From patchwork Tue Feb 8 20:14:42 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Julien Lepiller X-Patchwork-Id: 172 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 76B0927BBEA; Tue, 8 Feb 2022 20:47:58 +0000 (GMT) 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_INVALID, DKIM_SIGNED,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 E42A427BBE9 for ; Tue, 8 Feb 2022 20:47:57 +0000 (GMT) Received: from localhost ([::1]:43966 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nHXP3-0001Iz-3S for patchwork@mira.cbaines.net; Tue, 08 Feb 2022 15:47:57 -0500 Received: from eggs.gnu.org ([209.51.188.92]:41140) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nHWuG-0000en-Pa for guix-patches@gnu.org; Tue, 08 Feb 2022 15:16:09 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:54954) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nHWuG-0007Yr-Aj for guix-patches@gnu.org; Tue, 08 Feb 2022 15:16:08 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nHWuG-0002bm-6X for guix-patches@gnu.org; Tue, 08 Feb 2022 15:16:08 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#53882] [PATCH 16/24] gnu: Add ocaml-splittable-random. Resent-From: Julien Lepiller Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 08 Feb 2022 20:16: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 Received: via spool by 53882-submit@debbugs.gnu.org id=B53882.16443513209789 (code B ref 53882); Tue, 08 Feb 2022 20:16:08 +0000 Received: (at 53882) by debbugs.gnu.org; 8 Feb 2022 20:15:20 +0000 Received: from localhost ([127.0.0.1]:48820 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nHWtT-0002Xj-ST for submit@debbugs.gnu.org; Tue, 08 Feb 2022 15:15:20 -0500 Received: from lepiller.eu ([89.234.186.109]:47112) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nHWtJ-0002TE-E0 for 53882@debbugs.gnu.org; Tue, 08 Feb 2022 15:15:10 -0500 Received: from lepiller.eu (localhost [127.0.0.1]) by lepiller.eu (OpenSMTPD) with ESMTP id fce946fa for <53882@debbugs.gnu.org>; Tue, 8 Feb 2022 20:14:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed; d=lepiller.eu; h=from:to :subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; s=dkim; bh=1RbNj7aSe5gg9kCv4XNsG6Zgl IGLse0D9PNCyKNgt4c=; b=g7p16q8EIzWdQJb3+PETUQ1WiICjCr45ZCnvzbGEv cOfZUrLEDA3NZ9lxK44LprGmucGckWmXhmo3y3VktCySDiwbhUiTJR9HR1vL7rra FUSmJgCsuobJg8ms2hdAtjsCfYJKqPJ5CWEoAg9Wc55J99pZ6Ob8fevONlNA+ztT lPX5RGJTbyiuUui0H3qM0tTh4glUsroS3s2DwFIp6LTWX2PXiAbm54Ix/PB6pQ76 nBB4+eFIDYIUQ6nDOOOIYs6fFuQ7DcrPz67g5jZkosonck4xiC6xB+AEFwFGqegK B3v46Rw/OnzeUgVSrw8yLSoQO2b3PSkDhG/FsQ0dHIeIw== Received: by lepiller.eu (OpenSMTPD) with ESMTPSA id badd3723 (TLSv1.3:AEAD-AES256-GCM-SHA384:256:NO) for <53882@debbugs.gnu.org>; Tue, 8 Feb 2022 20:14:58 +0000 (UTC) From: Julien Lepiller Date: Tue, 8 Feb 2022 21:14:42 +0100 Message-Id: <7a0f1d4d46a0fe84b016fd108bd5b160eaf8ebc8.1644350658.git.julien@lepiller.eu> X-Mailer: git-send-email 2.34.0 In-Reply-To: <1dcef02fe1f5f25657c6427d09c43bfc41091050.1644350657.git.julien@lepiller.eu> References: <1dcef02fe1f5f25657c6427d09c43bfc41091050.1644350657.git.julien@lepiller.eu> 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 * 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 7888f21cd8..901f54c864 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