From patchwork Thu May 23 11:47:04 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jean-Pierre De Jesus DIAZ X-Patchwork-Id: 64851 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 E715227BBEA; Thu, 23 May 2024 12:49:17 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-0.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FROM_SUSPICIOUS_NTLD,MAILING_LIST_MULTI,PDS_OTHER_BAD_TLD, SPF_HELO_PASS,URIBL_BLOCKED autolearn=no 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 29AB727BBE2 for ; Thu, 23 May 2024 12:49:17 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sA6wP-0000eQ-LY; Thu, 23 May 2024 07:49:01 -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 1sA6wM-0000bW-Ul for guix-patches@gnu.org; Thu, 23 May 2024 07:48:58 -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 1sA6wM-0007vX-KY for guix-patches@gnu.org; Thu, 23 May 2024 07:48:58 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1sA6wP-0001lY-SF; Thu, 23 May 2024 07:49:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#71145] [PATCH 1/3] gnu: ocaml-sedlex: Use G-Expressions. Resent-From: Jean-Pierre De Jesus DIAZ Original-Sender: "Debbugs-submit" Resent-CC: julien@lepiller.eu, pukkamustard@posteo.net, guix-patches@gnu.org Resent-Date: Thu, 23 May 2024 11:49:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 71145 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 71145@debbugs.gnu.org Cc: Jean-Pierre De Jesus DIAZ , Julien Lepiller , pukkamustard X-Debbugs-Original-Xcc: Julien Lepiller , pukkamustard Received: via spool by 71145-submit@debbugs.gnu.org id=B71145.17164649076754 (code B ref 71145); Thu, 23 May 2024 11:49:01 +0000 Received: (at 71145) by debbugs.gnu.org; 23 May 2024 11:48:27 +0000 Received: from localhost ([127.0.0.1]:58966 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sA6vq-0001ks-NU for submit@debbugs.gnu.org; Thu, 23 May 2024 07:48:27 -0400 Received: from mail-wm1-f41.google.com ([209.85.128.41]:42011) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sA6vn-0001ki-2i for 71145@debbugs.gnu.org; Thu, 23 May 2024 07:48:25 -0400 Received: by mail-wm1-f41.google.com with SMTP id 5b1f17b1804b1-42011507a54so11225635e9.0 for <71145@debbugs.gnu.org>; Thu, 23 May 2024 04:48:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=foundation.xyz; s=google; t=1716464831; x=1717069631; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=RR9A3mxwIMlXI4TKD/6WMoo6Y2WSx0MhuX8OCEG+eYg=; b=Zk757/oVLfaYIt4oR/FTFfvCC4PG9js/h9Mz03l+JCnQBoutLe8Cmxu5plyyGK8fZc CWluEBgcaxlPO6T1hcQHqsJwnyn76paV25axwFcsL2iJrSCGEs69s48Owo8/JXOCxakx jOVLrrPcI6NB5iQGxUz8L8fZUSkXsPPQwO1W+doxD3NwY3mTFWgGw8mwoaKdcOom0Ayi ChVyzMqFFn5gIo01ViEVFFuyvz0h6NyjQTsv7tx4ENI5KB/l26j5/u53OoYDLoR4bcDs 9pOmNiBBNnMlXR2si4LvUljJfavCs8wQOSRpjTFZUwXbnoyhtqo5hkkCltPf1adPYXWC GJKw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1716464831; x=1717069631; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=RR9A3mxwIMlXI4TKD/6WMoo6Y2WSx0MhuX8OCEG+eYg=; b=Zjq1OdddfwQMylg2I8dQsAmLOcnmkYGowDWRqNx2tUYB7W3FaFq13eLq06Ba+/w2US tOZFvJ2XvmhA4ydyO74INj6ZWe2mGwN/8SZxGPvwA7VeUmMOmkDl2Vd93tsDz7Bt7yIx E4slHIZJalyN/MV9eMCHUFH2Lprn/f0/0GExEbYGWBvvW2ryv6FRpaUGVweJ8eGDC6Xn QBLYctPuLWNPd3WcMSWl5nqH6iIo34sIkQ7dMVFXy9/4MsY7Kac7oy6Y+gQywIIcrfuQ f9LQcbMUzPsTvGRPXJ9p4939BF4AI0hL+kjt01qqatrXZPJvFxau7P+YOiIeh+XI582e aLaQ== X-Gm-Message-State: AOJu0Yw1NCLTS/TsFr4iuwbDJ+gr6CSGgfTUYoM8Z5gPoVQAYiDZQyGp miTdA4ARkvM0PfTb4BPEECvh8DBGO50qUxW+1mHUU/a5lVvONJcUDm8DeuXcTEq5kgNjioaXJl8 dcWvLOg== X-Google-Smtp-Source: AGHT+IHaqH9hPmebOasXgIgIAaM8C7rJ0XUwvinY4c8teRyvOO7ieKd1wW9v8vQkGt8AKJjWp8M/kw== X-Received: by 2002:a05:600c:45ce:b0:418:5ef3:4a04 with SMTP id 5b1f17b1804b1-421015e05f6mr19148105e9.18.1716464830670; Thu, 23 May 2024 04:47:10 -0700 (PDT) Received: from jeandudey.home ([89.131.29.87]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-42100f99d7fsm23213205e9.31.2024.05.23.04.47.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 23 May 2024 04:47:10 -0700 (PDT) From: Jean-Pierre De Jesus DIAZ Date: Thu, 23 May 2024 13:47:04 +0200 Message-ID: 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-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-sedlex): Use G-expressions. Change-Id: I1dd8b9e1cefef90ff4cdcc592f5ad3d735a5081b --- gnu/packages/ocaml.scm | 40 +++++++++++++++++++--------------------- 1 file changed, 19 insertions(+), 21 deletions(-) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index ef092d8e41..2100227adf 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -3783,27 +3783,25 @@ (define-public ocaml-sedlex "1z8mmk1idh9hjhh2b9rp5b1h8kmzcxhagqkw0pvxn6ykx1brskq1")))) (build-system dune-build-system) (arguments - `(#:tests? #f ; no tests - #:package "sedlex" - #:phases - (modify-phases %standard-phases - (add-before 'build 'copy-resources - (lambda* (#:key inputs #:allow-other-keys) - (with-directory-excursion "src/generator/data" - ;; Newer versions of dune emit an error if files it wants to - ;; build already exist. Delete the dune file so dune doesn't - ;; complain. - (delete-file "dune") - (for-each - (lambda (file) - (copy-file (assoc-ref inputs file) file)) - '("DerivedCoreProperties.txt" "DerivedGeneralCategory.txt" - "PropList.txt"))) - #t)) - (add-before 'build 'chmod - (lambda _ - (for-each (lambda (file) (chmod file #o644)) (find-files "." ".*")) - #t))))) + (list #:tests? #f ; no tests + #:package "sedlex" + #:phases + #~(modify-phases %standard-phases + (add-before 'build 'copy-resources + (lambda* (#:key inputs #:allow-other-keys) + (with-directory-excursion "src/generator/data" + ;; Newer versions of dune emit an error if files it wants to + ;; build already exist. Delete the dune file so dune doesn't + ;; complain. + (delete-file "dune") + (for-each + (lambda (file) + (copy-file (assoc-ref inputs file) file)) + '("DerivedCoreProperties.txt" "DerivedGeneralCategory.txt" + "PropList.txt"))))) + (add-before 'build 'chmod + (lambda _ + (for-each (lambda (file) (chmod file #o644)) (find-files "." ".*"))))))) (propagated-inputs (list ocaml-gen ocaml-ppxlib ocaml-uchar)) ;; These three files are needed by src/generator/data/dune, but would be From patchwork Thu May 23 11:47:05 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jean-Pierre De Jesus DIAZ X-Patchwork-Id: 64852 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 E94D227BBEA; Thu, 23 May 2024 12:49:27 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-0.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FROM_SUSPICIOUS_NTLD,MAILING_LIST_MULTI,PDS_OTHER_BAD_TLD, SPF_HELO_PASS,URIBL_BLOCKED autolearn=no 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 079C227BBE2 for ; Thu, 23 May 2024 12:49:27 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sA6wN-0000c2-R2; Thu, 23 May 2024 07:48:59 -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 1sA6wM-0000aG-Hq for guix-patches@gnu.org; Thu, 23 May 2024 07:48:58 -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 1sA6wL-0007vK-5Q for guix-patches@gnu.org; Thu, 23 May 2024 07:48:58 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1sA6wQ-0001le-Ap; Thu, 23 May 2024 07:49:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#71145] [PATCH 2/3] gnu: ocaml-sedlex: Use ucd package. Resent-From: Jean-Pierre De Jesus DIAZ Original-Sender: "Debbugs-submit" Resent-CC: julien@lepiller.eu, pukkamustard@posteo.net, guix-patches@gnu.org Resent-Date: Thu, 23 May 2024 11:49:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 71145 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 71145@debbugs.gnu.org Cc: Jean-Pierre De Jesus DIAZ , Julien Lepiller , pukkamustard X-Debbugs-Original-Xcc: Julien Lepiller , pukkamustard Received: via spool by 71145-submit@debbugs.gnu.org id=B71145.17164649116771 (code B ref 71145); Thu, 23 May 2024 11:49:02 +0000 Received: (at 71145) by debbugs.gnu.org; 23 May 2024 11:48:31 +0000 Received: from localhost ([127.0.0.1]:58970 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sA6vv-0001l9-47 for submit@debbugs.gnu.org; Thu, 23 May 2024 07:48:31 -0400 Received: from mail-wm1-f67.google.com ([209.85.128.67]:47550) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sA6vr-0001kl-Bo for 71145@debbugs.gnu.org; Thu, 23 May 2024 07:48:29 -0400 Received: by mail-wm1-f67.google.com with SMTP id 5b1f17b1804b1-4200ee78f33so19111445e9.3 for <71145@debbugs.gnu.org>; Thu, 23 May 2024 04:48:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=foundation.xyz; s=google; t=1716464835; x=1717069635; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=7zGl3shnFbZ8GWsUZvHgCpNWrp9kehHLtOKkbZ0cxME=; b=rcLwGyZsTattzPlbAzo1Hs/SjIwKkT8AjOWQp3UAXJ/cMmqPBmrcwTs/9vI2NUHpeS D+t/T3YftPf0ox+3oBCTzTz1oZ3mFzEGdKX7rFNi2c1yH/KOMoSMjnqlBVqREYC9ONHu XEoWyHPHHtFWnDcJjl5/X9ShwO7liQAubH5x9WXejsHC0atED9TxOhl8KYOtdvB6VafX CRM0BehbofcFDnr3HKitayeL5Lc72maGoH7z8yxtSDoldXJexC5XgnsQR6AGv6YG//Kb 7b0e6CK3XBklsEVFiqT0cH8VtRcovw7xM7VFPAiNBhgNkfExMlxQwXysnIja4xZ1k47Y 7TFQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1716464835; x=1717069635; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=7zGl3shnFbZ8GWsUZvHgCpNWrp9kehHLtOKkbZ0cxME=; b=hmndvKxf22NpysQ3Oqf8exQdG2swtSZiaHT9H+MJfTlF0bXUTlLAC+QKyO8AS87JHI SZCgY/9Dce8dI/PVeWVg3BbVdAp66Rw+PFIczaeuqmNJ249fFWjX7zb7+6ehOl3jGGXM 7o565ZnkHsc2DIN/V13LUJl8qHwWYlWxpfQbQMkgwDu3q1bONE+diuX++sJNu+PIup+Z kHIadBYoo6MvaD3dFZwEklnsfxXaUXZlxeAPwyOtH3MiF/Gn0OJrK9Gg1FIkF2uoG8X4 i49HZ4LR4VmS7La4WWojzcwM7bpYMDy7igX2yC10QwJ9U1a4Q51Jv9Kmr0anuxp423Rq vMpA== X-Gm-Message-State: AOJu0Ywi4qnqofpsmZGjtG1gkEfMTUW+rSElDljKs1Q5PeKkcXKjxSP6 oqeZRsXsnTnwnn4u9z6RXjrKtSafLixBRw0IIFb4iswZggWQcb15tSit70qPbpBU+2hK4vjYPGm T6Siq1Vz1 X-Google-Smtp-Source: AGHT+IGQifVv9krZdCG+DSt/yJfyuPCSjWmksz3MR1nGe2xn3RbBHDg1iY7/cVpmwdZ35t7CBLXcqw== X-Received: by 2002:a1c:7703:0:b0:41f:b0e7:f299 with SMTP id 5b1f17b1804b1-420fd3032bfmr36316745e9.9.1716464835214; Thu, 23 May 2024 04:47:15 -0700 (PDT) Received: from jeandudey.home ([89.131.29.87]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-42100f99d7fsm23213205e9.31.2024.05.23.04.47.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 23 May 2024 04:47:14 -0700 (PDT) From: Jean-Pierre De Jesus DIAZ Date: Thu, 23 May 2024 13:47:05 +0200 Message-ID: <847d1287e1bd8b85e619e625195984432b7032de.1716464340.git.jean@foundation.xyz> 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-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-sedlex): Use ucd for Unicode files. Change-Id: I8c54e15bcb32cf315fde28921611b20eeb2a6637 --- gnu/packages/ocaml.scm | 35 +++++++++-------------------------- 1 file changed, 9 insertions(+), 26 deletions(-) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 2100227adf..10b98ca758 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -87,6 +87,7 @@ (define-module (gnu packages ocaml) #:use-module (gnu packages texinfo) #:use-module (gnu packages time) #:use-module (gnu packages tls) + #:use-module (gnu packages unicode) #:use-module (gnu packages version-control) #:use-module (gnu packages virtualization) #:use-module (gnu packages web) @@ -3788,6 +3789,8 @@ (define-public ocaml-sedlex #:phases #~(modify-phases %standard-phases (add-before 'build 'copy-resources + ;; These three files are needed by src/generator/data/dune, + ;; but would be downloaded using curl at build time. (lambda* (#:key inputs #:allow-other-keys) (with-directory-excursion "src/generator/data" ;; Newer versions of dune emit an error if files it wants to @@ -3796,38 +3799,18 @@ (define-public ocaml-sedlex (delete-file "dune") (for-each (lambda (file) - (copy-file (assoc-ref inputs file) file)) - '("DerivedCoreProperties.txt" "DerivedGeneralCategory.txt" - "PropList.txt"))))) + (copy-file (search-input-file inputs file) + (basename file))) + '("share/ucd/extracted/DerivedGeneralCategory.txt" + "share/ucd/DerivedCoreProperties.txt" + "share/ucd/PropList.txt"))))) (add-before 'build 'chmod (lambda _ (for-each (lambda (file) (chmod file #o644)) (find-files "." ".*"))))))) (propagated-inputs (list ocaml-gen ocaml-ppxlib ocaml-uchar)) - ;; These three files are needed by src/generator/data/dune, but would be - ;; downloaded using curl at build time. (inputs - `(("DerivedCoreProperties.txt" - ,(origin - (method url-fetch) - (uri "https://www.unicode.org/Public/12.1.0/ucd/DerivedCoreProperties.txt") - (sha256 - (base32 - "0s6sn1yr9qmb2i6gf8dir2zpsbjv1frdfzy3i2yjylzvf637msx6")))) - ("DerivedGeneralCategory.txt" - ,(origin - (method url-fetch) - (uri "https://www.unicode.org/Public/12.1.0/ucd/extracted/DerivedGeneralCategory.txt") - (sha256 - (base32 - "1rifzq9ba6c58dn0lrmcb5l5k4ksx3zsdkira3m5p6h4i2wriy3q")))) - ("PropList.txt" - ,(origin - (method url-fetch) - (uri "https://www.unicode.org/Public/12.1.0/ucd/PropList.txt") - (sha256 - (base32 - "0gsb1jpj3mnqbjgbavi4l95gl6g4agq58j82km22fdfg63j3w3fk")))))) + (list ucd)) (home-page "https://www.cduce.org/download.html#side") (synopsis "Lexer generator for Unicode and OCaml") (description "Lexer generator for Unicode and OCaml.") From patchwork Thu May 23 11:47:06 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jean-Pierre De Jesus DIAZ X-Patchwork-Id: 64850 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 2F4BF27BBEA; Thu, 23 May 2024 12:49:06 +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=-0.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FROM_SUSPICIOUS_NTLD,MAILING_LIST_MULTI,PDS_OTHER_BAD_TLD, SPF_HELO_PASS,URIBL_BLOCKED autolearn=no 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 4664B27BBE9 for ; Thu, 23 May 2024 12:49:05 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sA6wN-0000bn-Fu; Thu, 23 May 2024 07:48:59 -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 1sA6wM-0000aE-HZ for guix-patches@gnu.org; Thu, 23 May 2024 07:48:58 -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 1sA6wL-0007vJ-0Q for guix-patches@gnu.org; Thu, 23 May 2024 07:48:58 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1sA6wQ-0001lk-NP; Thu, 23 May 2024 07:49:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#71145] [PATCH 3/3] gnu: ocaml-sedlex: Update to 3.2. Resent-From: Jean-Pierre De Jesus DIAZ Original-Sender: "Debbugs-submit" Resent-CC: julien@lepiller.eu, pukkamustard@posteo.net, guix-patches@gnu.org Resent-Date: Thu, 23 May 2024 11:49:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 71145 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 71145@debbugs.gnu.org Cc: Jean-Pierre De Jesus DIAZ , Julien Lepiller , pukkamustard X-Debbugs-Original-Xcc: Julien Lepiller , pukkamustard Received: via spool by 71145-submit@debbugs.gnu.org id=B71145.17164649166778 (code B ref 71145); Thu, 23 May 2024 11:49:02 +0000 Received: (at 71145) by debbugs.gnu.org; 23 May 2024 11:48:36 +0000 Received: from localhost ([127.0.0.1]:58972 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sA6vz-0001lG-Ko for submit@debbugs.gnu.org; Thu, 23 May 2024 07:48:36 -0400 Received: from mail-wm1-f66.google.com ([209.85.128.66]:43472) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sA6vt-0001km-PB for 71145@debbugs.gnu.org; Thu, 23 May 2024 07:48:30 -0400 Received: by mail-wm1-f66.google.com with SMTP id 5b1f17b1804b1-42100fa9dd6so4525335e9.1 for <71145@debbugs.gnu.org>; Thu, 23 May 2024 04:48:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=foundation.xyz; s=google; t=1716464837; x=1717069637; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=egFWsOWodwBtOvJjxLnwYA/xTA7PUc1p3jqi1k6R71g=; b=NcJmn6Wku7IvIWqZaB1R/UFKrCoQDQCIa1+cIZOGxw+ruNfIPqRQMmuD/jI4JAXIev HIPXyccmT+T8doCbioSkcIeQbgF5F1Jz/gzpT8/fuIpIEIrP9A6+lmkVmql5m2GnKeG0 TBhmONxB2iwVxf9YSShSRkbm04MkjQCYo3S12ImRsoaLiOD1l4n78NsmeSZ5zv0mGaDN sa2EifDbKBQVGxZXmle3xgB7bD9YlcvwFzVKQmZVN9rFKYaIJ+DkC4AH95vdj+h4UJss L5w/SnjNvSSvVhAo3WjpovPOv+aMy4D4jnjnDPpFwDnxsN564B6temcTdP1mBAEvb5lH Q9LQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1716464837; x=1717069637; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=egFWsOWodwBtOvJjxLnwYA/xTA7PUc1p3jqi1k6R71g=; b=P+VqutSOW28iEmkE7nzTZ5atHOqxgLfGbx02e8Nys43HDDvMyWqoknVmnMh7W/re+W RpFQUxj8agzZzEgNPkmS/lAeVVWEzSemBxaqCDJSYHKE9lY9oKM/5FCDug+8nYWLruEd T2bWuqLYp+1FZcK6gP3BXcjAfdDF8c+9KNdjPiy0RjIdDKV3SNQ3xh3S42yqUjIhreGH BDfiGEu/nPiaMWVQDdXkEUdErJ7U55RovFlW4p0nfsLtGG1TItGMT9kbsHWDln9GgkYF QxQZzQbdDItbJpRofoofE2P88kPokIKVvCUuDZJB80LWL+RrjZnFkAhniT64u5brfz/c qqcg== X-Gm-Message-State: AOJu0Yxq7AI83dtbYDJLq55fzz8kIU/accdaP44ogmM3BV+UHQkvw/St JSFiztJbBmTethLk5xc3oqwjMudtvI7/uTSgv9nGa3vvdlAzuv6waLIVWdVPuWu7IjOCiCuP2zt 95faFLO14 X-Google-Smtp-Source: AGHT+IFucjGc66FPTlI4KMcw67cObYB2GgrrDfhPaFsYiRsR3vcWUP1Mo22N1EqrcNVr4aY6N2izNQ== X-Received: by 2002:a05:600c:5641:b0:41f:c5c5:c9df with SMTP id 5b1f17b1804b1-421015cbd20mr16995905e9.14.1716464837350; Thu, 23 May 2024 04:47:17 -0700 (PDT) Received: from jeandudey.home ([89.131.29.87]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-42100f99d7fsm23213205e9.31.2024.05.23.04.47.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 23 May 2024 04:47:17 -0700 (PDT) From: Jean-Pierre De Jesus DIAZ Date: Thu, 23 May 2024 13:47:06 +0200 Message-ID: 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-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/haxe.scm (ocaml-sedlex): Update to 3.2. (ocaml-sedlex-2): New variable. (ocaml-piqilib) : Replace ocaml-sedlex by ocaml-sedlex-2. * gnu/packages/ocaml.scm (haxe) : Replace ocaml-sedlex by ocaml-sedlex-2. Change-Id: I0ae3609f8db22589d8fdd110d1b7b92f6fead15d --- gnu/packages/haxe.scm | 2 +- gnu/packages/ocaml.scm | 28 ++++++++++++++++++++++++---- 2 files changed, 25 insertions(+), 5 deletions(-) diff --git a/gnu/packages/haxe.scm b/gnu/packages/haxe.scm index c7af07325f..f1cdc8732f 100644 --- a/gnu/packages/haxe.scm +++ b/gnu/packages/haxe.scm @@ -177,7 +177,7 @@ (define-public haxe ocaml-extlib ocaml-luv ocaml-ptmap - ocaml-sedlex + ocaml-sedlex-2 ocaml-sha ocaml-xml-light pcre2 diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 10b98ca758..c96b374a99 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -3772,7 +3772,7 @@ (define-public ocaml-gen (define-public ocaml-sedlex (package (name "ocaml-sedlex") - (version "2.6") + (version "3.2") (source (origin (method git-fetch) (uri (git-reference @@ -3781,10 +3781,10 @@ (define-public ocaml-sedlex (file-name (git-file-name name version)) (sha256 (base32 - "1z8mmk1idh9hjhh2b9rp5b1h8kmzcxhagqkw0pvxn6ykx1brskq1")))) + "1vzsmp8mvx9vrgjr5chsk2p2s5ii08c9kizw9ilx78jj30nzamz5")))) (build-system dune-build-system) (arguments - (list #:tests? #f ; no tests + (list ;#:tests? #f ; no tests #:package "sedlex" #:phases #~(modify-phases %standard-phases @@ -3807,6 +3807,7 @@ (define-public ocaml-sedlex (add-before 'build 'chmod (lambda _ (for-each (lambda (file) (chmod file #o644)) (find-files "." ".*"))))))) + (native-inputs (list ocaml-ppx-expect)) (propagated-inputs (list ocaml-gen ocaml-ppxlib ocaml-uchar)) (inputs @@ -3816,6 +3817,25 @@ (define-public ocaml-sedlex (description "Lexer generator for Unicode and OCaml.") (license license:expat))) +(define-public ocaml-sedlex-2 + (package + (inherit ocaml-sedlex) + (name "ocaml-sedlex") + (version "2.6") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/ocaml-community/sedlex") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1z8mmk1idh9hjhh2b9rp5b1h8kmzcxhagqkw0pvxn6ykx1brskq1")))) + (arguments + (substitute-keyword-arguments (package-arguments ocaml-sedlex) + ((#:tests? _ #t) #f))) ; no tests + (native-inputs '()))) + (define-public ocaml-uchar (package (name "ocaml-uchar") @@ -5218,7 +5238,7 @@ (define-public ocaml-piqilib (list which)) (propagated-inputs `(("ocaml-xmlm" ,ocaml-xmlm) - ("ocaml-sedlex" ,ocaml-sedlex) + ("ocaml-sedlex" ,ocaml-sedlex-2) ("ocaml-easy-format" ,ocaml-easy-format) ("ocaml-base64" ,ocaml-base64))) (home-page "https://piqi.org")