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