From patchwork Fri Sep 15 14:23:08 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Benjamin X-Patchwork-Id: 53916 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 4C76627BBEA; Fri, 15 Sep 2023 15:25:14 +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_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham 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 690F427BBE2 for ; Fri, 15 Sep 2023 15:25:12 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qh9kf-0004Ec-8f; Fri, 15 Sep 2023 10:24:57 -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 1qh9kd-0004EL-NK for guix-patches@gnu.org; Fri, 15 Sep 2023 10:24:55 -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 1qh9kd-0001Xx-FN for guix-patches@gnu.org; Fri, 15 Sep 2023 10:24:55 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qh9kj-0001pJ-T3; Fri, 15 Sep 2023 10:25:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#66000] [PATCH 1/1] gnu: dune-bootstrap: Update to 3.10.0. Resent-From: Benjamin Original-Sender: "Debbugs-submit" Resent-CC: julien@lepiller.eu, pukkamustard@posteo.net, guix-patches@gnu.org Resent-Date: Fri, 15 Sep 2023 14:25:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 66000 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 66000@debbugs.gnu.org Cc: Benjamin , Julien Lepiller , pukkamustard X-Debbugs-Original-Xcc: Julien Lepiller , pukkamustard Received: via spool by 66000-submit@debbugs.gnu.org id=B66000.16947878496950 (code B ref 66000); Fri, 15 Sep 2023 14:25:01 +0000 Received: (at 66000) by debbugs.gnu.org; 15 Sep 2023 14:24:09 +0000 Received: from localhost ([127.0.0.1]:44412 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qh9js-0001o1-Su for submit@debbugs.gnu.org; Fri, 15 Sep 2023 10:24:09 -0400 Received: from mail.uvy.fr ([146.59.197.40]:36576) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qh9jq-0001nE-T8 for 66000@debbugs.gnu.org; Fri, 15 Sep 2023 10:24:07 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=uvy.fr; s=202105; t=1694787834; bh=xKeZVcLyrkVzMHS2JRma4KmdKBOmSxivYkyCYNuXDm0=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=CgeHGqZ8KFwcXGXOumkpf0MmsovxLEmNzFV2Nz4KqS1T13p9T7XklMouytTDKaJmG iTDw4cUrKucLRiz7Rb5Jkn83nP3AqjzLNLfy7rtYttGAEK3jgKAB8NwiU12PlF7PAm ft/tdP939z1WVwvom3cnjSDRd0xzfkNXW1+O4CzRMOotZHMCswmnijn5fnFYifI6op KlSeqBiL8TcyTjY9bMP+o7iMbe8OmtHht8lPGDFNGuRJSXJVHHLmjHZpQYelXetw7E ZMRzGDUwl+KE6NtkThsgDSz9Uvhu7n8GYWP2NuN/xFm8kF+tbCPZVollJxlcY1TFGi zOOAT+j2SX22Q== From: Benjamin Date: Fri, 15 Sep 2023 16:23:08 +0200 Message-ID: X-Mailer: git-send-email 2.41.0 In-Reply-To: References: 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-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/ocaml.scm (dune-bootstrap): Update to 3.10.0. old version of dune is kept to be compatible with coq --- gnu/packages/coq.scm | 3 +++ gnu/packages/ocaml.scm | 31 +++++++++++++++++++++++-------- 2 files changed, 26 insertions(+), 8 deletions(-) diff --git a/gnu/packages/coq.scm b/gnu/packages/coq.scm index 09ca4030ea..a3f48648e4 100644 --- a/gnu/packages/coq.scm +++ b/gnu/packages/coq.scm @@ -84,6 +84,7 @@ (define-public coq-core (list ocaml-ounit2 which)) (arguments `(#:package "coq-core" + #:dune ,dune-3.6.1 #:test-target ".")) (properties '((upstream-name . "coq"))) ; also for inherited packages (home-page "https://coq.inria.fr") @@ -103,6 +104,7 @@ (define-public coq-stdlib (arguments `(#:package "coq-stdlib" #:test-target "." + #:dune ,dune-3.6.1 #:phases (modify-phases %standard-phases (add-before 'build 'fix-dune @@ -145,6 +147,7 @@ (define-public coq-ide (name "coq-ide") (arguments `(#:tests? #f + #:dune ,dune-3.6.1 #:package "coqide")) (propagated-inputs (list coq coq-ide-server)) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 8ff755aea9..b5713c37d6 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -1818,7 +1818,7 @@ (define-public ocaml-stringext (define dune-bootstrap (package (name "dune") - (version "3.6.1") + (version "3.10.0") (source (origin (method git-fetch) (uri (git-reference @@ -1827,7 +1827,7 @@ (define dune-bootstrap (file-name (git-file-name name version)) (sha256 (base32 - "0gv851wxbv5ln20429nj7p92spzxgw8vngg9z94q39aawn6q8lx6")))) + "0zwih4fwwrc8lwi2i4mmps9ng7z6mf46pps2i503lmx0dh8dl606")))) (build-system ocaml-build-system) (arguments `(#:tests? #f; require odoc @@ -1947,6 +1947,21 @@ (define-public ocaml5.0-dune (propagated-inputs (list ocaml5.0-dune-configurator)))) +(define-public dune-3.6.1 + (package + (inherit dune-bootstrap) + (name "dune") + (version "3.6.1") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/ocaml/dune") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0gv851wxbv5ln20429nj7p92spzxgw8vngg9z94q39aawn6q8lx6")))))) + (define-public ocaml-csexp (package (name "ocaml-csexp") @@ -2180,7 +2195,7 @@ (define-public ocaml-ppx-bitstring (description "This package provides a way to write bitstrings and matching over bitsrings in Erlang style as primitives to the language."))) - + (define-public ocaml-result (package (name "ocaml-result") @@ -2223,7 +2238,7 @@ (define-public ocaml5.0-result `(#:dune ,ocaml5.0-dune-bootstrap #:ocaml ,ocaml-5.0 #:findlib ,ocaml5.0-findlib)))) - + (define-public ocaml-topkg (package (name "ocaml-topkg") @@ -2253,7 +2268,7 @@ (define-public ocaml-topkg configuration and to specify information about the package's distribution, creation and publication procedures.") (license license:isc))) - + (define-public ocaml-rresult (package (name "ocaml-rresult") @@ -3772,7 +3787,7 @@ (define-public ocaml-jsonm the JSON data format. It can process JSON text without blocking on IO and without a complete in-memory representation of the data.") (license license:isc))) - + (define-public ocaml-ocp-indent (package (name "ocaml-ocp-indent") @@ -3807,7 +3822,7 @@ (define-public ocaml-ocp-indent fault-tolerant and approximate parsing. @end itemize") (license license:lgpl2.1))) - + (define-public ocaml-ocp-index (package (name "ocaml-ocp-index") @@ -6138,7 +6153,7 @@ (define-public ocaml-yojson yojson package. The program @code{atdgen} can be used to derive OCaml-JSON serializers and deserializers from type definitions.") (license license:bsd-3))) - + (define-public ocaml-merlin-lib (package (name "ocaml-merlin-lib")