From patchwork Wed Apr 24 01:54:35 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lobo Torres X-Patchwork-Id: 63332 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id E5F3127BBE9; Wed, 24 Apr 2024 14:55:40 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 9FF1916C78 for ; Wed, 24 Apr 2024 14:55:39 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rzd5L-0006NJ-B0; Wed, 24 Apr 2024 09:54:55 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rzRrV-0001qq-IX for guix-patches@gnu.org; Tue, 23 Apr 2024 21:55:53 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rzRrV-0002vI-4G for guix-patches@gnu.org; Tue, 23 Apr 2024 21:55:53 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rzRrk-0006ND-VR; Tue, 23 Apr 2024 21:56:09 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#70545] [PATCH 1/2] gnu: ocaml-camomile: Update to 2.0.0. Resent-From: Lobo Torres Original-Sender: "Debbugs-submit" Resent-CC: julien@lepiller.eu, pukkamustard@posteo.net, guix-patches@gnu.org Resent-Date: Wed, 24 Apr 2024 01:56:08 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 70545 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 70545@debbugs.gnu.org Cc: Lobo Torres , Julien Lepiller , pukkamustard X-Debbugs-Original-Xcc: Julien Lepiller , pukkamustard Received: via spool by 70545-submit@debbugs.gnu.org id=B70545.171392373524141 (code B ref 70545); Wed, 24 Apr 2024 01:56:08 +0000 Received: (at 70545) by debbugs.gnu.org; 24 Apr 2024 01:55:35 +0000 Received: from localhost ([127.0.0.1]:55569 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rzRqx-0006ET-RW for submit@debbugs.gnu.org; Tue, 23 Apr 2024 21:55:34 -0400 Received: from fhigh7-smtp.messagingengine.com ([103.168.172.158]:33205) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rzRqq-0006Bm-4e for 70545@debbugs.gnu.org; Tue, 23 Apr 2024 21:55:17 -0400 Received: from compute6.internal (compute6.nyi.internal [10.202.2.47]) by mailfhigh.nyi.internal (Postfix) with ESMTP id CCE5C1140162; Tue, 23 Apr 2024 21:54:49 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute6.internal (MEProxy); Tue, 23 Apr 2024 21:54:49 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=quiltro.org; h= cc:cc:content-transfer-encoding:content-type:date:date:from:from :in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:subject:subject:to:to; s=fm3; t=1713923689; x= 1714010089; bh=O4JqA941NWhyKIQZ4du4zv9IIItLN/PU5b0gEc782e8=; b=6 QegaJRchTav+u8cJOXd9frroh7KNtLIa3vlRGJ60jvz4oYl4TROJ+mb7G+CVNTg6 BqtvrBG4MyaWwyN2jeszoUGl7jzeo48wDl3T8962dmtG5bLgFniof88aZnofJogW P4RBmf3rlxiEqjLMW0QnkmCw1mtv59WYDUGQk+i0d96X8zCjk/H4TV7muK5CaA4Z 92bgIN77PSCPRLjMim6iOftP9Ut0DJyemczDfmnA474FhEiBNOT6zII1POM/+8hc 4kVW0gFHZFh+RG0I9n9QxTfDSkYOamyRTnUk4Qx6d+gdnlRxiDPCdQLDPIH7YCWe Kc2Ehf/OJZGNuNcSdroKg== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding :content-type:date:date:feedback-id:feedback-id:from:from :in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:subject:subject:to:to:x-me-proxy:x-me-proxy :x-me-sender:x-me-sender:x-sasl-enc; s=fm3; t=1713923689; x= 1714010089; bh=O4JqA941NWhyKIQZ4du4zv9IIItLN/PU5b0gEc782e8=; b=Q D9ldmGEnNBDSzPJlrWJA3pRLE0/4EGiCzrfRatZ+5r0dw/pWN4XY3gLYSTVKMWkq DgvX4j1RoodTPu5x1OEA14jOZn8/Uyro10HPGzOt/ItuoBvxebWEM/Iy7tzdFi/q jqtRnBVahSO4veJRadU+hZ4RRlk5sgXY78IJN1oE2AUDWjuxOSvzlVAWE/bVRDBd oD7p5aNcmskoUnKmkvI2p5DSjegQfYDY+APQJ89PwStgmhfDQv59C5chDc3kGPKJ sVSP+TkTTiJgMIlv9htvwCm1pQZXpCRgxTq9egjhOKxN9VnHoaTXrONImiieUzId /DayA30LjMsfUv3jTMFrg== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvledrudelvddghedvucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucenucfjughrpefhvfevufffkffojghfggfgsedtke ertdertddtnecuhfhrohhmpefnohgsohcuvfhorhhrvghsuceolhhosghosehquhhilhht rhhordhorhhgqeenucggtffrrghtthgvrhhnpeehleetveejfefhvdeulefhvedtffejie ehgeejffdtleekkeekgedvfedvvddtheenucffohhmrghinhepghhithhhuhgsrdgtohhm necuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehmrghilhhfrhhomheplhhosg hosehquhhilhhtrhhordhorhhg X-ME-Proxy: Feedback-ID: i31794918:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Tue, 23 Apr 2024 21:54:48 -0400 (EDT) From: Lobo Torres Date: Tue, 23 Apr 2024 21:54:35 -0400 Message-ID: <78d270643f8c776128f7ec09e1beb31dfb7de43e.1713910041.git.lobo@quiltro.org> X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-Mailman-Approved-At: Wed, 24 Apr 2024 09:54:43 -0400 X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/ocaml.scm (ocaml-camomile): Update to 2.0.0. * gnu/packages/ocaml.scm (ocaml-charinfo-width): Update to 2.0.0. * gnu/packages/ocaml.scm (ocaml-stdlib-random): New variable. Change-Id: I6d01453acc19db5df6a02343f96929d47721c911 --- gnu/packages/ocaml.scm | 109 ++++++++++++++++++++++++----------------- 1 file changed, 64 insertions(+), 45 deletions(-) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 7fad276b4e..75a42058d6 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -4825,6 +4825,33 @@ (define-public ocaml-stdlib-shims ;; with ocaml-linking exception (license license:lgpl2.1+))) +(define-public ocaml-stdlib-random + (package + (name "ocaml-stdlib-random") + (version "1.1.0") + (home-page "https://github.com/ocaml/stdlib-random") + (source + (origin + (method url-fetch) + (uri (string-append home-page + "/releases/download/" + version + "/stdlib-random-" + version + ".tbz")) + (sha256 + (base32 "0n95h57z0d9hf1y5a3v7bbci303wl63jn20ymnb8n2v8zs1034wb")))) + (build-system dune-build-system) + (native-inputs (list ocaml-cppo ocaml-odoc)) + (synopsis "Versioned random number library") + (description + "Compatibility library for Random number generation + +This library provides access to the various implementation of the Random +module from the OCaml standard library independently of the compiler +version.") + (license license:lgpl2.1+))) + (define-public ocaml-fileutils (package (name "ocaml-fileutils") @@ -4832,8 +4859,8 @@ (define-public ocaml-fileutils (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/gildor478/ocaml-fileutils") - (commit (string-append "v" version)))) + (url "https://github.com/gildor478/ocaml-fileutils") + (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 (base32 @@ -5443,27 +5470,23 @@ (define-public bap (define-public ocaml-camomile (package (name "ocaml-camomile") - (version "1.0.2") - (home-page "https://github.com/yoriyuki/Camomile") - (source (origin - (method url-fetch) - (uri (string-append home-page "/releases/download/" version - "/camomile-" version ".tbz")) - (sha256 - (base32 - "0chn7ldqb3wyf95yhmsxxq65cif56smgz1mhhc7m0dpwmyq1k97h")))) + (version "2.0.0") + (home-page "https://github.com/ocaml-community/Camomile") + (source + (origin + (method git-fetch) + (uri (git-reference + (url home-page) + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1br1as5xb8w0jds7yi23546nrf6sag8gkzkv5avkdlf3agwmfj8y")))) (build-system dune-build-system) - (arguments - `(#:tests? #f ; Tests fail, see https://github.com/yoriyuki/Camomile/issues/82 - #:phases - (modify-phases %standard-phases - (add-before 'build 'fix-usr-share - (lambda* (#:key outputs #:allow-other-keys) - (substitute* '("Camomile/dune" "configure.ml") - (("/usr/share") (string-append (assoc-ref outputs "out") "/share"))) - #t))))) + (propagated-inputs (list ocaml-camlp-streams dune-site)) + (native-inputs (list ocaml-stdlib-random)) (synopsis "Comprehensive Unicode library") - (description "Camomile is a Unicode library for OCaml. Camomile provides + (description + "Camomile is a Unicode library for OCaml. Camomile provides Unicode character type, UTF-8, UTF-16, UTF-32 strings, conversion to/from about 200 encodings, collation and locale-sensitive case mappings, and more. The library is currently designed for Unicode Standard 3.2.") @@ -5472,31 +5495,27 @@ (define-public ocaml-camomile (define-public ocaml-charinfo-width ;; Add LICENSE file and Dune tests - (let ((commit "20aaaa6dca8f1e0b1ace55b6f2a8ba5e5910b620")) - (package - (name "ocaml-charinfo-width") - (version (git-version "1.1.0" "1" commit)) - (home-page "https://github.com/kandu/charinfo_width/") - (source (origin - (method git-fetch) - (uri (git-reference - (url home-page) - (commit commit))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "04gil5hxm2jax9paw3i24d8zyzhyl5cphzfyryvy2lcrm3c485q0")))) - (build-system dune-build-system) - (propagated-inputs - (list ocaml-result ocaml-camomile)) - (native-inputs - (list ocaml-ppx-expect)) - (properties - `((upstream-name . "charInfo_width"))) - (synopsis "Determine column width for a character") - (description "This module implements purely in OCaml a character width + (package + (name "ocaml-charinfo-width") + (version "2.0.0") + (home-page "https://github.com/kandu/charinfo_width/") + (source + (origin + (method git-fetch) + (uri (git-reference + (url home-page) + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0f4siscbfm03bdgzip3n5m551v6zi8n4vgl69djnxa87mkfim015")))) + (build-system dune-build-system) + (propagated-inputs (list ocaml-result ocaml-camomile)) + (native-inputs (list ocaml-ppx-expect)) + (properties `((upstream-name . "charInfo_width"))) + (synopsis "Determine column width for a character") + (description "This module implements purely in OCaml a character width function that follows the prototype of POSIX's wcwidth.") - (license license:expat)))) + (license license:expat))) (define-public ocaml-zed (package