From unknown Thu Jun 19 16:23:54 2025 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-Mailer: MIME-tools 5.509 (Entity 5.509) Content-Type: text/plain; charset=utf-8 From: bug#53882 <53882@debbugs.gnu.org> To: bug#53882 <53882@debbugs.gnu.org> Subject: Status: [PATCH] gnu: Add ocaml-core. Reply-To: bug#53882 <53882@debbugs.gnu.org> Date: Thu, 19 Jun 2025 23:23:54 +0000 retitle 53882 [PATCH] gnu: Add ocaml-core. reassign 53882 guix-patches submitter 53882 Julien Lepiller severity 53882 normal tag 53882 patch thanks From debbugs-submit-bounces@debbugs.gnu.org Tue Feb 08 15:08:30 2022 Received: (at submit) by debbugs.gnu.org; 8 Feb 2022 20:08:30 +0000 Received: from localhost ([127.0.0.1]:48755 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nHWmr-0002IN-Sz for submit@debbugs.gnu.org; Tue, 08 Feb 2022 15:08:30 -0500 Received: from lists.gnu.org ([209.51.188.17]:58628) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nHWmq-0002ID-7O for submit@debbugs.gnu.org; Tue, 08 Feb 2022 15:08:28 -0500 Received: from eggs.gnu.org ([209.51.188.92]:39402) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nHWmp-0001qW-Qa for guix-patches@gnu.org; Tue, 08 Feb 2022 15:08:28 -0500 Received: from lepiller.eu ([89.234.186.109]:45040) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nHWmn-0005zf-5C for guix-patches@gnu.org; Tue, 08 Feb 2022 15:08:27 -0500 Received: from lepiller.eu (localhost [127.0.0.1]) by lepiller.eu (OpenSMTPD) with ESMTP id 788d1f30 for ; Tue, 8 Feb 2022 20:08:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed; d=lepiller.eu; h=date:from :to:subject:message-id:mime-version:content-type :content-transfer-encoding; s=dkim; bh=W+CyikeQg2H5GbaHSvXIXKGLA 9Wz6Op+EicQudu33vU=; b=GmUnBDgMluKmQI+KiTUa04t4FyvGS1awTu7dDN9D8 H69zItFg+X6ZJNzP4rpPuwFph4m9ckpX0Y4vR7lnRvW1MRZ+z2QbzjZsJQ8EWDj/ czeWw6QIa/U4LeSKQjgDy3nATHSOi8CoIrgoSuyLWzzhIFl9sPV5W6RnOsq0ycv3 wpBlXEE/mL2NKtJdPg60UY+vLDVeLEDsFVXtMK2BfhScme+fMOs86D1om5FScDPM y9zCb2ZJBhOazPDFSHIrcASfYN6WtEGtiwzAmSgffWFNUFj1HTDMd2s/Xv5KYDxd pw8j+Rv+Sko/bpHhLIFj3Q+SOsB9rg5koh0C+bKPYA9Ng== Received: by lepiller.eu (OpenSMTPD) with ESMTPSA id 8c98008a (TLSv1.3:AEAD-AES256-GCM-SHA384:256:NO) for ; Tue, 8 Feb 2022 20:08:19 +0000 (UTC) Date: Tue, 8 Feb 2022 21:08:15 +0100 From: Julien Lepiller To: guix-patches@gnu.org Subject: [PATCH] gnu: Add ocaml-core. Message-ID: <20220208210815.7ae6484d@tachikoma.lepiller.eu> X-Mailer: Claws Mail 4.0.0 (GTK+ 3.24.30; x86_64-pc-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Received-SPF: pass client-ip=89.234.186.109; envelope-from=julien@lepiller.eu; helo=lepiller.eu X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: -1.3 (-) X-Debbugs-Envelope-To: submit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.3 (--) Hi Guix! This patch series adds ocaml-core. It's one of the missing dependencies for bap. Adding this will get us closer to being able to update bap, and getting rid of its ocaml4.07 dependencies. The first two patches modify the importer, and I needed them to import the packages. The following patches are dependencies of ocaml-core. All of them follow the same principle: add the package and make the ocaml4.07 variant inherit from it. The derivation for most of these variants stay the same. From debbugs-submit-bounces@debbugs.gnu.org Tue Feb 08 15:15:04 2022 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 To: 53882@debbugs.gnu.org Subject: [PATCH 01/24] import: opam: Accept tabulations. 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 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 53882 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * 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 ":") -- 2.34.0 From debbugs-submit-bounces@debbugs.gnu.org Tue Feb 08 15:15:05 2022 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 To: 53882@debbugs.gnu.org Subject: [PATCH 02/24] import: opam: Factor out source import. 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 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 53882 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) 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 -- 2.34.0 From debbugs-submit-bounces@debbugs.gnu.org Tue Feb 08 15:15:07 2022 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 To: 53882@debbugs.gnu.org Subject: [PATCH 04/24] gnu: Add ocaml-typerep. 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 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 53882 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * 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 -- 2.34.0 From debbugs-submit-bounces@debbugs.gnu.org Tue Feb 08 15:15:11 2022 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 To: 53882@debbugs.gnu.org Subject: [PATCH 03/24] gnu: Add ocaml-spawn. 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 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 53882 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * 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") -- 2.34.0 From debbugs-submit-bounces@debbugs.gnu.org Tue Feb 08 15:15:13 2022 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 To: 53882@debbugs.gnu.org Subject: [PATCH 05/24] gnu: Add ocaml-ppx-typerep-conv. 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 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 53882 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * 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 -- 2.34.0 From debbugs-submit-bounces@debbugs.gnu.org Tue Feb 08 15:15:16 2022 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 To: 53882@debbugs.gnu.org Subject: [PATCH 06/24] gnu: Add ocaml-ppx-string. 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 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 53882 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * 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") -- 2.34.0 From debbugs-submit-bounces@debbugs.gnu.org Tue Feb 08 15:15:16 2022 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 To: 53882@debbugs.gnu.org Subject: [PATCH 07/24] gnu: Add ocaml-ppx-stable. 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 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 53882 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * 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") -- 2.34.0 From debbugs-submit-bounces@debbugs.gnu.org Tue Feb 08 15:15:17 2022 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 To: 53882@debbugs.gnu.org Subject: [PATCH 08/24] gnu: Add ocmal-ppx-pipebang. 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 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 53882 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * 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 -- 2.34.0 From debbugs-submit-bounces@debbugs.gnu.org Tue Feb 08 15:15:17 2022 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 To: 53882@debbugs.gnu.org Subject: [PATCH 10/24] gnu: Add ocaml-ppx-fixed-literal. 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 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 53882 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * 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") -- 2.34.0 From debbugs-submit-bounces@debbugs.gnu.org Tue Feb 08 15:15:17 2022 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 To: 53882@debbugs.gnu.org Subject: [PATCH 09/24] gnu: Add ocaml-ppx-module-timer. 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 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 53882 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * 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") -- 2.34.0 From debbugs-submit-bounces@debbugs.gnu.org Tue Feb 08 15:15:18 2022 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 To: 53882@debbugs.gnu.org Subject: [PATCH 11/24] gnu: Add ocaml-bin-prot. 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 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 53882 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * 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 -- 2.34.0 From debbugs-submit-bounces@debbugs.gnu.org Tue Feb 08 15:15:18 2022 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 To: 53882@debbugs.gnu.org Subject: [PATCH 12/24] gnu: Add ocaml-ppx-bin-prot. 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 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 53882 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * 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 -- 2.34.0 From debbugs-submit-bounces@debbugs.gnu.org Tue Feb 08 15:15:18 2022 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 To: 53882@debbugs.gnu.org Subject: [PATCH 13/24] gnu: Add ocaml-ppx-bench. 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 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 53882 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * 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 -- 2.34.0 From debbugs-submit-bounces@debbugs.gnu.org Tue Feb 08 15:15:19 2022 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 To: 53882@debbugs.gnu.org Subject: [PATCH 14/24] gnu: Add ocaml-ppx-sexp-value. 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 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 53882 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * 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 -- 2.34.0 From debbugs-submit-bounces@debbugs.gnu.org Tue Feb 08 15:15:19 2022 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 To: 53882@debbugs.gnu.org Subject: [PATCH 15/24] gnu: Add ocaml-ppx-sexp-message. 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 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 53882 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * 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 -- 2.34.0 From debbugs-submit-bounces@debbugs.gnu.org Tue Feb 08 15:15:20 2022 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 To: 53882@debbugs.gnu.org Subject: [PATCH 16/24] gnu: Add ocaml-splittable-random. 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 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 53882 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * 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 -- 2.34.0 From debbugs-submit-bounces@debbugs.gnu.org Tue Feb 08 15:15:20 2022 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 To: 53882@debbugs.gnu.org Subject: [PATCH 17/24] gnu: Add ocaml-base-quickcheck. 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 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 53882 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * 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") -- 2.34.0 From debbugs-submit-bounces@debbugs.gnu.org Tue Feb 08 15:15:20 2022 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 To: 53882@debbugs.gnu.org Subject: [PATCH 18/24] gnu: Add ocaml-ppx-fail. 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 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 53882 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * 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 -- 2.34.0 From debbugs-submit-bounces@debbugs.gnu.org Tue Feb 08 15:15:21 2022 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 To: 53882@debbugs.gnu.org Subject: [PATCH 19/24] gnu: Add ocmal-ppx-jane. 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 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 53882 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * 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)))) -- 2.34.0 From debbugs-submit-bounces@debbugs.gnu.org Tue Feb 08 15:15:21 2022 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 To: 53882@debbugs.gnu.org Subject: [PATCH 20/24] gnu: Add ocaml-base-bigstring. 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 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 53882 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * 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") -- 2.34.0 From debbugs-submit-bounces@debbugs.gnu.org Tue Feb 08 15:15:22 2022 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 To: 53882@debbugs.gnu.org Subject: [PATCH 21/24] gnu: Add ocaml-core-kernel. 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 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 53882 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * 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 -- 2.34.0 From debbugs-submit-bounces@debbugs.gnu.org Tue Feb 08 15:15:22 2022 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 To: 53882@debbugs.gnu.org Subject: [PATCH 22/24] gnu: Add ocaml-timezone. 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 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 53882 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * 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") -- 2.34.0 From debbugs-submit-bounces@debbugs.gnu.org Tue Feb 08 15:15:22 2022 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 To: 53882@debbugs.gnu.org Subject: [PATCH 23/24] gnu: ocaml-jane-street-headers: Add variant. 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 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 53882 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * 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 -- 2.34.0 From debbugs-submit-bounces@debbugs.gnu.org Tue Feb 08 15:15:23 2022 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 To: 53882@debbugs.gnu.org Subject: [PATCH 24/24] gnu: Add ocaml-core. 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 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 53882 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * 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 -- 2.34.0 From debbugs-submit-bounces@debbugs.gnu.org Wed Feb 23 11:12:31 2022 Received: (at 53882) by debbugs.gnu.org; 23 Feb 2022 16:12:31 +0000 Received: from localhost ([127.0.0.1]:46099 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nMuFi-0002eb-QB for submit@debbugs.gnu.org; Wed, 23 Feb 2022 11:12:30 -0500 Received: from mail-wr1-f52.google.com ([209.85.221.52]:33704) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nMuFh-0002eO-QJ for 53882@debbugs.gnu.org; Wed, 23 Feb 2022 11:12:30 -0500 Received: by mail-wr1-f52.google.com with SMTP id j17so13750414wrc.0 for <53882@debbugs.gnu.org>; Wed, 23 Feb 2022 08:12:29 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:references:date:in-reply-to:message-id :user-agent:mime-version:content-transfer-encoding; bh=KQrKFQEjZFu1K+guvnxarzx6Ss8hCveEmOEsLVeyYIA=; b=KWMCcDSfq1ZgCgrA53Tx+tTNZTmrhPJd+RMRZHeH4uC03yQeSv8TRAMSlgJRdqdNVv VbrX5VxQSMRPRQ2LDSdmCKY1nNKRYgsdGBrwZ78WLIetQ3lV0jieVDCy8j+J/wWlckNK 3FXmv3L77/5gzdjw4yv7i0Z/nPF/3Zz4B1D/9dIhDq+Qzti5JhMd44L5clP9NxqF8HWo iEoTbjrInhp/aqkXcH61Yuu9bW83D1lAIp4z7JO/okL/f7DW9/ZRoK0IkyCZoFZ6Nv38 hK4OsyqpcMzhoq0lOQdQxEE4Tn+FEH3apQ5lc/g8HL+Nu2IC6FIc37+txfbT3b9CPLSf zb4w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:references:date:in-reply-to :message-id:user-agent:mime-version:content-transfer-encoding; bh=KQrKFQEjZFu1K+guvnxarzx6Ss8hCveEmOEsLVeyYIA=; b=McI+6/XD0rPqLTL8E5C+vHQRqpUN42KvECYvV4yexXpnYIZnCRdyG83RH1hZKAe6Q/ p2W+T+bffercU6yDPGP2q4XWK/dGkhqa5sIB6MSjkd3Op6v9r4+rfeVtK1l2+AFmABsN MpUDngszFJhnEaQB1UOmNqXLe5XdKr9F17aPBKwH021RBGNJv/Rg094rGr5LXxkEYmCr FHUGQYHPLbPzl4QnN2bDvrYNml+g9a4Xv8+GWqIUvfMX2RbG7lLaMBx/G8b1CsSb1KY6 dbG/Ok2Lz1zZJtmLqcex+rXxmSmcY2hUjinJv0nqzjfuj5daWFO4n/5+F54OtIW41NZo wXqw== X-Gm-Message-State: AOAM531sjDQEFFuBHhSrMNvYgPBNu+2i4sT3yquRLx03TlIXqpja8yTY aIIPUop9XNd5EAQdpQuX/e8mt/LfaJs= X-Google-Smtp-Source: ABdhPJxMJyTNSYRMxl85gJgHFPIIGiqozufFc+TYNo7cmJNG/tTLgqmXavdSKq6Qed/F+3jOWge6NA== X-Received: by 2002:adf:ef92:0:b0:1e3:3f68:feb7 with SMTP id d18-20020adfef92000000b001e33f68feb7mr251208wro.443.1645632743723; Wed, 23 Feb 2022 08:12:23 -0800 (PST) Received: from pfiuh07 ([193.48.40.241]) by smtp.gmail.com with ESMTPSA id p12sm53071wmg.36.2022.02.23.08.12.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 23 Feb 2022 08:12:23 -0800 (PST) From: zimoun To: Julien Lepiller Subject: Re: bug#53882 [PATCH 19/24] gnu: Add ocmal-ppx-jane. References: <1dcef02fe1f5f25657c6427d09c43bfc41091050.1644350657.git.julien@lepiller.eu> <34da3833791425a6168fdcf79c91381ecf469af1.1644350658.git.julien@lepiller.eu> Date: Wed, 23 Feb 2022 17:12:18 +0100 In-Reply-To: <34da3833791425a6168fdcf79c91381ecf469af1.1644350658.git.julien@lepiller.eu> (Julien Lepiller's message of "Tue, 8 Feb 2022 21:14:45 +0100") Message-ID: <87h78pblzx.fsf_-_@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 53882 Cc: 53882@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Hi Julien, On mar., 08 f=C3=A9vr. 2022 at 21:14, Julien Lepiller = wrote: > * 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 [...] > + (list ocaml-base-quickcheck [...] > + ocaml-ppx-fixed-literal As far I see, this is not defined, i.e., missing. --8<---------------cut here---------------start------------->8--- [ 78%] GUILEC gnu/packages/ocaml.go : warning: possibly unbound variable `ocaml-ppx-fixed-lit= eral' --8<---------------cut here---------------end--------------->8--- Cheers, simon From debbugs-submit-bounces@debbugs.gnu.org Wed Feb 23 13:09:29 2022 Received: (at 53882) by debbugs.gnu.org; 23 Feb 2022 18:09:29 +0000 Received: from localhost ([127.0.0.1]:46448 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nMw4u-0005pn-Vu for submit@debbugs.gnu.org; Wed, 23 Feb 2022 13:09:29 -0500 Received: from albert.telenet-ops.be ([195.130.137.90]:53290) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nMw4s-0005pe-QW for 53882@debbugs.gnu.org; Wed, 23 Feb 2022 13:09:27 -0500 Received: from ptr-bvsjgyhxw7psv60dyze.18120a2.ip6.access.telenet.be ([IPv6:2a02:1811:8c09:9d00:3c5f:2eff:feb0:ba5a]) by albert.telenet-ops.be with bizsmtp id yi9Q2600M4UW6Th06i9Qm2; Wed, 23 Feb 2022 19:09:25 +0100 Message-ID: Subject: Re: [bug#53882] [PATCH 01/24] import: opam: Accept tabulations. From: Maxime Devos To: Julien Lepiller , 53882@debbugs.gnu.org Date: Wed, 23 Feb 2022 19:09:20 +0100 In-Reply-To: <1dcef02fe1f5f25657c6427d09c43bfc41091050.1644350657.git.julien@lepiller.eu> References: <20220208210815.7ae6484d@tachikoma.lepiller.eu> <1dcef02fe1f5f25657c6427d09c43bfc41091050.1644350657.git.julien@lepiller.eu> Content-Type: multipart/signed; micalg="pgp-sha512"; protocol="application/pgp-signature"; boundary="=-hVRwj6DJmggBY7fQLtwp" User-Agent: Evolution 3.38.3-1 MIME-Version: 1.0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r22; t=1645639765; bh=B+IWUD9lIeFinTjFOI73y16/1jNC8pfi5BYcLTVrjJY=; h=Subject:From:To:Date:In-Reply-To:References; b=OOzY45NEpZegYaEh9+VtgpSsSkagm/TbPPVQYyH61aegq/16dZ8ZUPo3ho2RUpo6p YA23rABAFvtwI3KqdAhonNrcb26u3ofU+fkYLNI5uvMHef9TOMfAHBpc9kkH83bE6N EeTQeSm1nAP6x5lMchkvQWZqVA+AkHY9GlDHqifFLYxTzaKcavJRRGU9I5kOx9KRUV kH+wIYVQjP1ecrkx0IP3rqtW67yoiN38Q6QDuGkfUyJGnGLAsrk/3ThV/QGaHRKC9W 4MJ695C1TgQ7wzIfjJLiVyuYyMmezZjygrihbwQ0HdpNGanWOOJDbvtA0wuuD3yXCm wcBmJsurSQEGg== X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 53882 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) --=-hVRwj6DJmggBY7fQLtwp Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable Julien Lepiller schreef op di 08-02-2022 om 21:14 [+0100]: > =C2=A0;; Define a PEG parser for the opam format > =C2=A0(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")) To test this, perhaps a few spaces can be replaced by tabs in 'test-opam-file' in tests/opam.scm? Greetings, Maxime. --=-hVRwj6DJmggBY7fQLtwp Content-Type: application/pgp-signature; name="signature.asc" Content-Description: This is a digitally signed message part Content-Transfer-Encoding: 7bit -----BEGIN PGP SIGNATURE----- iI0EABYKADUWIQTB8z7iDFKP233XAR9J4+4iGRcl7gUCYhZ4UBccbWF4aW1lZGV2 b3NAdGVsZW5ldC5iZQAKCRBJ4+4iGRcl7gcJAP4kD43uzLVfqxuG8/OiMdn4xIB0 zqYHpdI51+3vT4tr4AD+J9JPs+ppy2DcwbVgGWMGP9ShywhH66oRBVdIyyAf5Qk= =aTBV -----END PGP SIGNATURE----- --=-hVRwj6DJmggBY7fQLtwp-- From debbugs-submit-bounces@debbugs.gnu.org Thu Mar 17 08:56:30 2022 Received: (at 53882) by debbugs.gnu.org; 17 Mar 2022 12:56:31 +0000 Received: from localhost ([127.0.0.1]:53431 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nUpg6-0001DZ-Lp for submit@debbugs.gnu.org; Thu, 17 Mar 2022 08:56:30 -0400 Received: from mail-wr1-f41.google.com ([209.85.221.41]:41740) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nUpg5-0001DJ-4N for 53882@debbugs.gnu.org; Thu, 17 Mar 2022 08:56:29 -0400 Received: by mail-wr1-f41.google.com with SMTP id h23so6637221wrb.8 for <53882@debbugs.gnu.org>; Thu, 17 Mar 2022 05:56:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:references:date:in-reply-to:message-id :user-agent:mime-version; bh=WHroRbZoHDP6dN1JtZQRgAiaSEHz/7GUGQnrIzB6GtU=; b=OrUcKTbRKH5F44eOvjLGJNK9yB6U0iHcmIJskzb4xZ4A8HNVx15ofr9jqVDkUQGFYA 0jmt3aJ8ICSR7ehmQSeVguK43AOiGSpjIsBPDNTsMDUKwRhx3AuNJaKrKJrbUgUftluf NZzefTRMzOrTKXZWqDQ7AtwVGQSI/S0YSLMCYshL+GTIAxFfrMtlY4ovO9jW2K+GF5Iv LQcDC0Yo+WX5b3hj4KnS8f/s7GMkGL8xl7m6mnyctR2XLP3YWJGlb2tSYqI+3CoJUk97 u/MZ6qFfTfKqYZqMxk/V3S4eGE2a3/Sx3wrfT6tT8txE1SJtrxYgMZV4NxJpFkaO4nWC ykPw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:references:date:in-reply-to :message-id:user-agent:mime-version; bh=WHroRbZoHDP6dN1JtZQRgAiaSEHz/7GUGQnrIzB6GtU=; b=f4CkmGBhJ4oQi1QtSnaxWI7CTtL+goDIpiLHXV3wOti6h1ZHU6ntzP0KBViC9WPb/T gkPzpFbtqccfZEG0qSCICbbqxXFlpNnXX8O3sgzTa3zkWAjJFfjVUJVj+BP/waTF19z9 uXtEgpG4jToSKAa5wM/Dp17B97Ew/fqSJHSG6ecmpmSllLcS4vcSxL9TewuanfcCEmix vVEEJyEKBG+X9PK5QG9bWCRvq0ogIlUyoL7kAM5W/mOOD0UW/j7nwIfuYHwDxa0fVxWd pawnozXzU/HsmJUL2Thb5FzYD5g9OQU91EJ8BNKaIhFM91y1g4+u9MvLPN9pYhM5Ttza CDQw== X-Gm-Message-State: AOAM533vcRBzFFOft1spuReJFa/QLuooc+k00l60lkS5x6BlDlHpLFTt mSTgnOCzG+a8SthF89FWIlwc8F6HOQ4= X-Google-Smtp-Source: ABdhPJym9vnnLl7s2mEeKoy9uScj14Fv1IdC4Oy3pkuHA8pMnD23dgyX+aym6W4URW8Rq5uoR9fLlw== X-Received: by 2002:adf:fc51:0:b0:203:da3e:7d96 with SMTP id e17-20020adffc51000000b00203da3e7d96mr3943706wrs.242.1647521782959; Thu, 17 Mar 2022 05:56:22 -0700 (PDT) Received: from pfiuh07 ([193.48.40.241]) by smtp.gmail.com with ESMTPSA id 2-20020a1c1902000000b00380d3873d6asm4340305wmz.43.2022.03.17.05.56.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 17 Mar 2022 05:56:22 -0700 (PDT) From: zimoun To: Julien Lepiller Subject: Re: bug#53882: [PATCH] gnu: Add ocaml-core. References: <1dcef02fe1f5f25657c6427d09c43bfc41091050.1644350657.git.julien@lepiller.eu> <34da3833791425a6168fdcf79c91381ecf469af1.1644350658.git.julien@lepiller.eu> <87h78pblzx.fsf_-_@gmail.com> Date: Tue, 15 Mar 2022 15:14:39 +0100 In-Reply-To: <87h78pblzx.fsf_-_@gmail.com> (zimoun's message of "Wed, 23 Feb 2022 17:12:18 +0100") Message-ID: <87k0cv8fqo.fsf_-_@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: 0.5 (/) X-Debbugs-Envelope-To: 53882 Cc: 53882@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.5 (/) Hi Julien, >> * gnu/packages/ocaml.scm (ocaml-ppx-jane): New variable. [...] > [ 78%] GUILEC gnu/packages/ocaml.go > : warning: possibly unbound variable `ocaml-ppx-fixed-literal' Did you have a chance to look into it? Cheers, simon From debbugs-submit-bounces@debbugs.gnu.org Tue Apr 05 12:07:49 2022 Received: (at 53882) by debbugs.gnu.org; 5 Apr 2022 16:07:50 +0000 Received: from localhost ([127.0.0.1]:55902 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nblif-0005Z4-J6 for submit@debbugs.gnu.org; Tue, 05 Apr 2022 12:07:49 -0400 Received: from eggs.gnu.org ([209.51.188.92]:39936) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nblid-0005Ym-MT for 53882@debbugs.gnu.org; Tue, 05 Apr 2022 12:07:47 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]:35444) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nbliY-0006yg-D4; Tue, 05 Apr 2022 12:07:42 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:In-Reply-To:Date:References:Subject:To: From; bh=UMZWBFPsm6SUaP12DSVzKW4vySgZ1SZv7PaQp2SanNE=; b=KiKfcQr3B5Fx3mvXhShT pXuKakdDObXSFWDcE6WiyL4Mzn7wYGzmBblUBB7yavK9Gbav1SWowt7eIThP5B744C7204nYdAhtU 3NESwE5K1hrNEwpGv8I8erZD40MCcfQZ8SeMgzdWqimobEFYOKkH4dUksRBMgZqIFDISyWY57Jt/F l2hMRAsXjky8U/XhH2J0oj4p9vSnx6FHQX2eUtLsfIedRqgG15cD/vSIVCl4BEMGrV/EfcPDpzQej CDKFNKx+IJxptpjqm0D0CsVHA4eF7oYwzrJ/7F2EPJ9G5EdUYCJB5BZ/tj/4Hjc1frTqTYKV/82gy Z1465nlnM1SL/A==; Received: from [193.50.110.173] (port=58782 helo=ribbon) by fencepost.gnu.org with esmtpsa (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nbliX-00056u-Pi; Tue, 05 Apr 2022 12:07:42 -0400 From: =?utf-8?Q?Ludovic_Court=C3=A8s?= To: Julien Lepiller Subject: Re: bug#53882: [PATCH] gnu: Add ocaml-core. References: <1dcef02fe1f5f25657c6427d09c43bfc41091050.1644350657.git.julien@lepiller.eu> <34da3833791425a6168fdcf79c91381ecf469af1.1644350658.git.julien@lepiller.eu> <87h78pblzx.fsf_-_@gmail.com> <87k0cv8fqo.fsf_-_@gmail.com> Date: Tue, 05 Apr 2022 18:07:40 +0200 In-Reply-To: <87k0cv8fqo.fsf_-_@gmail.com> (zimoun's message of "Tue, 15 Mar 2022 15:14:39 +0100") Message-ID: <877d83ms37.fsf_-_@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 53882 Cc: 53882@debbugs.gnu.org, zimoun X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) Ping! :-) zimoun skribis: > Hi Julien, > >>> * gnu/packages/ocaml.scm (ocaml-ppx-jane): New variable. > > [...] > >> [ 78%] GUILEC gnu/packages/ocaml.go >> : warning: possibly unbound variable `ocaml-ppx-fixed-literal' > > Did you have a chance to look into it? > > > > Cheers, > simon From debbugs-submit-bounces@debbugs.gnu.org Wed Apr 06 15:28:08 2022 Received: (at 53882) by debbugs.gnu.org; 6 Apr 2022 19:28:08 +0000 Received: from localhost ([127.0.0.1]:59187 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ncBK4-00038g-5l for submit@debbugs.gnu.org; Wed, 06 Apr 2022 15:28:08 -0400 Received: from mail-wm1-f43.google.com ([209.85.128.43]:37775) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ncBK2-000383-Tu for 53882@debbugs.gnu.org; Wed, 06 Apr 2022 15:28:07 -0400 Received: by mail-wm1-f43.google.com with SMTP id l7-20020a05600c1d0700b0038c99618859so4282947wms.2 for <53882@debbugs.gnu.org>; Wed, 06 Apr 2022 12:28:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:references:date:in-reply-to:message-id :user-agent:mime-version; bh=xggVPKKg5vgUqHSDoxFbQXL3rVlEQ5PvZAu+h+C97uY=; b=hrY/Kk1yA2qExUZE4fxqn4KgBT7NwObPl6qTCfIJUTUDqqDWwg3D2CiMPcgQw/V3+2 xoIydjPp0U91y0aYfv35439h7hB7Lpa6GG2DYhPs71sWer9I3riMsUlhrx5ISoNNgEzo c2EEkbNooUQdBCxlqOcH0PAJwszj1ZSkk8omoGOQLqDm1wpBHu950p1pyad4rDza7xLl zfdcaMzdRjLzlUgwPNLcMIWXrsupCEX2wgFUOPzZXahsSpEFzF3VUZyunQKHw0hCEwW/ TVzR9sYYz6kVdHRHnwbVGUXkL0IuMHdCopsFTAGrnYDGelsdfwHb68BtXvm+tomMQ4ZI zrqw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:references:date:in-reply-to :message-id:user-agent:mime-version; bh=xggVPKKg5vgUqHSDoxFbQXL3rVlEQ5PvZAu+h+C97uY=; b=s1h30uv44hIiaFQTDwyx3ScEgjgqZy7hl5H863T7hdfY165p0Zs+Z5WnV2AchwtT8n 8AAhT0TxaZ2e+B8NN9SP74EzKQOod/bW3YK+AwM3t1uK4EO8dpVT6Zn6VZvcp8nDeLW4 uqjwVW1lChm3KWbXCrZTE4NEu3HdhIVizpVkceS4YRBsrzN61x8t7B6wTIEbS5m8Drq4 AOYkmsehE3Fijc96BThqIm8spiBs7mMZQyKYPczvt4i93/2EeFs6qBXalpoYyQsMsfWO NZ+4gLzaTCHzVC0EF49SMF2c0/qP7zrIvmeG96lbUefxuwlJAdSue/kvRfweCG2wyNIT xBdg== X-Gm-Message-State: AOAM5327EKQ8je+xlmo3KaP3bM5BAl8BTjVnqGOmvAaz5IRKSW6DDfoy ZunPQCzwqAzpmxztdouJTG1tsvG63NI= X-Google-Smtp-Source: ABdhPJxmFryB6ZH1FIMTe0CMxuBGcw2MrVwqqXbXOL3s24MU6L2mQIoqH+qHckLQnSe38syXxQWY7A== X-Received: by 2002:a05:600c:3b26:b0:38c:8358:4b84 with SMTP id m38-20020a05600c3b2600b0038c83584b84mr9004969wms.185.1649273280662; Wed, 06 Apr 2022 12:28:00 -0700 (PDT) Received: from pfiuh07 ([193.48.40.241]) by smtp.gmail.com with ESMTPSA id s1-20020adfb781000000b002060d4a8bd9sm10403100wre.17.2022.04.06.12.28.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 06 Apr 2022 12:28:00 -0700 (PDT) From: zimoun To: Ludovic =?utf-8?Q?Court=C3=A8s?= Subject: Re: bug#53882: [PATCH] gnu: Add ocaml-core. References: <1dcef02fe1f5f25657c6427d09c43bfc41091050.1644350657.git.julien@lepiller.eu> <34da3833791425a6168fdcf79c91381ecf469af1.1644350658.git.julien@lepiller.eu> <87h78pblzx.fsf_-_@gmail.com> <87k0cv8fqo.fsf_-_@gmail.com> <877d83ms37.fsf_-_@gnu.org> Date: Wed, 06 Apr 2022 21:00:01 +0200 In-Reply-To: <877d83ms37.fsf_-_@gnu.org> ("Ludovic =?utf-8?Q?Court=C3=A8s?= =?utf-8?Q?=22's?= message of "Tue, 05 Apr 2022 18:07:40 +0200") Message-ID: <8735iqqbpq.fsf_-_@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 53882 Cc: 53882@debbugs.gnu.org, Julien Lepiller X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Hi Ludo, I have v2 which fixes minor things (typo, indent etc.). The other one about ocaml-ppx-jane seems an error an my side. I will send this v2 on this Friday Apr. 8th. However, the series will be broken because of ocaml-odoc broken [1] by: --8<---------------cut here---------------start------------->8--- commit bd9eb9ef27496e951c070f5b206c164c0c998483 Author: Julien Lepiller Date: Sun Mar 13 14:48:53 2022 +0100 gnu: dune: Update to 3.0.3. * gnu/packages/ocaml.scm (dune): Update to 3.0.3. (dune-configurator)[arguments]: Remove vendored dependencies. (ocaml4.09-dune-configurator)[arguments]: Extend from dune-configurator. gnu/packages/ocaml.scm | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) --8<---------------cut here---------------end--------------->8--- This series is independant of the failure but it would be cool to shave the yak. ;-) I will give a look on this Friday if no one beats me. 1: Cheers, simon From debbugs-submit-bounces@debbugs.gnu.org Thu Apr 07 06:08:17 2022 Received: (at submit) by debbugs.gnu.org; 7 Apr 2022 10:08:21 +0000 Received: from localhost ([127.0.0.1]:59893 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ncP3Z-00030l-0p for submit@debbugs.gnu.org; Thu, 07 Apr 2022 06:08:15 -0400 Received: from lists.gnu.org ([209.51.188.17]:59122) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ncP2m-0002qw-I4 for submit@debbugs.gnu.org; Thu, 07 Apr 2022 06:07:47 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:37326) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ncP2j-0006Qw-P4 for guix-patches@gnu.org; Thu, 07 Apr 2022 06:07:11 -0400 Received: from mout02.posteo.de ([185.67.36.66]:42035) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ncP2f-00066S-I7 for guix-patches@gnu.org; Thu, 07 Apr 2022 06:07:09 -0400 Received: from submission (posteo.de [185.67.36.169]) by mout02.posteo.de (Postfix) with ESMTPS id 2218624010B for ; Thu, 7 Apr 2022 12:07:02 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1649326022; bh=RDw/2WTQMMUyEwg/iyGAobqi7fL2usGo+J3MXVJPQAA=; h=From:To:Cc:Subject:Date:From; b=qgZPSnQahKOWayJxLRvlwgmnwra5TyAUIdzelQ5giLaENOlNYkkSd/vGER+x1FrzV KlUy6TpfKsUtjKWEoCd7/XwCTMucA7cNzsh7BgJTYybsHUk8NEcHwL88RCR1wK5zck qBKB956RCeAzy45O+km4e4mKpmsKmbS8vjxRX7tBkK77+V15s0ifsF12b1dGMEeMBL IQpmcZG6Z9PwAqbHn61FUuZ8mFY9bTERUOE2eJlCxE+DmXScuTFohN0EOa5au8jXnH 5gHfOAjYy7E9l9aPCbHF5PHEyGJnSou8Yw/OhmHAVsj2USVUP3wN7LrOihe354f8Jy xqv4FU132xBhg== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4KYxr23Nzcz6tnC; Thu, 7 Apr 2022 12:06:58 +0200 (CEST) References: <1dcef02fe1f5f25657c6427d09c43bfc41091050.1644350657.git.julien@lepiller.eu> <34da3833791425a6168fdcf79c91381ecf469af1.1644350658.git.julien@lepiller.eu> <87h78pblzx.fsf_-_@gmail.com> <87k0cv8fqo.fsf_-_@gmail.com> <877d83ms37.fsf_-_@gnu.org> <8735iqqbpq.fsf_-_@gmail.com> From: pukkamustard To: zimoun Subject: Re: [bug#53882] [PATCH] gnu: Add ocaml-core. Date: Thu, 07 Apr 2022 10:04:55 +0000 In-reply-to: <8735iqqbpq.fsf_-_@gmail.com> Message-ID: <86h775p5q6.fsf@posteo.net> MIME-Version: 1.0 Content-Type: text/plain Received-SPF: pass client-ip=185.67.36.66; envelope-from=pukkamustard@posteo.net; helo=mout02.posteo.de X-Spam_score_int: -43 X-Spam_score: -4.4 X-Spam_bar: ---- X-Spam_report: (-4.4 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_MED=-2.3, RCVD_IN_MSPIKE_H5=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: -1.3 (-) X-Debbugs-Envelope-To: submit Cc: 53882@debbugs.gnu.org, Ludovic =?utf-8?Q?Court=C3=A8s?= , Julien Lepiller , guix-patches@gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.3 (--) zimoun writes: > However, the series will be broken because of ocaml-odoc broken [1] by: > > commit bd9eb9ef27496e951c070f5b206c164c0c998483 > Author: Julien Lepiller > Date: Sun Mar 13 14:48:53 2022 +0100 > > gnu: dune: Update to 3.0.3. > > * gnu/packages/ocaml.scm (dune): Update to 3.0.3. > (dune-configurator)[arguments]: Remove vendored dependencies. > (ocaml4.09-dune-configurator)[arguments]: Extend from dune-configurator. > > gnu/packages/ocaml.scm | 17 ++++++++++++----- > 1 file changed, 12 insertions(+), 5 deletions(-) > > This series is independant of the failure but it would be cool to shave > the yak. ;-) I will give a look on this Friday if no one beats me. I've already tried shaving the yak (: https://issues.guix.gnu.org/54596 - pukkamustard From debbugs-submit-bounces@debbugs.gnu.org Fri Apr 08 09:22:10 2022 Received: (at 53882) by debbugs.gnu.org; 8 Apr 2022 13:22:10 +0000 Received: from localhost ([127.0.0.1]:34204 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ncoZ0-0007jF-EN for submit@debbugs.gnu.org; Fri, 08 Apr 2022 09:22:10 -0400 Received: from mail-wr1-f52.google.com ([209.85.221.52]:33698) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ncoYz-0007j2-9T for 53882@debbugs.gnu.org; Fri, 08 Apr 2022 09:22:09 -0400 Received: by mail-wr1-f52.google.com with SMTP id c7so12910944wrd.0 for <53882@debbugs.gnu.org>; Fri, 08 Apr 2022 06:22:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=7GxWePjvSOtgQjYnHij1a0arkUdKpmNeo4xVk6H6Vrw=; b=lgmX6ifJpzQQiL2eSiapJ73azYUrztAhbxquDHSgMeCf8pKch0k5OKe2W7vZHEikUi HwnNFVNvfSc1FjeUxbqHuxfG/MZS/ikPcTaUM3zCdC39IImfui8nB5UqZiz7c40GXEmE 6a8CUn7QDywESeQggyd+xDoo+3lW0xPj66bqJY+dw/DPZA33CW2WUByz1ow3cy0/hK64 MXWaLwVkGenxG+bLckSMHSSzQ7zTbZH0ItARjiQCznC5PvN/TbPrUZ0BcPlMowxYiO91 iTn305DXoxM4DslBIAMugx+rhQBrFDmNgCQIxuHo9ZEEFIQwoCgEwSv/ygSlTwL2fA8m fQxQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=7GxWePjvSOtgQjYnHij1a0arkUdKpmNeo4xVk6H6Vrw=; b=IU5GfQU+XZN7iWALwwJi58cjSYaA5Wo5yni/A2Yg8WpkQFl/sohQucxsa3a5nGdBfn gLmH+oZttPIrFsd9iQuWTXOlLUHv2QWPixnlYmPLidUSylFlJOXX5r5VgphIm3ET0U1V iWYrL/HIUixLdGCXisj5Y/bdKUt2X/jMxgGeaDANMQJw6ukV8YMO08CsD5qRWPEN1ryj tV5IYN0+afgp/8YPoSsMejLdEuZYCL1ahLPPStHUqK8Ub+QsK7fKMQfJkOcMQa3pBwvV pv6SLuYy45gvZUcpmL72eBNziTTizKDzjooDNDKEeg/W3xH87KlMKiaYoAjPdJn0wYZ/ q5Uw== X-Gm-Message-State: AOAM530wMowln2p/fMH9sUKh8lGo/Wb+tTJeFSmsZsaDN6oH0gH5hecQ lNJIhhojF18mVFqYn8/6gyp67fR8Rtg= X-Google-Smtp-Source: ABdhPJwIYPahj4i8Bk48J7bLJCjrqBUWhpC1gesBqO1Cu4pPoXWyOsFbG2WbeeDw6N0JLqjFjKzDQQ== X-Received: by 2002:a5d:64e3:0:b0:204:1a79:f1b9 with SMTP id g3-20020a5d64e3000000b002041a79f1b9mr14344219wri.330.1649424123319; Fri, 08 Apr 2022 06:22:03 -0700 (PDT) Received: from localhost.localdomain ([193.48.40.241]) by smtp.gmail.com with ESMTPSA id f9-20020adff589000000b002060fcd92e9sm13428814wro.14.2022.04.08.06.22.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 08 Apr 2022 06:22:02 -0700 (PDT) From: zimoun To: 53882@debbugs.gnu.org Subject: [PATCH v2 00/25] Add ocaml-core Date: Fri, 8 Apr 2022 15:21:48 +0200 Message-Id: <20220408132148.3300884-1-zimon.toutoune@gmail.com> X-Mailer: git-send-email 2.34.0 MIME-Version: 1.0 X-Debbugs-CC: ludo@gnu.org Content-Transfer-Encoding: 8bit X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 53882 Cc: ludo@gnu.org, zimoun X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Hi, The aim of this series is: This patch series adds ocaml-core. It's one of the missing dependencies for bap. Adding this will get us closer to being able to update bap, and getting rid of its ocaml4.07 dependencies. The first two patches modify the importer, and I needed them to import the packages. The following patches are dependencies of ocaml-core. All of them follow the same principle: add the package and make the ocaml4.07 variant inherit from it. The derivation for most of these variants stay the same. and the first patch comes from #54596 fixing ocaml-odoc broken by the recent change about dune. All LTGM! I fixed minor typos and lint. Some descriptions would need a better wording but hey. :-) Cheers, simon Julien Lepiller (24): import: opam: Accept tabulations. import: opam: Factor out source import. gnu: Add ocaml-spawn. gnu: Add ocaml-typerep. gnu: Add ocaml-ppx-typerep-conv. gnu: Add ocaml-ppx-string. gnu: Add ocaml-ppx-stable. gnu: Add ocaml-ppx-pipebang. gnu: Add ocaml-ppx-module-timer. gnu: Add ocaml-ppx-fixed-literal. gnu: Add ocaml-bin-prot. gnu: Add ocaml-ppx-bin-prot. gnu: Add ocaml-ppx-bench. gnu: Add ocaml-ppx-sexp-value. gnu: Add ocaml-ppx-sexp-message. gnu: Add ocaml-splittable-random. gnu: Add ocaml-base-quickcheck. gnu: Add ocaml-ppx-fail. gnu: Add ocaml-ppx-jane. gnu: Add ocaml-base-bigstring. gnu: Add ocaml-core-kernel. gnu: Add ocaml-timezone. gnu: ocaml-jane-street-headers: Add variant. gnu: Add ocaml-core. pukkamustard (1): gnu: ocaml-odoc: Update to 2.2.0-alpha. gnu/packages/ocaml.scm | 1154 +++++++++++++++++++++++++++------------- guix/import/opam.scm | 85 +-- 2 files changed, 839 insertions(+), 400 deletions(-) base-commit: e3e3381fdbc56f351063d9b4a49e99645b20d7d3 -- 2.34.0 From debbugs-submit-bounces@debbugs.gnu.org Fri Apr 08 09:23:34 2022 Received: (at 53882) by debbugs.gnu.org; 8 Apr 2022 13:23:34 +0000 Received: from localhost ([127.0.0.1]:34219 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ncoaM-0007ma-9V for submit@debbugs.gnu.org; Fri, 08 Apr 2022 09:23:34 -0400 Received: from mail-wm1-f44.google.com ([209.85.128.44]:37503) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ncoaK-0007ln-1M for 53882@debbugs.gnu.org; Fri, 08 Apr 2022 09:23:32 -0400 Received: by mail-wm1-f44.google.com with SMTP id f16-20020a7bcd10000000b0038e9ce3b2a9so1125649wmj.2 for <53882@debbugs.gnu.org>; Fri, 08 Apr 2022 06:23:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=X0627M+mvPZUQUEyfxINxxlZPwERrL4xOD4cFA6DgLg=; b=YILLK4iNhZNRRqs6tGiH/q+iXDrnIkx3usFT2s6EBnpXZCRoOf4M3qUytdcDRnbu6u 1b8ylgHTWsBcBPcj7LeMVZHBNZhAPCTSRVxdx5QJHbYYXv3L0hF1ZIhVJlRpyrp9Ezi7 Hyk5tIxVbZ4Wmj6fJsAMPi4QyG6rEC3vro5RUc3UvvRHah9Ky81VTc9bjiprAabvjXh2 rRWInCdpVf4rrJY+MMI4JtssCXAxJj+9T1/Z5KuwjOvTC5onKjiuS+Fw6KEXfoJGyQZh GURIQuTq+P0ktPPaX5Br6OHqGNU+R5J/rlzJT3r38cGE3RSjplHmfLw/aVKoMprqVrkp 3KsQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=X0627M+mvPZUQUEyfxINxxlZPwERrL4xOD4cFA6DgLg=; b=2jv1MaPSt9Jhsmm3VHuG+uc4tVNtAA1HRItS1RVOaPYBE/Eq78bWB94iFzOAGRHaYv 2EpL1MY3+tDO9bf0tGEYsDeHmsoE6XT5LyxhiIBEyWL0f0dYyd0Mx3dta4OXAitgUHLp f3msOHLyNmrUIvzFKG4bH0rNiWRyYy9kYo1itPYb2+LaVw26MhRMCvVJ1ERt6A/i0FsQ NnH9nqDZZMIdmN4sPrdi0uJUk389Lvn0n7FteOQvAgg+uJ1L45Yrb4cPsxKJZnQHfVco dI55Ao+F+lhQKT4yButpnosxLyWh0JzyeFridrLkFMrwCeoFzzw1kUmxx8ut4pPEJQlG Dndg== X-Gm-Message-State: AOAM531k8xbhL/+Q70/AZlVcU4M1/Uzs/ca8UrGPF4SpQTSararTpTsf J/r/Yas5O3Y+P0igBWtbajqWBjDXfCI= X-Google-Smtp-Source: ABdhPJz5HBEmoIJt8f0/vrGEWrSQ1KqfVEMRDS7Kw86kQQI1Xr9U/k2lO7xwGfO7P+xypJkq19GtrQ== X-Received: by 2002:a7b:c219:0:b0:38e:7a12:1b59 with SMTP id x25-20020a7bc219000000b0038e7a121b59mr16794581wmi.87.1649424206256; Fri, 08 Apr 2022 06:23:26 -0700 (PDT) Received: from localhost.localdomain ([193.48.40.241]) by smtp.gmail.com with ESMTPSA id z3-20020a1cf403000000b0037d1f4a2201sm10108954wma.21.2022.04.08.06.23.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 08 Apr 2022 06:23:25 -0700 (PDT) From: zimoun To: 53882@debbugs.gnu.org Subject: [PATCH v2 01/25] gnu: ocaml-odoc: Update to 2.2.0-alpha. Date: Fri, 8 Apr 2022 15:22:41 +0200 Message-Id: <20220408132305.3301350-1-zimon.toutoune@gmail.com> X-Mailer: git-send-email 2.34.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 53882 Cc: pukkamustard X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) From: pukkamustard * gnu/packages/ocaml.scm (ocaml-odoc): Update to 2.2.0-alpha. --- gnu/packages/ocaml.scm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 78eab203de..cb461bf257 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -6766,7 +6766,9 @@ (define-public ocaml4.07-bisect-ppx (define-public ocaml-odoc (package (name "ocaml-odoc") - (version "2.1.0") + ;; 2.2.0-alpha contains fixes for Dune 3.0 compatibility + ;; (https://github.com/ocaml/odoc/commit/6ac97f3148f7791ec7451785ef4dbd9ca0daf2d1) + (version "2.2.0-alpha") (source (origin (method git-fetch) @@ -6775,7 +6777,7 @@ (define-public ocaml-odoc (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "1ycb468pc6vsvqj176j99bmbkrr9saxvyn9qhpazi01abbcq5d90")))) + (base32 "07zjkk455l51i29lcayzrc1q8j5bvbv97sscv8yhcj7x6h6q2nag")))) (build-system dune-build-system) (arguments `(#:phases -- 2.34.0 From debbugs-submit-bounces@debbugs.gnu.org Fri Apr 08 09:23:36 2022 Received: (at 53882) by debbugs.gnu.org; 8 Apr 2022 13:23:36 +0000 Received: from localhost ([127.0.0.1]:34226 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ncoaO-0007nO-K6 for submit@debbugs.gnu.org; Fri, 08 Apr 2022 09:23:36 -0400 Received: from mail-wr1-f48.google.com ([209.85.221.48]:46031) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ncoaK-0007lo-A5 for 53882@debbugs.gnu.org; Fri, 08 Apr 2022 09:23:33 -0400 Received: by mail-wr1-f48.google.com with SMTP id w4so12770559wrg.12 for <53882@debbugs.gnu.org>; Fri, 08 Apr 2022 06:23:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=njhE0Wp9ks/wa54lZfJG8fhoghy4v0Z7ewVX6M9Qv9g=; b=m8KFzLiJirQShx06AtLE79MayBLQPjhrWDpI/bb3mnRP4fHSOLUeXo5Rhbs1gEeGig nLkLxaUtHQ8uvOt3pMGl6+nQ+mHyZPqixojvBiy2afVsZui7u9DGv34BpSbmJQHrqgLb eEE4eRSMUSWrfBBm43X7gpdjDhFJkdiCTBQyUfOP87y8cOx0PKIFJuYqaUPqxCpgT+We 5tmH/12oXydAcFmPcAtl6FgsD9/VeHaU+1bxR0nL28YpVMmPMlPNjqOjTvwUNXQSYwlf dJFMcNASJ6AzKFyRlYuWNMVpaD80k9M9yXHMiLp0T7jKNFXBzegzY5bu2yxDTjBJp33P KhNQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=njhE0Wp9ks/wa54lZfJG8fhoghy4v0Z7ewVX6M9Qv9g=; b=BoFrVeAId2roC1YYgcTfscVo91VAvDkzywmMxFHEp3nyPQNlfuwDMLzP0K/zNITxHm v7ZHy0fbHd5QwuqnFGEN22wpGZZzhcT91GCwaxm3dTrZdljLVnNOWd4VQYpPBDObhcel ZwY2i7S7sudcJ1Z0kV4D7mN7q137z7fGw7bQSKeXKOJYoM25D9pP5kvjRmYlhbNlMTU1 xamJbKt+WrLscLRx/iFaRcjF6L4n3L67bPWgwradOHnd3jPaTasrFigIwwWv/rXYHrPi tOkh/JinPRg5eKHVBHPkwPpjVMhTV8pkmbrfz9BuoSF8P0Tl4x1UEkFhaE1iYUQJ+SVu D9vg== X-Gm-Message-State: AOAM533NQ1sSSypaOMAPndVPYZrtNCC/41PrUx/dEh81Yx7sbA6rvosK LuIuek/j7+6MvQ6ippGKWT3jmjMzv7U= X-Google-Smtp-Source: ABdhPJxDslTd7Iw+0TMBL26ffbgORcFzESS+sjzHtsA0reoJZFejaRT2Tt9uOszULqBWsbmh4k6SJw== X-Received: by 2002:a5d:5982:0:b0:204:1b19:40da with SMTP id n2-20020a5d5982000000b002041b1940damr14510467wri.23.1649424206676; Fri, 08 Apr 2022 06:23:26 -0700 (PDT) Received: from localhost.localdomain ([193.48.40.241]) by smtp.gmail.com with ESMTPSA id z3-20020a1cf403000000b0037d1f4a2201sm10108954wma.21.2022.04.08.06.23.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 08 Apr 2022 06:23:26 -0700 (PDT) From: zimoun To: 53882@debbugs.gnu.org Subject: [PATCH v2 02/25] import: opam: Accept tabulations. Date: Fri, 8 Apr 2022 15:22:42 +0200 Message-Id: <20220408132305.3301350-2-zimon.toutoune@gmail.com> X-Mailer: git-send-email 2.34.0 In-Reply-To: <20220408132305.3301350-1-zimon.toutoune@gmail.com> References: <20220408132305.3301350-1-zimon.toutoune@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 53882 Cc: Julien Lepiller X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) From: Julien Lepiller * guix/import/opam.scm (SP, SP2): Accept tabulation as whitespace. --- guix/import/opam.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/guix/import/opam.scm b/guix/import/opam.scm index f569c921b1..f51d17dea4 100644 --- a/guix/import/opam.scm +++ b/guix/import/opam.scm @@ -61,8 +61,8 @@ (define-module (guix import opam) ;; Define a PEG parser for the opam format (define-peg-pattern comment none (and "#" (* COMMCHR) "\n")) -(define-peg-pattern SP none (or " " "\n" comment)) -(define-peg-pattern SP2 body (or " " "\n")) +(define-peg-pattern SP none (or " " "\n" "\t" comment)) +(define-peg-pattern SP2 body (or " " "\n" "\t")) (define-peg-pattern QUOTE none "\"") (define-peg-pattern QUOTE2 body "\"") (define-peg-pattern COLON none ":") -- 2.34.0 From debbugs-submit-bounces@debbugs.gnu.org Fri Apr 08 09:23:37 2022 Received: (at 53882) by debbugs.gnu.org; 8 Apr 2022 13:23:37 +0000 Received: from localhost ([127.0.0.1]:34228 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ncoaO-0007nR-Qn for submit@debbugs.gnu.org; Fri, 08 Apr 2022 09:23:37 -0400 Received: from mail-wm1-f49.google.com ([209.85.128.49]:44813) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ncoaK-0007lq-OH for 53882@debbugs.gnu.org; Fri, 08 Apr 2022 09:23:33 -0400 Received: by mail-wm1-f49.google.com with SMTP id v20-20020a05600c15d400b0038e9a88aee7so2390202wmf.3 for <53882@debbugs.gnu.org>; Fri, 08 Apr 2022 06:23:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=BUJtkYFdetVaPu6l8TfFFtPl0IRzAI6UAoMdeWnnqFI=; b=GvH3IAxhlMATlgi5aHlpmd0ZIHOM/BUgMiiN4wiMfdJaKHKxGT4JB0+MFwPdiBII2j 2oblEa0waF8HH1z5apw+IPlEUQyWuiOjA64W57yPlftP4LgAsbVzaywr+h/L6n2cCkmM 0cWRYIPR9JK/5RDBRiafEjxjBKop3+GikPrsF2RC0vHWQz2IkxN5kiJqJzbRtJjY+dC/ q+TIdzFC9xjFJ+Enp5Lywi7B6y7IiRCyWNigbv1sxpG0GjBcdyfDs3SKcq8O3alYAIob numzx38HbL3ndnTtj7G2WYFF2pvKO+dqAX81t1boUQlztWEAcGOH1lRLs012a0cYef7H dAtA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=BUJtkYFdetVaPu6l8TfFFtPl0IRzAI6UAoMdeWnnqFI=; b=FDPjFs4OfEKze5Y8ZuUTnyYPGv5b+nteMpb7VdZlsbu/7S05ChHwlFVDcEjRX76Vd3 yPWscSWPOrFwRRHK/D4Nxf/hYGXfK7NezCIDzR5b894ykt7FL7QPv2EJ9arZCFja6Tx2 tlVLSCxPclbZP/w1RESVaZpg+TxOD1ef+xsHdGxNjuRg7M9+IOH0TLUvso3b3sewygbK OZHfM2Nb+Wgh2Go5emTDHEoEt1856DmLZvpKJ+MsQaothlnhs2/fmLs8CWjBqybCS9AJ Of05qmKV2hqUPEn2XhJjA8YiP0g/e+oBXyuE9Iu94CdySFqUWfyhIk3ceRK+F28bh5dE trOA== X-Gm-Message-State: AOAM530c4cnhmW3Kc+QT/7hJPKsIxMwGngGUkNXdko3D7ma1U61IKzyV LxmPaleW/BprZ+HAtXR/NdQhE0VOHHU= X-Google-Smtp-Source: ABdhPJyokck7FkX40ojzOKikwyETUG0EuB+DQjwkxTI8t8mgv6juS1A94wKKVBPIC4EScvTUfkLwlQ== X-Received: by 2002:a05:600c:d8:b0:38e:785a:2fc7 with SMTP id u24-20020a05600c00d800b0038e785a2fc7mr17019251wmm.59.1649424207151; Fri, 08 Apr 2022 06:23:27 -0700 (PDT) Received: from localhost.localdomain ([193.48.40.241]) by smtp.gmail.com with ESMTPSA id z3-20020a1cf403000000b0037d1f4a2201sm10108954wma.21.2022.04.08.06.23.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 08 Apr 2022 06:23:26 -0700 (PDT) From: zimoun To: 53882@debbugs.gnu.org Subject: [PATCH v2 03/25] import: opam: Factor out source import. Date: Fri, 8 Apr 2022 15:22:43 +0200 Message-Id: <20220408132305.3301350-3-zimon.toutoune@gmail.com> X-Mailer: git-send-email 2.34.0 In-Reply-To: <20220408132305.3301350-1-zimon.toutoune@gmail.com> References: <20220408132305.3301350-1-zimon.toutoune@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 53882 Cc: Julien Lepiller X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) From: Julien Lepiller This also ensures a package can be imported even when it does not specify a URL. * guix/import/opam.scm (opam->guix-source): New procedure. (opam->guix-package): Use it. --- guix/import/opam.scm | 81 +++++++++++++++++++++++--------------------- 1 file changed, 43 insertions(+), 38 deletions(-) diff --git a/guix/import/opam.scm b/guix/import/opam.scm index f51d17dea4..b4b5a6eaad 100644 --- a/guix/import/opam.scm +++ b/guix/import/opam.scm @@ -324,6 +324,20 @@ (define* (opam-fetch name #:optional (repositories-specs '("opam"))) (filter-map get-opam-repository repositories-specs)) (warning (G_ "opam: package '~a' not found~%") name))) +(define (opam->guix-source url-dict) + (let ((source-url (and url-dict + (or (metadata-ref url-dict "src") + (metadata-ref url-dict "archive"))))) + (if source-url + (call-with-temporary-output-file + (lambda (temp port) + (and (url-fetch source-url temp) + `(origin + (method url-fetch) + (uri ,source-url) + (sha256 (base32 ,(guix-hash-url temp))))))) + 'no-source-information))) + (define* (opam->guix-package name #:key (repo 'opam) version) "Import OPAM package NAME from REPOSITORY (a directory name) or, if REPOSITORY is #f, from the official OPAM repository. Return a 'package' sexp @@ -332,9 +346,7 @@ (define* (opam->guix-package name #:key (repo 'opam) version) (opam-file (opam-fetch name with-opam)) (version (assoc-ref opam-file "version")) (opam-content (assoc-ref opam-file "metadata")) - (url-dict (metadata-ref opam-content "url")) - (source-url (or (metadata-ref url-dict "src") - (metadata-ref url-dict "archive"))) + (source (opam->guix-source (metadata-ref opam-content "url"))) (requirements (metadata-ref opam-content "depends")) (names (dependency-list->names requirements)) (dependencies (filter-dependencies names)) @@ -348,41 +360,34 @@ (define* (opam->guix-package name #:key (repo 'opam) version) (not (member name '("dune" "jbuilder")))) native-dependencies)))) (let ((use-dune? (member "dune" names))) - (call-with-temporary-output-file - (lambda (temp port) - (and (url-fetch source-url temp) - (values - `(package - (name ,(ocaml-name->guix-name name)) - (version ,version) - (source - (origin - (method url-fetch) - (uri ,source-url) - (sha256 (base32 ,(guix-hash-url temp))))) - (build-system ,(if use-dune? - 'dune-build-system - 'ocaml-build-system)) - ,@(if (null? inputs) - '() - `((propagated-inputs (list ,@inputs)))) - ,@(if (null? native-inputs) - '() - `((native-inputs (list ,@native-inputs)))) - ,@(if (equal? name (guix-name->opam-name (ocaml-name->guix-name name))) - '() - `((properties - ,(list 'quasiquote `((upstream-name . ,name)))))) - (home-page ,(metadata-ref opam-content "homepage")) - (synopsis ,(metadata-ref opam-content "synopsis")) - (description ,(beautify-description - (metadata-ref opam-content "description"))) - (license ,(spdx-string->license - (metadata-ref opam-content "license")))) - (filter - (lambda (name) - (not (member name '("dune" "jbuilder")))) - dependencies)))))))) + (values + `(package + (name ,(ocaml-name->guix-name name)) + (version ,version) + (source ,source) + (build-system ,(if use-dune? + 'dune-build-system + 'ocaml-build-system)) + ,@(if (null? inputs) + '() + `((propagated-inputs (list ,@inputs)))) + ,@(if (null? native-inputs) + '() + `((native-inputs (list ,@native-inputs)))) + ,@(if (equal? name (guix-name->opam-name (ocaml-name->guix-name name))) + '() + `((properties + ,(list 'quasiquote `((upstream-name . ,name)))))) + (home-page ,(metadata-ref opam-content "homepage")) + (synopsis ,(metadata-ref opam-content "synopsis")) + (description ,(beautify-description + (metadata-ref opam-content "description"))) + (license ,(spdx-string->license + (metadata-ref opam-content "license")))) + (filter + (lambda (name) + (not (member name '("dune" "jbuilder")))) + dependencies))))) (define* (opam-recursive-import package-name #:key repo) (recursive-import package-name -- 2.34.0 From debbugs-submit-bounces@debbugs.gnu.org Fri Apr 08 09:23:37 2022 Received: (at 53882) by debbugs.gnu.org; 8 Apr 2022 13:23:38 +0000 Received: from localhost ([127.0.0.1]:34232 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ncoaP-0007ng-CV for submit@debbugs.gnu.org; Fri, 08 Apr 2022 09:23:37 -0400 Received: from mail-wr1-f47.google.com ([209.85.221.47]:34512) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ncoaL-0007lt-Ld for 53882@debbugs.gnu.org; Fri, 08 Apr 2022 09:23:34 -0400 Received: by mail-wr1-f47.google.com with SMTP id m30so12871413wrb.1 for <53882@debbugs.gnu.org>; Fri, 08 Apr 2022 06:23:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=7d0FIh4LkaY+v1twwCL9krmU3xIWstuR44m91v5X0cM=; b=YbT5S1/nSW+JUa8JXRaZ6vJYRFvoJr7erbOEb7Qjsm3gi5sTSAHYZkb7aEi0o0H2Ns BAjADEiuoOHf6MoYwiKdHjgPjtV2LKCoS1zJO3bCWxKD+s1ZGYTLXtok2hOpuy20JnqR 5dxq3yNlvpDGNLgTwrV2g44GdeFS24BLq5Zu4I7wC2svmpYUk2sYgCmCT9VL95geloL2 7zyOb0G6oV9YWZShkR1GmQJIiMtAPCV/Kh8agTCWsoDlnNgktErFyigN7Zefaw8pN+vM ThCawsmprcXm4r5rULFR7dVmnxHphesGPi57521kspUAYyqYbdCoRuH74oxKfiNlP6Oc q3Ng== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=7d0FIh4LkaY+v1twwCL9krmU3xIWstuR44m91v5X0cM=; b=P1IQVDMLhA5sTV5Y4ddP+AjON2LT1pYXJb2oOTxKqHM36fy16ZKD0I+E/cF34AIkA6 A+evShPMymQfRmRkR4whRC3Ru3/GDIS+YQXowv1hCH5ZjTXWBqpJ5ReR/4UOteO1aJ/j ARAIKcYATe/OqqgFCVm1FX8FjrXZ4K8pD5bBZ5amCIHp03LDuJB5Aer1lNz3bs1Bd/xX 3rYQ2aLzZ7xscYxesohximYlWt5ujeQEcHrNcoln6yY1pcruf5ti6MeVDJDDF/3WwBqY z0nEj4ylaDEcsM1SL/Ripbg0Gky7cpU8JUzg81FZEG+VpLLQXHIntAGnuvKeRjzbcEMH P9Fg== X-Gm-Message-State: AOAM532JtL6mDTgsc46UAd5Thx0JgxmdeMSS/RzeYOUEU8lP9unJH/JR 986I0iA5WBgX0edBynVHLloUoG9CUNg= X-Google-Smtp-Source: ABdhPJyOwLV2iAXo5NRhQor4sE4KjwbvtTZILxs8YHVvXFJ4e0TpcT5WIX9iXfDQOuJsr3kWUgq7UQ== X-Received: by 2002:adf:ef11:0:b0:205:b266:68eb with SMTP id e17-20020adfef11000000b00205b26668ebmr15149052wro.310.1649424207995; Fri, 08 Apr 2022 06:23:27 -0700 (PDT) Received: from localhost.localdomain ([193.48.40.241]) by smtp.gmail.com with ESMTPSA id z3-20020a1cf403000000b0037d1f4a2201sm10108954wma.21.2022.04.08.06.23.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 08 Apr 2022 06:23:27 -0700 (PDT) From: zimoun To: 53882@debbugs.gnu.org Subject: [PATCH v2 05/25] gnu: Add ocaml-typerep. Date: Fri, 8 Apr 2022 15:22:45 +0200 Message-Id: <20220408132305.3301350-5-zimon.toutoune@gmail.com> X-Mailer: git-send-email 2.34.0 In-Reply-To: <20220408132305.3301350-1-zimon.toutoune@gmail.com> References: <20220408132305.3301350-1-zimon.toutoune@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 53882 Cc: Julien Lepiller X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) From: Julien Lepiller * gnu/packages/ocaml.scm (ocaml-typerep): New variable. (ocaml4.07-typerep): Inherit from it. --- gnu/packages/ocaml.scm | 50 +++++++++++++++++++++++++++--------------- 1 file changed, 32 insertions(+), 18 deletions(-) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 6690fab76d..8c464147f5 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -5786,29 +5786,43 @@ (define-public ocaml4.07-ppx-here "0wxcak3ay4jpigm3pfdcpr65qw4hxfa8whhkryhcd8gy71x056z5")) (properties `((upstream-name . "ppx_here")))))) -(define-public ocaml4.07-typerep +(define-public ocaml-typerep (package - (name "ocaml4.07-typerep") - (version "0.11.0") - (source (origin - (method url-fetch) - (uri (string-append "https://ocaml.janestreet.com/ocaml-core/v" - (version-major+minor version) - "/files/typerep-v" version ".tar.gz")) - (sha256 - (base32 - "1zi7hy0prpgzqhr4lkacr04wvlvbp21jfbdfvffhrm6cd400rb5v")))) + (name "ocaml-typerep") + (version "0.14.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/janestreet/typerep") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0wc7h853ka3s3lxxgm61ypidl0lzgc9abdkil6f72anl0c417y90")))) (build-system dune-build-system) - (arguments - `(#:tests? #f - #:ocaml ,ocaml-4.07 - #:findlib ,ocaml4.07-findlib - #:dune ,ocaml4.07-dune)) - (propagated-inputs `(("ocaml-base" ,(package-with-ocaml4.07 ocaml-base)))) + (arguments `(#:tests? #f)); no tests + (propagated-inputs (list ocaml-base)) + (properties `((ocaml4.07-variant . ,(delay ocaml4.07-typerep)))) (home-page "https://github.com/janestreet/typerep") (synopsis "Typerep is a library for runtime types") (description "Typerep is a library for runtime types.") - (license license:asl2.0))) + (license license:expat))) + +(define-public ocaml4.07-typerep + (package-with-ocaml4.07 + (package + (inherit ocaml-typerep) + (version "0.11.0") + (source (origin + (method url-fetch) + (uri (string-append "https://ocaml.janestreet.com/ocaml-core/v" + (version-major+minor version) + "/files/typerep-v" version ".tar.gz")) + (sha256 + (base32 + "1zi7hy0prpgzqhr4lkacr04wvlvbp21jfbdfvffhrm6cd400rb5v")))) + (properties '()) + (license license:asl2.0)))) (define-public ocaml4.07-ppx-sexp-value (package -- 2.34.0 From debbugs-submit-bounces@debbugs.gnu.org Fri Apr 08 09:23:39 2022 Received: (at 53882) by debbugs.gnu.org; 8 Apr 2022 13:23:39 +0000 Received: from localhost ([127.0.0.1]:34235 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ncoaP-0007nn-Sj for submit@debbugs.gnu.org; Fri, 08 Apr 2022 09:23:38 -0400 Received: from mail-wr1-f53.google.com ([209.85.221.53]:36367) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ncoaL-0007lr-6M for 53882@debbugs.gnu.org; Fri, 08 Apr 2022 09:23:34 -0400 Received: by mail-wr1-f53.google.com with SMTP id u3so12852597wrg.3 for <53882@debbugs.gnu.org>; Fri, 08 Apr 2022 06:23:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=b0WR+cuwMGuGdS8A+evQ6tLLmsAp0EIkDu2FbrLlZ5s=; b=Wfj3/QMgdQQXpE1Ofc3rAJxmQoxXrd5XT7/qcJXp0X4YZqnFXBRDfyI3yeyKC9w5un so253lkuyN4uKxvSTyVfGJ+GaAKS3pZ0EDAuLrCpDYqWwUZnZi1Fx0s/rsi1cqUqJRuH 9Fkv7vdZgnyH1JFoTMd3E2LEBZK3OHiAimwqvJ9aBmds/I2/ISpdbBzhzjiQuyGOCa09 2VGYuQj/d07b4gM98ShkDg6EFNhqqKQSKgy8/8qvboL9coCnOME2FN6BUqENEaeEsyTW S9LBH6BKUmfsJ3v2Ik5kSVj50EfIlNAZDBJj2p4bY9j+8xD488b2s4kK8aSybPFDivZZ Ms+A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=b0WR+cuwMGuGdS8A+evQ6tLLmsAp0EIkDu2FbrLlZ5s=; b=oo1JELQsc6UWkGsRYnwqI87p1Jc4xxepTT97GU9ujRdLwZH7QxpiGJYjMNU+DWkN2A cr33hgSTy9/qrwby5JRzCg75+kxmODlIHojzAXpDgXloUjCp+zl3mGi+qSO5dcjlJJTM qtBYa8zePbF4ofSKzmQaMcK2YHVJd1udKHzB0Fa5Oz657n/r1CPMMgFWCDt58Y0CRBod hLYNfIC5oLbQi5MHDISOoYUT83azRrScrPchPKdmk8jZ3JuZrN3op8BlGr40f7opYNvt cH4Bptedr6jEiYFyntriimt5iaKSztW7OM9GKBJyJWvlDxqTUQ9P1te0l5+ITjI/Zt/l k1sg== X-Gm-Message-State: AOAM531KsoDOQJztnbf/C7Zcu9XaH5PJpf0ym9PRRhY8mL4iandknM1H kTe0Xv1jdgae0l1eZn+caAIIBsjCtB8= X-Google-Smtp-Source: ABdhPJzSoiJ4Cfdo4R8CT8cy0Kg2gTMC6YQTSkhnVf/wX47O1Hbt0vJboRo4pLeChd6jMVn5w9o2zQ== X-Received: by 2002:adf:d081:0:b0:1ef:9378:b7cc with SMTP id y1-20020adfd081000000b001ef9378b7ccmr14875836wrh.407.1649424207580; Fri, 08 Apr 2022 06:23:27 -0700 (PDT) Received: from localhost.localdomain ([193.48.40.241]) by smtp.gmail.com with ESMTPSA id z3-20020a1cf403000000b0037d1f4a2201sm10108954wma.21.2022.04.08.06.23.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 08 Apr 2022 06:23:27 -0700 (PDT) From: zimoun To: 53882@debbugs.gnu.org Subject: [PATCH v2 04/25] gnu: Add ocaml-spawn. Date: Fri, 8 Apr 2022 15:22:44 +0200 Message-Id: <20220408132305.3301350-4-zimon.toutoune@gmail.com> X-Mailer: git-send-email 2.34.0 In-Reply-To: <20220408132305.3301350-1-zimon.toutoune@gmail.com> References: <20220408132305.3301350-1-zimon.toutoune@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 53882 Cc: Julien Lepiller X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) From: Julien Lepiller * gnu/packages/ocaml.scm (ocaml-spawn): New variable. (ocaml4.07-spawn): Inherit from it. --- gnu/packages/ocaml.scm | 55 ++++++++++++++++++++++++++++-------------- 1 file changed, 37 insertions(+), 18 deletions(-) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index cb461bf257..6690fab76d 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -6446,10 +6446,10 @@ (define-public ocaml4.07-configurator @end itemize") (license license:asl2.0))) -(define-public ocaml4.07-spawn +(define-public ocaml-spawn (package - (name "ocaml4.07-spawn") - (version "0.13.0") + (name "ocaml-spawn") + (version "0.15.0") (source (origin (method git-fetch) (uri (git-reference @@ -6458,22 +6458,12 @@ (define-public ocaml4.07-spawn (file-name (git-file-name name version)) (sha256 (base32 - "1w003k1kw1lmyiqlk58gkxx8rac7dchiqlz6ah7aj7bh49b36ppf")))) + "1fjr91psas5zmk1hxvxh0dchhn0pkyzlr4gg232f5g9vdgissi0p")))) (build-system dune-build-system) - (arguments - `(#:phases - (modify-phases %standard-phases - (add-before 'check 'fix-tests - (lambda _ - (substitute* "test/tests.ml" - (("/bin/pwd") (which "pwd")) - (("/bin/echo") (which "echo"))) - #t))) - #:ocaml ,ocaml-4.07 - #:findlib ,ocaml4.07-findlib - #:dune ,ocaml4.07-dune)) - (native-inputs - `(("ocaml-ppx-expect" ,(package-with-ocaml4.07 ocaml-ppx-expect)))) + (propagated-inputs (list ocaml-odoc)) + (native-inputs (list ocaml-ppx-expect)) + (properties + `((ocaml4.07-variant . ,(delay ocaml4.07-spawn)))) (home-page "https://github.com/janestreet/spawn") (synopsis "Spawning sub-processes") (description @@ -6495,6 +6485,35 @@ (define-public ocaml4.07-spawn @end itemize") (license license:asl2.0))) +(define-public ocaml4.07-spawn + (package-with-ocaml4.07 + (package + (inherit ocaml-spawn) + (version "0.13.0") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/janestreet/spawn") + (commit (string-append "v" version)))) + (file-name (git-file-name "ocaml4.07-spawn" version)) + (sha256 + (base32 + "1w003k1kw1lmyiqlk58gkxx8rac7dchiqlz6ah7aj7bh49b36ppf")))) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-before 'check 'fix-tests + (lambda _ + (substitute* "test/tests.ml" + (("/bin/pwd") (which "pwd")) + (("/bin/echo") (which "echo"))) + #t))) + #:ocaml ,ocaml-4.07 + #:findlib ,ocaml4.07-findlib + #:dune ,ocaml4.07-dune)) + (propagated-inputs '()) + (properties '())))) + (define-public ocaml4.07-core (package (name "ocaml4.07-core") -- 2.34.0 From debbugs-submit-bounces@debbugs.gnu.org Fri Apr 08 09:23:40 2022 Received: (at 53882) by debbugs.gnu.org; 8 Apr 2022 13:23:40 +0000 Received: from localhost ([127.0.0.1]:34240 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ncoaR-0007o8-2P for submit@debbugs.gnu.org; Fri, 08 Apr 2022 09:23:39 -0400 Received: from mail-wr1-f42.google.com ([209.85.221.42]:47094) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ncoaM-0007lv-Go for 53882@debbugs.gnu.org; Fri, 08 Apr 2022 09:23:35 -0400 Received: by mail-wr1-f42.google.com with SMTP id v2so1958881wrv.13 for <53882@debbugs.gnu.org>; Fri, 08 Apr 2022 06:23:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=WQVs6QwcBtaKjP068RGbZQTAh8TvjZBrOmKbxaphYVw=; b=Ps3SpH5NK8YuqA8ociL2cy7dICFUW7bBbyzgbrs5eIaMOTbEikHWp7RqrzxzIB5QyC ymIPqwR+cda0XrtQZZeA6I/83R/4flb0ksi5Nq9bROodreJiz3s1/M3Zo3cg2qlgJyC0 mcSBLGm2vAM9wubqEvuK2jWSBjqQbnoFI/hJ9OnUb1QasSbFmK31S5WSWXRBUrQJ6KTf bS48Jt2y6lbVaxi8vSMospj4rdAwAtK9gSGR3GDWIvRsX3Ttjv0uewOJlUS44K3nIIvI ZWNJTLirr7i39EaKmVQCj/0rTWfP0z/zmGWUx4x5qzPUk57TRiW7t90Y4eiPABbAXoBT 6bkA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=WQVs6QwcBtaKjP068RGbZQTAh8TvjZBrOmKbxaphYVw=; b=sCTL5ZHZBbKPrr9YsFqpyapzKLv5r+uP0hcyY3oGbQNAToQoTOw+mGTI9pSTmoPzOm r8Bkij/GOkG5xaujgIuyPKX5GxqSxx+D1cogH/ZAdgIkMO1EtVfevHm0HB0bpo5uPubh trILVKiJrAJSipkgeCuRGXkIsfCZiAyqjTg5Af7xoUHoxT84owNJH2vAgw4zIFVSXUH9 MixlxFlUeNdPqdNWJ9DOc2HTHfjgstiGSDZpE4kTqwzYfcm03bhNGSsXP8d7IZEKJ6Bw r7o5pEA5jI0l/8dVhy/Syk92tp1fdJCF08ZzWbx2lxOSCferwmdf/g5fv7HqfAhqGX17 s0Fw== X-Gm-Message-State: AOAM5312lu0Bs1yv90+K0l+dmlOLcCTkm/eksDYbmuOAw6jTHEMxhXF7 tSJs3Do1oQA42/71DgXBnvwnojcnciw= X-Google-Smtp-Source: ABdhPJwb5RGsA0yUzRlDNM5rJvv7NlDEf9kCA039aqGwLpVfoxL2rodaGub3aWCRjMgHyuAEGPNrMw== X-Received: by 2002:a5d:6d0f:0:b0:207:990e:8e6 with SMTP id e15-20020a5d6d0f000000b00207990e08e6mr2002777wrq.384.1649424208888; Fri, 08 Apr 2022 06:23:28 -0700 (PDT) Received: from localhost.localdomain ([193.48.40.241]) by smtp.gmail.com with ESMTPSA id z3-20020a1cf403000000b0037d1f4a2201sm10108954wma.21.2022.04.08.06.23.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 08 Apr 2022 06:23:28 -0700 (PDT) From: zimoun To: 53882@debbugs.gnu.org Subject: [PATCH v2 07/25] gnu: Add ocaml-ppx-string. Date: Fri, 8 Apr 2022 15:22:47 +0200 Message-Id: <20220408132305.3301350-7-zimon.toutoune@gmail.com> X-Mailer: git-send-email 2.34.0 In-Reply-To: <20220408132305.3301350-1-zimon.toutoune@gmail.com> References: <20220408132305.3301350-1-zimon.toutoune@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 53882 Cc: Julien Lepiller X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) From: Julien Lepiller * gnu/packages/ocaml.scm (ocaml-ppx-string): New variable. --- gnu/packages/ocaml.scm | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 8ec5953730..f8f815b358 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -6247,6 +6247,29 @@ (define-public ocaml4.07-ppx-typerep-conv (list ocaml-base ocaml-typerep ocaml-migrate-parsetree ocaml-ppxlib)) (license license:asl2.0)))) +(define-public ocaml-ppx-string + (package + (name "ocaml-ppx-string") + (version "0.14.1") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/janestreet/ppx_string") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0a8khmg0y32kyn3q6idwgh0d6d1s6ms1w75gj3dzng0v7y4h6jx4")))) + (build-system dune-build-system) + (arguments `(#:tests? #f)); no tests + (propagated-inputs + (list ocaml-base ocaml-ppx-base ocaml-stdio ocaml-ppxlib)) + (properties `((upstream-name . "ppx_string"))) + (home-page "https://github.com/janestreet/ppx_string") + (synopsis "Ppx extension for string interpolation") + (description "This extension provides a syntax for string interpolation.") + (license license:expat))) + (define-public ocaml-ppx-base (package (name "ocaml-ppx-base") -- 2.34.0 From debbugs-submit-bounces@debbugs.gnu.org Fri Apr 08 09:23:40 2022 Received: (at 53882) by debbugs.gnu.org; 8 Apr 2022 13:23:41 +0000 Received: from localhost ([127.0.0.1]:34243 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ncoaR-0007oR-Vo for submit@debbugs.gnu.org; Fri, 08 Apr 2022 09:23:40 -0400 Received: from mail-wm1-f51.google.com ([209.85.128.51]:37512) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ncoaM-0007lu-3p for 53882@debbugs.gnu.org; Fri, 08 Apr 2022 09:23:35 -0400 Received: by mail-wm1-f51.google.com with SMTP id f16-20020a7bcd10000000b0038e9ce3b2a9so1125730wmj.2 for <53882@debbugs.gnu.org>; Fri, 08 Apr 2022 06:23:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=oBUhwxCGoBUYFb30pJ3u1qIUKPKfZ5tvqIxpt+b7bJA=; b=TCwEpYcWGAsrVMndqKis1XYkn9bGhsciv7jGhCKMfvToec2rahyyFYYuy8NuQ8yFdW vP1Ai9fMib6yOIsVzWK5bMSzs00gdLUovJ3gqAna9nDCQ1v3V4U7eIPvFP9XGR1hUH2E a5co0ZwzjQcb8mnQH0AT184sYF9w1akAC7xPK63qEcAaD6s1uwxszadM+uSX9XKpA42N 0QYWnf35oMMBFCjM7I8XykYl1/4lzZEkztFh8+/D62pkQCRbgnEZuYTWIElIQjPhBwyp BRTB/2huSDE2Fm0JrCZZTISb0ndBHq0BHObbZp2ShxINCeWV4DbZ5RWHCvPgq0bN6UXU qV7g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=oBUhwxCGoBUYFb30pJ3u1qIUKPKfZ5tvqIxpt+b7bJA=; b=NPmXDkL3cgDNtGV/62iQ2pC17yGTv6kjWZoxoIDX2oaIGQCMgV982KvcsbHRSLGjV/ hwv5qfInJlVjKwXtCJGzwpiUQHjCBkZrLVuTAB7d7ElcH7HoYMlIea/asCETFYVEVdge kZR19oWTBJwwe3yxBZU5lj/HMiDsXNMPw57+75b0r2wP+94ZA6PkN6CQv1z4oJ4eExAK oiYjvIx6g33xaTKtVq7swIAVphH5fmYQHz1G6G9zyI30OjS3oPdvGDmn7W8Xm41eNjfZ 8m0b/J38R1mh4hCeYHDhp1lTx5u0oFJRyhmO1VL4pft5fAT4OP3KNH5mZ/r/A2reAgea uwZQ== X-Gm-Message-State: AOAM5309q2iLmiGmimv7S5ir9ohVez1ISKXqjRHJjoRbaEQvWDuVX5BU EC3jgMTErClVW4oJRfdMdlYbFpeokhU= X-Google-Smtp-Source: ABdhPJwc+QFYH/a8UaSHz1rt4+9x50kOjMoifqZZiaX7/oZWVF/NL/mQsfGIS4kWwuWk5OsbNh4+vw== X-Received: by 2002:a05:600c:154d:b0:38c:e9b8:d13f with SMTP id f13-20020a05600c154d00b0038ce9b8d13fmr16936991wmg.183.1649424208478; Fri, 08 Apr 2022 06:23:28 -0700 (PDT) Received: from localhost.localdomain ([193.48.40.241]) by smtp.gmail.com with ESMTPSA id z3-20020a1cf403000000b0037d1f4a2201sm10108954wma.21.2022.04.08.06.23.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 08 Apr 2022 06:23:28 -0700 (PDT) From: zimoun To: 53882@debbugs.gnu.org Subject: [PATCH v2 06/25] gnu: Add ocaml-ppx-typerep-conv. Date: Fri, 8 Apr 2022 15:22:46 +0200 Message-Id: <20220408132305.3301350-6-zimon.toutoune@gmail.com> X-Mailer: git-send-email 2.34.0 In-Reply-To: <20220408132305.3301350-1-zimon.toutoune@gmail.com> References: <20220408132305.3301350-1-zimon.toutoune@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 53882 Cc: Julien Lepiller X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) From: Julien Lepiller * gnu/packages/ocaml.scm (ocaml-ppx-typerep-conv): New variable. (ocaml4.07-ppx-typerep-conv): Inherit from it. --- gnu/packages/ocaml.scm | 60 +++++++++++++++++++++++++----------------- 1 file changed, 36 insertions(+), 24 deletions(-) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 8c464147f5..8ec5953730 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -6203,37 +6203,49 @@ (define-public ocaml4.07-ppx-js-style "0z3fc55jdjhhsblla6z4fqc13kljpcz29q79rvs5h2vsraqrldr2")) (properties `((upstream-name . "ppx_js_style")))))) -(define-public ocaml4.07-ppx-typerep-conv +(define-public ocaml-ppx-typerep-conv (package - (name "ocaml4.07-ppx-typerep-conv") - (version "0.11.1") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/janestreet/ppx_typerep_conv") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "0a13dpfrrg0rsm8qni1bh7pqcda30l70z8r6yzi5a64bmwk7g5ah")))) + (name "ocaml-ppx-typerep-conv") + (version "0.14.2") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/janestreet/ppx_typerep_conv/") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0yk9vkpnwr8labgfncqdi4rfkj88d8mb3cr8m4gdqpi3f2r27hf0")))) (build-system dune-build-system) (arguments - `(#:test-target "." - #:ocaml ,ocaml-4.07 - #:findlib ,ocaml4.07-findlib - #:dune ,ocaml4.07-dune)) - (propagated-inputs - `(("ocaml-base" ,(package-with-ocaml4.07 ocaml-base)) - ("ocaml-typerep" ,ocaml4.07-typerep) - ("ocaml-migrate-parsetree" - ,(package-with-ocaml4.07 ocaml-migrate-parsetree)) - ("ocaml-ppxlib" ,(package-with-ocaml4.07 ocaml-ppxlib)))) - (properties `((upstream-name . "ppx_typerep_conv"))) + `(#:test-target ".")) + (propagated-inputs (list ocaml-base ocaml-typerep ocaml-ppxlib)) + (properties `((upstream-name . "ppx_typerep_conv") + (ocaml4.07-variant . ,(delay ocaml4.07-ppx-typerep-conv)))) (home-page "https://github.com/janestreet/ppx_typerep_conv") (synopsis "Generation of runtime types from type declarations") (description "This package can automatically generate runtime types from type definitions.") - (license license:asl2.0))) + (license license:expat))) + +(define-public ocaml4.07-ppx-typerep-conv + (package-with-ocaml4.07 + (package + (inherit ocaml-ppx-typerep-conv) + (version "0.11.1") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/janestreet/ppx_typerep_conv") + (commit (string-append "v" version)))) + (file-name (git-file-name "ocaml4.07-ppx-typerep-conv" version)) + (sha256 + (base32 + "0a13dpfrrg0rsm8qni1bh7pqcda30l70z8r6yzi5a64bmwk7g5ah")))) + (properties '()) + (propagated-inputs + (list ocaml-base ocaml-typerep ocaml-migrate-parsetree ocaml-ppxlib)) + (license license:asl2.0)))) (define-public ocaml-ppx-base (package -- 2.34.0 From debbugs-submit-bounces@debbugs.gnu.org Fri Apr 08 09:23:41 2022 Received: (at 53882) by debbugs.gnu.org; 8 Apr 2022 13:23:41 +0000 Received: from localhost ([127.0.0.1]:34246 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ncoaS-0007oj-MH for submit@debbugs.gnu.org; Fri, 08 Apr 2022 09:23:41 -0400 Received: from mail-wr1-f54.google.com ([209.85.221.54]:46594) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ncoaM-0007ly-UX for 53882@debbugs.gnu.org; Fri, 08 Apr 2022 09:23:35 -0400 Received: by mail-wr1-f54.google.com with SMTP id v2so1958916wrv.13 for <53882@debbugs.gnu.org>; Fri, 08 Apr 2022 06:23:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=yROuKoLy6S8jbN4BhLTEsATZkhh+KlOTwdAyBMmkN10=; b=Qeqj07uX1VDZjHF1eLkG2kSDTrteTArAWW2sP4TZe0WHpJRP4fdJ0eP4tfHaS6kq7u hurBEyf9j34DB3o8JZuobu/PpxNqjPXaT2K8ROTVxDqxF/jdnls2HAdZRYmTQd0TpzPS X7I7Na1S5xtiJW5yANMwcQ7WCJHdbiGdxn7i1lAPe9J2jJtSckITUq7ndZn71DNCtN2D XDgsMREzw7cNerc3jnqI6GfJGiJt6B2u5DMEGE1pMumCdGzAX3FQVO2QFGL42XsKzuOc urCWDkhB+LZ8Tk5Uto9B4U3VnJs+WPjNA1kUZcG0OUvEyXEcebTGjlR+9gHmHUPIqm6P FqQQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=yROuKoLy6S8jbN4BhLTEsATZkhh+KlOTwdAyBMmkN10=; b=eMduq8HPv8+PI7ItXDF+KDpzkRdp+s9eZJ3SZETS+H4cxfJTj/cKpPxgzhicOiAoGG xMaEpsmTx2DBxky+x7GQxQmf1JtjcjjjCAsf/IoTyAmEu/yixWXtIcfNhV0NSKtgJY8A QKW0+QpGWdZ78Dm7H1o1u8ftSufa0n8vNL8mlrFBgX1aYAAlnBGxj7Jy3RrStxdfROR+ Vx3oCK1ZyFucM4tGUvQrINIxlJQsLEMCVExYPX4c5d8apqRNAN5dLAmDRdhUYHtGa53a qpv66d297reFyGZ3THdQVyIBlOUK55FSEUq8rntOOcN+zFo5Ju5nEJ+ACguOcFuWBWSf 3Hnw== X-Gm-Message-State: AOAM530lfK7FT+gyKIIepx0H77nFhp3R+gq9RxLGvQfR/rq1/sT7k8HU miO0FIj4XXJsnp0Ka1H9KiVItnc5pvI= X-Google-Smtp-Source: ABdhPJwlWPryB267St6CH1IbQCZ6hkjZHFnjsrzoKNB4BCIMcWxZQ4GCjtJijs6r+YNqScSVLe2IAA== X-Received: by 2002:adf:cd91:0:b0:206:1c09:cdb1 with SMTP id q17-20020adfcd91000000b002061c09cdb1mr14889023wrj.502.1649424209305; Fri, 08 Apr 2022 06:23:29 -0700 (PDT) Received: from localhost.localdomain ([193.48.40.241]) by smtp.gmail.com with ESMTPSA id z3-20020a1cf403000000b0037d1f4a2201sm10108954wma.21.2022.04.08.06.23.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 08 Apr 2022 06:23:29 -0700 (PDT) From: zimoun To: 53882@debbugs.gnu.org Subject: [PATCH v2 08/25] gnu: Add ocaml-ppx-stable. Date: Fri, 8 Apr 2022 15:22:48 +0200 Message-Id: <20220408132305.3301350-8-zimon.toutoune@gmail.com> X-Mailer: git-send-email 2.34.0 In-Reply-To: <20220408132305.3301350-1-zimon.toutoune@gmail.com> References: <20220408132305.3301350-1-zimon.toutoune@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 53882 Cc: Julien Lepiller X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) From: Julien Lepiller * gnu/packages/ocaml.scm (ocaml-ppx-stable): New variable. --- gnu/packages/ocaml.scm | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index f8f815b358..d202d45474 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -6270,6 +6270,30 @@ (define-public ocaml-ppx-string (description "This extension provides a syntax for string interpolation.") (license license:expat))) +(define-public ocaml-ppx-stable + (package + (name "ocaml-ppx-stable") + (version "0.14.1") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/janestreet/ppx_stable") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1sp1kn23qr0pfypa4ilvhqq5y11y13xpfygfl582ra9kik5xqfa1")))) + (build-system dune-build-system) + (arguments + `(#:test-target "tests")) + (propagated-inputs (list ocaml-base ocaml-ppxlib)) + (properties `((upstream-name . "ppx_stable"))) + (home-page "https://github.com/janestreet/ppx_stable") + (synopsis "Stable types conversions generator") + (description "This package is a ppx extension for easier implementation of +conversion functions between almost identical types.") + (license license:expat))) + (define-public ocaml-ppx-base (package (name "ocaml-ppx-base") -- 2.34.0 From debbugs-submit-bounces@debbugs.gnu.org Fri Apr 08 09:23:42 2022 Received: (at 53882) by debbugs.gnu.org; 8 Apr 2022 13:23:42 +0000 Received: from localhost ([127.0.0.1]:34251 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ncoaT-0007or-B2 for submit@debbugs.gnu.org; Fri, 08 Apr 2022 09:23:42 -0400 Received: from mail-wm1-f41.google.com ([209.85.128.41]:37504) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ncoaN-0007lz-B5 for 53882@debbugs.gnu.org; Fri, 08 Apr 2022 09:23:35 -0400 Received: by mail-wm1-f41.google.com with SMTP id f16-20020a7bcd10000000b0038e9ce3b2a9so1125774wmj.2 for <53882@debbugs.gnu.org>; Fri, 08 Apr 2022 06:23:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=WXfElVCScCEx98D8qp6txU/aNzVk+aO7Y3gp9femPAk=; b=C6jLyLgePtr3sbygIJSNbBp8gavSVUi9TRC4sQSY34Cp1c6Ey3bwRtNZQPC8ajdu53 +yhYqqI66mVrN+OY+aqCbqkFTxa4j9cWW8/epIf7tfeZlNEDaS2SiEEqzI6uf3kTRBik AueXgk0XLbgYPG+VkX3YjRn1a+fOUjXYMJS+lqi7vF+nmjrw+5oDUV2DdKuXkNc3gfHX NNXydlm/qNdGNKwFqYVYp3LOJhlVs/NOTnzhUywxBsOTZeqisLNa5tD9bSy3Bn2lzCB9 lhOG8bWqQkRvdUa+gSu1ZFSdKnSB9lnV2+Q8A/xUOHrt26RB8sm61AOMX7vgzUaCThOI FibQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=WXfElVCScCEx98D8qp6txU/aNzVk+aO7Y3gp9femPAk=; b=mGjhjKJj8DAsYQQXcf0Wx1jxf0Vgpru18uN4Fwe3dFsaxd94R7FckAIiWezwBky1Ch s1FKEcxCMCEfWoLznFo2qEUYxXv6vt/THKMvasGsiwE+zTJn8/MN+D3CN/kFK3TYXEKB dDrOWEXJ7/9suZSToOSDWnILvGsrm3sd+IWlASe1Ep689vfuvjdv5hjLIGy+bDYPnfEi GUilGwHiCcW/C843D4HDuNm0sAudNq/fIE6/uf+loYiVcUTQW+13/mkmIv7j55ByeQl/ RvkHWaABi2NiE0epJ5hlygs71fL6Ss3RQWI4M/3efTYpl2baim8BZ1GXt3PksJ56Kikr 5wRg== X-Gm-Message-State: AOAM533uZTI4FefG8zMsbMpame7OBawinEPoOQkLdbsId2aZWEdH8qXh lzTxJH6IWrpDWqI0ceOZ2p+ebDpu3bk= X-Google-Smtp-Source: ABdhPJwgOihb5BibhFb9hldYrR7oUNFChAhRGWlKveCgxBV0SYZL3u0BB50IDSD6Shqe4JNLcsYJBQ== X-Received: by 2002:a7b:cb84:0:b0:382:a9b9:2339 with SMTP id m4-20020a7bcb84000000b00382a9b92339mr17298911wmi.91.1649424209764; Fri, 08 Apr 2022 06:23:29 -0700 (PDT) Received: from localhost.localdomain ([193.48.40.241]) by smtp.gmail.com with ESMTPSA id z3-20020a1cf403000000b0037d1f4a2201sm10108954wma.21.2022.04.08.06.23.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 08 Apr 2022 06:23:29 -0700 (PDT) From: zimoun To: 53882@debbugs.gnu.org Subject: [PATCH v2 09/25] gnu: Add ocaml-ppx-pipebang. Date: Fri, 8 Apr 2022 15:22:49 +0200 Message-Id: <20220408132305.3301350-9-zimon.toutoune@gmail.com> X-Mailer: git-send-email 2.34.0 In-Reply-To: <20220408132305.3301350-1-zimon.toutoune@gmail.com> References: <20220408132305.3301350-1-zimon.toutoune@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 53882 Cc: Julien Lepiller X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) From: Julien Lepiller * gnu/packages/ocaml.scm (ocaml-ppx-pipebang): New variable. (ocaml4.07-ppx-pipebang): Inherit from it. --- gnu/packages/ocaml.scm | 57 +++++++++++++++++++++++++----------------- 1 file changed, 34 insertions(+), 23 deletions(-) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index d202d45474..c2924fc59d 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -5888,35 +5888,46 @@ (define-public ocaml4.07-ppx-sexp-message context such as function arguments.") (license license:asl2.0))) -(define-public ocaml4.07-ppx-pipebang +(define-public ocaml-ppx-pipebang (package - (name "ocaml4.07-ppx-pipebang") - (version "0.11.0") - (source (origin - (method url-fetch) - (uri (string-append "https://ocaml.janestreet.com/ocaml-core/v" - (version-major+minor version) - "/files/ppx_pipebang-v" version ".tar.gz")) - (sha256 - (base32 - "1wrrzlb4kdvkkcmzi01fw25jar38r2jlnyn0i6pn4z0lq4gpm9m0")))) + (name "ocaml-ppx-pipebang") + (version "0.14.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/janestreet/ppx_pipebang") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0450b3p2rpnnn5yyvbkcd3c33jr2z0dp8blwxddaj2lv7nzl5dzf")))) (build-system dune-build-system) - (arguments - ;; No tests - `(#:tests? #f - #:ocaml ,ocaml-4.07 - #:findlib ,ocaml4.07-findlib - #:dune ,ocaml4.07-dune)) - (propagated-inputs - `(("ocaml-migrate-parsetree" - ,(package-with-ocaml4.07 ocaml-migrate-parsetree)) - ("ocaml-ppxlib" ,(package-with-ocaml4.07 ocaml-ppxlib)))) - (properties `((upstream-name . "ppx_pipebang"))) + (arguments `(#:tests? #f)); no tests + (propagated-inputs (list ocaml-ppxlib)) + (properties `((upstream-name . "ppx_pipebang") + (ocaml4.07-variant . ,(delay ocaml4.07-ppx-pipebang)))) (home-page "https://github.com/janestreet/ppx_pipebang") (synopsis "Inline reverse application operators `|>` and `|!`") (description "A ppx rewriter that inlines reverse application operators @code{|>} and @code{|!}.") - (license license:asl2.0))) + (license license:expat))) + +(define-public ocaml4.07-ppx-pipebang + (package-with-ocaml4.07 + (package + (inherit ocaml-ppx-pipebang) + (version "0.11.0") + (source (origin + (method url-fetch) + (uri (string-append "https://ocaml.janestreet.com/ocaml-core/v" + (version-major+minor version) + "/files/ppx_pipebang-v" version ".tar.gz")) + (sha256 + (base32 + "1wrrzlb4kdvkkcmzi01fw25jar38r2jlnyn0i6pn4z0lq4gpm9m0")))) + (propagated-inputs (list ocaml-migrate-parsetree ocaml-ppxlib)) + (properties '()) + (license license:asl2.0)))) (define-public ocaml-ppx-optional (package -- 2.34.0 From debbugs-submit-bounces@debbugs.gnu.org Fri Apr 08 09:23:43 2022 Received: (at 53882) by debbugs.gnu.org; 8 Apr 2022 13:23:43 +0000 Received: from localhost ([127.0.0.1]:34255 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ncoaU-0007pJ-Co for submit@debbugs.gnu.org; Fri, 08 Apr 2022 09:23:43 -0400 Received: from mail-wr1-f54.google.com ([209.85.221.54]:34525) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ncoaN-0007m1-Nn for 53882@debbugs.gnu.org; Fri, 08 Apr 2022 09:23:36 -0400 Received: by mail-wr1-f54.google.com with SMTP id m30so12871568wrb.1 for <53882@debbugs.gnu.org>; Fri, 08 Apr 2022 06:23:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=Jh2ZhJGr/8QL6cTKKwt2uODqLJpp8dcmbTrTemri3Hw=; b=SdhZNroa67Qh7LjdN7662PsF9J/lBSo4a1w5yroZ+xuw/mGOnKp5vA+GUdayFBkB1W 6YAoyMosulvDOAFEGqHcQ8TiUjDSkg1Q1zeR/2VwAh1eghG+p0u0LJsDWgrezW8D+uxf IZMXY/KERRSpAfZ9m9BiTY9CyNiWWRp8fQdl27PM0lKf8r86HUBziPXp8/aO+XsV+ZvT sIpHz+U9aTBCNqZr6sddSW/yAAXPLnGJTUCQgcR3nag70yxVKyLuejf/jUzlX/qgIeMm InZl1YYO/0C7oi8cSv7eQCCmjEUFFan5LqZJyB86IFZMFe4qzw9KqeFE9kMazfYGCLzU vEcw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=Jh2ZhJGr/8QL6cTKKwt2uODqLJpp8dcmbTrTemri3Hw=; b=o60gWYxeM7fuJVCBeHSVMRyX6Rsc8YBcaSpC7Psqhxrl01dpDX+vab9TkrXxC8s9JE f/G+5swD39DOBND1bevM3uTdAtyG4PKtcxur694xs0vRhyJlIEn8zp0TEIzaZX428TrG mex+kSopk+91qeaGYSJWRkUt62Cg1ZOcGaAsFxC0l0NpmBHSR06sPJLR+rN2HfatwZek brO3YGgQk1ijocCD4+YvSNFyMqY9HiskXITAnLZcSugHgCTr4kdrzr6WVdG/LYVriI4C OrBvNhZs2f3BtZ2XI74roZu2kDmX3Ok3vY9QX4WGHt+WfeqReMeetylsr1MvBs5Y+aP+ USQQ== X-Gm-Message-State: AOAM532hYK1pbRHlRKP8DPvwgftBA8oX4ahMm+01c7vFARD/1aaRkWPF +kVPqBbhJTLKawd1wRv4UkvdHBPYsgk= X-Google-Smtp-Source: ABdhPJxDigfGiykOwHdg7JUaHFlFs4sgP329jqSda8ynqQ1C/YbBSJJOoHa6Pv5vvmc+WQEDt5G/ZQ== X-Received: by 2002:a5d:6981:0:b0:205:e04a:e20f with SMTP id g1-20020a5d6981000000b00205e04ae20fmr14587851wru.6.1649424210173; Fri, 08 Apr 2022 06:23:30 -0700 (PDT) Received: from localhost.localdomain ([193.48.40.241]) by smtp.gmail.com with ESMTPSA id z3-20020a1cf403000000b0037d1f4a2201sm10108954wma.21.2022.04.08.06.23.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 08 Apr 2022 06:23:29 -0700 (PDT) From: zimoun To: 53882@debbugs.gnu.org Subject: [PATCH v2 10/25] gnu: Add ocaml-ppx-module-timer. Date: Fri, 8 Apr 2022 15:22:50 +0200 Message-Id: <20220408132305.3301350-10-zimon.toutoune@gmail.com> X-Mailer: git-send-email 2.34.0 In-Reply-To: <20220408132305.3301350-1-zimon.toutoune@gmail.com> References: <20220408132305.3301350-1-zimon.toutoune@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 53882 Cc: Julien Lepiller X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) From: Julien Lepiller * gnu/packages/ocaml.scm (ocaml-ppx-module-timer): New variable. --- gnu/packages/ocaml.scm | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index c2924fc59d..a5f57fe36f 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -5929,6 +5929,31 @@ (define-public ocaml4.07-ppx-pipebang (properties '()) (license license:asl2.0)))) +(define-public ocaml-ppx-module-timer + (package + (name "ocaml-ppx-module-timer") + (version "0.14.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/janestreet/ppx_module_timer") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "163q1rpblwv82fxwyf0p4j9zpsj0jzvkfmzb03r0l49gqhn89mp6")))) + (build-system dune-build-system) + (arguments + `(#:tests? #f)); no tests + (propagated-inputs + (list ocaml-base ocaml-ppx-base ocaml-stdio ocaml-time-now ocaml-ppxlib)) + (properties `((upstream-name . "ppx_module_timer"))) + (home-page "https://github.com/janestreet/ppx_module_timer") + (synopsis "Ppx rewriter that records top-level module startup times") + (description "Modules using @samp{ppx_module_timer} have instrumentation +to record their startup time.") + (license license:expat))) + (define-public ocaml-ppx-optional (package (name "ocaml-ppx-optional") -- 2.34.0 From debbugs-submit-bounces@debbugs.gnu.org Fri Apr 08 09:23:48 2022 Received: (at 53882) by debbugs.gnu.org; 8 Apr 2022 13:23:48 +0000 Received: from localhost ([127.0.0.1]:34258 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ncoaa-0007ps-3t for submit@debbugs.gnu.org; Fri, 08 Apr 2022 09:23:48 -0400 Received: from mail-wm1-f52.google.com ([209.85.128.52]:43874) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ncoaO-0007m2-7G for 53882@debbugs.gnu.org; Fri, 08 Apr 2022 09:23:36 -0400 Received: by mail-wm1-f52.google.com with SMTP id m67-20020a1ca346000000b0038e6a1b218aso5552547wme.2 for <53882@debbugs.gnu.org>; Fri, 08 Apr 2022 06:23:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=TJuA+okP7VtBn/go+iop0Nr2GAjZke7U8us0FID8cEM=; b=IAxkubcdtQkxSzFA+ueL9nFnx0ZLmmlFzB5ym2LT4rLSBsH3bOrm0IbmI5VVlKD1aW imXlGxPS32ATeBbHHGLt3/SXw8RJ/J1oIvb7fssQ/EvjfMXfVFlHjEu8+1sHwfHSMh/j mlXFKVGJ4ofadWvEg47u59GFw5qQa2fMlmZ9g0BHMyv4468OlzHZK4Qr40Lj0R6Eip+F MgpwklFUg9u1mcv2WkPEqOPd4/a0ip1hvUYqKkSyUJFzM8jPD7Vfu3QjX2+lOK8qBFM9 GpKSw/utcQr3kTqF/PSXfCDhYN43TZzjZg9GFJWxCe5450kKggqyG6DGB3lZ+MeRFJdU GGnw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=TJuA+okP7VtBn/go+iop0Nr2GAjZke7U8us0FID8cEM=; b=B+ENtoHPRFNSYbjrNtG+EaGGgiytjHqBcfHbzzjpcdfsQaswNccuYovPgnXPdG9ERN JWMzMrKN6L9gvyJ79q4fVprqTG2ud7qaHDRxeBlnC6Du60mmO51U7zjmPC+ADN3w+CqD Bo60LtOUIQk2os+jKt7NSEF5d0vop7KqTzS7azsrms8x7Nt4eeviBEGnNCYe1DYbH7wJ taeTdWchBFVmoUwiecnvu9Ph+GlySSfujPFwhBtKC24Hy12/ma7IoiDPi1qp1SLoHWZv nXvo1FWdU0laQw7DXb0+60jLVf52TnxipN7+zVWydH/LwSKUyc/n43mJf3SPgNBPvK+f opzw== X-Gm-Message-State: AOAM531YG7NCiHTqHe8BdLqdw3V8I9U0PEuwMxRc+1ZtuiXCm1tZV5R6 DsgxSTk2/bpoNk1fEuKcec/GNXpDhAE= X-Google-Smtp-Source: ABdhPJwdGMNbL5h2GellbHd+t1rt92aMSyEOJFxTsdTVW9YWjNpKwNY6d0VNMI54DIMce5pED4XOGw== X-Received: by 2002:a05:600c:228f:b0:38e:74f7:a0fb with SMTP id 15-20020a05600c228f00b0038e74f7a0fbmr17064529wmf.39.1649424210665; Fri, 08 Apr 2022 06:23:30 -0700 (PDT) Received: from localhost.localdomain ([193.48.40.241]) by smtp.gmail.com with ESMTPSA id z3-20020a1cf403000000b0037d1f4a2201sm10108954wma.21.2022.04.08.06.23.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 08 Apr 2022 06:23:30 -0700 (PDT) From: zimoun To: 53882@debbugs.gnu.org Subject: [PATCH v2 11/25] gnu: Add ocaml-ppx-fixed-literal. Date: Fri, 8 Apr 2022 15:22:51 +0200 Message-Id: <20220408132305.3301350-11-zimon.toutoune@gmail.com> X-Mailer: git-send-email 2.34.0 In-Reply-To: <20220408132305.3301350-1-zimon.toutoune@gmail.com> References: <20220408132305.3301350-1-zimon.toutoune@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 53882 Cc: Julien Lepiller X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) From: Julien Lepiller * gnu/packages/ocaml.scm (ocaml-ppx-fixed-literal): New variable. --- gnu/packages/ocaml.scm | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index a5f57fe36f..67902f58b3 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -5954,6 +5954,31 @@ (define-public ocaml-ppx-module-timer to record their startup time.") (license license:expat))) +(define-public ocaml-ppx-fixed-literal + (package + (name "ocaml-ppx-fixed-literal") + (version "0.14.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/janestreet/ppx_fixed_literal") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0s7rb4dhz4ibhh42a9sfxjj3zbwfyfmaihr92hpdv5j9xqn3n8mi")))) + (build-system dune-build-system) + (arguments + `(#:tests? #f)); no tests + (propagated-inputs (list ocaml-base ocaml-ppxlib)) + (properties `((upstream-name . "ppx_fixed_literal"))) + (home-page "https://github.com/janestreet/ppx_fixed_literal") + (synopsis "Simpler notation for fixed point literals") + (description + "@samp{ppx-fixed-literal} is a ppx rewriter that rewrites fixed point +literal of the form 1.0v to conversion functions currently in scope.") + (license license:expat))) + (define-public ocaml-ppx-optional (package (name "ocaml-ppx-optional") -- 2.34.0 From debbugs-submit-bounces@debbugs.gnu.org Fri Apr 08 09:23:49 2022 Received: (at 53882) by debbugs.gnu.org; 8 Apr 2022 13:23:49 +0000 Received: from localhost ([127.0.0.1]:34260 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ncoaa-0007pv-I9 for submit@debbugs.gnu.org; Fri, 08 Apr 2022 09:23:48 -0400 Received: from mail-wr1-f45.google.com ([209.85.221.45]:37603) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ncoaO-0007m3-O6 for 53882@debbugs.gnu.org; Fri, 08 Apr 2022 09:23:37 -0400 Received: by mail-wr1-f45.google.com with SMTP id z1so12837077wrg.4 for <53882@debbugs.gnu.org>; Fri, 08 Apr 2022 06:23:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=dB91o/yMhIHd22oFn8cYthbo0LDD4SS3RPwLKcg3qUQ=; b=lvF22GKs+q5gnsVcEdL1nyIzCSJ2OY8igKeqWVAHDpcHHT73p46+UUiR5iVzHE0M0G dBleQcQq1MNSlvIDzlttgkVQmzaelTVb02VFp2dvl8gBHo+TorunuCTFyBwMhYej33Ci 6tS6TDYBInnJf8JTQSUDqMBZ3iU6aBqcNZ0+KbbL1tOJrKnA8DzpYkJp3f2e//j3vqbX eqEmCgyNdwiH2CygmZmBbfrPfWIaQCPW2tSRktVEywWQg0eYaDTHx1MrHShwmF8OhW6T oCDJP+8oxTBvw1zpJNDo+P8CmF9z9RFuJAkLirktYHofH8lMcv8yXPVJxtDIDbWr6ylS vtvA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=dB91o/yMhIHd22oFn8cYthbo0LDD4SS3RPwLKcg3qUQ=; b=guCbqZAsvpHv4csCeYqmoIcWg0U90ZF4PK6IwHMRn1P+KduZ4HcebZoLFwLBDsoUkd HQ7I2gvsVL6pSddX04O2uLlcMLidBv70Qz4mpDVZcN5g6vBvcSjhUltw/HmRH1iwUWKq PcWcRKP3G7kIcHEDCM0jp8lkjoJ121yPx3tJ5gp46GWGqvv+RsfYufoOQVJH/h7RX5CS RoDcI2pHfrmgo92wAloZCv9Af/p4FsCElXp0n8/8GyaY302dMVjdve3k1EtPmkebAvWl bNwEuMVIJR7aFIOa1EK5nx5OR8XgoRvYwRXOHN5C/qBxE+RiHtRT4Ww8IuZR51NFFCsN oiMg== X-Gm-Message-State: AOAM531zqDjaGEbSb97RcUEZ152lXbG7XFRa6gIgUMVuFe33JqDDodxA qYJznzR16ox29EppZOx3TFlM74D2eKo= X-Google-Smtp-Source: ABdhPJyg3tDP89UaOtq/rr0RlIYOW8VwmzJ1G/BiHOG2HdBq3zdwmQ1x+E+pZY1NGJgWjR7wIgNMmA== X-Received: by 2002:adf:bc0d:0:b0:206:14a6:817f with SMTP id s13-20020adfbc0d000000b0020614a6817fmr14835585wrg.136.1649424211096; Fri, 08 Apr 2022 06:23:31 -0700 (PDT) Received: from localhost.localdomain ([193.48.40.241]) by smtp.gmail.com with ESMTPSA id z3-20020a1cf403000000b0037d1f4a2201sm10108954wma.21.2022.04.08.06.23.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 08 Apr 2022 06:23:30 -0700 (PDT) From: zimoun To: 53882@debbugs.gnu.org Subject: [PATCH v2 12/25] gnu: Add ocaml-bin-prot. Date: Fri, 8 Apr 2022 15:22:52 +0200 Message-Id: <20220408132305.3301350-12-zimon.toutoune@gmail.com> X-Mailer: git-send-email 2.34.0 In-Reply-To: <20220408132305.3301350-1-zimon.toutoune@gmail.com> References: <20220408132305.3301350-1-zimon.toutoune@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 53882 Cc: Julien Lepiller X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) From: Julien Lepiller * gnu/packages/ocaml.scm (ocaml-bin-prot): New variable. (ocaml4.07-bin-prot): Inherit from it. --- gnu/packages/ocaml.scm | 75 ++++++++++++++++++++++++++---------------- 1 file changed, 47 insertions(+), 28 deletions(-) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 67902f58b3..fbe07fbb21 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -5580,33 +5580,30 @@ (define-public ocaml4.07-ppx-custom-printf "11b73smf3g3bpd9lg014pr4rx285nk9mnk6g6464ph51jv0sqzhj")) (properties `((upstream-name . "ppx_custom_printf")))))) -(define-public ocaml4.07-bin-prot +(define-public ocaml-bin-prot (package - (name "ocaml4.07-bin-prot") - (version "0.11.0") - (source (origin - (method url-fetch) - (uri (string-append "https://ocaml.janestreet.com/ocaml-core/v" - (version-major+minor version) - "/files/bin_prot-v" version ".tar.gz")) - (sha256 - (base32 - "1rsd91gx36prj4whi76nsiz1bzpgal9nzyw3pxdz1alv4ilk2il6")))) + (name "ocaml-bin-prot") + (version "0.14.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/janestreet/bin_prot") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1qyqbfp4zdc2jb87370cdgancisqffhf9x60zgh2m31kqik8annr")))) (build-system dune-build-system) - (inputs - `(("ocaml-base" ,(package-with-ocaml4.07 ocaml-base)) - ("ocaml-ppx-compare" ,(package-with-ocaml4.07 ocaml-ppx-compare)) - ("ocaml-ppx-custom-printf" ,(package-with-ocaml4.07 ocaml-ppx-custom-printf)) - ("ocaml-ppx-fields-conv" ,(package-with-ocaml4.07 ocaml-ppx-fields-conv)) - ("ocaml-ppx-sexp-conv" ,(package-with-ocaml4.07 ocaml-ppx-sexp-conv)) - ("ocaml-ppx-variants-conv" ,(package-with-ocaml4.07 ocaml-ppx-variants-conv)) - ("ocaml-migrate-parsetree" - ,(package-with-ocaml4.07 ocaml-migrate-parsetree)))) - (arguments - `(#:ocaml ,ocaml-4.07 - #:findlib ,ocaml4.07-findlib - #:dune ,ocaml4.07-dune)) - (properties `((upstream-name . "bin_prot"))) + (propagated-inputs + (list ocaml-base + ocaml-ppx-compare + ocaml-ppx-custom-printf + ocaml-ppx-fields-conv + ocaml-ppx-optcomp + ocaml-ppx-sexp-conv + ocaml-ppx-variants-conv)) + (properties `((upstream-name . "bin_prot") + (ocaml4.07-variant . ,(delay ocaml4.07-bin-prot)))) (home-page "https://github.com/janestreet/bin_prot") (synopsis "Binary protocol generator") (description "This library contains functionality for reading and writing @@ -5615,9 +5612,31 @@ (define-public ocaml4.07-bin-prot structured values at speeds sufficient to saturate a gigabit connection. The protocol is also heavily optimized for size, making it ideal for long-term storage of large amounts of data.") - (license (list - license:asl2.0 - license:bsd-3)))) + (license license:expat))) + +(define-public ocaml4.07-bin-prot + (package-with-ocaml4.07 + (package + (inherit ocaml-bin-prot) + (version "0.11.0") + (source (origin + (method url-fetch) + (uri (string-append "https://ocaml.janestreet.com/ocaml-core/v" + (version-major+minor version) + "/files/bin_prot-v" version ".tar.gz")) + (sha256 + (base32 + "1rsd91gx36prj4whi76nsiz1bzpgal9nzyw3pxdz1alv4ilk2il6")))) + (propagated-inputs (list ocaml-base + ocaml-ppx-compare + ocaml-ppx-custom-printf + ocaml-ppx-fields-conv + ocaml-ppx-variants-conv + ocaml-migrate-parsetree)) + (properties '()) + (license (list + license:asl2.0 + license:bsd-3))))) (define-public ocaml-octavius (package -- 2.34.0 From debbugs-submit-bounces@debbugs.gnu.org Fri Apr 08 09:23:49 2022 Received: (at 53882) by debbugs.gnu.org; 8 Apr 2022 13:23:49 +0000 Received: from localhost ([127.0.0.1]:34262 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ncoab-0007q2-04 for submit@debbugs.gnu.org; Fri, 08 Apr 2022 09:23:49 -0400 Received: from mail-wm1-f49.google.com ([209.85.128.49]:43873) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ncoaP-0007m5-3Q for 53882@debbugs.gnu.org; Fri, 08 Apr 2022 09:23:38 -0400 Received: by mail-wm1-f49.google.com with SMTP id m67-20020a1ca346000000b0038e6a1b218aso5552589wme.2 for <53882@debbugs.gnu.org>; Fri, 08 Apr 2022 06:23:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=tc4+nvws21rYmo9rGHp397Id9+YFKbxzZR5cwvia4Po=; b=mlPA06sFwLX0ELVmX60zKCbOm7MaBrRV0sl3VAdGWAnsyqRcORvseuu5xneC9wogO7 8f5wqG2K4XEDPDM0F71qBJGwpLVoWnzG1mNjtH72P1O6jRY44g4+eZZ9SN+VwpB/9odx iRmSFNWJsWQVveAIEX6HGud3VeY2mpX62S7l3BnpB5d+EWFYAWHFEbNjTkyprLgex6+T L15ppsLb5BKB0wavf2tT+ExUG4jUX92JOb1UrsbnmmMOx4bJTrO5lv+aTSHgvIxzW42Z deX6UzyfbD28b0ernyD1otI35H68kqAosKY2WGGaI2cgMw4wWAaei809KPff6M0CnfoP 6sow== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=tc4+nvws21rYmo9rGHp397Id9+YFKbxzZR5cwvia4Po=; b=l7+UYe37SiJge+D3EFzytzW7G3XfGbU/YDlZTuQubTPtRIIXBOiuOnCLmTIcCVmMYo xeywyVvwgsicTZSnrH21IPaBWE8U3585gUzy3TyynZkpcW96GRvXYAJnmOcEL9PpXyHd 7ylthhRKIfi00ngYpinsRsL15wZ+Vns9YM0xn3laL3bIWdgWsGP038Sc34FhLw1OSjPg zNiy/kyI3QHW/vbLWB2Go1yxwU6shajTC2xV6FeI0AX3q/3MT2492xe1zC7yssnUtCm3 1NdM3FjH0t8OgXZIWYVkoSXw7y/ehk1YyvCmBMjpbaCwUIFGFqIaMfzoEUFtKwKbIDKl A9WA== X-Gm-Message-State: AOAM530QHbfkzG//mk8zaWzjpp0e9uaTX+gbGkW5mFIZPBjYO8CWOHYv GXz2P0Xvlk0Q9CT5d4U05JZHW1I4uL4= X-Google-Smtp-Source: ABdhPJxGeyBSaEz3CmStbxdwqQjqkzVvVFDnr4bQCCvehzME8lxKx0L2mF5zXigXGTkuoEELIoxtZA== X-Received: by 2002:a1c:218b:0:b0:38e:aa07:62a8 with SMTP id h133-20020a1c218b000000b0038eaa0762a8mr1630833wmh.172.1649424211576; Fri, 08 Apr 2022 06:23:31 -0700 (PDT) Received: from localhost.localdomain ([193.48.40.241]) by smtp.gmail.com with ESMTPSA id z3-20020a1cf403000000b0037d1f4a2201sm10108954wma.21.2022.04.08.06.23.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 08 Apr 2022 06:23:31 -0700 (PDT) From: zimoun To: 53882@debbugs.gnu.org Subject: [PATCH v2 13/25] gnu: Add ocaml-ppx-bin-prot. Date: Fri, 8 Apr 2022 15:22:53 +0200 Message-Id: <20220408132305.3301350-13-zimon.toutoune@gmail.com> X-Mailer: git-send-email 2.34.0 In-Reply-To: <20220408132305.3301350-1-zimon.toutoune@gmail.com> References: <20220408132305.3301350-1-zimon.toutoune@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 53882 Cc: Julien Lepiller X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) From: Julien Lepiller * gnu/packages/ocaml.scm (ocaml-ppx-bin-prot): New variable. (ocaml4.07-ppx-bin-prot): Inherit from it. --- gnu/packages/ocaml.scm | 64 ++++++++++++++++++++++++++---------------- 1 file changed, 40 insertions(+), 24 deletions(-) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index fbe07fbb21..14e945df56 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -6423,39 +6423,55 @@ (define-public ocaml4.07-ppx-base ("ocaml-ppxlib" ,ocaml-ppxlib))) (properties `((upstream-name . "ppx_base")))))) -(define-public ocaml4.07-ppx-bin-prot +(define-public ocaml-ppx-bin-prot (package - (name "ocaml4.07-ppx-bin-prot") - (version "0.11.1") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/janestreet/ppx_bin_prot") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "1h60i75bzvhna1axyn662gyrzhh441l79vl142d235i5x31dmnkz")))) + (name "ocaml-ppx-bin-prot") + (version "0.14.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/janestreet/ppx_bin_prot") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1qryjxhyz3kn5jz5wm62j59lhjhd1mp7nbsj0np9qnbpapnnr1zg")))) (build-system dune-build-system) (arguments ;; Cyclic dependency with ocaml-ppx-jane - `(#:tests? #f - #:ocaml ,ocaml-4.07 - #:findlib ,ocaml4.07-findlib - #:dune ,ocaml4.07-dune)) + `(#:tests? #f)) (propagated-inputs - `(("ocaml-base" ,(package-with-ocaml4.07 ocaml-base)) - ("ocaml-bin-prot" ,ocaml4.07-bin-prot) - ("ocaml-ppx-here" ,(package-with-ocaml4.07 ocaml-ppx-here)) - ("ocaml-migrate-parsetree" - ,(package-with-ocaml4.07 ocaml-migrate-parsetree)) - ("ocaml-ppxlib" ,(package-with-ocaml4.07 ocaml-ppxlib)))) - (properties `((upstream-name . "ppx_bin_prot"))) + (list ocaml-base ocaml-bin-prot ocaml-ppx-here ocaml-ppxlib)) + (properties `((upstream-name . "ppx_bin_prot") + (ocaml4.07-variant . ,(delay ocaml4.07-ppx-bin-prot)))) (home-page "https://github.com/janestreet/ppx_bin_prot") (synopsis "Generation of bin_prot readers and writers from types") (description "Generation of binary serialization and deserialization functions from type definitions.") - (license license:asl2.0))) + (license license:expat))) + +(define-public ocaml4.07-ppx-bin-prot + (package-with-ocaml4.07 + (package + (inherit ocaml-ppx-bin-prot) + (version "0.11.1") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/janestreet/ppx_bin_prot") + (commit (string-append "v" version)))) + (file-name (git-file-name "ocaml4.07-ppx-bin-prot" version)) + (sha256 + (base32 + "1h60i75bzvhna1axyn662gyrzhh441l79vl142d235i5x31dmnkz")))) + (propagated-inputs + (list ocaml-base + ocaml-bin-prot + ocaml-ppx-here + ocaml-migrate-parsetree + ocaml-ppxlib)) + (properties '()) + (license license:asl2.0)))) (define-public ocaml4.07-ppx-jane (package -- 2.34.0 From debbugs-submit-bounces@debbugs.gnu.org Fri Apr 08 09:23:49 2022 Received: (at 53882) by debbugs.gnu.org; 8 Apr 2022 13:23:49 +0000 Received: from localhost ([127.0.0.1]:34264 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ncoab-0007q9-DM for submit@debbugs.gnu.org; Fri, 08 Apr 2022 09:23:49 -0400 Received: from mail-wm1-f54.google.com ([209.85.128.54]:39790) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ncoaP-0007m6-LH for 53882@debbugs.gnu.org; Fri, 08 Apr 2022 09:23:38 -0400 Received: by mail-wm1-f54.google.com with SMTP id bi13-20020a05600c3d8d00b0038c2c33d8f3so7546843wmb.4 for <53882@debbugs.gnu.org>; Fri, 08 Apr 2022 06:23:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=9CqO0qMWTGWBbrCNLxMwBhRF8l41mLpiCKCxYHT8/7w=; b=M6N0d7JaKFa8KiQcf9Uy0B5gtPn8VSjXAclh8MPRtm6ZEBhff5sQjnFFCaWGkFg9Dc NQG5XQwz1iHBxAhhEJEWBo5TtC9JzH2TAXfRTc/f3JSgtHfOEYWA6yrYjSOWKBwWs6xn kIEz/nbqonlEiGKjmX+fYFVS6NFC96rh5j8wcePSYqdt0u3WExuv0OGqNarP0uRGajWF N2Sio2N83pANaPfy9OC3mT6hVcksILVWN02LPZJfIhh9d2agVTSebaAbSP+6Dk7PzdIy fT3ZaheikwWV0diFPZaDE4mIY7Gg84jOOV3Und+KPdTyHdNz9PJOYZ6kEMc3Rq7R6o4R TDYA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=9CqO0qMWTGWBbrCNLxMwBhRF8l41mLpiCKCxYHT8/7w=; b=v5HqoV4LpTia7Ge1keu2/rm5tCwHNE2K9LebPeFwfOjLmcqYTXYhcXQhyIZ1fUy36c oGzs+n0I+NckrYntjxYYkKOCxxC1WmlQe6ZS1lZGuFxcum8M1apoJJOrFOJjDQ5wm0MM i8u7N7yxv07EzJXfEWIfUcBr6LPqCW4Y1Will5mStqgbRrpW9ruJTulM2OryCsylAZlo qb5f88yPygVfBge2zFpZcHAPhBVaOzrl7yPph/TC1uPBEd3JYPGmf0WkPDUl5Lm4A4Te WrMuYN81nAtvPhij5C2J185xbSaHjAjKkh6zILGGmV286YG0W9frl2BUTkaQUmhx6f/h VzYg== X-Gm-Message-State: AOAM531HSS+TMIZ3/gGBwZEKpM3mPB+livEWXE6oIheee5XiKWHedcW+ s6g5eYIw3hZS0wpyiV0VIuZ5WyfSUIE= X-Google-Smtp-Source: ABdhPJzj/jCWBEjE1h8/7P0zCbbkRUgXMc6bVlAjAEOQQB+gcvP+dj69BxwdnTkxpqVecTnbqzWJVw== X-Received: by 2002:a7b:cf23:0:b0:38e:7df5:b492 with SMTP id m3-20020a7bcf23000000b0038e7df5b492mr17171671wmg.49.1649424211997; Fri, 08 Apr 2022 06:23:31 -0700 (PDT) Received: from localhost.localdomain ([193.48.40.241]) by smtp.gmail.com with ESMTPSA id z3-20020a1cf403000000b0037d1f4a2201sm10108954wma.21.2022.04.08.06.23.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 08 Apr 2022 06:23:31 -0700 (PDT) From: zimoun To: 53882@debbugs.gnu.org Subject: [PATCH v2 14/25] gnu: Add ocaml-ppx-bench. Date: Fri, 8 Apr 2022 15:22:54 +0200 Message-Id: <20220408132305.3301350-14-zimon.toutoune@gmail.com> X-Mailer: git-send-email 2.34.0 In-Reply-To: <20220408132305.3301350-1-zimon.toutoune@gmail.com> References: <20220408132305.3301350-1-zimon.toutoune@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 53882 Cc: Julien Lepiller X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) From: Julien Lepiller * gnu/packages/ocaml.scm (ocaml-ppx-bench): New variable. (ocaml4.07-ppx-bench): Inherit from it. --- gnu/packages/ocaml.scm | 57 ++++++++++++++++++++++++++---------------- 1 file changed, 35 insertions(+), 22 deletions(-) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 14e945df56..baa269c8ce 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -5744,35 +5744,48 @@ (define-public ocaml4.07-ppx-enumerate "0spx9k1v7vjjb6sigbfs69yndgq76v114jhxvzjmffw7q989cyhr")))) (properties `((upstream-name . "ppx_enumerate")))))) -(define-public ocaml4.07-ppx-bench +(define-public ocaml-ppx-bench (package - (name "ocaml4.07-ppx-bench") - (version "0.11.0") - (source (origin - (method url-fetch) - (uri (string-append "https://ocaml.janestreet.com/ocaml-core/v" - (version-major+minor version) - "/files/ppx_bench-v" version ".tar.gz")) - (sha256 - (base32 - "0ys4pblbcjbk9dn073rqiwm7r6rc7fah03j7riklkwnb5n44andl")))) + (name "ocaml-ppx-bench") + (version "0.14.1") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/janestreet/ppx_bench") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "12r7jgqgpb4i4cry3rgyl2nmxcscs5w7mmk06diz7i49r27p96im")))) (build-system dune-build-system) (arguments ;; No tests - `(#:tests? #f - #:ocaml ,ocaml-4.07 - #:findlib ,ocaml4.07-findlib - #:dune ,ocaml4.07-dune)) - (propagated-inputs - `(("ocaml-ppx-inline-test" ,(package-with-ocaml4.07 ocaml-ppx-inline-test)) - ("ocaml-migrate-parsetree" - ,(package-with-ocaml4.07 ocaml-migrate-parsetree)) - ("ocaml-ppxlib" ,(package-with-ocaml4.07 ocaml-ppxlib)))) - (properties `((upstream-name . "ppx_bench"))) + `(#:tests? #f)) + (propagated-inputs (list ocaml-ppx-inline-test ocaml-ppxlib)) + (properties `((upstream-name . "ppx_bench") + (ocaml4.07-variant . ,(delay ocaml4.07-ppx-bench)))) (home-page "https://github.com/janestreet/ppx_bench") (synopsis "Syntax extension for writing in-line benchmarks in ocaml code") (description "Syntax extension for writing in-line benchmarks in ocaml code.") - (license license:asl2.0))) + (license license:expat))) + +(define-public ocaml4.07-ppx-bench + (package-with-ocaml4.07 + (package + (inherit ocaml-ppx-bench) + (version "0.11.0") + (source (origin + (method url-fetch) + (uri (string-append "https://ocaml.janestreet.com/ocaml-core/v" + (version-major+minor version) + "/files/ppx_bench-v" version ".tar.gz")) + (sha256 + (base32 + "0ys4pblbcjbk9dn073rqiwm7r6rc7fah03j7riklkwnb5n44andl")))) + (propagated-inputs + (list ocaml-ppx-inline-test ocaml-migrate-parsetree ocaml-ppxlib)) + (properties '()) + (license license:asl2.0)))) (define-public ocaml-ppx-here (package -- 2.34.0 From debbugs-submit-bounces@debbugs.gnu.org Fri Apr 08 09:23:50 2022 Received: (at 53882) by debbugs.gnu.org; 8 Apr 2022 13:23:50 +0000 Received: from localhost ([127.0.0.1]:34266 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ncoab-0007qH-Ql for submit@debbugs.gnu.org; Fri, 08 Apr 2022 09:23:50 -0400 Received: from mail-wr1-f54.google.com ([209.85.221.54]:41802) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ncoaQ-0007mF-Di for 53882@debbugs.gnu.org; Fri, 08 Apr 2022 09:23:39 -0400 Received: by mail-wr1-f54.google.com with SMTP id k23so12818580wrd.8 for <53882@debbugs.gnu.org>; Fri, 08 Apr 2022 06:23:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=xq7lqdfwOg1CSLhfmg5mb5EzYvpYtmj69a+diYN9ylA=; b=Ubj8pLPAcEDfOPhkK7zvuuMuzt19jS60JbkRtG/tnqTGo/t8GWyf1HhIKCpmydPx+t QsYh52T0C67RFMNH5I/jf+dbVgvigf3Ut68E4VqtngAvnqpVDiUq2YOpymLQ2WKlvlKQ slyErskEdUmJtT78kuzASBCv5Op6m/nfGyiawr9DAf1fi5nNS+NjK8+MTLA42X0Ng8yX kqiVSU8Li6eXdUOPOOs015/FGfkjVy+PUOPgDg04LzGRFrkavUu8qhHD6qNSRPB055qG kYXLDJqNZ2I+YYfjDlAMA8YlxMlDPWJ/CsRd6qJPHZZoU53uRcmlury93YdfMC07TLqs 9LXg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=xq7lqdfwOg1CSLhfmg5mb5EzYvpYtmj69a+diYN9ylA=; b=JI3IPh6m/4FJD8Io8CwyHre8XXmchH7jwoHJUV7GIgSi/4fjNq9UX8KNTMxpQCS0va Mo94sjs0yoE7C/+2BpXO7VWGXlIkrRbBjb0VIxqbsfOqN3P3MYelXUw6uorilXGzZb4/ C97rv+z4g3xYwot8Hsf4dIMbvFKaQwVI5qm7GcUC2/lzzlGQyE1/VwyIvY8Rgkn+owgk /EufWRkwthT9IWxfZItC4R1WeXV2FH1ZwtX4wIPUYIvhFGoSAKocAsWAMh7jqdn4cIpL LKk8lvmcMomFKBCsKfIMrTiYTykaB+8IrQVIvP8VH7LvVmC5vE1B6q6TJD/9kFe6DXxO p8TA== X-Gm-Message-State: AOAM532nvrETZ/vdgenvvq8XFVU3UgYdrRuzRDqONBu1hP4X1EKguyrD LSpR9IrseBX1vvkyLBUssApoYjQzwfM= X-Google-Smtp-Source: ABdhPJyQfTOC6qlmu2un2ck4bApVGIhKyWQ6Oh/KycIQ+hcMadbffPHgm5I+TebXyd4o9oBrliFZzw== X-Received: by 2002:a05:6000:1848:b0:204:e90:cb55 with SMTP id c8-20020a056000184800b002040e90cb55mr14731985wri.58.1649424212902; Fri, 08 Apr 2022 06:23:32 -0700 (PDT) Received: from localhost.localdomain ([193.48.40.241]) by smtp.gmail.com with ESMTPSA id z3-20020a1cf403000000b0037d1f4a2201sm10108954wma.21.2022.04.08.06.23.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 08 Apr 2022 06:23:32 -0700 (PDT) From: zimoun To: 53882@debbugs.gnu.org Subject: [PATCH v2 16/25] gnu: Add ocaml-ppx-sexp-message. Date: Fri, 8 Apr 2022 15:22:56 +0200 Message-Id: <20220408132305.3301350-16-zimon.toutoune@gmail.com> X-Mailer: git-send-email 2.34.0 In-Reply-To: <20220408132305.3301350-1-zimon.toutoune@gmail.com> References: <20220408132305.3301350-1-zimon.toutoune@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 53882 Cc: Julien Lepiller X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) From: Julien Lepiller * gnu/packages/ocaml.scm (ocaml-ppx-sexp-message): New variable. (ocaml4.07-ppx-sexp-message): Inherit from it. --- gnu/packages/ocaml.scm | 61 ++++++++++++++++++++++++++---------------- 1 file changed, 38 insertions(+), 23 deletions(-) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index ab97ee27d6..942bcab4ad 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -5902,38 +5902,53 @@ (define-public ocaml4.07-ppx-sexp-value (properties '()) (license license:asl2.0)))) -(define-public ocaml4.07-ppx-sexp-message +(define-public ocaml-ppx-sexp-message (package - (name "ocaml4.07-ppx-sexp-message") - (version "0.11.0") - (source (origin - (method url-fetch) - (uri (string-append "https://ocaml.janestreet.com/ocaml-core/v" - (version-major+minor version) - "/files/ppx_sexp_message-v" version ".tar.gz")) - (sha256 - (base32 - "1yh440za0w9cvrbxbmqacir8715kdaw6sw24ys9xj80av9nqpiw7")))) + (name "ocaml-ppx-sexp-message") + (version "0.14.1") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/janestreet/ppx_sexp_message") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1lvsr0d68kakih1ll33hy6dxbjkly6lmky4q6z0h0hrcbd6z48k4")))) (build-system dune-build-system) - (arguments - `(#:ocaml ,ocaml-4.07 - #:findlib ,ocaml4.07-findlib - #:dune ,ocaml4.07-dune)) (propagated-inputs - `(("ocaml-base" ,(package-with-ocaml4.07 ocaml-base)) - ("ocaml-ppx-here" ,(package-with-ocaml4.07 ocaml-ppx-here)) - ("ocaml-ppx-sexp-conv" ,(package-with-ocaml4.07 ocaml-ppx-sexp-conv)) - ("ocaml-migrate-parsetree" - ,(package-with-ocaml4.07 ocaml-migrate-parsetree)) - ("ocaml-ppxlib" ,(package-with-ocaml4.07 ocaml-ppxlib)))) - (properties `((upstream-name . "ppx_sexp_message"))) + (list ocaml-base ocaml-ppx-here ocaml-ppx-sexp-conv ocaml-ppxlib)) + (properties `((upstream-name . "ppx_sexp_message") + (ocaml4.07-variant . ,(delay ocaml4.07-ppx-sexp-message)))) (home-page "https://github.com/janestreet/ppx_sexp_message") (synopsis "Ppx rewriter for easy construction of s-expressions") (description "Ppx_sexp_message aims to ease the creation of s-expressions in OCaml. This is mainly motivated by writing error and debugging messages, where one needs to construct a s-expression based on various element of the context such as function arguments.") - (license license:asl2.0))) + (license license:expat))) + +(define-public ocaml4.07-ppx-sexp-message + (package-with-ocaml4.07 + (package + (inherit ocaml-ppx-sexp-message) + (version "0.11.0") + (source (origin + (method url-fetch) + (uri (string-append "https://ocaml.janestreet.com/ocaml-core/v" + (version-major+minor version) + "/files/ppx_sexp_message-v" version ".tar.gz")) + (sha256 + (base32 + "1yh440za0w9cvrbxbmqacir8715kdaw6sw24ys9xj80av9nqpiw7")))) + (propagated-inputs + (list ocaml-base + ocaml-ppx-here + ocaml-ppx-sexp-conv + ocaml-migrate-parsetree + ocaml-ppxlib)) + (properties '()) + (license license:asl2.0)))) (define-public ocaml-ppx-pipebang (package -- 2.34.0 From debbugs-submit-bounces@debbugs.gnu.org Fri Apr 08 09:23:50 2022 Received: (at 53882) by debbugs.gnu.org; 8 Apr 2022 13:23:50 +0000 Received: from localhost ([127.0.0.1]:34268 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ncoac-0007qO-76 for submit@debbugs.gnu.org; Fri, 08 Apr 2022 09:23:50 -0400 Received: from mail-wm1-f41.google.com ([209.85.128.41]:55167) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ncoaQ-0007mD-2E for 53882@debbugs.gnu.org; Fri, 08 Apr 2022 09:23:39 -0400 Received: by mail-wm1-f41.google.com with SMTP id r64so5461424wmr.4 for <53882@debbugs.gnu.org>; Fri, 08 Apr 2022 06:23:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=f/IG5enwbzjbLOzaeuzrkf1tZys2nvi8BqEG/cWSRao=; b=iG+/k+hqiR8XOv0NIW48Wo8zVNPy7E7au07p1k7UPQ3fZ9BPFvK5bfvhE7IeVSJ0M9 M+P9MzuX9SThjDrfRfPyX1p514NETUI36n68UhVf4k5FuJM5Yjg5TVLi3xWoJ8ECZTPw I0VeYlvK6DEOaxmx8tUdzk+Ic4+GoJqiXC/LsAW59fR2KaQILh0PKz0gDvXvTC3O/GCm RZpZp4Qt8S+jnCZbKYROj9qKCJmUpKqY/ztY2KJx/hghY2qeFuLIPrx5OlSM4Pz4f/1p Vy/gmEmk3kafWv0BBKO8swbgcIqqUjodx262HEfJYQIDQDBPcGKyhelUNZIh7L63RsOd P6NQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=f/IG5enwbzjbLOzaeuzrkf1tZys2nvi8BqEG/cWSRao=; b=1XdxpMWujw+jI5AcQ/3d4eQaWvWJt7+4MlKlvgm6neqpwptq4oCkboToLvEQ2reZhJ bKdv2UyrdwcwWsCuhC11b9fvhidla84ePr6SrhqmhZHAvPMimotmX7l6+hpl5XFAI83V 14gZO0Vnj7WPvPV7xYAHWV3Q5YJvQTPXF0+4mVdcy4pTKXD2ofITv2vKFSVUGIc9hoix qO17yL8rh46FXPoryPOej9+mKd+buJ291jvtSph9J12gQGrtWyFZ5/4o+WpfMS272OQO Qxg4OTioGdNghdsKlH+99olHcaZOPS4Fd0MP3vggfOJm9vdy7NrFHl9B5ucCGjeLQgXT MNPg== X-Gm-Message-State: AOAM532RyE78Fm46o2uCohBmQqLifw6+s/f4vORgRXnzLRRSSHTajnRS 4ggHcbvKsQWBCo68+b66e2LDbKJ3OL0= X-Google-Smtp-Source: ABdhPJyMLqSoeBULMBkvnOrvPSFZaLEK9JEqzdAX2FnN6FSgfRAp27VnvbPfKGg5KqBTLHZA51Uwrg== X-Received: by 2002:a05:600c:1909:b0:38c:e8f3:8e3d with SMTP id j9-20020a05600c190900b0038ce8f38e3dmr16672112wmq.152.1649424212470; Fri, 08 Apr 2022 06:23:32 -0700 (PDT) Received: from localhost.localdomain ([193.48.40.241]) by smtp.gmail.com with ESMTPSA id z3-20020a1cf403000000b0037d1f4a2201sm10108954wma.21.2022.04.08.06.23.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 08 Apr 2022 06:23:32 -0700 (PDT) From: zimoun To: 53882@debbugs.gnu.org Subject: [PATCH v2 15/25] gnu: Add ocaml-ppx-sexp-value. Date: Fri, 8 Apr 2022 15:22:55 +0200 Message-Id: <20220408132305.3301350-15-zimon.toutoune@gmail.com> X-Mailer: git-send-email 2.34.0 In-Reply-To: <20220408132305.3301350-1-zimon.toutoune@gmail.com> References: <20220408132305.3301350-1-zimon.toutoune@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 53882 Cc: Julien Lepiller X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) From: Julien Lepiller * gnu/packages/ocaml.scm (ocaml-ppx-sexp-value): New variable. (ocaml4.07-ppx-sexp-value): Inherit from it. --- gnu/packages/ocaml.scm | 65 ++++++++++++++++++++++++++---------------- 1 file changed, 40 insertions(+), 25 deletions(-) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index baa269c8ce..ab97ee27d6 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -5856,36 +5856,51 @@ (define-public ocaml4.07-typerep (properties '()) (license license:asl2.0)))) -(define-public ocaml4.07-ppx-sexp-value +(define-public ocaml-ppx-sexp-value (package - (name "ocaml4.07-ppx-sexp-value") - (version "0.11.0") - (source (origin - (method url-fetch) - (uri (string-append "https://ocaml.janestreet.com/ocaml-core/v" - (version-major+minor version) - "/files/ppx_sexp_value-v" version ".tar.gz")) - (sha256 - (base32 - "1xnalfrln6k5khsyxvxkg6v32q8fpr4cqamsjqfih29jdv486xrs")))) + (name "ocaml-ppx-sexp-value") + (version "0.14.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/janestreet/ppx_sexp_value") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1d1c92pyypqkd9473d59j0sfppxvcxggbc62w8bkqnbxrdmvirn9")))) (build-system dune-build-system) - (arguments - `(#:ocaml ,ocaml-4.07 - #:findlib ,ocaml4.07-findlib - #:dune ,ocaml4.07-dune)) (propagated-inputs - `(("ocaml-base" ,(package-with-ocaml4.07 ocaml-base)) - ("ocaml-ppx-here" ,(package-with-ocaml4.07 ocaml-ppx-here)) - ("ocaml-ppx-sexp-conv" ,(package-with-ocaml4.07 ocaml-ppx-sexp-conv)) - ("ocaml-migrate-parsetree" - ,(package-with-ocaml4.07 ocaml-migrate-parsetree)) - ("ocaml-ppxlib" ,(package-with-ocaml4.07 ocaml-ppxlib)))) - (properties `((upstream-name . "ppx_sexp_value"))) + (list ocaml-base ocaml-ppx-here ocaml-ppx-sexp-conv ocaml-ppxlib)) + (properties `((upstream-name . "ppx_sexp_value") + (ocaml4.07-variant . ,(delay ocaml4.07-ppx-sexp-value)))) (home-page "https://github.com/janestreet/ppx_sexp_value") (synopsis "Simplify building s-expressions from ocaml values") - (description "A ppx rewriter that simplifies building s-expressions from -ocaml values.") - (license license:asl2.0))) + (description "@samp{ppx-sexp-value} is a ppx rewriter that simplifies +building s-expressions from ocaml values.") + (license license:expat))) + +(define-public ocaml4.07-ppx-sexp-value + (package-with-ocaml4.07 + (package + (inherit ocaml-ppx-sexp-value) + (version "0.11.0") + (source (origin + (method url-fetch) + (uri (string-append "https://ocaml.janestreet.com/ocaml-core/v" + (version-major+minor version) + "/files/ppx_sexp_value-v" version ".tar.gz")) + (sha256 + (base32 + "1xnalfrln6k5khsyxvxkg6v32q8fpr4cqamsjqfih29jdv486xrs")))) + (propagated-inputs + (list ocaml-base + ocaml-ppx-here + ocaml-ppx-sexp-conv + ocaml-migrate-parsetree + ocaml-ppxlib)) + (properties '()) + (license license:asl2.0)))) (define-public ocaml4.07-ppx-sexp-message (package -- 2.34.0 From debbugs-submit-bounces@debbugs.gnu.org Fri Apr 08 09:23:51 2022 Received: (at 53882) by debbugs.gnu.org; 8 Apr 2022 13:23:51 +0000 Received: from localhost ([127.0.0.1]:34270 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ncoac-0007qW-KK for submit@debbugs.gnu.org; Fri, 08 Apr 2022 09:23:51 -0400 Received: from mail-wm1-f45.google.com ([209.85.128.45]:42604) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ncoaQ-0007mS-T4 for 53882@debbugs.gnu.org; Fri, 08 Apr 2022 09:23:40 -0400 Received: by mail-wm1-f45.google.com with SMTP id n126-20020a1c2784000000b0038e8af3e788so4002254wmn.1 for <53882@debbugs.gnu.org>; Fri, 08 Apr 2022 06:23:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=zZyG06khIBMo+p31W/MZpooh5jmkdeIQGrbvRE/KRXM=; b=oP/edgp2qF2uzpLxdD1meB2Gk/XvC+C+ydDhFayH0/gLbs5k4Fg4NUtRDTg4cpScL5 5qSjBvh70Jv8wNds6+s2nwgA1tTcrHlv9K60oJYZ1QX0HT6ckvzuMCOOFZdSXoXWijHw net1M94HLGAupqMBSgkszmuujQ9QS+PTLggXObYbTGovNxIqDaiXe4s397bShGoxOUUW vOF51Avmch/TbBK1DGXvk/u+IOijAsnsjHHVTqeXrkTMvys85vu57+3PjNsAFtaIC+CN WZ3Wsv484W6Ls9VgPv/l+PTM6sji6BzefU+MfkOAq0FAKs6/+4V4ITd6qSkW/uGXfKIn AZng== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=zZyG06khIBMo+p31W/MZpooh5jmkdeIQGrbvRE/KRXM=; b=ynnQyQN6sf56tGBulzEE2HLs8d1sxebYNpL9pqxcFRTFq5ntlrEE9/RsrBiLyuitC6 YpHjLwqwGMNO2tbtdT77YCYiOlJCv3LEfLLMmqRWdYZbPc85lv/9BtaAGNuU4kRS+IxT jXUJD4wj5768dBdUZf/06q2pv4zwW1TYjEj3tmjTkpXRad11y2MVWjuZl8ovIrz/PXEm dV0hkKgirqBHqkYCZfti095VBqvG4xAOxDz7A/iaPnwj8aQ5saRHv/SeY1O5oVSS9AeR AOFJ/elGYDtuwXaHnUwUQeVc3bVNXyS0Iq1q88T1V6dC84z0NhnxeQWrQNYuYQUA3dVd CgAg== X-Gm-Message-State: AOAM530s4RFwVuWH6nMAVjaNnogHtuBWgOAXp+6MXWKLhBLN7dSakp58 zXR91To9vA+uFdT0Ad8OiMGibj8k+D8= X-Google-Smtp-Source: ABdhPJzNDiKyBjaKyKIF8K7z4/cpVVge0uP0d+ZLrDUH0xBPCC8x7nKb/hIg8uwbEYY7747mzJlHsg== X-Received: by 2002:a7b:c922:0:b0:383:e7e2:4a1a with SMTP id h2-20020a7bc922000000b00383e7e24a1amr17401698wml.51.1649424213325; Fri, 08 Apr 2022 06:23:33 -0700 (PDT) Received: from localhost.localdomain ([193.48.40.241]) by smtp.gmail.com with ESMTPSA id z3-20020a1cf403000000b0037d1f4a2201sm10108954wma.21.2022.04.08.06.23.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 08 Apr 2022 06:23:33 -0700 (PDT) From: zimoun To: 53882@debbugs.gnu.org Subject: [PATCH v2 17/25] gnu: Add ocaml-splittable-random. Date: Fri, 8 Apr 2022 15:22:57 +0200 Message-Id: <20220408132305.3301350-17-zimon.toutoune@gmail.com> X-Mailer: git-send-email 2.34.0 In-Reply-To: <20220408132305.3301350-1-zimon.toutoune@gmail.com> References: <20220408132305.3301350-1-zimon.toutoune@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 53882 Cc: Julien Lepiller X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) From: Julien Lepiller * gnu/packages/ocaml.scm (ocaml-splittable-random): New variable. (ocaml4.07-splittable-random): Inherit from it. --- gnu/packages/ocaml.scm | 59 +++++++++++++++++++++++++++--------------- 1 file changed, 38 insertions(+), 21 deletions(-) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 942bcab4ad..ec2d8ab12e 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -6563,29 +6563,28 @@ (define-public ocaml4.07-ppx-jane driver including all standard Jane Street ppx rewriters.") (license license:asl2.0))) -(define-public ocaml4.07-splittable-random +(define-public ocaml-splittable-random (package - (name "ocaml4.07-splittable-random") - (version "0.11.0") - (source (origin - (method url-fetch) - (uri (string-append "https://ocaml.janestreet.com/ocaml-core/v" - (version-major+minor version) - "/files/splittable_random-v" version ".tar.gz")) - (sha256 - (base32 - "0l1wbd881mymlnpzlq5q53mmdz3g5d7qjhyc7lfaq1x0iaccn5lc")))) + (name "ocaml-splittable-random") + (version "0.14.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/janestreet/splittable_random") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0ax988b1wc7km8khg4s6iphbz16y1rssh7baigxfyw3ldp0agk14")))) (build-system dune-build-system) - (arguments - `(#:ocaml ,ocaml-4.07 - #:findlib ,ocaml4.07-findlib - #:dune ,ocaml4.07-dune)) (propagated-inputs - `(("ocaml-base" ,(package-with-ocaml4.07 ocaml-base)) - ("ocaml-ppx-jane" ,ocaml4.07-ppx-jane) - ("ocaml-migrate-parsetree" - ,(package-with-ocaml4.07 ocaml-migrate-parsetree)))) - (properties `((upstream-name . "splittable_random"))) + (list ocaml-base + ocaml-ppx-assert + ocaml-ppx-bench + ocaml-ppx-inline-test + ocaml-ppx-sexp-message)) + (properties `((upstream-name . "splittable_random") + (ocaml-4.07-variant . ,(delay ocaml4.07-splittable-random)))) (home-page "https://github.com/janestreet/splittable_random") (synopsis "PRNG that can be split into independent streams") (description "This package provides a splittable @@ -6595,7 +6594,25 @@ (define-public ocaml4.07-splittable-random This library implements a splittable pseudo-random number generator that sacrifices cryptographic-quality randomness in favor of performance.") - (license license:asl2.0))) + (license license:expat))) + +(define-public ocaml4.07-splittable-random + (package-with-ocaml4.07 + (package + (inherit ocaml-splittable-random) + (version "0.11.0") + (source (origin + (method url-fetch) + (uri (string-append "https://ocaml.janestreet.com/ocaml-core/v" + (version-major+minor version) + "/files/splittable_random-v" version ".tar.gz")) + (sha256 + (base32 + "0l1wbd881mymlnpzlq5q53mmdz3g5d7qjhyc7lfaq1x0iaccn5lc")))) + (propagated-inputs + (list ocaml-base ocaml4.07-ppx-jane ocaml-migrate-parsetree)) + (properties '()) + (license license:asl2.0)))) (define-public ocaml4.07-jane-street-headers (package -- 2.34.0 From debbugs-submit-bounces@debbugs.gnu.org Fri Apr 08 09:23:51 2022 Received: (at 53882) by debbugs.gnu.org; 8 Apr 2022 13:23:51 +0000 Received: from localhost ([127.0.0.1]:34272 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ncoad-0007qd-1N for submit@debbugs.gnu.org; Fri, 08 Apr 2022 09:23:51 -0400 Received: from mail-wm1-f44.google.com ([209.85.128.44]:38902) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ncoaR-0007mU-78 for 53882@debbugs.gnu.org; Fri, 08 Apr 2022 09:23:40 -0400 Received: by mail-wm1-f44.google.com with SMTP id r206-20020a1c44d7000000b0038ccb70e239so13578wma.3 for <53882@debbugs.gnu.org>; Fri, 08 Apr 2022 06:23:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=rSvVR82WVj/5hQdo0DRyr41ihpoVOERcjMoFilSYtlc=; b=X/2HoF3z4eDlDq8+e11hrhs0rw4+t8Ex9u4hUZS5DclesidWDA0x4FBvMgk3oUBLJ4 fnuKtDsP85f/OMJcwuY2tvme5oxqXOT/VnNMcsxw0TrVyX8lC4ed61PClaP6VmGXRZqj JF0XfQANnG6wKggKS7qUJKCiBfC7SWuAWPlr5tTJjH933Ix8aRUpqTemhyaN9UWfgQLR 3F+NVi1njOgAJASoVyzEbPvdMnGi+JB+Yg4leC0/KVxLwXI9gT8XSCC4TZu5+T6yRhhW bA9yI06yJwAc+Mtx2hIYUWbTm2FgARFduORz4Wmym6/Tc5RafxJT4CRQcbncKm86YxX4 kygw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=rSvVR82WVj/5hQdo0DRyr41ihpoVOERcjMoFilSYtlc=; b=vRFBn8DzgOtLEsoTSb2NHbV7UuXiAZgO8JmhWr+ZmAY5vavYMLDwir8QRBOGLzDzjz jBLskfr8Nlj8b5p39KAQ42ls493zvfmQzfZkbehCTuzGsGbsm7HPCpOFZwyIimSbYSTx rDLaCpT73mfQy0CuhTl0dw/5nFbr5Y5k310HNEOcEYvkFU5H1rQrx0Y1L0MiBJ48Urt6 6+eiygIuEJONNcajvSKP/Tv/fsTcA7Tzep8Q+CXWjA118AobBPe4EvPQlioH+VATHeMX VJt+188hPdLWRL1jmbVBW3Wq/PhIPyA7WxDOHayYPgC4TuqwKQeP1f6oLRVqbZPdSp7B meOQ== X-Gm-Message-State: AOAM530b1pZ1Q4LXkaGHZ7AykMWrfEexzpK0Gz4Wq2CT+ZzrcKmM0IYL gNjKqwZxaMSnbCEOATdQGXpixa/t71E= X-Google-Smtp-Source: ABdhPJx0vrM/XV1bViHEsncpmjPEi1k6u/ZH/BkzbX112TylYZAilC7gxPQeiMkNGoR4WEC3FSMiQw== X-Received: by 2002:a05:600c:3d0e:b0:38c:9b5e:52c0 with SMTP id bh14-20020a05600c3d0e00b0038c9b5e52c0mr16525010wmb.3.1649424213732; Fri, 08 Apr 2022 06:23:33 -0700 (PDT) Received: from localhost.localdomain ([193.48.40.241]) by smtp.gmail.com with ESMTPSA id z3-20020a1cf403000000b0037d1f4a2201sm10108954wma.21.2022.04.08.06.23.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 08 Apr 2022 06:23:33 -0700 (PDT) From: zimoun To: 53882@debbugs.gnu.org Subject: [PATCH v2 18/25] gnu: Add ocaml-base-quickcheck. Date: Fri, 8 Apr 2022 15:22:58 +0200 Message-Id: <20220408132305.3301350-18-zimon.toutoune@gmail.com> X-Mailer: git-send-email 2.34.0 In-Reply-To: <20220408132305.3301350-1-zimon.toutoune@gmail.com> References: <20220408132305.3301350-1-zimon.toutoune@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 53882 Cc: Julien Lepiller X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) From: Julien Lepiller * gnu/packages/ocaml.scm (ocaml-base-quickcheck): New variable. --- gnu/packages/ocaml.scm | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index ec2d8ab12e..a57ec2b05f 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -6614,6 +6614,39 @@ (define-public ocaml4.07-splittable-random (properties '()) (license license:asl2.0)))) +(define-public ocaml-base-quickcheck + (package + (name "ocaml-base-quickcheck") + (version "0.14.1") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/janestreet/base_quickcheck") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0apq3d9xb0zdaqsl4cjk5skyig57ff1plndb2mh0nn3czvfhifxs")))) + (build-system dune-build-system) + (propagated-inputs + (list ocaml-base + ocaml-ppx-base + ocaml-ppx-fields-conv + ocaml-ppx-let + ocaml-ppx-sexp-message + ocaml-ppx-sexp-value + ocaml-splittable-random + ocaml-ppxlib)) + (properties `((upstream-name . "base_quickcheck"))) + (home-page "https://github.com/janestreet/base_quickcheck") + (synopsis + "Randomized testing framework, designed for compatibility with Base") + (description + "@samp{base-quickcheck} provides randomized testing in the style of +Haskell's Quickcheck library, with support for built-in types as well as +types provided by Base.") + (license license:expat))) + (define-public ocaml4.07-jane-street-headers (package (name "ocaml4.07-jane-street-headers") -- 2.34.0 From debbugs-submit-bounces@debbugs.gnu.org Fri Apr 08 09:23:51 2022 Received: (at 53882) by debbugs.gnu.org; 8 Apr 2022 13:23:51 +0000 Received: from localhost ([127.0.0.1]:34274 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ncoad-0007qk-Dl for submit@debbugs.gnu.org; Fri, 08 Apr 2022 09:23:51 -0400 Received: from mail-wm1-f53.google.com ([209.85.128.53]:55181) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ncoaS-0007mu-Kt for 53882@debbugs.gnu.org; Fri, 08 Apr 2022 09:23:41 -0400 Received: by mail-wm1-f53.google.com with SMTP id r64so5461493wmr.4 for <53882@debbugs.gnu.org>; Fri, 08 Apr 2022 06:23:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=RRJABVQ4G1Q9XJ+bmUC50WovglKRd86dk6V9D88DzKA=; b=gmjGUXHiKBG95l39ZDVn339kHj05jL0DcudFRSTh8dCyHHa6/0WUrA9SmiX9BGbB9z 9eF3ue64KNzV+mQxL84c7GGY7Wnqn1S7Dqp+kibFJ5t5Pixab3tvhLk14JAZ3XzvL3IW cgHPXiVhSr3S2IKYXDDlZUTAbVTYOdk/Ep6pztPz5dgJzeO5VtymFFOwOHg3EKCkSqPB BfxMB0/RSYLAoU5QRSuiwz4hG7DMUMpjJzkahKS2fscPWB/whnHG9gGDoUPiXkV9VCLs 1xYGb/pTAeHEW6ZirwjXwOCU3SgbqWsCg8V/tNk3XRnqgmvhAiL+O9A3c9mPkuD4YvBM V3RA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=RRJABVQ4G1Q9XJ+bmUC50WovglKRd86dk6V9D88DzKA=; b=WVmavxqkCdcdp/SkCn8PYYMZSUChWMuDy5oeu/86MX8wSfjOJNwS+uyE/92UN+Orkm xpuR9SMZFQdYgLDLHZsryuyGmS3BJxPwS8VT9KX9NfYo0dE9WAQZKxDkGKievyD53WcW Ao1cKb78bHPESSFULCk5Ir/bW/cF+vEZRgjAk0yyI1Lk7E407lcYo3xExp2YyAFwcLIx BfifeOEv4Cl3LnDGDK5G3dzG9gyjD4vSkOk0FuB+ibS1ox5Yo0h1hlofWfpdHPmrgghA MVOxNFxv04TdDeU8uNG+s+SmqlQXvPbZKmV0f2drZ0l+P5O0jADma2SuON0aU3Xryo9D EyOg== X-Gm-Message-State: AOAM531TM+aN4PX/rIGjQvRgQbufxhd4jJDHUCbm4EQeN85rQK7Xz/vC C6g7F/z35zXJTGhNQcyhF6JOguIbO5Y= X-Google-Smtp-Source: ABdhPJwhnK55aeO4TDP3JtUnmLBP5G2JfW5dDVIHmOBisNcleSUhRRjTr0zpGz4Jb84j1HZstd7MRg== X-Received: by 2002:a05:600c:4e8b:b0:38c:90cf:1158 with SMTP id f11-20020a05600c4e8b00b0038c90cf1158mr17367073wmq.107.1649424215063; Fri, 08 Apr 2022 06:23:35 -0700 (PDT) Received: from localhost.localdomain ([193.48.40.241]) by smtp.gmail.com with ESMTPSA id z3-20020a1cf403000000b0037d1f4a2201sm10108954wma.21.2022.04.08.06.23.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 08 Apr 2022 06:23:34 -0700 (PDT) From: zimoun To: 53882@debbugs.gnu.org Subject: [PATCH v2 21/25] gnu: Add ocaml-base-bigstring. Date: Fri, 8 Apr 2022 15:23:01 +0200 Message-Id: <20220408132305.3301350-21-zimon.toutoune@gmail.com> X-Mailer: git-send-email 2.34.0 In-Reply-To: <20220408132305.3301350-1-zimon.toutoune@gmail.com> References: <20220408132305.3301350-1-zimon.toutoune@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 53882 Cc: Julien Lepiller X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) From: Julien Lepiller * gnu/packages/ocaml.scm (ocaml-base-bigstring): New variable. --- gnu/packages/ocaml.scm | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 3e5c7e8bf2..ba21f76759 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -6612,6 +6612,28 @@ (define-public ocaml4.07-ppx-jane (properties '()) (license license:asl2.0)))) +(define-public ocaml-base-bigstring + (package + (name "ocaml-base-bigstring") + (version "0.14.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/janestreet/base_bigstring") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1ald2m7qywhxbygv58dzpgaj54p38zn0aiqd1z7i95kf3bsnsjqa")))) + (build-system dune-build-system) + (propagated-inputs (list ocaml-base ocaml-ppx-jane)) + (properties `((upstream-name . "base_bigstring"))) + (home-page "https://github.com/janestreet/base_bigstring") + (synopsis "String type based on [Bigarray], for use in I/O and C-bindings") + (description "This package provides string type based on [Bigarray], for +use in I/O and C-bindings.") + (license license:expat))) + (define-public ocaml-splittable-random (package (name "ocaml-splittable-random") -- 2.34.0 From debbugs-submit-bounces@debbugs.gnu.org Fri Apr 08 09:23:52 2022 Received: (at 53882) by debbugs.gnu.org; 8 Apr 2022 13:23:52 +0000 Received: from localhost ([127.0.0.1]:34276 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ncoad-0007qr-My for submit@debbugs.gnu.org; Fri, 08 Apr 2022 09:23:52 -0400 Received: from mail-wr1-f48.google.com ([209.85.221.48]:34532) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ncoaS-0007mo-5s for 53882@debbugs.gnu.org; Fri, 08 Apr 2022 09:23:41 -0400 Received: by mail-wr1-f48.google.com with SMTP id m30so12871879wrb.1 for <53882@debbugs.gnu.org>; Fri, 08 Apr 2022 06:23:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=IpWM8UyStZSBEUb0q8kjHmur0Gic88vS+p9k93ygsPU=; b=N9dOoWmAmtuK8SYQSkrn4TDN5Z67Ka2dEDPJ0jmxhjuZphlPhmxocOsYkDmj4qzJQO lzAjsDsVLQEpFGm3AqOkkw3zH81oKQPC4CQQ5+C4VAihGSkNqAgnLdTISiWinwgQooIG P/t/TnoQcjsgJ7h61asjD+e408g70onmvhr3Un4dMYG/XbUZ/oJxbMbqP1yHukTdkWG5 2Pi/T3maa5VuO0v8GoHjo9qUQHI5FLJfx41Gf/stN2at3WPtNVsa2/cRRDPoSDZE44wh ZuFlEmVqbFOObT2a/v+UrvjaPjRYMtx6Gzi7rAOV1yM9NxLq+1+hLGkrKCJBXycgr8Jm 5RCA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=IpWM8UyStZSBEUb0q8kjHmur0Gic88vS+p9k93ygsPU=; b=CaeSET6lYYDgvMRnj88xU9XrxQg9hJ0qChNDwdxpoVkPTfNRuk4TNWwvW5PhFhya2J IJatm2+OBIXiZXk8c/kN0Ovk2K2Bp/rEdhqWrrdokMHY/W9nTAfBS1CZD1VJnztBwmX1 lIpjfAf5/84oDze4CpG1VxD1BpwbiNf7tN8+bEPyVU5VfO5pJMHZ/Fo5TNrXraWpe0jk w+Fu+vTnogp6gw2PyBvbqV6RPpcsvrkVNjXISbQV20dY+oG2QaapDQ3RdWnLZErfMKRV AKehQ+Xt+kprAygr8290JxziaRSHj+nfQ3pyn9pV3TBWbXY6BsJf0eSnYkS3BJiwt1hU gT3Q== X-Gm-Message-State: AOAM530P3gTHimAQ8iG/aACYvIy5HxXUE7YWowTO6iHcUrl6cQvOAH9v fpFDkZR7CYJZrUXlSY07yJf4aFXayJ8= X-Google-Smtp-Source: ABdhPJwhhRZGbpMlIujlBYtk05vURUO2G5/icPSG4wpKXv3xSKh7DM8brLpdpYPZnCXU0b2wYHJHaQ== X-Received: by 2002:adf:9b9e:0:b0:206:e5b:63f2 with SMTP id d30-20020adf9b9e000000b002060e5b63f2mr14838476wrc.46.1649424214578; Fri, 08 Apr 2022 06:23:34 -0700 (PDT) Received: from localhost.localdomain ([193.48.40.241]) by smtp.gmail.com with ESMTPSA id z3-20020a1cf403000000b0037d1f4a2201sm10108954wma.21.2022.04.08.06.23.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 08 Apr 2022 06:23:34 -0700 (PDT) From: zimoun To: 53882@debbugs.gnu.org Subject: [PATCH v2 20/25] gnu: Add ocaml-ppx-jane. Date: Fri, 8 Apr 2022 15:23:00 +0200 Message-Id: <20220408132305.3301350-20-zimon.toutoune@gmail.com> X-Mailer: git-send-email 2.34.0 In-Reply-To: <20220408132305.3301350-1-zimon.toutoune@gmail.com> References: <20220408132305.3301350-1-zimon.toutoune@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 53882 Cc: Julien Lepiller X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) From: Julien Lepiller * gnu/packages/ocaml.scm (ocaml-ppx-jane): New variable. (ocaml4.07-ppx-jane): Inherit from it. --- gnu/packages/ocaml.scm | 116 +++++++++++++++++++++++++++-------------- 1 file changed, 77 insertions(+), 39 deletions(-) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 1c81f2de1c..3e5c7e8bf2 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -6527,52 +6527,90 @@ (define-public ocaml4.07-ppx-bin-prot (properties '()) (license license:asl2.0)))) -(define-public ocaml4.07-ppx-jane +(define-public ocaml-ppx-jane (package - (name "ocaml4.07-ppx-jane") - (version "0.11.0") - (source (origin - (method url-fetch) - (uri (string-append "https://ocaml.janestreet.com/ocaml-core/v" - (version-major+minor version) - "/files/ppx_jane-v" version ".tar.gz")) - (sha256 - (base32 - "0lgppkw3aixrfnixihrsz2ipafv8fpvkdpy3pw8n0r615gg8x8la")))) + (name "ocaml-ppx-jane") + (version "0.14.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/janestreet/ppx_jane") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1kk238fvrcylymwm7xwc7llbyspmx1y662ypq00vy70g112rir7j")))) (build-system dune-build-system) (arguments - `(#:test-target "." - #:ocaml ,ocaml-4.07 - #:findlib ,ocaml4.07-findlib - #:dune ,ocaml4.07-dune)) + `(#:test-target ".")) (propagated-inputs - `(("ocaml-ppx-assert" ,(package-with-ocaml4.07 ocaml-ppx-assert)) - ("ocaml-ppx-base" ,(package-with-ocaml4.07 ocaml-ppx-base)) - ("ocaml-ppx-bench" ,ocaml4.07-ppx-bench) - ("ocaml-ppx-bin-prot" ,ocaml4.07-ppx-bin-prot) - ("ocaml-ppx-custom-printf" ,(package-with-ocaml4.07 ocaml-ppx-custom-printf)) - ("ocaml-ppx-expect" ,(package-with-ocaml4.07 ocaml-ppx-expect)) - ("ocaml-ppx-fail" ,ocaml4.07-ppx-fail) - ("ocaml-ppx-fields-conv" ,(package-with-ocaml4.07 ocaml-ppx-fields-conv)) - ("ocaml-ppx-here" ,(package-with-ocaml4.07 ocaml-ppx-here)) - ("ocaml-ppx-inline-test" ,(package-with-ocaml4.07 ocaml-ppx-inline-test)) - ("ocaml-ppx-let" ,(package-with-ocaml4.07 ocaml-ppx-let)) - ("ocaml-ppx-optcomp" ,(package-with-ocaml4.07 ocaml-ppx-optcomp)) - ("ocaml-ppx-optional" ,(package-with-ocaml4.07 ocaml-ppx-optional)) - ("ocaml-ppx-pipebang" ,ocaml4.07-ppx-pipebang) - ("ocaml-ppx-sexp-message" ,ocaml4.07-ppx-sexp-message) - ("ocaml-ppx-sexp-value" ,ocaml4.07-ppx-sexp-value) - ("ocaml-ppx-typerep-conv" ,ocaml4.07-ppx-typerep-conv) - ("ocaml-ppx-variants-conv" ,(package-with-ocaml4.07 ocaml-ppx-variants-conv)) - ("ocaml-migrate-parsetree" - ,(package-with-ocaml4.07 ocaml-migrate-parsetree)) - ("ocaml-ppxlib" ,(package-with-ocaml4.07 ocaml-ppxlib)))) - (properties `((upstream-name . "ppx_jane"))) + (list ocaml-base-quickcheck + ocaml-ppx-assert + ocaml-ppx-base + ocaml-ppx-bench + ocaml-ppx-bin-prot + ocaml-ppx-custom-printf + ocaml-ppx-expect + ocaml-ppx-fields-conv + ocaml-ppx-fixed-literal + ocaml-ppx-here + ocaml-ppx-inline-test + ocaml-ppx-let + ocaml-ppx-module-timer + ocaml-ppx-optcomp + ocaml-ppx-optional + ocaml-ppx-pipebang + ocaml-ppx-sexp-message + ocaml-ppx-sexp-value + ocaml-ppx-stable + ocaml-ppx-string + ocaml-ppx-typerep-conv + ocaml-ppx-variants-conv + ocaml-ppxlib)) + (properties `((upstream-name . "ppx_jane") + (ocaml4.07-variant . ,(delay ocaml4.07-ppx-jane)))) (home-page "https://github.com/janestreet/ppx_jane") (synopsis "Standard Jane Street ppx rewriters") (description "This package installs a ppx-jane executable, which is a ppx driver including all standard Jane Street ppx rewriters.") - (license license:asl2.0))) + (license license:expat))) + +(define-public ocaml4.07-ppx-jane + (package-with-ocaml4.07 + (package + (inherit ocaml-ppx-jane) + (version "0.11.0") + (source (origin + (method url-fetch) + (uri (string-append "https://ocaml.janestreet.com/ocaml-core/v" + (version-major+minor version) + "/files/ppx_jane-v" version ".tar.gz")) + (sha256 + (base32 + "0lgppkw3aixrfnixihrsz2ipafv8fpvkdpy3pw8n0r615gg8x8la")))) + (propagated-inputs + (list ocaml-ppx-assert + ocaml-ppx-base + ocaml-ppx-bench + ocaml-ppx-bin-prot + ocaml-ppx-custom-printf + ocaml-ppx-expect + ocaml-ppx-fail + ocaml-ppx-fields-conv + ocaml-ppx-here + ocaml-ppx-inline-test + ocaml-ppx-let + ocaml-ppx-optcomp + ocaml-ppx-optional + ocaml-ppx-pipebang + ocaml-ppx-sexp-message + ocaml-ppx-sexp-value + ocaml-ppx-typerep-conv + ocaml-ppx-variants-conv + ocaml-migrate-parsetree + ocaml-ppxlib)) + (properties '()) + (license license:asl2.0)))) (define-public ocaml-splittable-random (package @@ -6621,7 +6659,7 @@ (define-public ocaml4.07-splittable-random (base32 "0l1wbd881mymlnpzlq5q53mmdz3g5d7qjhyc7lfaq1x0iaccn5lc")))) (propagated-inputs - (list ocaml-base ocaml4.07-ppx-jane ocaml-migrate-parsetree)) + (list ocaml-base ocaml-ppx-jane ocaml-migrate-parsetree)) (properties '()) (license license:asl2.0)))) -- 2.34.0 From debbugs-submit-bounces@debbugs.gnu.org Fri Apr 08 09:23:52 2022 Received: (at 53882) by debbugs.gnu.org; 8 Apr 2022 13:23:52 +0000 Received: from localhost ([127.0.0.1]:34278 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ncoae-0007qz-7w for submit@debbugs.gnu.org; Fri, 08 Apr 2022 09:23:52 -0400 Received: from mail-wm1-f54.google.com ([209.85.128.54]:35587) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ncoaS-0007n0-MJ for 53882@debbugs.gnu.org; Fri, 08 Apr 2022 09:23:41 -0400 Received: by mail-wm1-f54.google.com with SMTP id c190-20020a1c35c7000000b0038e37907b5bso7604163wma.0 for <53882@debbugs.gnu.org>; Fri, 08 Apr 2022 06:23:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=pIwenH/jQAUEcsV8zPPh3QXVQf1xLTD7q8WKZclQgeA=; b=HrwVMDsvx8XIE4gVT5utUOWcpsmY9p1Q11z4ap9CcTT1cCUwQWgM3S3h8VaMJrPApO 5MlM9TFJkx7s/scdbMAVP7epO/JLp97pa3738UwNXqgZWowq8pJewXQoapphOAW1xMO+ jN4NapE78J6CLJArwt1mLG5aFsjarHzenJnkpREFXlvMIMrSIcSGoswZ85i6zAZ7yWkt 45i+TsRUnIOrTCSQsq76e7cXdoqAV3jq9KcSk7hhP0dtaEJxeNs6ROt5dROCXQjKH4fv dM9uEeCndJkCja+q+l8XxifjZHLPjZOCE+O9tx0byxEnbk5B0y1rUcYgsStjdcU+DPnF BoRg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=pIwenH/jQAUEcsV8zPPh3QXVQf1xLTD7q8WKZclQgeA=; b=6W3T7Zt7nDklMmZiHuKM6+kEhHlm/xRdF1GtHY+lpt9Mtk7ilHED8JZb4cmPCFM0ms ZorCM6sRq+tnTHj8VgmazJo6+0Vu54O+sKXeC4l0Z9sOnrpp6r4TlTk/YkiJFlwt3dit FcKGmWIiMrGw5kYHuKvWS+i6VkKqeC+zG89X3HuGxXRnmJ1FM1+qPLEodOkUAuZNGW4K c9ywKhdYqYWNMBU6WM1Gjlhb0Stze9hZgtlO0WqVjlmWhkvrkzIT3XgZOxmOU+rpDacY W9Z+bv1wPlj5H0/QqXUiXuseWv07KCbLVib61gJvp8wri8galSzv7h6fWB0NRM2GkMCa bQQw== X-Gm-Message-State: AOAM532ieBbmoZXb9t/oXyqnGYTW72f3Dl7OxzmguXbV6TbwIZYVPtQD DNLsC6sTDQUIYVShqhWroty7JAN8PpY= X-Google-Smtp-Source: ABdhPJxfcFpSjmjn64aIumMsFv7NUlHzRlGNI2vRAnOeYv212q1AJv7SgSIHZq1LHubLBD9+0giRiA== X-Received: by 2002:a05:600c:1990:b0:38c:c0a2:c0ab with SMTP id t16-20020a05600c199000b0038cc0a2c0abmr16893959wmq.72.1649424214158; Fri, 08 Apr 2022 06:23:34 -0700 (PDT) Received: from localhost.localdomain ([193.48.40.241]) by smtp.gmail.com with ESMTPSA id z3-20020a1cf403000000b0037d1f4a2201sm10108954wma.21.2022.04.08.06.23.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 08 Apr 2022 06:23:33 -0700 (PDT) From: zimoun To: 53882@debbugs.gnu.org Subject: [PATCH v2 19/25] gnu: Add ocaml-ppx-fail. Date: Fri, 8 Apr 2022 15:22:59 +0200 Message-Id: <20220408132305.3301350-19-zimon.toutoune@gmail.com> X-Mailer: git-send-email 2.34.0 In-Reply-To: <20220408132305.3301350-1-zimon.toutoune@gmail.com> References: <20220408132305.3301350-1-zimon.toutoune@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 53882 Cc: Julien Lepiller X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) From: Julien Lepiller * gnu/packages/ocaml.scm (ocaml-ppx-fail): New variable. (ocaml4.07-ppx-fail): Inherit from it. --- gnu/packages/ocaml.scm | 57 +++++++++++++++++++++++++----------------- 1 file changed, 34 insertions(+), 23 deletions(-) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index a57ec2b05f..1c81f2de1c 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -6139,35 +6139,46 @@ (define-public ocaml4.07-ppx-let (properties `((upstream-name . "ppx_let")))))) -(define-public ocaml4.07-ppx-fail +(define-public ocaml-ppx-fail (package - (name "ocaml4.07-ppx-fail") - (version "0.11.0") - (source (origin - (method url-fetch) - (uri (string-append "https://ocaml.janestreet.com/ocaml-core/v" - (version-major+minor version) - "/files/ppx_fail-v" version ".tar.gz")) - (sha256 - (base32 - "07plqsvljiwvngggfypwq55g46s5my55y45mvlmalrxyppzr03s8")))) + (name "ocaml-ppx-fail") + (version "0.14.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/janestreet/ppx_fail") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "012p9gv7w4sk3b4x0sdmqrmr2856w8xc424waxb6vrybid7qjs95")))) (build-system dune-build-system) - (arguments - `(#:ocaml ,ocaml-4.07 - #:findlib ,ocaml4.07-findlib - #:dune ,ocaml4.07-dune)) - (propagated-inputs - `(("ocaml-base" ,(package-with-ocaml4.07 ocaml-base)) - ("ocaml-ppx-here" ,(package-with-ocaml4.07 ocaml-ppx-here)) - ("ocaml-migrate-parsetree" - ,(package-with-ocaml4.07 ocaml-migrate-parsetree)) - ("ocaml-ppxlib" ,(package-with-ocaml4.07 ocaml-ppxlib)))) - (properties `((upstream-name . "ppx_fail"))) + (propagated-inputs (list ocaml-base ocaml-ppx-here ocaml-ppxlib)) + (properties `((upstream-name . "ppx_fail") + (ocaml4.07-variant . ,(delay ocaml4.07-ppx-fail)))) (home-page "https://github.com/janestreet/ppx_fail") (synopsis "Add location to calls to failwiths") (description "Syntax extension that makes [failwiths] always include a position.") - (license license:asl2.0))) + (license license:expat))) + +(define-public ocaml4.07-ppx-fail + (package-with-ocaml4.07 + (package + (inherit ocaml-ppx-fail) + (version "0.11.0") + (source (origin + (method url-fetch) + (uri (string-append "https://ocaml.janestreet.com/ocaml-core/v" + (version-major+minor version) + "/files/ppx_fail-v" version ".tar.gz")) + (sha256 + (base32 + "07plqsvljiwvngggfypwq55g46s5my55y45mvlmalrxyppzr03s8")))) + (propagated-inputs + (list ocaml-base ocaml-ppx-here ocaml-migrate-parsetree ocaml-ppxlib)) + (properties '()) + (license license:asl2.0)))) (define-public ocaml-ppx-cold (package -- 2.34.0 From debbugs-submit-bounces@debbugs.gnu.org Fri Apr 08 09:23:53 2022 Received: (at 53882) by debbugs.gnu.org; 8 Apr 2022 13:23:53 +0000 Received: from localhost ([127.0.0.1]:34280 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ncoae-0007r6-K4 for submit@debbugs.gnu.org; Fri, 08 Apr 2022 09:23:52 -0400 Received: from mail-wm1-f42.google.com ([209.85.128.42]:34392) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ncoaT-0007nI-I3 for 53882@debbugs.gnu.org; Fri, 08 Apr 2022 09:23:42 -0400 Received: by mail-wm1-f42.google.com with SMTP id j5-20020a05600c1c0500b0038ea8b53580so730908wms.1 for <53882@debbugs.gnu.org>; Fri, 08 Apr 2022 06:23:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=B3ol157kZvtDLYuqouI0E9YCzD/MgaXqGSmeiVU5y/4=; b=RBUsjvPb8yraVzi9tYItotfGCLbtkFw0CFXrXPv0LABCuI/46nLrJcXTCjt3Xcz2RO oO73mKo2DnvWryplSy3w2UPBLjFTNqYxtNVXqD9K+DhmiSr1p3XYN3v87iRyFoYgc4vN 3zPO8Txf5z037V3BWvmtbI7yIUR6TlYMKCLuKGHZzpmem6EV7r+Lx6eGbwSiEUmf+QLs un0VZ+9aGBcUmVrVHT+sJ9MZlUMLh0rS8RQb363hzbDWy2y+GLSOVshCcTcCirEWIErU tgMl0HwFfFPwX+my065m9K1r72Nhscf5FOo0cIhfItW+nI9O2DW/Gl851zfe5+YDxIAt 1iCA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=B3ol157kZvtDLYuqouI0E9YCzD/MgaXqGSmeiVU5y/4=; b=NsZXFUCn/I9RHgpPrDpZy92cQ6EvqDxFabIm9kmNf21+0zI67Y6VppH6UqROOUxjXc Cw8mNLu2hqkznedSCjnlUvTAWUmSSUQLsbpjgFDT5t93TG9P0fLQURgG0xXF+HTppYll IdvtdqQu30kbs9bcZpM0dqeGLqJzJZRAkfXwwneube2fvDxP2+uaoEeXJj2FhIvtdoWt QatPD0WlCmcKPEM3MoMqchnfOqvxslxMHzqjWxokwo/rKrdc2RmrE2QAGMBBdsr2C+Sr Twy96f0ptZ/iQtDWBZQAyuPk+peWNNVHhBVxA9/AkKDwmhbgXKqyadNtmWvUqg2aLksP 9TXw== X-Gm-Message-State: AOAM533iGfZe/v+uw0Rcw02vd6MJz00BhEuy52bjkqFr+aP582S1Dyam uwmjsP4Ge0XdtY2CBDxWx1dwaErKl5Y= X-Google-Smtp-Source: ABdhPJzmDccHqNpYaa3oB/yf8nppNhIL7ZsbogUiZWQ6n1014C9V9SxP70yiMI6YODoCxlA5K13xpw== X-Received: by 2002:a05:600c:3486:b0:38e:98bf:ba15 with SMTP id a6-20020a05600c348600b0038e98bfba15mr6451557wmq.13.1649424215968; Fri, 08 Apr 2022 06:23:35 -0700 (PDT) Received: from localhost.localdomain ([193.48.40.241]) by smtp.gmail.com with ESMTPSA id z3-20020a1cf403000000b0037d1f4a2201sm10108954wma.21.2022.04.08.06.23.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 08 Apr 2022 06:23:35 -0700 (PDT) From: zimoun To: 53882@debbugs.gnu.org Subject: [PATCH v2 23/25] gnu: Add ocaml-timezone. Date: Fri, 8 Apr 2022 15:23:03 +0200 Message-Id: <20220408132305.3301350-23-zimon.toutoune@gmail.com> X-Mailer: git-send-email 2.34.0 In-Reply-To: <20220408132305.3301350-1-zimon.toutoune@gmail.com> References: <20220408132305.3301350-1-zimon.toutoune@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 53882 Cc: Julien Lepiller X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) From: Julien Lepiller * gnu/packages/ocaml.scm (ocaml-timezone): New variable. --- gnu/packages/ocaml.scm | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index be6477edbe..c1e30ba88f 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -6976,6 +6976,28 @@ (define-public ocaml4.07-core-kernel ;; MLton and sjs license:expat))))) +(define-public ocaml-timezone + (package + (name "ocaml-timezone") + (version "0.14.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/janestreet/timezone") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0zf075k94nk2wxnzpxia7pnm655damwp1b58xf2s9disia1ydxg7")))) + (build-system dune-build-system) + (propagated-inputs (list ocaml-core-kernel ocaml-ppx-jane)) + (home-page "https://github.com/janestreet/timezone") + (synopsis "Time-zone handling") + (description + "Timezone handles parsing timezone data and create @code{Timezone.t} +that can later be used to manipulate time in core_kernel or core.") + (license license:expat))) + (define-public ocaml-markup (package (name "ocaml-markup") -- 2.34.0 From debbugs-submit-bounces@debbugs.gnu.org Fri Apr 08 09:23:53 2022 Received: (at 53882) by debbugs.gnu.org; 8 Apr 2022 13:23:53 +0000 Received: from localhost ([127.0.0.1]:34282 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ncoae-0007rE-Ur for submit@debbugs.gnu.org; Fri, 08 Apr 2022 09:23:53 -0400 Received: from mail-wr1-f46.google.com ([209.85.221.46]:34532) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ncoaT-0007n8-5W for 53882@debbugs.gnu.org; Fri, 08 Apr 2022 09:23:42 -0400 Received: by mail-wr1-f46.google.com with SMTP id m30so12871922wrb.1 for <53882@debbugs.gnu.org>; Fri, 08 Apr 2022 06:23:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=z0T9ACY2rx/RRj1XnAu281QCAB3eI3/k33Y3QS8mFbc=; b=WAuMrGFe6ukMS9CZhP8tm9nBwBIbTViL1fm3n1cMEgbCj8zmS361wQWj3VAFM7H8jd fiy0nMe/coRSiasHnARPObIBilVT+ewvJ/0X2Biui4JrPz9Sgrxr3RfqkAqWeCnsUaQx dSc2OIluozg7iBNIxN2xpzrjVGKwKko3EputcOpbG3MJftW+MvTSQw+p/evUTd9I2oyX RRijdLtn3bcRWQh79LX28oijooA2w/UCSn2rzdRmfb+QyJVBko9H7UM8g9gNAQro0mUe fUHYoO5UKzzZrEEWyI3e1zxqAOKU7Bbw53f4SiEahYem1gJ37meO1J44ePZEA+DQKskq zBog== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=z0T9ACY2rx/RRj1XnAu281QCAB3eI3/k33Y3QS8mFbc=; b=BRi9i9bi2nquPqgeMDp7NerJ0N51EGUzcJ6nWjOU3zv0eHEe7x3+VMNNqE8NzEKqTx YhD9N/bMGPuCxA7iVdEQMMZbebN+1uWcvXG8/7dv42E7cXz99ai1A8UK49LfHJNeTvV4 2KXlkCvH7FOK9+KS7YD/gkMWk+Nr5qW2tHQxWynaE+litUgEYtuE3+QAfzpcHMrj0kUG q1cTRtVU4lerDeq6Dk3XRS8i9beZJi+U/JnVqg9FwwXWKnHUR4/ipwJuFyA4ExyJ3QUw nV5Oby5dkUC7TO6mb7n+DjZFTwWRwNmxW68GOrXI3Q1vYELF76r/6c5YVE7zagKX/3Ga BRxQ== X-Gm-Message-State: AOAM530HRRTY4IL0zOVN50l932Pb194BzSEUZNjtnWPfMYYAs4ANDyiT Y+HoBcDygHt543Qhdc1JJBM/ra4Cxnw= X-Google-Smtp-Source: ABdhPJwtvanXr3/08PlbX/yH+NYxROR130AtL8mwbS/GqTCtster8CvRnJ12Ud197yMtfL+AoCzGug== X-Received: by 2002:adf:e301:0:b0:205:db69:6dba with SMTP id b1-20020adfe301000000b00205db696dbamr15266950wrj.605.1649424215492; Fri, 08 Apr 2022 06:23:35 -0700 (PDT) Received: from localhost.localdomain ([193.48.40.241]) by smtp.gmail.com with ESMTPSA id z3-20020a1cf403000000b0037d1f4a2201sm10108954wma.21.2022.04.08.06.23.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 08 Apr 2022 06:23:35 -0700 (PDT) From: zimoun To: 53882@debbugs.gnu.org Subject: [PATCH v2 22/25] gnu: Add ocaml-core-kernel. Date: Fri, 8 Apr 2022 15:23:02 +0200 Message-Id: <20220408132305.3301350-22-zimon.toutoune@gmail.com> X-Mailer: git-send-email 2.34.0 In-Reply-To: <20220408132305.3301350-1-zimon.toutoune@gmail.com> References: <20220408132305.3301350-1-zimon.toutoune@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 53882 Cc: Julien Lepiller X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) From: Julien Lepiller * gnu/packages/ocaml.scm (ocaml-core-kernel): New variable. (ocaml4.07-core-kernel): Inherit from it. --- gnu/packages/ocaml.scm | 118 +++++++++++++++++++++++++++-------------- 1 file changed, 77 insertions(+), 41 deletions(-) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index ba21f76759..be6477edbe 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -6887,58 +6887,94 @@ (define-public ocaml4.07-core ;; by OCaml's license for consortium members (see THIRD-PARTY.txt). (license license:asl2.0))) -(define-public ocaml4.07-core-kernel +(define-public ocaml-core-kernel (package - (name "ocaml4.07-core-kernel") - (version "0.11.1") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/janestreet/core_kernel") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "1dg7ygy7i64c5gaakb1cp1b26p9ks81vbxmb8fd7jff2q60j2z2g")))) + (name "ocaml-core-kernel") + (version "0.14.2") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/janestreet/core_kernel") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1vxv9rq6m52n60gprm4sqjj1i1p4dd4sgns068hkp9g558d8zdjx")))) (build-system dune-build-system) (arguments ;; Cyclic dependency with ocaml-core - `(#:tests? #f - #:ocaml ,ocaml-4.07 - #:findlib ,ocaml4.07-findlib - #:dune ,ocaml4.07-dune)) + `(#:tests? #f)) (propagated-inputs - `(("ocaml-base" ,(package-with-ocaml4.07 ocaml-base)) - ("ocaml-bin-prot" ,ocaml4.07-bin-prot) - ("ocaml-configurator" ,ocaml4.07-configurator) - ("ocaml-fieldslib" ,(package-with-ocaml4.07 ocaml-fieldslib)) - ("ocaml-jane-street-headers" ,ocaml4.07-jane-street-headers) - ("ocaml-ppx-assert" ,(package-with-ocaml4.07 ocaml-ppx-assert)) - ("ocaml-ppx-base" ,(package-with-ocaml4.07 ocaml-ppx-base)) - ("ocaml-ppx-hash" ,(package-with-ocaml4.07 ocaml-ppx-hash)) - ("ocaml-ppx-inline-test" ,(package-with-ocaml4.07 ocaml-ppx-inline-test)) - ("ocaml-ppx-jane" ,ocaml4.07-ppx-jane) - ("ocaml-ppx-sexp-conv" ,(package-with-ocaml4.07 ocaml-ppx-sexp-conv)) - ("ocaml-ppx-sexp-message" ,ocaml4.07-ppx-sexp-message) - ("ocaml-sexplib" ,(package-with-ocaml4.07 ocaml-sexplib)) - ("ocaml-splittable-random" ,ocaml4.07-splittable-random) - ("ocaml-stdio" ,(package-with-ocaml4.07 ocaml-stdio)) - ("ocaml-typerep" ,ocaml4.07-typerep) - ("ocaml-variantslib" ,(package-with-ocaml4.07 ocaml-variantslib)) - ("ocaml-migrate-parsetree" - ,(package-with-ocaml4.07 ocaml-migrate-parsetree)))) - (properties `((upstream-name . "core_kernel"))) + (list ocaml-base + ocaml-base-bigstring + ocaml-base-quickcheck + ocaml-bin-prot + ocaml-fieldslib + ocaml-jane-street-headers + ocaml-jst-config + ocaml-ppx-assert + ocaml-ppx-base + ocaml-ppx-hash + ocaml-ppx-inline-test + ocaml-ppx-jane + ocaml-ppx-sexp-conv + ocaml-ppx-sexp-message + ocaml-sexplib + ocaml-splittable-random + ocaml-stdio + ocaml-time-now + ocaml-typerep + ocaml-variantslib + ocaml-ppx-optcomp)) + (properties `((upstream-name . "core_kernel") + (ocaml4.07-variant . ,(delay ocaml4.07-core-kernel)))) (home-page "https://github.com/janestreet/core_kernel") (synopsis "Portable standard library for OCaml") (description "Core is an alternative to the OCaml standard library. Core_kernel is the system-independent part of Core. It is aimed for cases when the full Core is not available, such as in Javascript.") - (license (list - ;; this package and parts of OCaml, relicensed by janestreet - license:asl2.0 - ;; MLton and sjs - license:expat)))) + (license license:expat))) + +(define-public ocaml4.07-core-kernel + (package-with-ocaml4.07 + (package + (inherit ocaml-core-kernel) + (version "0.11.1") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/janestreet/core_kernel") + (commit (string-append "v" version)))) + (file-name (git-file-name "ocaml4.07-core-kernel" version)) + (sha256 + (base32 + "1dg7ygy7i64c5gaakb1cp1b26p9ks81vbxmb8fd7jff2q60j2z2g")))) + (propagated-inputs + (list ocaml-base + ocaml-bin-prot + ocaml4.07-configurator + ocaml-fieldslib + ocaml-jane-street-headers + ocaml-ppx-assert + ocaml-ppx-base + ocaml-ppx-hash + ocaml-ppx-inline-test + ocaml-ppx-jane + ocaml-ppx-sexp-conv + ocaml-ppx-sexp-message + ocaml-sexplib + ocaml-splittable-random + ocaml-stdio + ocaml-typerep + ocaml-variantslib + ocaml-migrate-parsetree)) + (properties '()) + (license (list + ;; this package and parts of OCaml, relicensed by janestreet + license:asl2.0 + ;; MLton and sjs + license:expat))))) (define-public ocaml-markup (package -- 2.34.0 From debbugs-submit-bounces@debbugs.gnu.org Fri Apr 08 09:23:53 2022 Received: (at 53882) by debbugs.gnu.org; 8 Apr 2022 13:23:54 +0000 Received: from localhost ([127.0.0.1]:34284 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ncoaf-0007rL-In for submit@debbugs.gnu.org; Fri, 08 Apr 2022 09:23:53 -0400 Received: from mail-wm1-f43.google.com ([209.85.128.43]:52904) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ncoaT-0007nP-W2 for 53882@debbugs.gnu.org; Fri, 08 Apr 2022 09:23:42 -0400 Received: by mail-wm1-f43.google.com with SMTP id r7so5476975wmq.2 for <53882@debbugs.gnu.org>; Fri, 08 Apr 2022 06:23:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=+LBqQrDM10mf/YiI4srEGPqioPIgWsIzRYopBKpMZ8E=; b=nAzJtNWUlqUFmvYGHjOYElFhwzDZYlC/0Qni40GRq9AlfCmcjY0N4a+6fSWQGuFcYi T9PrxD5vLAzZWqm0WUnDJLH+zXMc7FCWDCrdgXuojrj3rIkf0iFohWJBx0CnF11eYVMC ve2NlQMjIM07xV2uryG/aTbL2sEp+ZffNcEvJiUbvT5KF+U5W2HXpUl5wSssDf9GH2/T 7MGEGL43OyLR6J49/b0p146udbQgo/lWZp0D0vx2GLjuhznHtQleHUNTShaRo8lCkF7N hdA/c8RbdTsTBo51N9o8h7oLJJpNo3NsumRA3oqKid4P2QP7Zo8Y7Ll204U8OisMeh3w bVwQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=+LBqQrDM10mf/YiI4srEGPqioPIgWsIzRYopBKpMZ8E=; b=FX5jlQacgkoYeAETYhpIKr/lPFPmngQHnuwBifJVNzUMCyalLqQv+kW6sGdLYje3Gn gSbGqPI3bb5z4BnleCNUj7S2Tpv/oSpahXWAsood1oHJliroHdqmbMbXGyrvtRqfWUQQ zsk9xGq3xSA+fKZZot1T4xqH3ByCEyIzU0JemLNmyQ6WSxT8xdi4SHWvrlAHP6YN/UAv 1Pozs15hbhdIO0hkeLYxehh7x+wlZbdnOa/TiCt/t9B6WBRjFSTG60nO/z2G9iujqV61 pEWFLbcVBmBi6jeyUC0LN1i42FXClkVX+P1uXFZ9SDsng4lxOM4o8+6Ff/W4QUHEpoGO 731w== X-Gm-Message-State: AOAM532V/4IyScxP7S22uL388jrABlyiko361t4wwyAz6ZFvVzm1VqTn F3v+sYEF0tfgBf769Qx1w69oy2noyRQ= X-Google-Smtp-Source: ABdhPJxbkY6m6GL8ocrSuqlI9mb8HVkOdTylx+ch/nWIsPx6gWiq8jYuf6y0wWpTvOwdrysLDMMBmQ== X-Received: by 2002:a05:600c:209:b0:38e:8c24:ebdd with SMTP id 9-20020a05600c020900b0038e8c24ebddmr8941046wmi.128.1649424216380; Fri, 08 Apr 2022 06:23:36 -0700 (PDT) Received: from localhost.localdomain ([193.48.40.241]) by smtp.gmail.com with ESMTPSA id z3-20020a1cf403000000b0037d1f4a2201sm10108954wma.21.2022.04.08.06.23.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 08 Apr 2022 06:23:36 -0700 (PDT) From: zimoun To: 53882@debbugs.gnu.org Subject: [PATCH v2 24/25] gnu: ocaml-jane-street-headers: Add variant. Date: Fri, 8 Apr 2022 15:23:04 +0200 Message-Id: <20220408132305.3301350-24-zimon.toutoune@gmail.com> X-Mailer: git-send-email 2.34.0 In-Reply-To: <20220408132305.3301350-1-zimon.toutoune@gmail.com> References: <20220408132305.3301350-1-zimon.toutoune@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 53882 Cc: Julien Lepiller X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) From: Julien Lepiller * gnu/packages/ocaml.scm (ocaml-jane-street-heaers)[properties]: Add ocaml4.07 variant. --- gnu/packages/ocaml.scm | 1 + 1 file changed, 1 insertion(+) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index c1e30ba88f..e3092e8434 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -4476,6 +4476,7 @@ (define-public ocaml-jane-street-headers "028yxb4h3iy025iy89v8653m5brh7flrjshghs4x99pd690pmfs7")) (build-system dune-build-system) (arguments '(#:tests? #f)) ; no tests + (properties `((ocaml4.07-variant . ,(delay ocaml4.07-jane-street-headers)))) (home-page "https://github.com/janestreet/jane-street-headers") (synopsis "Jane Street C header files") (description "C header files shared between the various Jane Street -- 2.34.0 From debbugs-submit-bounces@debbugs.gnu.org Fri Apr 08 09:23:54 2022 Received: (at 53882) by debbugs.gnu.org; 8 Apr 2022 13:23:54 +0000 Received: from localhost ([127.0.0.1]:34286 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ncoaf-0007rS-TT for submit@debbugs.gnu.org; Fri, 08 Apr 2022 09:23:54 -0400 Received: from mail-wr1-f54.google.com ([209.85.221.54]:42780) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ncoaU-0007nZ-DL for 53882@debbugs.gnu.org; Fri, 08 Apr 2022 09:23:43 -0400 Received: by mail-wr1-f54.google.com with SMTP id r13so12806899wrr.9 for <53882@debbugs.gnu.org>; Fri, 08 Apr 2022 06:23:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=I8BT/F+Eigrc3/WWaBjZkBkoyfH07q4C+R6/HPHgJbE=; b=KJRHJl4aIXze9WRWly0L7qRoJRW3NY3ta635bwt1a4Qo6I/9d2u/2Z3FVga5CQesbQ wsSA1Z+waqxiH5deSaZA/d1rv3n5SZ5ArjYMjYO07vLdlZiFVuyD/BihyRXNHtXG+jdq tohbPwEFz2QlH1/hukI+uxU+xMbfgkQlSHc3TJmPO9czKmFgZqWXnN+bWp1s55a/H9cp t/k3iAgwtjkop8rt4spdLbgK064J7oY35iSvFc945T6QihPzvwSjL234SYzY+zE3hwY7 CHPF/Qq1D5nZ7ErnkoyVrIyJeOU7rMAM6+nodBwDHs8g6cUzMLHmLbGR4JhOBIsQc3h5 MU4w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=I8BT/F+Eigrc3/WWaBjZkBkoyfH07q4C+R6/HPHgJbE=; b=bkeIwgoa2+nSsnLtqkBTKSAB/Gp5qowJSHrRRV98T4yGrztTC5P1gBOFZ1DQplqMna Bta/z9zI+Hl9X6DwrM9IRZPwkf7+CgK59H+t07TAQSQ0EHDnFTJxbv9gBZjwkDLmGy5q jATKnVlfJR/vGO4tf3XUgrEr7V7m9/o8+MpS3pU0pod31gW6MV03/IbJ1CYxfkXOPeE8 CXHhwyp02PWfPr2Ll+kiUFUwgF5q++Uv83jaOmSnSWWTP0QppDbrbFOojbN0vE3FOOkI M0IVDG9yosd8BuWmvUe0EnheuY+QyCqDUMDppJXWcZbG7BUUV7AKCXq8uxi7Hzk1ZZgc xZoQ== X-Gm-Message-State: AOAM533MEX1oygxEKuBrz6mP2nKQuuKwIqrqUe97HHzZKHg+1MkAEFYj SWudviMZL3kCGn4mrJBYiRSK/3aoU6Q= X-Google-Smtp-Source: ABdhPJw79UoTw0Ya1IXQfIedmthMH9+ZV/arDlbG0iamHCiXfdFrYsSpaZr3la3GuyPP3yMx0hxnCA== X-Received: by 2002:a5d:64a2:0:b0:207:8c2d:122b with SMTP id m2-20020a5d64a2000000b002078c2d122bmr5745087wrp.93.1649424216840; Fri, 08 Apr 2022 06:23:36 -0700 (PDT) Received: from localhost.localdomain ([193.48.40.241]) by smtp.gmail.com with ESMTPSA id z3-20020a1cf403000000b0037d1f4a2201sm10108954wma.21.2022.04.08.06.23.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 08 Apr 2022 06:23:36 -0700 (PDT) From: zimoun To: 53882@debbugs.gnu.org Subject: [PATCH v2 25/25] gnu: Add ocaml-core. Date: Fri, 8 Apr 2022 15:23:05 +0200 Message-Id: <20220408132305.3301350-25-zimon.toutoune@gmail.com> X-Mailer: git-send-email 2.34.0 In-Reply-To: <20220408132305.3301350-1-zimon.toutoune@gmail.com> References: <20220408132305.3301350-1-zimon.toutoune@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 53882 Cc: Julien Lepiller X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) From: Julien Lepiller * gnu/packages/ocaml.scm (ocaml-core): New variable. (ocaml4.07-core): Inherit from it. --- gnu/packages/ocaml.scm | 79 ++++++++++++++++++++++++++---------------- 1 file changed, 50 insertions(+), 29 deletions(-) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index e3092e8434..2cfe94106d 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -6848,45 +6848,66 @@ (define-public ocaml4.07-spawn (propagated-inputs '()) (properties '())))) -(define-public ocaml4.07-core +(define-public ocaml-core (package - (name "ocaml4.07-core") - (version "0.11.3") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/janestreet/core") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "0pzl8n09z4f3i7z2wq4cjxfqrr8mj6xcdp7rbg0nxap2zdhjgvrq")))) + (name "ocaml-core") + (version "0.14.1") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/janestreet/core") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1isrcl07nkmdm6akqsqs9z8s6zvva2lvg47kaagy7gsbyszrqb82")))) (build-system dune-build-system) (arguments `(#:package "core" - #:tests? #f; Require a cyclic dependency: core_extended - #:ocaml ,ocaml-4.07 - #:findlib ,ocaml4.07-findlib - #:dune ,ocaml4.07-dune)) + #:tests? #f)); Require a cyclic dependency: core_extended (propagated-inputs - `(("ocaml-base" ,(package-with-ocaml4.07 ocaml-base)) - ("ocaml-configurator" ,ocaml4.07-configurator) - ("ocaml-core-kernel" ,ocaml4.07-core-kernel) - ("ocaml-ppx-assert" ,(package-with-ocaml4.07 ocaml-ppx-assert)) - ("ocaml-ppx-jane" ,ocaml4.07-ppx-jane) - ("ocaml-sexplib" ,(package-with-ocaml4.07 ocaml-sexplib)) - ("ocaml-spawn" ,ocaml4.07-spawn) - ("ocaml-stdio" ,(package-with-ocaml4.07 ocaml-stdio)) - ("ocaml-migrate-parsetree" - ,(package-with-ocaml4.07 ocaml-migrate-parsetree)) - ("ocaml-ppxlib" ,(package-with-ocaml4.07 ocaml-ppxlib)))) + (list ocaml-core-kernel + ocaml-jst-config + ocaml-ppx-jane + ocaml-sexplib + ocaml-timezone + ocaml-spawn)) (home-page "https://github.com/janestreet/core") (synopsis "Alternative to OCaml's standard library") (description "The Core suite of libraries is an alternative to OCaml's standard library that was developed by Jane Street.") - ;; Also contains parts of OCaml, relicensed to asl2.0, as permitted + ;; Also contains parts of OCaml, relicensed to expat, as permitted ;; by OCaml's license for consortium members (see THIRD-PARTY.txt). - (license license:asl2.0))) + (license license:expat))) + +(define-public ocaml4.07-core + (package-with-ocaml4.07 + (package + (inherit ocaml-core) + (version "0.11.3") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/janestreet/core") + (commit (string-append "v" version)))) + (file-name (git-file-name "ocaml4.07-core" version)) + (sha256 + (base32 + "0pzl8n09z4f3i7z2wq4cjxfqrr8mj6xcdp7rbg0nxap2zdhjgvrq")))) + (propagated-inputs + (list ocaml-base + ocaml4.07-configurator + ocaml-core-kernel + ocaml-ppx-assert + ocaml-ppx-jane + ocaml-sexplib + ocaml-spawn + ocaml-stdio + ocaml-migrate-parsetree + ocaml-ppxlib)) + ;; Also contains parts of OCaml, relicensed to asl2.0, as permitted + ;; by OCaml's license for consortium members (see THIRD-PARTY.txt). + (license license:asl2.0)))) (define-public ocaml-core-kernel (package -- 2.34.0 From debbugs-submit-bounces@debbugs.gnu.org Mon Apr 11 06:20:03 2022 Received: (at 53882-done) by debbugs.gnu.org; 11 Apr 2022 10:20:03 +0000 Received: from localhost ([127.0.0.1]:42589 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ndr9P-00013c-3G for submit@debbugs.gnu.org; Mon, 11 Apr 2022 06:20:03 -0400 Received: from eggs.gnu.org ([209.51.188.92]:34132) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ndr9N-00012y-LW for 53882-done@debbugs.gnu.org; Mon, 11 Apr 2022 06:20:02 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]:34590) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ndr9H-0005za-Td; Mon, 11 Apr 2022 06:19:55 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:In-Reply-To:Date:References:Subject:To: From; bh=BJqK9pe8mShYF9dgMkvON6459Wl7DL8jO+EMxVKLxc8=; b=HfkaJuJxdKeF5rBgksD1 Fxcj9IR32VR9EqPa4tqUWmR7Twvm4xWoglHrlaJeFKF0ysmzHWWVuDXSoXyMKZdasYOGDg+gZEQIy njUREaRQLAVU2xBLth1Q2HA8laTST1F2qrF7oWoHoaeneOU5g2IdF5aKR7Jzcz5xJe0Cn/eexlZkY gkXSw6lK+JMqj1ewHfoANPkYlp08RT14IK2CMO5GRaWQYTncf1wZS8pz0GSfC3oOW5L8dZtsOD4aB BbAxWJ+Hn6ormAFeUTAoQ4lQMz7rf7k7bJtngt86lEDMwzWZ5F1OW1DytPJF/rkJU3LH3XiDS4UU+ WkIOWgR17W9QOw==; Received: from 91-160-117-201.subs.proxad.net ([91.160.117.201]:62808 helo=ribbon) by fencepost.gnu.org with esmtpsa (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ndr9H-0003rN-Fc; Mon, 11 Apr 2022 06:19:55 -0400 From: =?utf-8?Q?Ludovic_Court=C3=A8s?= To: zimoun Subject: Re: bug#53882: [PATCH] gnu: Add ocaml-core. References: <20220208210815.7ae6484d@tachikoma.lepiller.eu> <20220408132148.3300884-1-zimon.toutoune@gmail.com> Date: Mon, 11 Apr 2022 12:19:52 +0200 In-Reply-To: <20220408132148.3300884-1-zimon.toutoune@gmail.com> (zimoun's message of "Fri, 8 Apr 2022 15:21:48 +0200") Message-ID: <87v8vfkjlj.fsf_-_@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 53882-done Cc: Julien Lepiller , 53882-done@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) Hi, zimoun skribis: > The aim of this series is: > > This patch series adds ocaml-core. It's one of the missing > dependencies for bap. Adding this will get us closer to being abl= e to > update bap, and getting rid of its ocaml4.07 dependencies. > > The first two patches modify the importer, and I needed them to i= mport > the packages. The following patches are dependencies of ocaml-cor= e. > All of them follow the same principle: add the package and make t= he > ocaml4.07 variant inherit from it. The derivation for most of the= se > variants stay the same. > > and the first patch comes from #54596 fixing ocaml-odoc broken by the rec= ent > change about dune. > > > All LTGM! I fixed minor typos and lint. Some descriptions would need a > better wording but hey. :-) Pushed the whole thing as 24851bf6f9afa29074b4b88f990704b2f386e202. Thanks to the three of you! Ludo=E2=80=99. From unknown Thu Jun 19 16:23:54 2025 Received: (at fakecontrol) by fakecontrolmessage; To: internal_control@debbugs.gnu.org From: Debbugs Internal Request Subject: Internal Control Message-Id: bug archived. Date: Mon, 09 May 2022 11:24:09 +0000 User-Agent: Fakemail v42.6.9 # This is a fake control message. # # The action: # bug archived. thanks # This fakemail brought to you by your local debbugs # administrator