From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp2 ([2001:41d0:2:4a6f::]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id DaxlIXm3dmDDBAAAgWs5BA (envelope-from ) for ; Wed, 14 Apr 2021 11:35:53 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp2 with LMTPS id wACDDHm3dmBVIgAAB5/wlQ (envelope-from ) for ; Wed, 14 Apr 2021 09:35:53 +0000 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id BA79C22B8F for ; Wed, 14 Apr 2021 11:15:13 +0200 (CEST) Received: from localhost ([::1]:40966 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lWbc8-0007Ah-Pf for larch@yhetil.org; Wed, 14 Apr 2021 05:15:12 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:36020) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lWbb6-0005XE-BE for guix-patches@gnu.org; Wed, 14 Apr 2021 05:14:08 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:50228) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lWbb6-00025U-1l for guix-patches@gnu.org; Wed, 14 Apr 2021 05:14:08 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lWbb5-0007Er-Tj for guix-patches@gnu.org; Wed, 14 Apr 2021 05:14:07 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#47768] [PATCH 13/37] gnu: Add ocaml-sedlex. Resent-From: pukkamustard Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 14 Apr 2021 09:14:07 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 47768 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 47768@debbugs.gnu.org Cc: pukkamustard Received: via spool by 47768-submit@debbugs.gnu.org id=B47768.161839161827466 (code B ref 47768); Wed, 14 Apr 2021 09:14:07 +0000 Received: (at 47768) by debbugs.gnu.org; 14 Apr 2021 09:13:38 +0000 Received: from localhost ([127.0.0.1]:33461 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lWbab-00078p-SJ for submit@debbugs.gnu.org; Wed, 14 Apr 2021 05:13:38 -0400 Received: from mout02.posteo.de ([185.67.36.66]:60581) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lWbaR-000752-3Q for 47768@debbugs.gnu.org; Wed, 14 Apr 2021 05:13:28 -0400 Received: from submission (posteo.de [89.146.220.130]) by mout02.posteo.de (Postfix) with ESMTPS id 2D53C2400FD for <47768@debbugs.gnu.org>; Wed, 14 Apr 2021 11:13:21 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1618391601; bh=sK5NHPutVGXLsS9cGhePbjA+dMtxQ+F/bg4jf2DQkao=; h=From:To:Cc:Subject:Date:From; b=DBiEWGpNUb+g2+fd2EW1vpd4B1GYGnbO4XCauMKEt0lXWf3uJGkaFABPzWaUAdDlz xlSSkkBuhi3fIUmEOZt9uK/vkHDFrsvHTJukIoUugWB58mX8pMi5khuXPuS6zcZXbv sbNX6LnGQwLzxhIo6r/TVGRZ/dsgztczA2sw/w43TwHEzVRtps3sPeq6/Ph83TJ2gv h7Qp8MLLqi3Zha3mvQNyBRkzig41tacLDhqhAq7X7j32sMplX18xNnwUbU2gjDS8uW 6h1Dfqy4DrEOCnJzrtdeYWezvd2FKHe79NZRN4ziHQD+EV8pNpYTMiAGL0yKp+dvfI pzxgPiN3/hyMA== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4FKxbN4JStz9rxF; Wed, 14 Apr 2021 11:13:20 +0200 (CEST) From: pukkamustard Date: Wed, 14 Apr 2021 11:12:39 +0200 Message-Id: <20210414091303.6990-13-pukkamustard@posteo.net> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210414091303.6990-1-pukkamustard@posteo.net> References: <20210414091303.6990-1-pukkamustard@posteo.net> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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+larch=yhetil.org@gnu.org Sender: "Guix-patches" X-Migadu-Flow: FLOW_IN ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1618391713; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=Dfx1qENG1SxC4DYJlEPZV3CvJTnK/zXSG64ZHZpvtmY=; b=pgj/qoInPpgn9rL8uVnHMhDrhDOrsGc4rpyDAbWQ6f3HM6cFc48xHd0bDwHmLEmz7whQzu vLre3Owz+8VNrBeEeEm9dGOwhqmtupjXDZb7Rbn9BDLKUMgYH2utqBOzvrC9H4AYzpvhab OI2qeF8HK84uvybjkzd0vPFi7yp9HUQTvaHgxJm8N/Jkgn7wlN80akKsAFGgdw6K9+upGJ pveyzVbPcPPvBn8CPczqhvWPuMyWA3oKTWy4+ECCOtzYdHP4GNpeX2zceL6M5MH46OCedx FJSL2s7VLWqbsQ09pasF6GDltUp1/LGB9Z8Aj7UHo4DyEPxbzwo/9E9Y0z4Ffw== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1618391713; a=rsa-sha256; cv=none; b=qN+JhZez8LM0gRNxzg0P8Hd0+dwNE0xSlvC99UDu1+TkMqgg6lOAOx2wTdVk9AFPXCu38d In1CJ02wwBDskP7QO67lA4o3XVCTT42r+ZR9VZeK9DwihVZQrxzjWzZbKDVUjtKjHQBnda SOC3t4TwmwVcBbrogtug7sn9AN+Ql55JLF/2XH7voYEWbKC8BK3AgHIZOvqjFenQHhJshH 2DSMJWNtcCynaPfG0me5yngxU5shLRPGPQHhIAAjsVgzlB/qAkDQNdF6yrrJiXvuFiTyn1 PPav1hByj8V7i6XfAT/TSaidL8TCqFjAbFyrgy0Z2IL8AyZAJsIVtpiTun2saw== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=posteo.net header.s=2017 header.b=DBiEWGpN; dmarc=fail reason="SPF not aligned (strict)" header.from=posteo.net (policy=none); spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Migadu-Spam-Score: 3.66 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=posteo.net header.s=2017 header.b=DBiEWGpN; dmarc=fail reason="SPF not aligned (strict)" header.from=posteo.net (policy=none); spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Migadu-Queue-Id: BA79C22B8F X-Spam-Score: 3.66 X-Migadu-Scanner: scn0.migadu.com X-TUID: r1R3liCFifrx * gnu/packages/ocaml.scm (ocaml-sedlex): New variable. (ocaml4.07-sedlex): Inherit from ocaml-sedlex. --- gnu/packages/ocaml.scm | 57 ++++++++++++++++++++++++++++-------------- 1 file changed, 38 insertions(+), 19 deletions(-) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 7848a2b3e5..f6c26b04f4 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -2555,10 +2555,10 @@ representation of the data.") and consumable.") (license license:bsd-2))) -(define-public ocaml4.07-sedlex +(define-public ocaml-sedlex (package - (name "ocaml4.07-sedlex") - (version "2.1") + (name "ocaml-sedlex") + (version "2.3") (source (origin (method git-fetch) (uri (git-reference @@ -2567,36 +2567,37 @@ and consumable.") (file-name (git-file-name name version)) (sha256 (base32 - "05f6qa8x3vhpdz1fcnpqk37fpnyyq13icqsk2gww5idjnh6kng26")))) + "0iw3phlaqr27jdf857hmj5v5hdl0vngbb2h37p2ll18sw991fxar")))) (build-system dune-build-system) (arguments - `(#:tests? #f; no tests + `(#: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"))) + (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))) - #:ocaml ,ocaml-4.07 - #:findlib ,ocaml4.07-findlib - #:dune ,ocaml4.07-dune)) + #t))))) (native-inputs - `(("ocamlbuild" ,(package-with-ocaml4.07 ocamlbuild)))) + `(("ocamlbuild" ,ocamlbuild))) (propagated-inputs - `(("ocaml-gen" ,(package-with-ocaml4.07 ocaml-gen)) - ("ocaml-ppx-tools-versioned" - ,(package-with-ocaml4.07 ocaml-ppx-tools-versioned)) - ("ocaml-uchar" ,(package-with-ocaml4.07 ocaml-uchar)))) + `(("ocaml-gen" ,ocaml-gen) + ("ocaml-ppxlib" ,ocaml-ppxlib) + ("ocaml-ppx-tools-versioned" ,ocaml-ppx-tools-versioned) + ("ocaml-uchar" ,ocaml-uchar))) ;; These three files are needed by src/generator/data/dune, but would be ;; downloaded using curl at build time. (inputs @@ -2621,11 +2622,29 @@ and consumable.") (sha256 (base32 "0gsb1jpj3mnqbjgbavi4l95gl6g4agq58j82km22fdfg63j3w3fk")))))) + (properties `((ocaml4.07-variant . ,(delay ocaml4.07-sedlex)))) (home-page "https://www.cduce.org/download.html#side") (synopsis "Lexer generator for Unicode and OCaml") (description "Lexer generator for Unicode and OCaml.") (license license:expat))) +(define-public ocaml4.07-sedlex + (package-with-ocaml4.07 + (package + (inherit ocaml-sedlex) + (name "ocaml-sedlex") + (version "2.1") + (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 + "05f6qa8x3vhpdz1fcnpqk37fpnyyq13icqsk2gww5idjnh6kng26")))) + (properties '())))) + (define-public ocaml-uchar (package (name "ocaml-uchar") @@ -3473,7 +3492,7 @@ Format module of the OCaml standard library.") `(("which" ,which))) (propagated-inputs `(("ocaml-xmlm" ,(package-with-ocaml4.07 ocaml-xmlm)) - ("ocaml-sedlex" ,ocaml4.07-sedlex) + ("ocaml-sedlex" ,(package-with-ocaml4.07 ocaml-sedlex)) ("ocaml-easy-format" ,(package-with-ocaml4.07 ocaml-easy-format)) ("ocaml-base64" ,(package-with-ocaml4.07 ocaml-base64)))) (home-page "http://piqi.org") -- 2.31.1