From patchwork Fri Apr 8 13:23:00 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Tournier X-Patchwork-Id: 38401 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 C1D1127BBEA; Fri, 8 Apr 2022 14:26:28 +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 1181427BBE9 for ; Fri, 8 Apr 2022 14:26:28 +0100 (BST) Received: from localhost ([::1]:33136 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ncod9-0005e7-7Y for patchwork@mira.cbaines.net; Fri, 08 Apr 2022 09:26:27 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:57232) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ncobE-0002YM-9Y for guix-patches@gnu.org; Fri, 08 Apr 2022 09:24:28 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:40408) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ncoav-0001RR-Jo for guix-patches@gnu.org; Fri, 08 Apr 2022 09:24:27 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ncoav-0007uC-G7 for guix-patches@gnu.org; Fri, 08 Apr 2022 09:24:09 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#53882] [PATCH v2 20/25] gnu: Add ocaml-ppx-jane. Resent-From: zimoun Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 08 Apr 2022 13:24:09 +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.164942423230196 (code B ref 53882); Fri, 08 Apr 2022 13:24:09 +0000 Received: (at 53882) by debbugs.gnu.org; 8 Apr 2022 13:23:52 +0000 Received: from localhost ([127.0.0.1]:34276 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ncoad-0007qr-My for submit@debbugs.gnu.org; Fri, 08 Apr 2022 09:23:52 -0400 Received: from mail-wr1-f48.google.com ([209.85.221.48]:34532) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ncoaS-0007mo-5s for 53882@debbugs.gnu.org; Fri, 08 Apr 2022 09:23:41 -0400 Received: by mail-wr1-f48.google.com with SMTP id m30so12871879wrb.1 for <53882@debbugs.gnu.org>; Fri, 08 Apr 2022 06:23:40 -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=IpWM8UyStZSBEUb0q8kjHmur0Gic88vS+p9k93ygsPU=; b=N9dOoWmAmtuK8SYQSkrn4TDN5Z67Ka2dEDPJ0jmxhjuZphlPhmxocOsYkDmj4qzJQO lzAjsDsVLQEpFGm3AqOkkw3zH81oKQPC4CQQ5+C4VAihGSkNqAgnLdTISiWinwgQooIG P/t/TnoQcjsgJ7h61asjD+e408g70onmvhr3Un4dMYG/XbUZ/oJxbMbqP1yHukTdkWG5 2Pi/T3maa5VuO0v8GoHjo9qUQHI5FLJfx41Gf/stN2at3WPtNVsa2/cRRDPoSDZE44wh ZuFlEmVqbFOObT2a/v+UrvjaPjRYMtx6Gzi7rAOV1yM9NxLq+1+hLGkrKCJBXycgr8Jm 5RCA== 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=IpWM8UyStZSBEUb0q8kjHmur0Gic88vS+p9k93ygsPU=; b=CaeSET6lYYDgvMRnj88xU9XrxQg9hJ0qChNDwdxpoVkPTfNRuk4TNWwvW5PhFhya2J IJatm2+OBIXiZXk8c/kN0Ovk2K2Bp/rEdhqWrrdokMHY/W9nTAfBS1CZD1VJnztBwmX1 lIpjfAf5/84oDze4CpG1VxD1BpwbiNf7tN8+bEPyVU5VfO5pJMHZ/Fo5TNrXraWpe0jk w+Fu+vTnogp6gw2PyBvbqV6RPpcsvrkVNjXISbQV20dY+oG2QaapDQ3RdWnLZErfMKRV AKehQ+Xt+kprAygr8290JxziaRSHj+nfQ3pyn9pV3TBWbXY6BsJf0eSnYkS3BJiwt1hU gT3Q== X-Gm-Message-State: AOAM530P3gTHimAQ8iG/aACYvIy5HxXUE7YWowTO6iHcUrl6cQvOAH9v fpFDkZR7CYJZrUXlSY07yJf4aFXayJ8= X-Google-Smtp-Source: ABdhPJwhhRZGbpMlIujlBYtk05vURUO2G5/icPSG4wpKXv3xSKh7DM8brLpdpYPZnCXU0b2wYHJHaQ== X-Received: by 2002:adf:9b9e:0:b0:206:e5b:63f2 with SMTP id d30-20020adf9b9e000000b002060e5b63f2mr14838476wrc.46.1649424214578; Fri, 08 Apr 2022 06:23:34 -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.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 08 Apr 2022 06:23:34 -0700 (PDT) From: zimoun Date: Fri, 8 Apr 2022 15:23:00 +0200 Message-Id: <20220408132305.3301350-20-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-ppx-jane): New variable. (ocaml4.07-ppx-jane): Inherit from it. --- gnu/packages/ocaml.scm | 116 +++++++++++++++++++++++++++-------------- 1 file changed, 77 insertions(+), 39 deletions(-) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 1c81f2de1c..3e5c7e8bf2 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -6527,52 +6527,90 @@ (define-public ocaml4.07-ppx-bin-prot (properties '()) (license license:asl2.0)))) -(define-public ocaml4.07-ppx-jane +(define-public ocaml-ppx-jane (package - (name "ocaml4.07-ppx-jane") - (version "0.11.0") - (source (origin - (method url-fetch) - (uri (string-append "https://ocaml.janestreet.com/ocaml-core/v" - (version-major+minor version) - "/files/ppx_jane-v" version ".tar.gz")) - (sha256 - (base32 - "0lgppkw3aixrfnixihrsz2ipafv8fpvkdpy3pw8n0r615gg8x8la")))) + (name "ocaml-ppx-jane") + (version "0.14.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/janestreet/ppx_jane") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1kk238fvrcylymwm7xwc7llbyspmx1y662ypq00vy70g112rir7j")))) (build-system dune-build-system) (arguments - `(#:test-target "." - #:ocaml ,ocaml-4.07 - #:findlib ,ocaml4.07-findlib - #:dune ,ocaml4.07-dune)) + `(#:test-target ".")) (propagated-inputs - `(("ocaml-ppx-assert" ,(package-with-ocaml4.07 ocaml-ppx-assert)) - ("ocaml-ppx-base" ,(package-with-ocaml4.07 ocaml-ppx-base)) - ("ocaml-ppx-bench" ,ocaml4.07-ppx-bench) - ("ocaml-ppx-bin-prot" ,ocaml4.07-ppx-bin-prot) - ("ocaml-ppx-custom-printf" ,(package-with-ocaml4.07 ocaml-ppx-custom-printf)) - ("ocaml-ppx-expect" ,(package-with-ocaml4.07 ocaml-ppx-expect)) - ("ocaml-ppx-fail" ,ocaml4.07-ppx-fail) - ("ocaml-ppx-fields-conv" ,(package-with-ocaml4.07 ocaml-ppx-fields-conv)) - ("ocaml-ppx-here" ,(package-with-ocaml4.07 ocaml-ppx-here)) - ("ocaml-ppx-inline-test" ,(package-with-ocaml4.07 ocaml-ppx-inline-test)) - ("ocaml-ppx-let" ,(package-with-ocaml4.07 ocaml-ppx-let)) - ("ocaml-ppx-optcomp" ,(package-with-ocaml4.07 ocaml-ppx-optcomp)) - ("ocaml-ppx-optional" ,(package-with-ocaml4.07 ocaml-ppx-optional)) - ("ocaml-ppx-pipebang" ,ocaml4.07-ppx-pipebang) - ("ocaml-ppx-sexp-message" ,ocaml4.07-ppx-sexp-message) - ("ocaml-ppx-sexp-value" ,ocaml4.07-ppx-sexp-value) - ("ocaml-ppx-typerep-conv" ,ocaml4.07-ppx-typerep-conv) - ("ocaml-ppx-variants-conv" ,(package-with-ocaml4.07 ocaml-ppx-variants-conv)) - ("ocaml-migrate-parsetree" - ,(package-with-ocaml4.07 ocaml-migrate-parsetree)) - ("ocaml-ppxlib" ,(package-with-ocaml4.07 ocaml-ppxlib)))) - (properties `((upstream-name . "ppx_jane"))) + (list ocaml-base-quickcheck + ocaml-ppx-assert + ocaml-ppx-base + ocaml-ppx-bench + ocaml-ppx-bin-prot + ocaml-ppx-custom-printf + ocaml-ppx-expect + ocaml-ppx-fields-conv + ocaml-ppx-fixed-literal + ocaml-ppx-here + ocaml-ppx-inline-test + ocaml-ppx-let + ocaml-ppx-module-timer + ocaml-ppx-optcomp + ocaml-ppx-optional + ocaml-ppx-pipebang + ocaml-ppx-sexp-message + ocaml-ppx-sexp-value + ocaml-ppx-stable + ocaml-ppx-string + ocaml-ppx-typerep-conv + ocaml-ppx-variants-conv + ocaml-ppxlib)) + (properties `((upstream-name . "ppx_jane") + (ocaml4.07-variant . ,(delay ocaml4.07-ppx-jane)))) (home-page "https://github.com/janestreet/ppx_jane") (synopsis "Standard Jane Street ppx rewriters") (description "This package installs a ppx-jane executable, which is a ppx driver including all standard Jane Street ppx rewriters.") - (license license:asl2.0))) + (license license:expat))) + +(define-public ocaml4.07-ppx-jane + (package-with-ocaml4.07 + (package + (inherit ocaml-ppx-jane) + (version "0.11.0") + (source (origin + (method url-fetch) + (uri (string-append "https://ocaml.janestreet.com/ocaml-core/v" + (version-major+minor version) + "/files/ppx_jane-v" version ".tar.gz")) + (sha256 + (base32 + "0lgppkw3aixrfnixihrsz2ipafv8fpvkdpy3pw8n0r615gg8x8la")))) + (propagated-inputs + (list ocaml-ppx-assert + ocaml-ppx-base + ocaml-ppx-bench + ocaml-ppx-bin-prot + ocaml-ppx-custom-printf + ocaml-ppx-expect + ocaml-ppx-fail + ocaml-ppx-fields-conv + ocaml-ppx-here + ocaml-ppx-inline-test + ocaml-ppx-let + ocaml-ppx-optcomp + ocaml-ppx-optional + ocaml-ppx-pipebang + ocaml-ppx-sexp-message + ocaml-ppx-sexp-value + ocaml-ppx-typerep-conv + ocaml-ppx-variants-conv + ocaml-migrate-parsetree + ocaml-ppxlib)) + (properties '()) + (license license:asl2.0)))) (define-public ocaml-splittable-random (package @@ -6621,7 +6659,7 @@ (define-public ocaml4.07-splittable-random (base32 "0l1wbd881mymlnpzlq5q53mmdz3g5d7qjhyc7lfaq1x0iaccn5lc")))) (propagated-inputs - (list ocaml-base ocaml4.07-ppx-jane ocaml-migrate-parsetree)) + (list ocaml-base ocaml-ppx-jane ocaml-migrate-parsetree)) (properties '()) (license license:asl2.0))))