From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp11.migadu.com ([2001:41d0:303:e224::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms8.migadu.com with LMTPS id 6OAXONzeRGVYngAA9RJhRA:P1 (envelope-from ) for ; Fri, 03 Nov 2023 12:51:57 +0100 Received: from aspmx1.migadu.com ([2001:41d0:303:e224::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp11.migadu.com with LMTPS id 6OAXONzeRGVYngAA9RJhRA (envelope-from ) for ; Fri, 03 Nov 2023 12:51:57 +0100 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 854393295C for ; Fri, 3 Nov 2023 12:51:56 +0100 (CET) Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=posteo.net header.s=2017 header.b=DL3weksp; dmarc=fail reason="SPF not aligned (strict)" header.from=posteo.net (policy=none); 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" ARC-Seal: i=1; s=key1; d=yhetil.org; t=1699012316; a=rsa-sha256; cv=none; b=uS7j+DS4sn8be4AbPRzTNGPg4vFbhT/dfHFIRYmRlv5e4rPc8BAwGAggA4ezdR5v0oJa3y 5UwxPpB+Zn1MZwWKTJc/8LyBPJcWYOkCFeEjmiDSBDymwUc3wIn8PEC1/4cMj+m58kU+Gg D3iA8UTt8GhWZydqSziUssvZbMx7SJeQGV3EB0SmaRmcMAxbX6U3/0wn9fQA39GBjRzGE+ jGEUkzfpSQD33eZdRQciL/uyUR7HXw+yiLuGt7jlxpLXajDC5Yiqu1+viGTnlS1jlwW/ec naUkW1A28q7Wo7LKJz8xUg2kQYsS7dftF0D01ZQiH+icoukKjZrm02dPEihV1Q== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=posteo.net header.s=2017 header.b=DL3weksp; dmarc=fail reason="SPF not aligned (strict)" header.from=posteo.net (policy=none); 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" ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1699012316; 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=nWNvv/wNFxfstx22P9cKDtTwtHDZAZe2RP+kjMncoMc=; b=aypqec02vhEqDO/8oWhImq4Y/BdRWevyExfJNzgHfnpjptoQgHy4Hbx41gFP60/J4D0z9C a55Hnw+EvsKnTs/3swZl/2Qtrmzd1eGXdEzl1CgTXYVo9h4aJpBbfQ3e5l7Me8k0QYeEAJ /qEFWYXj+rXYOkudkh+7dWQjfb8XvH7XfXxOtp2I44AFohFGluZ8XF0ge+IHosGUV2JS70 2w2H+qv/XREyNCzitQ24KxPE90yxL+t5fTSZcyfTERdCjKwLa5sFp/mAj/OUyuvQ04Pu5J CMEVpJ1IU2Ib9rAe4l818seiPRBeXuAtkL2HSu7OrdQKd8wh3WMiXpFIoWPBTQ== Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qysiF-0003FG-VR; Fri, 03 Nov 2023 07:51:45 -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 1qysi5-00039F-Qr for guix-patches@gnu.org; Fri, 03 Nov 2023 07:51:35 -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 1qysi4-00061f-3B for guix-patches@gnu.org; Fri, 03 Nov 2023 07:51:33 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qysid-0008GY-IX; Fri, 03 Nov 2023 07:52:07 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#64249] [PATCH v8 11/13] gnu: opam: Split build into smaller sub-packages. Resent-From: pukkamustard Original-Sender: "Debbugs-submit" Resent-CC: julien@lepiller.eu, pukkamustard@posteo.net, guix-patches@gnu.org Resent-Date: Fri, 03 Nov 2023 11:52:07 +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.169901229231625 (code B ref 64249); Fri, 03 Nov 2023 11:52:07 +0000 Received: (at 64249) by debbugs.gnu.org; 3 Nov 2023 11:51:32 +0000 Received: from localhost ([127.0.0.1]:57169 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qysi3-0008Dz-IV for submit@debbugs.gnu.org; Fri, 03 Nov 2023 07:51:32 -0400 Received: from mout01.posteo.de ([185.67.36.65]:49473) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qyshx-0008BW-0V for 64249@debbugs.gnu.org; Fri, 03 Nov 2023 07:51:28 -0400 Received: from submission (posteo.de [185.67.36.169]) by mout01.posteo.de (Postfix) with ESMTPS id D3897240027 for <64249@debbugs.gnu.org>; Fri, 3 Nov 2023 12:50:43 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1699012243; bh=IytCOYO+KOwhQG8M+MdMYCPdsgSw7BH7Q/gqLSvhWsw=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version: Content-Transfer-Encoding:From; b=DL3wekspSSWmD+M70spYkX/jnF/UqN2PbAvsZA2+SBCUqOBFu/JwKITwvtXcAaLQQ acfbXLGLcbmo4kmyPZyMjR8Sbt8kDhDQR4U6t0iSKeK73+4s4sELRsh3O7BG991ItA nlIiAtqLBRk/Gd2h+J/qt/aIH4LW2wA5Q5FjHXo8NHX5plsPfetBoEvG8Dsr1iqI+0 14iuXauvwEbUKoZUHYc5p1EXwrsE3kxd7MOdSubq70BRVk+OtvPz5BlhqXigrTtpJQ 1IUxaHocCyGfbraDfkiAxAehCp8gvqkkRIRSw7xd2NoyYs5vf6yduUx5NF6MwY+zDw 01mXqimVrYOpw== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4SMJwL6ymXz9rxX; Fri, 3 Nov 2023 12:50:42 +0100 (CET) From: pukkamustard Date: Fri, 3 Nov 2023 11:50:19 +0000 Message-ID: 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-Migadu-Queue-Id: 854393295C X-Migadu-Scanner: mx12.migadu.com X-Migadu-Spam-Score: -3.71 X-Spam-Score: -3.71 X-TUID: AvYl3qe6xnmT * gnu/packages/ocaml.scm (opam): Split build into smaller sub-packages. (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, ocaml-ocb-stubblr) [native-inputs]: Replace opam with opam-installer. --- gnu/packages/ocaml.scm | 263 ++++++++++++++++++++++++++++------------- 1 file changed, 183 insertions(+), 80 deletions(-) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index c448e64bc7..eccc870c08 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 @@ -846,9 +846,9 @@ (define-public ocaml-opam-file-format ;; With static-linking exception (license license:lgpl2.1+))) -(define-public opam +(define ocaml-opam-core (package - (name "opam") + (name "ocaml-opam-core") (version "2.1.3") (source (origin (method git-fetch) @@ -860,32 +860,151 @@ (define-public opam (base32 "1mw535zsw7xlvpgwnk1dan76z3f7lh5imlg0s6kdyhfg0iqisjd7")))) (build-system dune-build-system) + (arguments `(#:package "opam-core" + ;; tests are run with the opam package + #:tests? #f + #:phases + (modify-phases %standard-phases + (add-before 'build 'pre-build + (lambda* (#:key inputs make-flags #:allow-other-keys) + (let ((bash (assoc-ref inputs "bash")) + (bwrap (search-input-file inputs "/bin/bwrap"))) + (substitute* "src/core/opamSystem.ml" + (("\"/bin/sh\"") + (string-append "\"" bash "/bin/sh\"")) + (("getconf") + (which "getconf"))))))))) + (propagated-inputs + (list ocaml-graph + ocaml-re + ocaml-cppo)) + (inputs (list bubblewrap)) + (home-page "https://opam.ocamlpro.com/") + (synopsis "Package manager for OCaml") + (description + "OPAM is a tool to manage OCaml packages. It supports multiple +simultaneous compiler installations, flexible package constraints, and a +Git-friendly development workflow.") + ;; The 'LICENSE' file waives some requirements compared to LGPLv3. + (license license:lgpl3))) + +(define ocaml-opam-format + (package + (inherit ocaml-opam-core) + (name "ocaml-opam-format") + (inputs '()) + (propagated-inputs (list ocaml-opam-core + ocaml-opam-file-format + ocaml-re)) + (arguments `(#:package "opam-format" + ;; tests are run with the opam package + #: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) + (name "ocaml-opam-repository") + (inputs '()) + (propagated-inputs (list ocaml-opam-format)) + (arguments `(#:package "opam-repository" + ;; tests are run with the opam package + #:tests? #f + #:phases %standard-phases)))) + +(define ocaml-opam-state + (package + (inherit ocaml-opam-core) + (name "ocaml-opam-state") + (arguments `(#:package "opam-state" + ;; tests are run with the opam package + #:tests? #f + #:phases + (modify-phases %standard-phases + (add-before 'build 'pre-build + (lambda* (#:key inputs make-flags #:allow-other-keys) + (let ((bwrap (search-input-file inputs "/bin/bwrap"))) + ;; Use bwrap from the store directly. + (substitute* "src/state/shellscripts/bwrap.sh" + (("-v bwrap") (string-append "-v " bwrap)) + (("exec bwrap") (string-append "exec " bwrap)) + ;; Mount /gnu and /run/current-system in the + ;; isolated environment when building with opam. + ;; This is necessary for packages to find external + ;; dependencies, such as a C compiler, make, etc... + (("^add_sys_mounts /usr") + (string-append "add_sys_mounts " + (%store-directory) + " /run/current-system /usr"))))))))) + (inputs (list bubblewrap)) + (propagated-inputs (list ocaml-opam-repository)))) + +(define ocaml-opam-solver + (package + (inherit ocaml-opam-core) + (name "ocaml-opam-solver") + (inputs '()) + (propagated-inputs (list ocaml-opam-format + ocaml-mccs + ocaml-dose3)) + (arguments `(#:package "opam-solver" + ;; tests are run with the opam package + #:tests? #f + #:phases %standard-phases)))) + +(define ocaml-opam-client + (package + (inherit ocaml-opam-core) + (name "ocaml-opam-client") + (arguments `(#:package "opam-client" + ;; tests are run with the opam package + #:tests? #f + #:phases + (modify-phases %standard-phases + (add-before 'build 'pre-build + (lambda* (#:key inputs make-flags #:allow-other-keys) + (let ((bwrap (search-input-file inputs "/bin/bwrap"))) + (substitute* "src/client/opamInitDefaults.ml" + (("\"bwrap\"") (string-append "\"" bwrap "\""))))))))) + (inputs (list bubblewrap)) + (propagated-inputs + (list ocaml-opam-state + ocaml-opam-solver + ocaml-opam-repository + ocaml-base64 + ocaml-re + ocaml-cmdliner)))) + +(define-public opam + (package + (inherit ocaml-opam-core) + (name "opam") + (build-system dune-build-system) (arguments - `(#:phases + `(#:package "opam" + #:phases (modify-phases %standard-phases - (add-before 'build 'pre-build - (lambda* (#:key inputs make-flags #:allow-other-keys) - (let ((bash (assoc-ref inputs "bash")) - (bwrap (search-input-file inputs "/bin/bwrap"))) - (substitute* "src/core/opamSystem.ml" - (("\"/bin/sh\"") - (string-append "\"" bash "/bin/sh\"")) - (("getconf") - (which "getconf"))) - ;; Use bwrap from the store directly. - (substitute* "src/state/shellscripts/bwrap.sh" - (("-v bwrap") (string-append "-v " bwrap)) - (("exec bwrap") (string-append "exec " bwrap)) - ;; Mount /gnu and /run/current-system in the - ;; isolated environment when building with opam. - ;; This is necessary for packages to find external - ;; dependencies, such as a C compiler, make, etc... - (("^add_sys_mounts /usr") - (string-append "add_sys_mounts " - (%store-directory) - " /run/current-system /usr"))) - (substitute* "src/client/opamInitDefaults.ml" - (("\"bwrap\"") (string-append "\"" bwrap "\"")))))) (add-before 'check 'prepare-checks (lambda* (#:key inputs #:allow-other-keys) ;; Opam tests need to run an isolated environment from a writable @@ -966,22 +1085,11 @@ (define-public opam "0j9abisx3ifzm66ci3p45mngmz4f0fx7yd9jjxrz3f8w5jffc9ii")) ("opam-repo-f372039d" ,(opam-repo "f372039db86a970ef3e662adbfe0d4f5cd980701" "0ld7fcry6ss6fmrpswvr6bikgx299w97h0gwrjjh7kd7rydsjdws"))))) - (inputs - (list ocaml ncurses curl bubblewrap ocaml-cmdliner ocaml-dose3 - ocaml-mccs ocaml-opam-file-format ocaml-re)) + (inputs (list ocaml-opam-client)) (properties ;; OPAM 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)))) - (home-page "https://opam.ocamlpro.com/") - (synopsis "Package manager for OCaml") - (description - "OPAM is a tool to manage OCaml packages. It supports multiple -simultaneous compiler installations, flexible package constraints, and a -Git-friendly development workflow.") - - ;; The 'LICENSE' file waives some requirements compared to LGPLv3. - (license license:lgpl3))) + `((ocaml5.0-variant . ,(delay opam)))))) (define-public ocaml-opam-monorepo (package @@ -2204,7 +2312,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 @@ -2234,7 +2342,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 @@ -2349,7 +2457,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 @@ -2479,13 +2587,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") @@ -2526,9 +2634,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") @@ -2748,7 +2856,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") @@ -2872,7 +2980,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 @@ -3334,7 +3442,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) @@ -3368,7 +3476,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))) @@ -3398,7 +3506,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) @@ -3472,7 +3580,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 @@ -3613,7 +3721,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 @@ -3639,9 +3747,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))) @@ -3686,7 +3794,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" @@ -3727,9 +3835,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))) @@ -4147,7 +4255,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 @@ -5154,7 +5262,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))) @@ -5771,12 +5879,8 @@ (define-public ocaml-ocb-stubblr ;; Guix doesn't have cc, but it has gcc (("\"cc\"") "\"gcc\"")) #t))))) - (inputs - `(("topkg" ,ocaml-topkg) - ("opam" ,opam))) - (native-inputs - `(("astring" ,ocaml-astring) - ("ocamlbuild" ,ocamlbuild))) + (inputs (list ocaml-topkg opam-installer)) + (native-inputs (list ocaml-astring ocamlbuild)) (synopsis "OCamlbuild plugin for C stubs") (description "Ocb-stubblr is about ten lines of code that you need to repeat over, over, over and over again if you are using ocamlbuild to build @@ -5804,7 +5908,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) @@ -9524,7 +9628,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 @@ -9552,7 +9656,7 @@ (define-public ocaml-uucp (modify-phases %standard-phases (delete 'configure)))) (native-inputs - (list opam + (list opam-installer ocaml-findlib ocamlbuild ocaml-topkg @@ -9586,7 +9690,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 @@ -10047,8 +10151,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.41.0