From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp10.migadu.com ([2001:41d0:403:478a::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms9.migadu.com with LMTPS id kBkeCx2xw2R3fAAASxT56A (envelope-from ) for ; Fri, 28 Jul 2023 14:14:21 +0200 Received: from aspmx1.migadu.com ([2001:41d0:403:478a::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp10.migadu.com with LMTPS id mOgkCh2xw2QPbAAAG6o9tA (envelope-from ) for ; Fri, 28 Jul 2023 14:14:21 +0200 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 9809E6B437 for ; Fri, 28 Jul 2023 14:14:20 +0200 (CEST) Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=posteo.net header.s=2017 header.b=U1f8XrjM; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"; dmarc=fail reason="SPF not aligned (strict)" header.from=posteo.net (policy=none) ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1690546460; 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=huZFnN8Li+S88sUpBGGXb+EwoG3vF5S7XRy+aOzNEGM=; b=AbsFl8q0qd1UYK4qUlhceLJVKvV7+e4uTuXglwiqfbr0AAppd5fS3PV/fwzgUApmwO5m7k hPHHQgEaW2b/azsEND9MsLubaUqY2FWBBJOSC8RcoUpN8i5+4LFdAN4d7bu4Uni2gKphDD zVJ1OaMytxc0xLKeJD68jxO9aMXGmo6VLdotEktyjrqqYS/IuzHvSuIcMf0PqZsKgqDHaA 4fxPM6rgcpCh8QPD1X6gldSAzs7m87JkTdt+cRDToR7KpPfoFDAtCNvQLUAUbTP6EiiXPL w/KRcQdI5q1Asucm5gXAzLPifvsgY+IaP1R0OIUrVx6ZAQGtaWK8Hkld+e15nw== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=posteo.net header.s=2017 header.b=U1f8XrjM; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"; dmarc=fail reason="SPF not aligned (strict)" header.from=posteo.net (policy=none) ARC-Seal: i=1; s=key1; d=yhetil.org; t=1690546460; a=rsa-sha256; cv=none; b=Hymwm43XOoXxK/1Lu2CxSGh/v5oyex/HtQotsQZi52Wk2LBZioKoKo9qbaikYvV3HmTWvU kIB0OnZTX+BSx6xHPF5HMXF+gtItuZPlpAy9i3c7Vm9ytdZzq5J9AsdH/ILPpETcV2fXZx LfUHnagA/Uk50J0O4HwEkS+GEbn+Ht/XQ0pei7MObP0wZrVbDns2uegyjVWG/59qUlVcwX LL1LUumKAXeXDDL1vytxSjsMNZtswoEPXdB6hTQXgJr1iy6Cr7EKwP6YJChWQOtK1OpX3P WFAbgfY4tV1BEv2ooPXUSb+cq81uTOWzkl8hXcD/QRi80LNxYvhb36PMI/xpXg== Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qPLME-0000tZ-5H; Fri, 28 Jul 2023 07:10:06 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qPLMC-0000sf-Ki for guix-patches@gnu.org; Fri, 28 Jul 2023 07:10:04 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qPLMC-0008Ed-6v for guix-patches@gnu.org; Fri, 28 Jul 2023 07:10:04 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qPLMC-00007P-2Y; Fri, 28 Jul 2023 07:10:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#64249] [PATCH ocaml-team v4 8/9] gnu: Add opam-installer. Resent-From: pukkamustard Original-Sender: "Debbugs-submit" Resent-CC: julien@lepiller.eu, pukkamustard@posteo.net, guix-patches@gnu.org Resent-Date: Fri, 28 Jul 2023 11:10:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 64249 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 64249@debbugs.gnu.org Cc: pukkamustard , Julien Lepiller , pukkamustard X-Debbugs-Original-Xcc: Julien Lepiller , pukkamustard Received: via spool by 64249-submit@debbugs.gnu.org id=B64249.1690542549318 (code B ref 64249); Fri, 28 Jul 2023 11:10:04 +0000 Received: (at 64249) by debbugs.gnu.org; 28 Jul 2023 11:09:09 +0000 Received: from localhost ([127.0.0.1]:43854 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qPLLI-000051-Sm for submit@debbugs.gnu.org; Fri, 28 Jul 2023 07:09:09 -0400 Received: from mout02.posteo.de ([185.67.36.66]:33777) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qPLLE-0008Uj-66 for 64249@debbugs.gnu.org; Fri, 28 Jul 2023 07:09:05 -0400 Received: from submission (posteo.de [185.67.36.169]) by mout02.posteo.de (Postfix) with ESMTPS id 9E6BA240101 for <64249@debbugs.gnu.org>; Fri, 28 Jul 2023 13:08:58 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1690542538; bh=3CEtR37R50aLzKWg7206Cum8u8tjLG3CUbWnf2VaZro=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version: Content-Transfer-Encoding:From; b=U1f8XrjMpL6Txp0q4LzbNQHdJITudqOerMmgsZ2uQLckkY1gs7OxFwPcPXH9QbbVF bE/kVCxDI4ksnXLRkYYllQvAIUdttzFTZtRxZ7qESb5pGv0A7+RGIocn0Xg3JTWZPl rtymIfiSPM6s2Hb/DlA5lgp47m2AhJf4bW1DLO6ZGXTiUkGXtNW2A5PKDz8PMLXgzU zWvCHk6li4/DIYFypCcr4Gj5BgCgfkAqo/VBuUg33D0ojJ98Bapt8PVKkJ3gErjja6 dLCUcXe8bPnA8IUY5JBspGfPNqdZObbPyT713LPp8xY4HIa9VvFiPNg4vIoF3qMZmy IZVMgcXJezHAg== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4RC4dQ1W0Tz6ty7; Fri, 28 Jul 2023 13:08:58 +0200 (CEST) From: pukkamustard Date: Fri, 28 Jul 2023 11:08:30 +0000 Message-ID: <736385d685b5a9b8074265a8e063f9d666680966.1690541801.git.pukkamustard@posteo.net> In-Reply-To: References: 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-bounces+larch=yhetil.org@gnu.org X-Migadu-Flow: FLOW_IN X-Migadu-Country: US X-Spam-Score: 7.16 X-Migadu-Queue-Id: 9809E6B437 X-Migadu-Spam-Score: 7.16 X-Migadu-Scanner: mx0.migadu.com X-TUID: U9iUo/kDZ8pA * gnu/packages/ocaml.scm (opam-installer): New variable. (ocaml-down, ocaml-topkg, ocaml-rresult, ocaml-mtime, ocaml-fmt, ocaml-astring, ocaml-react, ocaml-hmap, ocaml-logs, ocaml-fpath, ocaml-bos, ocaml-xmlm, ocaml-uchar, ocaml-uutf, ocaml-uunf, ocaml-jsonm, ocaml-ptime, ocaml-uuidm, ocaml-tsdl, ocaml-uucp, ocaml-uucd, ocaml-uuseg, ocaml-afl-persistent) [native-inputs]: Replace opam with opam-installer. --- gnu/packages/ocaml.scm | 90 ++++++++++++++++++++++++++---------------- 1 file changed, 55 insertions(+), 35 deletions(-) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 0d78f4d864..90fedc2e88 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -780,7 +780,7 @@ (define-public ocaml-down ,#~(list "build" "--lib-dir" (string-append #$output "/lib/ocaml/site-lib")))) (native-inputs - (list ocaml-findlib ocamlbuild ocaml-topkg opam)) + (list ocaml-findlib ocamlbuild ocaml-topkg opam-installer)) (home-page "https://erratique.ch/software/down") (synopsis "OCaml toplevel (REPL) upgrade") (description "Down is an unintrusive user experience upgrade for the @@ -901,6 +901,27 @@ (define ocaml-opam-format #:tests? #f #:phases %standard-phases)))) +(define-public opam-installer + (package + (inherit ocaml-opam-core) + (name "opam-installer") + (native-inputs (list ocaml-opam-format + ocaml-cmdliner)) + (inputs '()) + (propagated-inputs '()) + (arguments `(#:package "opam-installer" + ;; requires all of opam + #:tests? #f)) + (synopsis "Tool for installing OCaml packages") + (description "@var{opam-installer} is a tool for installing OCaml packages +based on @code{.install} files defined by the OPAM package manager. It is +useful for installing OCaml packages without requiring the entirety of +OPAM.") + (properties + ;; opam-installer is used as a tool and not as a library, we can use the + ;; OCaml 4.14 compiled opam until opam is compatible with OCaml 5.0. + `((ocaml5.0-variant . ,(delay opam-installer)))))) + (define ocaml-opam-repository (package (inherit ocaml-opam-core) @@ -2325,7 +2346,7 @@ (define-public ocaml-topkg "11ycfk0prqvifm9jca2308gw8a6cjb1hqlgfslbji2cqpan09kpq")))) (build-system ocaml-build-system) (native-inputs - (list opam ocamlbuild)) + (list opam-installer ocamlbuild)) (propagated-inputs `(("result" ,ocaml-result))) (arguments @@ -2355,7 +2376,7 @@ (define-public ocaml-rresult "0h2mjyzhay1p4k7n0mzaa7hlc7875kiy6m1i3r1n03j6hddpzahi")))) (build-system ocaml-build-system) (native-inputs - (list opam ocamlbuild)) + (list opam-installer ocamlbuild)) (propagated-inputs `(("topkg" ,ocaml-topkg))) (arguments @@ -2470,7 +2491,7 @@ (define-public ocaml-mtime "1ss4w3qxsfp51d88r0j7dzqs05dbb1xdx11hn1jl9cvd03ma0g9z")))) (build-system ocaml-build-system) (native-inputs - (list ocamlbuild opam)) + (list ocamlbuild opam-installer)) (propagated-inputs `(("topkg" ,ocaml-topkg))) (arguments @@ -2600,13 +2621,13 @@ (define-public ocaml-fmt "0q8j2in2473xh7k4hfgnppv9qy77f2ih89yp6yhpbp92ba021yzi")))) (build-system ocaml-build-system) (native-inputs - `(("ocamlbuild" ,ocamlbuild) - ("opam" ,opam) - ("topkg" ,ocaml-topkg))) + (list ocamlbuild + opam-installer + ocaml-topkg)) (propagated-inputs - `(("cmdliner" ,ocaml-cmdliner) - ("ocaml-stdlib-shims" ,ocaml-stdlib-shims) - ("ocaml-uchar" ,ocaml-uchar))) + (list ocaml-cmdliner + ocaml-stdlib-shims + ocaml-uchar)) (arguments `(#:tests? #f #:build-flags (list "build" "--with-base-unix" "true" "--with-cmdliner" "true") @@ -2647,9 +2668,9 @@ (define-public ocaml-astring "1ykhg9gd3iy7zsgyiy2p9b1wkpqg9irw5pvcqs3sphq71iir4ml6")))) (build-system ocaml-build-system) (native-inputs - `(("ocamlbuild" ,ocamlbuild) - ("opam" ,opam) - ("topkg" ,ocaml-topkg))) + (list ocamlbuild + opam-installer + ocaml-topkg)) (arguments `(#:tests? #f #:build-flags (list "build") @@ -2869,7 +2890,7 @@ (define-public ocaml-react "16cg4byj8lfbbw96dhh8sks5y9n1c3fshz7f2p8m7wgisqax7bf4")))) (build-system ocaml-build-system) (native-inputs - (list ocamlbuild opam ocaml-topkg)) + (list ocamlbuild opam-installer ocaml-topkg)) (arguments `(#:tests? #f #:build-flags (list "build") @@ -2993,7 +3014,7 @@ (define-public ocaml-hmap #:phases (modify-phases %standard-phases (delete 'configure)))) - (native-inputs (list ocaml-topkg ocamlbuild opam)) + (native-inputs (list ocaml-topkg ocamlbuild opam-installer)) (home-page "https://erratique.ch/software/hmap") (synopsis "Heterogeneous value maps for OCaml") (description @@ -3455,7 +3476,7 @@ (define-public ocaml-logs (modify-phases %standard-phases (delete 'configure)))) (native-inputs - (list ocamlbuild opam)) + (list ocamlbuild opam-installer)) (propagated-inputs `(("fmt" ,ocaml-fmt) ("lwt" ,ocaml-lwt) @@ -3489,7 +3510,7 @@ (define-public ocaml-fpath (modify-phases %standard-phases (delete 'configure)))) (native-inputs - (list ocamlbuild opam)) + (list ocamlbuild opam-installer)) (propagated-inputs `(("topkg" ,ocaml-topkg) ("astring" ,ocaml-astring))) @@ -3519,7 +3540,7 @@ (define-public ocaml-bos (modify-phases %standard-phases (delete 'configure)))) (native-inputs - (list ocamlbuild opam)) + (list ocamlbuild opam-installer)) (propagated-inputs `(("topkg" ,ocaml-topkg) ("astring" ,ocaml-astring) @@ -3593,7 +3614,7 @@ (define-public ocaml-xmlm (modify-phases %standard-phases (delete 'configure)))) (native-inputs - (list ocamlbuild ocaml-topkg opam)) + (list ocamlbuild ocaml-topkg opam-installer)) (home-page "https://erratique.ch/software/xmlm") (synopsis "Streaming XML codec for OCaml") (description "Xmlm is a streaming codec to decode and encode the XML data @@ -3734,7 +3755,7 @@ (define-public ocaml-uchar (modify-phases %standard-phases (delete 'configure)))) (native-inputs - (list ocamlbuild opam)) + (list ocamlbuild opam-installer)) (home-page "https://github.com/ocaml/uchar") (synopsis "Compatibility library for OCaml's Uchar module") (description "The uchar package provides a compatibility library for the @@ -3760,9 +3781,9 @@ (define-public ocaml-uutf (modify-phases %standard-phases (delete 'configure)))) (native-inputs - `(("ocamlbuild" ,ocamlbuild) - ("opam" ,opam) - ("topkg" ,ocaml-topkg))) + (list ocamlbuild + opam-installer + ocaml-topkg)) (propagated-inputs `(("uchar" ,ocaml-uchar) ("cmdliner" ,ocaml-cmdliner))) @@ -3807,7 +3828,7 @@ (define-public ocaml-uunf #t))))) (native-inputs `(("ocamlbuild" ,ocamlbuild) - ("opam" ,opam) + ("opam-installer" ,opam-installer) ("topkg" ,ocaml-topkg) ;; Test data is otherwise downloaded with curl ("NormalizationTest.txt" @@ -3848,9 +3869,9 @@ (define-public ocaml-jsonm (modify-phases %standard-phases (delete 'configure)))) (native-inputs - `(("ocamlbuild" ,ocamlbuild) - ("opam" ,opam) - ("topkg" ,ocaml-topkg))) + (list ocamlbuild + opam-installer + ocaml-topkg)) (propagated-inputs `(("uutf" ,ocaml-uutf) ("cmdliner" ,ocaml-cmdliner))) @@ -4268,7 +4289,7 @@ (define-public ocaml-ptime #:phases (modify-phases %standard-phases (delete 'configure)))) (propagated-inputs (list ocaml-result js-of-ocaml)) - (native-inputs (list ocaml-findlib ocamlbuild ocaml-topkg opam)) + (native-inputs (list ocaml-findlib ocamlbuild ocaml-topkg opam-installer)) (home-page "https://erratique.ch/software/ptime") (synopsis "POSIX time for OCaml") (description @@ -5275,7 +5296,7 @@ (define-public ocaml-uuidm (modify-phases %standard-phases (delete 'configure)))) (native-inputs - (list ocamlbuild opam)) + (list ocamlbuild opam-installer)) (propagated-inputs `(("cmdliner" ,ocaml-cmdliner) ("topkg" ,ocaml-topkg))) @@ -5921,7 +5942,7 @@ (define-public ocaml-tsdl (modify-phases %standard-phases (delete 'configure)))) (native-inputs - (list ocamlbuild ocaml-astring opam pkg-config)) + (list ocamlbuild ocaml-astring opam-installer pkg-config)) (inputs `(("topkg" ,ocaml-topkg) ("sdl2" ,sdl2) @@ -9641,7 +9662,7 @@ (define-public ocaml-uucd (propagated-inputs (list ocaml-xmlm)) (native-inputs - (list opam ocaml-findlib ocamlbuild ocaml-topkg)) + (list opam-installer ocaml-findlib ocamlbuild ocaml-topkg)) (home-page "https://erratique.ch/software/uucd") (synopsis "Unicode character database decoder for OCaml") (description "Uucd is an OCaml module to decode the data of the Unicode @@ -9669,7 +9690,7 @@ (define-public ocaml-uucp (modify-phases %standard-phases (delete 'configure)))) (native-inputs - (list opam + (list opam-installer ocaml-findlib ocamlbuild ocaml-topkg @@ -9703,7 +9724,7 @@ (define-public ocaml-uuseg (propagated-inputs (list ocaml-uucp ocaml-uutf ocaml-cmdliner)) (native-inputs - (list opam ocaml-findlib ocamlbuild ocaml-topkg)) + (list opam-installer ocaml-findlib ocamlbuild ocaml-topkg)) (home-page "https://erratique.ch/software/uuseg") (synopsis "Unicode text segmentation for OCaml") (description "Uuseg is an OCaml library for segmenting Unicode text. It @@ -10164,8 +10185,7 @@ (define-public ocaml-afl-persistent (invoke "./build.sh"))) ;; XXX: The tests are already run in the build.sh script. (delete 'check)))) - (native-inputs - `(("opam" ,opam))) + (native-inputs (list opam-installer)) (home-page "https://github.com/stedolan/ocaml-afl-persistent") (synopsis "Use afl-fuzz in persistent mode") (description -- 2.40.1