From patchwork Fri Apr 8 13:22:57 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Tournier X-Patchwork-Id: 38403 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 B3C3027BBE9; 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 3E40E27BBEA for ; Fri, 8 Apr 2022 14:26:38 +0100 (BST) Received: from localhost ([::1]:34022 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ncodJ-0006F6-9V for patchwork@mira.cbaines.net; Fri, 08 Apr 2022 09:26:37 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:57212) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ncobE-0002XP-4t for guix-patches@gnu.org; Fri, 08 Apr 2022 09:24:28 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:40405) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ncoau-0001RG-AB for guix-patches@gnu.org; Fri, 08 Apr 2022 09:24:17 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ncoau-0007tq-6q for guix-patches@gnu.org; Fri, 08 Apr 2022 09:24:08 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#53882] [PATCH v2 17/25] gnu: Add ocaml-splittable-random. Resent-From: zimoun Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 08 Apr 2022 13:24:08 +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.164942423130174 (code B ref 53882); Fri, 08 Apr 2022 13:24:08 +0000 Received: (at 53882) by debbugs.gnu.org; 8 Apr 2022 13:23:51 +0000 Received: from localhost ([127.0.0.1]:34270 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ncoac-0007qW-KK for submit@debbugs.gnu.org; Fri, 08 Apr 2022 09:23:51 -0400 Received: from mail-wm1-f45.google.com ([209.85.128.45]:42604) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ncoaQ-0007mS-T4 for 53882@debbugs.gnu.org; Fri, 08 Apr 2022 09:23:40 -0400 Received: by mail-wm1-f45.google.com with SMTP id n126-20020a1c2784000000b0038e8af3e788so4002254wmn.1 for <53882@debbugs.gnu.org>; Fri, 08 Apr 2022 06:23:38 -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=zZyG06khIBMo+p31W/MZpooh5jmkdeIQGrbvRE/KRXM=; b=oP/edgp2qF2uzpLxdD1meB2Gk/XvC+C+ydDhFayH0/gLbs5k4Fg4NUtRDTg4cpScL5 5qSjBvh70Jv8wNds6+s2nwgA1tTcrHlv9K60oJYZ1QX0HT6ckvzuMCOOFZdSXoXWijHw net1M94HLGAupqMBSgkszmuujQ9QS+PTLggXObYbTGovNxIqDaiXe4s397bShGoxOUUW vOF51Avmch/TbBK1DGXvk/u+IOijAsnsjHHVTqeXrkTMvys85vu57+3PjNsAFtaIC+CN WZ3Wsv484W6Ls9VgPv/l+PTM6sji6BzefU+MfkOAq0FAKs6/+4V4ITd6qSkW/uGXfKIn AZng== 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=zZyG06khIBMo+p31W/MZpooh5jmkdeIQGrbvRE/KRXM=; b=ynnQyQN6sf56tGBulzEE2HLs8d1sxebYNpL9pqxcFRTFq5ntlrEE9/RsrBiLyuitC6 YpHjLwqwGMNO2tbtdT77YCYiOlJCv3LEfLLMmqRWdYZbPc85lv/9BtaAGNuU4kRS+IxT jXUJD4wj5768dBdUZf/06q2pv4zwW1TYjEj3tmjTkpXRad11y2MVWjuZl8ovIrz/PXEm dV0hkKgirqBHqkYCZfti095VBqvG4xAOxDz7A/iaPnwj8aQ5saRHv/SeY1O5oVSS9AeR AOFJ/elGYDtuwXaHnUwUQeVc3bVNXyS0Iq1q88T1V6dC84z0NhnxeQWrQNYuYQUA3dVd CgAg== X-Gm-Message-State: AOAM530s4RFwVuWH6nMAVjaNnogHtuBWgOAXp+6MXWKLhBLN7dSakp58 zXR91To9vA+uFdT0Ad8OiMGibj8k+D8= X-Google-Smtp-Source: ABdhPJzNDiKyBjaKyKIF8K7z4/cpVVge0uP0d+ZLrDUH0xBPCC8x7nKb/hIg8uwbEYY7747mzJlHsg== X-Received: by 2002:a7b:c922:0:b0:383:e7e2:4a1a with SMTP id h2-20020a7bc922000000b00383e7e24a1amr17401698wml.51.1649424213325; Fri, 08 Apr 2022 06:23:33 -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.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 08 Apr 2022 06:23:33 -0700 (PDT) From: zimoun Date: Fri, 8 Apr 2022 15:22:57 +0200 Message-Id: <20220408132305.3301350-17-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-splittable-random): New variable. (ocaml4.07-splittable-random): Inherit from it. --- gnu/packages/ocaml.scm | 59 +++++++++++++++++++++++++++--------------- 1 file changed, 38 insertions(+), 21 deletions(-) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 942bcab4ad..ec2d8ab12e 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -6563,29 +6563,28 @@ (define-public ocaml4.07-ppx-jane driver including all standard Jane Street ppx rewriters.") (license license:asl2.0))) -(define-public ocaml4.07-splittable-random +(define-public ocaml-splittable-random (package - (name "ocaml4.07-splittable-random") - (version "0.11.0") - (source (origin - (method url-fetch) - (uri (string-append "https://ocaml.janestreet.com/ocaml-core/v" - (version-major+minor version) - "/files/splittable_random-v" version ".tar.gz")) - (sha256 - (base32 - "0l1wbd881mymlnpzlq5q53mmdz3g5d7qjhyc7lfaq1x0iaccn5lc")))) + (name "ocaml-splittable-random") + (version "0.14.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/janestreet/splittable_random") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0ax988b1wc7km8khg4s6iphbz16y1rssh7baigxfyw3ldp0agk14")))) (build-system dune-build-system) - (arguments - `(#:ocaml ,ocaml-4.07 - #:findlib ,ocaml4.07-findlib - #:dune ,ocaml4.07-dune)) (propagated-inputs - `(("ocaml-base" ,(package-with-ocaml4.07 ocaml-base)) - ("ocaml-ppx-jane" ,ocaml4.07-ppx-jane) - ("ocaml-migrate-parsetree" - ,(package-with-ocaml4.07 ocaml-migrate-parsetree)))) - (properties `((upstream-name . "splittable_random"))) + (list ocaml-base + ocaml-ppx-assert + ocaml-ppx-bench + ocaml-ppx-inline-test + ocaml-ppx-sexp-message)) + (properties `((upstream-name . "splittable_random") + (ocaml-4.07-variant . ,(delay ocaml4.07-splittable-random)))) (home-page "https://github.com/janestreet/splittable_random") (synopsis "PRNG that can be split into independent streams") (description "This package provides a splittable @@ -6595,7 +6594,25 @@ (define-public ocaml4.07-splittable-random This library implements a splittable pseudo-random number generator that sacrifices cryptographic-quality randomness in favor of performance.") - (license license:asl2.0))) + (license license:expat))) + +(define-public ocaml4.07-splittable-random + (package-with-ocaml4.07 + (package + (inherit ocaml-splittable-random) + (version "0.11.0") + (source (origin + (method url-fetch) + (uri (string-append "https://ocaml.janestreet.com/ocaml-core/v" + (version-major+minor version) + "/files/splittable_random-v" version ".tar.gz")) + (sha256 + (base32 + "0l1wbd881mymlnpzlq5q53mmdz3g5d7qjhyc7lfaq1x0iaccn5lc")))) + (propagated-inputs + (list ocaml-base ocaml4.07-ppx-jane ocaml-migrate-parsetree)) + (properties '()) + (license license:asl2.0)))) (define-public ocaml4.07-jane-street-headers (package