From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp2 ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id wLZRMuqPEGFsXgEAgWs5BA (envelope-from ) for ; Mon, 09 Aug 2021 04:16:10 +0200 Received: from aspmx1.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp2 with LMTPS id WIv9LeqPEGGBdwAAB5/wlQ (envelope-from ) for ; Mon, 09 Aug 2021 02:16:10 +0000 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 3E53018197 for ; Mon, 9 Aug 2021 04:16:10 +0200 (CEST) Received: from localhost ([::1]:48402 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mCupl-0006PN-4y for larch@yhetil.org; Sun, 08 Aug 2021 22:16:09 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:43688) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mCupe-0006Ov-PN for guix-patches@gnu.org; Sun, 08 Aug 2021 22:16:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:43573) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mCupe-0002wn-Is for guix-patches@gnu.org; Sun, 08 Aug 2021 22:16:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mCupe-0004o8-EL for guix-patches@gnu.org; Sun, 08 Aug 2021 22:16:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#49950] [PATCH] Update opam and dune Resent-From: Julien Lepiller Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 09 Aug 2021 02:16:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 49950 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 49950@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.162847531118415 (code B ref -1); Mon, 09 Aug 2021 02:16:02 +0000 Received: (at submit) by debbugs.gnu.org; 9 Aug 2021 02:15:11 +0000 Received: from localhost ([127.0.0.1]:55119 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mCuol-0004mp-VU for submit@debbugs.gnu.org; Sun, 08 Aug 2021 22:15:11 -0400 Received: from lists.gnu.org ([209.51.188.17]:35904) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mCuoh-0004mO-Iq for submit@debbugs.gnu.org; Sun, 08 Aug 2021 22:15:06 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:43648) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mCuoh-0006LV-2i for guix-patches@gnu.org; Sun, 08 Aug 2021 22:15:03 -0400 Received: from lepiller.eu ([2a00:5884:8208::1]:43828) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mCuoe-00029J-Bd for guix-patches@gnu.org; Sun, 08 Aug 2021 22:15:02 -0400 Received: from lepiller.eu (localhost [127.0.0.1]) by lepiller.eu (OpenSMTPD) with ESMTP id f06e1cbb for ; Mon, 9 Aug 2021 02:14:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed; d=lepiller.eu; h=date:from :to:subject:message-id:mime-version:content-type; s=dkim; bh=QSE BKqwcRyrc/o+LxTz4G74QD3YcsEaHjfN4rc5gFqc=; b=PaNHIIc1/lrOS8vKUgd brCR4hfi3N5p7dtCGcyWzY+DmyRNEKF/MdgDGmCs1PYEMOrmVbwONt3w+gOUdEma 0hzBe53SEM5+KzoSY+n9gH6Y7Qd4cR8cc8bpvrPOM6zzxP1J3MIj2IwScc5GEf3H 4O8ug5m82A6cJa9feV5GvJKRLMCf0SA/SBPPVeyKZL5tpxrnI2Dj6GkpQj2mGEyd MLqk1GkI7bvw+CTPG0dlLB7ChohSPmYdqHht5l8KJAraYWYoa9HhKqv/2JAPRRBB 064KANY1bRjyrwQy8GBCAw7qJNiJIOUlmSabWz7D++UBFIBJU1meTBIQdCz12XiF Trg== Received: by lepiller.eu (OpenSMTPD) with ESMTPSA id 57e454f2 (TLSv1.3:AEAD-AES256-GCM-SHA384:256:NO) for ; Mon, 9 Aug 2021 02:14:53 +0000 (UTC) Date: Mon, 9 Aug 2021 04:14:44 +0200 From: Julien Lepiller Message-ID: <20210809041444.613748a7@tachikoma.lepiller.eu> X-Mailer: Claws Mail 3.18.0 (GTK+ 2.24.32; x86_64-pc-linux-gnu) MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="MP_/2tLrTx5RrkrNgm9kwFvi5ls" Received-SPF: pass client-ip=2a00:5884:8208::1; envelope-from=julien@lepiller.eu; helo=lepiller.eu X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action 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" X-Migadu-Flow: FLOW_IN ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1628475370; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type:resent-cc:resent-from:resent-sender: resent-message-id:list-id:list-help:list-unsubscribe:list-subscribe: list-post:dkim-signature; bh=TY/jI/JatCEkvJ3Tock3SU1OtIbgfrR2yJrtKqnRNkg=; b=FMWCeZzHph2AOx8otIJmX0VjQL8D3ipuU9qT4FPwRGRcTl2sTozsuk+1lLBVOxgVSyhGlE RkGeof9QZUQnlnR0vcKGh6YrtpBdGw0MMZSf57lJgmKcvkIjatE88ZOX96vJBh8FMAllKw ybfTstyXgCMWBaCsn0IlGJeV8j7NsI6blcZf7BMv5Q94D4h5LVBy9P5LKHeOXf39x/LuTQ CFCbG+ZtbUav+DIAaSwI+khkFsZy/qW2zqlzkuW39EhqJrPd9tL/iifMSoQ9uSdiHxF8d+ Tl5lGVtl5WJgRnd9QqLolUzzxgjU6Pu2YKLITG/kUtDGJyozE7KFMMfk58eHoQ== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1628475370; a=rsa-sha256; cv=none; b=eXlZqcP+GhZRsK/gkd12ab4GHwaZ9+CPR+tMwL0HLwKyTpGXTP5ZXZeVbI7zShBKGK3Fjc yrRstrtgeoIItpGqabiJ7KOxT2kSW9ufEQQrpZ+7RV9gMoWkqnf+MY0p0fhBIhSB+8W3Ev 11CwlFJhHCnFQ/aiqQgW9F0WW3bZftD/DoD8yago8Dim9mYIbq8J3NM+oNBhANhA38o4Rf xbSP+CgH/Qwm3AvKLWWYN5f4EOkgLC2uMnvn8Yss80yKkweQBCL5St24wPHF7rRpBeSJgu frywI8jyZMgvNAIce8n8Tzk2rtRWw10fuhuc1ePwG6XLTrmODB55U8j1OVdN6A== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=lepiller.eu header.s=dkim header.b=PaNHIIc1; dmarc=fail reason="SPF not aligned (relaxed)" header.from=lepiller.eu (policy=none); spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Migadu-Spam-Score: -1.31 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=lepiller.eu header.s=dkim header.b=PaNHIIc1; dmarc=fail reason="SPF not aligned (relaxed)" header.from=lepiller.eu (policy=none); spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Migadu-Queue-Id: 3E53018197 X-Spam-Score: -1.31 X-Migadu-Scanner: scn1.migadu.com X-TUID: X0OefpV5TykH --MP_/2tLrTx5RrkrNgm9kwFvi5ls Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Content-Disposition: inline Hi Guix! This small series updates opam and dune. Opam was surprisingly difficult to update, after the switch to dune, but I had to update it because the previous version we had doesn't build with the new dune. The most difficult part was making the tests pass, as they require network access. For some of them, I was able to download the files in advance (see opam-repo in the inputs), and change the tests to use that, fix shebangs, ... I still had to disable three tests: one that runs opam and let it clone a git repository, one that fails only because of a difference in text formating (it's expected to be on one line, but actually is nicely formated), and one that compares a generated dune file with the one that was just modified. also ocaml-markup fails with the new dune, so I updated it to the latest version. --MP_/2tLrTx5RrkrNgm9kwFvi5ls Content-Type: text/x-patch Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename=0001-gnu-ocaml-markup-Update-to-1.0.2.patch >From 8b17bf14e9892b26b049c530365c6a41b1231838 Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Mon, 9 Aug 2021 03:57:38 +0200 Subject: [PATCH 1/4] gnu: ocaml-markup: Update to 1.0.2. * gnu/packages/ocaml.scm (ocaml-markup): Update to 1.0.2. --- gnu/packages/ocaml.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 112751ddec..923d7b1704 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -6432,7 +6432,7 @@ the full Core is not available, such as in Javascript.") (define-public ocaml-markup (package (name "ocaml-markup") - (version "1.0.0") + (version "1.0.2") (home-page "https://github.com/aantron/markup.ml") (source (origin @@ -6443,7 +6443,7 @@ the full Core is not available, such as in Javascript.") (file-name (git-file-name name version)) (sha256 (base32 - "09hkrf9pw6hpb9j06p5bddklpnjwdjpqza3bx2179l970yl67an9")))) + "1kvqwrrcrys5d0kzdwxcj66jpi6sdhfas4pcg02pixx92q87vhqm")))) (build-system dune-build-system) (arguments `(#:package "markup")) -- 2.32.0 --MP_/2tLrTx5RrkrNgm9kwFvi5ls Content-Type: text/x-patch Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename=0002-gnu-ocaml-opam-file-format-Update-to-2.1.3.patch >From d76314465a79fe531c05f3849f5e609c175362aa Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Mon, 9 Aug 2021 03:24:08 +0200 Subject: [PATCH 2/4] gnu: ocaml-opam-file-format: Update to 2.1.3. * gnu/packages/ocaml.scm (ocaml-opam-file-format): Update to 2.1.3. --- gnu/packages/ocaml.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 923d7b1704..11f7eff267 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -747,7 +747,7 @@ let () = String.split_on_char ':' (Sys.getenv \"OCAMLPATH\") (define-public ocaml-opam-file-format (package (name "ocaml-opam-file-format") - (version "2.0.0") + (version "2.1.3") (source (origin (method git-fetch) (uri (git-reference @@ -756,7 +756,7 @@ let () = String.split_on_char ':' (Sys.getenv \"OCAMLPATH\") (file-name (git-file-name name version)) (sha256 (base32 - "0fqb99asnair0043hhc8r158d6krv5nzvymd0xwycr5y72yrp0hv")))) + "1fxhppdmrysr2nb5z3c448h17np48f3ga9jih33acj78r4rdblcs")))) (build-system ocaml-build-system) (arguments `(#:tests? #f; No tests -- 2.32.0 --MP_/2tLrTx5RrkrNgm9kwFvi5ls Content-Type: text/x-patch Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename=0003-gnu-opam-Update-to-2.1.0.patch >From 66cc97fb59324387a3d829e1dbe7382e5511fe6a Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Mon, 9 Aug 2021 03:20:06 +0200 Subject: [PATCH 3/4] gnu: opam: Update to 2.1.0. * gnu/packages/ocaml.scm (opam): Update to 2.1.0. --- gnu/packages/ocaml.scm | 158 +++++++++++++++++++++++------------------ 1 file changed, 89 insertions(+), 69 deletions(-) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 11f7eff267..230d9d1e03 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -77,6 +77,7 @@ #:use-module (gnu packages texinfo) #:use-module (gnu packages time) #:use-module (gnu packages tls) + #:use-module (gnu packages version-control) #:use-module (gnu packages virtualization) #:use-module (gnu packages web) #:use-module (gnu packages web-browsers) @@ -775,7 +776,7 @@ the opam file format.") (define-public opam (package (name "opam") - (version "2.0.8") + (version "2.1.0") (source (origin (method git-fetch) (uri (git-reference @@ -784,78 +785,97 @@ the opam file format.") (file-name (git-file-name name version)) (sha256 (base32 - "1z0ls6xxa4ws5xw0am5gxmh5apnmyhgkcphrncp53w34j8sfydsj")))) - (build-system ocaml-build-system) + "12l7l4pbzy71k1yc7ym5aczajszvc9bqkdnfg8xhqc8ch8j1h1lj")))) + (build-system dune-build-system) (arguments - `(#:configure-flags - (list (string-append "SHELL=" - (assoc-ref %build-inputs "bash") - "/bin/sh")) + `(#:test-target "." + #: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 (string-append (assoc-ref inputs "bubblewrap") + "/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") + "add_sys_mounts /gnu /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 + ;; home directory. + (mkdir-p "test-home") + (setenv "HOME" (string-append (getcwd) "/test-home")) - ;; For some reason, 'ocp-build' needs $TERM to be set. - #:make-flags - (list "TERM=screen" - (string-append "SHELL=" - (assoc-ref %build-inputs "bash") - "/bin/sh")) - - #:test-target "tests" - - #: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 (string-append (assoc-ref inputs "bubblewrap") - "/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") - "add_sys_mounts /gnu /run/current-system /usr")) - (substitute* "src/client/opamInitDefaults.ml" - (("\"bwrap\"") (string-append "\"" bwrap "\""))) - ;; Generating the documentation needs write access - (for-each - (lambda (f) (chmod f #o644)) - (find-files "doc" ".")) - #t))) - (add-before 'check 'pre-check - (lambda _ - ;; The "repo" test attempts to open some of these files O_WRONLY - ;; and fails with a bogus "OpamSystem.File_not_found" otherwise. - (for-each - (lambda (f) (chmod f #o644)) - (find-files "tests/packages" "\\.opam$")) - - (substitute* "tests/Makefile" - (("/usr/bin/printf") - (which "printf")) - ;; By default tests run twice: once with a "local" repository - ;; and once with a git repository: disable the git tests to - ;; avoid the dependency. - (("all: local git") - "all: local")) - #t))))) + ;; Opam tests require data from opam-repository. Instead of + ;; downloading them with wget from the guix environment, copy the + ;; content to the expected directory. + (substitute* "tests/reftests/dune.inc" + (("tar -C.*opam-archive-([0-9a-f]*)[^)]*" _ commit) + (string-append "rmdir %{targets}) (run cp -r " + (assoc-ref inputs (string-append "opam-repo-" commit)) + "/ %{targets}) (run chmod +w -R %{targets}")) + (("wget[^)]*") "touch %{targets}") + ;; Disable a failing test because of different line wrapping + (("diff cli-versioning.test cli-versioning.out") "run true") + ;; Disable a failing test because it tries to clone a git + ;; repository from inside bwrap + (("diff upgrade-format.test upgrade-format.out") "run true")) + (substitute* "tests/reftests/dune" + ;; Because of our changes to the previous file, we cannot check + ;; it can be regenerated + (("diff dune.inc dune.inc.gen") "run true")) + ;; Ensure we can run the generated build.sh (no /bin/sh) + (substitute* '("tests/reftests/legacy-local.test" + "tests/reftests/legacy-git.test") + (("#! ?/bin/sh") (string-append "#!" (assoc-ref inputs "bash") + "/bin/sh"))) + (substitute* "tests/reftests/testing-env" + (("OPAMSTRICT=1") + (string-append "OPAMSTRICT=1\nLIBRARY_PATH=" + (assoc-ref inputs "libc") "/lib")))))))) (native-inputs - `(("dune" ,dune) - ("ocaml-cppo" ,ocaml-cppo) + (let ((opam-repo (lambda (commit hash) + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/ocaml/opam-repository") + (commit commit))) + (file-name (git-file-name "opam-repo" commit)) + (sha256 (base32 hash)))))) + `(("dune" ,dune) + ("ocaml-cppo" ,ocaml-cppo) - ;; For tests. - ("openssl" ,openssl) - ("python" ,python-wrapper) - ("rsync" ,rsync) - ("unzip" ,unzip) - ("which" ,which))) + ;; For tests. + ("git" ,git) + ("openssl" ,openssl) + ("python" ,python-wrapper) + ("rsync" ,rsync) + ("unzip" ,unzip) + ("which" ,which) + + ;; Data for tests + ("opam-repo-009e00fa" ,(opam-repo "009e00fa86300d11c311309a2544e5c6c3eb8de2" + "1wwy0rwrsjf4q10j1rh1dazk32fbzhzy6f7zl6qmndidx9b1bq7w")) + ("opam-repo-ad4dd344" ,(opam-repo "ad4dd344fe5cd1cab49ced49d6758a9844549fb4" + "1a1qj47kj8xjdnc4zc50ijrix1kym1n7k20n3viki80a7518baw8")) + ("opam-repo-c1d23f0e" ,(opam-repo "c1d23f0e17ec83a036ebfbad1c78311b898a2ca0" + "0j9abisx3ifzm66ci3p45mngmz4f0fx7yd9jjxrz3f8w5jffc9ii")) + ("opam-repo-f372039d" ,(opam-repo "f372039db86a970ef3e662adbfe0d4f5cd980701" + "0ld7fcry6ss6fmrpswvr6bikgx299w97h0gwrjjh7kd7rydsjdws"))))) (inputs `(("ocaml" ,ocaml) ("ncurses" ,ncurses) -- 2.32.0 --MP_/2tLrTx5RrkrNgm9kwFvi5ls Content-Type: text/x-patch Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename=0004-gnu-ocaml-dune-Update-to-2.9.0.patch >From 3fe708407a881e3e5e306e4461e44d31bb0e9c9d Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Sun, 8 Aug 2021 22:53:27 +0200 Subject: [PATCH 4/4] gnu: ocaml-dune: Update to 2.9.0. * gnu/packages/ocaml.scm (dune): Update to 2.9.0. --- gnu/packages/ocaml.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 230d9d1e03..efbd03aa56 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -1625,7 +1625,7 @@ full_split, cut, rcut, etc..") (define dune-bootstrap (package (name "dune") - (version "2.8.5") + (version "2.9.0") (source (origin (method git-fetch) (uri (git-reference @@ -1634,7 +1634,7 @@ full_split, cut, rcut, etc..") (file-name (git-file-name name version)) (sha256 (base32 - "0a1jj6njzsfjgklsirs6a79079wg4jhy6n888vg3dgp44awwq5jn")))) + "01np4jy0f3czkpzkl38k9b4lsh41qk52ldaqxl98mgigyzhx4w0b")))) (build-system ocaml-build-system) (arguments `(#:tests? #f; require odoc -- 2.32.0 --MP_/2tLrTx5RrkrNgm9kwFvi5ls--