From patchwork Fri Apr 8 13:22:45 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Tournier X-Patchwork-Id: 38402 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 42E5427BBEB; Fri, 8 Apr 2022 14:26:38 +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_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable 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 C759527BBE9 for ; Fri, 8 Apr 2022 14:26:37 +0100 (BST) Received: from localhost ([::1]:33952 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ncodI-0006CZ-VT for patchwork@mira.cbaines.net; Fri, 08 Apr 2022 09:26:36 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:57114) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ncoap-0002Mc-Iw for guix-patches@gnu.org; Fri, 08 Apr 2022 09:24:04 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:40392) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ncoap-0001Py-Am for guix-patches@gnu.org; Fri, 08 Apr 2022 09:24:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ncoap-0007sI-7g for guix-patches@gnu.org; Fri, 08 Apr 2022 09:24:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#53882] [PATCH v2 05/25] gnu: Add ocaml-typerep. Resent-From: zimoun Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 08 Apr 2022 13:24:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 53882 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 53882@debbugs.gnu.org Cc: Julien Lepiller Received: via spool by 53882-submit@debbugs.gnu.org id=B53882.164942421829998 (code B ref 53882); Fri, 08 Apr 2022 13:24:03 +0000 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 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 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" X-getmail-retrieved-from-mailbox: Patches 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