From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp10.migadu.com ([2001:41d0:403:58f0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms8.migadu.com with LMTPS id qJEzCyafTGUC3AAAG6o9tA:P1 (envelope-from ) for ; Thu, 09 Nov 2023 09:58:14 +0100 Received: from aspmx1.migadu.com ([2001:41d0:403:58f0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp10.migadu.com with LMTPS id qJEzCyafTGUC3AAAG6o9tA (envelope-from ) for ; Thu, 09 Nov 2023 09:58:14 +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 67E233AB7F for ; Thu, 9 Nov 2023 09:58:13 +0100 (CET) Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=nanein.fr header.s=mail header.b=LL+Lc5gl; dmarc=pass (policy=none) header.from=gnu.org; 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=1699520294; a=rsa-sha256; cv=none; b=nrMag78WkSs/NoEPDQ/QmaQoL0JaPEVTLNaOg5w5hoWnUV+HNckQne+mMkuX7lZOA2/kA5 obqyMI5Fr5UXuCJ65fwfyssA1pLk8jL09wZkTBYQQi15F2d8ersPGKMSGePZJ3trK+S+ZM Y2lWNJVA32qQCFOZQdrgOZkKlP7io/cUOab7CfPUNUoh8XA1L9HTxDEverdgFAqNz/RZX6 cnCCTYl6E/FF6M/vehIm9IJi/uPWSfTGv/fz/SZq/ecS+d9GzmEW0lp3ehBQcnOgM2Yo36 IWCccrNSySL6WyW2dfexsBNaEtZzVBT64tBo8FK/Ykuj683ctO4KRdo19/t0TQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1699520294; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: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=AAmZvPjh2jDa1kXW915uWAQmwGUFIw7JcPREoVA6r/0=; b=ofdW7/GZ/Skb4bI26A4Z7UJSbSwWrK/1C5qut47CEuMCXn5V65E91Z+JYCWJf/u3aoiDHQ xQznPgRBhe2Wej/pMJ5HXuKkQ5AeC6n0KCOiq1VkG1+10cjc4Axi1/Rxc3SrUk/eBxBmTY 10lJyJwKhmv3FCEby9OSchmThqMkTZe8piecQsSyfZAhRcIhiYeRikufqnMxzILmwwa1Wu 5Qxvys3n+beockBJG6wAJWTj2Jm2FbkZazSW5JW5TNVEr9tLthuY7aIXPY685mPMT1pWHZ F1QgotYRPL/e9ZusyunWzM1aiC1pcrWdtC1h8zKJ5tPqAh5/97On1dcxBxRKOQ== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=nanein.fr header.s=mail header.b=LL+Lc5gl; dmarc=pass (policy=none) header.from=gnu.org; 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" Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1r10rK-0006ze-3f; Thu, 09 Nov 2023 03:57:54 -0500 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 1r0quP-0007uN-5S for guix-patches@gnu.org; Wed, 08 Nov 2023 17:20:25 -0500 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 1r0quO-0005LK-Tq for guix-patches@gnu.org; Wed, 08 Nov 2023 17:20:24 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1r0qv1-000750-Ag for guix-patches@gnu.org; Wed, 08 Nov 2023 17:21:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#64249] [PATCH v8 13/13] gnu: opam: Update to 2.1.5. Resent-From: DABY-SEESARAM Arnaud Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 08 Nov 2023 22:21:03 +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: pukkamustard Cc: 64249@debbugs.gnu.org, DABY-SEESARAM Arnaud Received: via spool by 64249-submit@debbugs.gnu.org id=B64249.169948203527151 (code B ref 64249); Wed, 08 Nov 2023 22:21:03 +0000 Received: (at 64249) by debbugs.gnu.org; 8 Nov 2023 22:20:35 +0000 Received: from localhost ([127.0.0.1]:46423 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r0quV-00073h-98 for submit@debbugs.gnu.org; Wed, 08 Nov 2023 17:20:35 -0500 Received: from nanein.fr ([185.230.78.41]:42226) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r0o1h-00026c-4O for 64249@debbugs.gnu.org; Wed, 08 Nov 2023 14:15:48 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=nanein.fr; s=mail; t=1699470899; bh=onr2yA6/z9cd5OJcLS7S9CldIGDHVOEoBG+A05PtT6k=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=LL+Lc5glsyYTWIrwJNhiTjPIhqb1LLP/j+rz+KJjL8Oy8Ut4bZ55EBG6N+Dxg7/3x TA9DfbzGCRih+ozbWFR5Jtde6o8YFXZdjpfHHVGPZnlX2sNqRPBImqh2JV0DE/P1pc 8HYp38McrZkcCZKZcPzcqBuMGqMckGrFq9ywf0KBylQWEwG+oAhZ4mXpJ8xAJQfDME lm2RPKzt0GqRY1Iw93N/82SNGmxIIDWzZbSFb9u8PunEhZ5pMe3pfaO99Dt0jM+Vto xBr8e3qx74Y0UdbTANsRlZ3EmyJTOzJebmkpECZM2ycUzzEjnbLarHr77OIQut8qyG 6RWYRsqn5tl4U4ri9N4x+qm3CKKBs7+y+9xG5HO5vqvxhVDoN+FozLxGNuymyXxekK kVwiSbFAxncVRvNZqTngtPS/H9XisCqpPE8m4vvETlbrQYfXtGzeeZM1JkrF5PF/53 lxVMJwof7YCQnZUOTGBQnckPTAC51uMwkyk2t5F9iDhEtReou/QUjGZaeCuE2sny5y HRYD0GtzyDdThBPs+MFlIi6mqgvrrIkeI+NRPwWDD0jfMvib9rrNUy6K/Zt1mgVYcv ZXE3Wpgg3WT93RBHgWZo3qI/KVJS6Mku97jxLkhBeh7zHTyd12dIKp8y7lTzPKA6dw Xb1CLZhTQIo5a99BQlfkdbNQ= Received: from Arnaud (6.17.61.188.dynamic.wline.res.cust.swisscom.ch [188.61.17.6]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (prime256v1) server-digest SHA256) (No client certificate requested) by nanein.fr (Postfix) with ESMTPSA id 425FF1401F5; Wed, 8 Nov 2023 20:14:59 +0100 (CET) Date: Wed, 8 Nov 2023 20:14:53 +0100 Message-ID: References: MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="1hVIeNX3usid+aq1" Content-Disposition: inline In-Reply-To: X-Mailman-Approved-At: Wed, 08 Nov 2023 17:20:27 -0500 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-Mailman-Approved-At: Thu, 09 Nov 2023 03:57:52 -0500 X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-to: DABY-SEESARAM Arnaud X-ACL-Warn: , DABY-SEESARAM Arnaud via Guix-patches From: DABY-SEESARAM Arnaud via Guix-patches via 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-Scanner: mx11.migadu.com X-Spam-Score: -6.71 X-Migadu-Queue-Id: 67E233AB7F X-Migadu-Spam-Score: -6.71 X-TUID: p2Ue/k5+809A --1hVIeNX3usid+aq1 Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Hi, After applying V8 series, I could build - all packages starting by "coq", - all packages starting by "ocaml" which do not start by "ocaml4.07". (I used the guile function `fold-packages` to check this). Some packages still fail to build. - At least some ocaml4.07* packages are broken. I have not looked at them, as some of them seem to be broken on master=20 as well. - why3 was broken. Upgrading it to 1.6.0 fixes it. - frama-c was broken. This too could be fixed by upgrading frama-c. The build process of frama-c has changed between the last packaged=20 version (24.0-Chromium) and the current one (27.1-Cobalt). I was able to get frama-c 27.1 to build by switching from=20 ocaml-build-system to dune-build-system and adding a few new=20 dependencies. Although it is not very satisfying yet, as I had to=20 disable tests for some of these dependencies. I can send you my additional patches to complete the V8 series if you=20 wish. Best, --=20 ds-ac Le Fri, Nov 03, 2023 at 11:50:21AM +0000, pukkamustard a =E9crit > * gnu/packages/ocaml.scm (opam): Update to 2.1.5. > [native-inputs]: Add more test data. > [arguments]: Disable failing test. > (ocaml-graph): Update to 2.0.0. > (ocaml-dose3): Update to 7.0.0. > * gnu/packages/patches/ocaml-dose3-Fix-for-ocaml-4.06.patch: Remove. > * gnu/packages/patches/ocaml-dose3-Install-mli-cmx-etc.patch: Remove. > * gnu/packages/patches/ocaml-dose3-add-unix-dependency.patch: Remove. > * gnu/packages/patches/ocaml-dose3-dont-make-printconf.patch: Remove. > * gnu/local.mk (dist_path_DATA): Unregister removed patches. > --- > gnu/local.mk | 4 - > gnu/packages/ocaml.scm | 132 +++++++++-------- > .../ocaml-dose3-Fix-for-ocaml-4.06.patch | 52 ------- > .../ocaml-dose3-Install-mli-cmx-etc.patch | 133 ------------------ > .../ocaml-dose3-add-unix-dependency.patch | 25 ---- > .../ocaml-dose3-dont-make-printconf.patch | 9 -- > 6 files changed, 74 insertions(+), 281 deletions(-) > delete mode 100644 gnu/packages/patches/ocaml-dose3-Fix-for-ocaml-4.06.p= atch > delete mode 100644 gnu/packages/patches/ocaml-dose3-Install-mli-cmx-etc.= patch > delete mode 100644 gnu/packages/patches/ocaml-dose3-add-unix-dependency.= patch > delete mode 100644 gnu/packages/patches/ocaml-dose3-dont-make-printconf.= patch >=20 > diff --git a/gnu/local.mk b/gnu/local.mk > index 22aeebc0b6..5e5c948e68 100644 > --- a/gnu/local.mk > +++ b/gnu/local.mk > @@ -1691,10 +1691,6 @@ dist_patch_DATA =3D \ > %D%/packages/patches/nvi-db4.patch \ > %D%/packages/patches/nyacc-binary-literals.patch \ > %D%/packages/patches/obs-modules-location.patch \ > - %D%/packages/patches/ocaml-dose3-add-unix-dependency.patch \ > - %D%/packages/patches/ocaml-dose3-Fix-for-ocaml-4.06.patch \ > - %D%/packages/patches/ocaml-dose3-dont-make-printconf.patch \ > - %D%/packages/patches/ocaml-dose3-Install-mli-cmx-etc.patch \ > %D%/packages/patches/ocaml-multiple-definitions.patch \ > %D%/packages/patches/ocaml-4.07-dynamically-allocate-signal-stack.patc= h \ > %D%/packages/patches/ocaml-4.09-dynamically-allocate-signal-stack.patc= h \ > diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm > index 8fd2f2a3cf..12c8d5c27d 100644 > --- a/gnu/packages/ocaml.scm > +++ b/gnu/packages/ocaml.scm > @@ -713,7 +713,7 @@ (define-public ocaml-mccs > (define-public ocaml-dose3 > (package > (name "ocaml-dose3") > - (version "5.0.1") > + (version "7.0.0") > (source (origin > (method git-fetch) > (uri (git-reference > @@ -722,29 +722,16 @@ (define-public ocaml-dose3 > (file-name (git-file-name name version)) > (sha256 > (base32 > - "0dxkw37gj8z45kd0dnrlfgpj8yycq0dphs8kjm9kvq9xc8rikxp3")) > - (patches > - (search-patches > - "ocaml-dose3-add-unix-dependency.patch" > - "ocaml-dose3-Fix-for-ocaml-4.06.patch" > - "ocaml-dose3-dont-make-printconf.patch" > - "ocaml-dose3-Install-mli-cmx-etc.patch")))) > - (build-system ocaml-build-system) > - (arguments > - `(#:tests? #f ;the test suite requires python 2 > - #:configure-flags > - ,#~(list (string-append "SHELL=3D" > - #+(file-append (canonical-package bash-mi= nimal) > - "/bin/sh"))) > - #:make-flags > - ,#~(list (string-append "LIBDIR=3D" #$output "/lib/ocaml/site-lib= ")))) > - (propagated-inputs > - (list ocaml-graph ocaml-cudf ocaml-extlib ocaml-re)) > - (native-inputs > - (list perl > - ocaml-extlib > - ocamlbuild > - ocaml-cppo)) > + "0hcjh68svicap7j9bghgkp49xa12qhxa1pygmrgc9qwm0m4dhirb"))= )) > + (build-system dune-build-system) > + (arguments `(#:package "dose3")) > + (propagated-inputs (list ocaml-extlib > + ocaml-base64-boot > + ocaml-cudf > + ocaml-graph > + ocaml-re > + ocaml-stdlib-shims)) > + (native-inputs (list ocaml-ounit)) > (home-page "https://www.mancoosi.org/software/") > (synopsis "Package distribution management framework") > (description "Dose3 is a framework made of several OCaml libraries f= or > @@ -849,7 +836,7 @@ (define-public ocaml-opam-file-format > (define ocaml-opam-core > (package > (name "ocaml-opam-core") > - (version "2.1.3") > + (version "2.1.5") > (source (origin > (method git-fetch) > (uri (git-reference > @@ -858,7 +845,7 @@ (define ocaml-opam-core > (file-name (git-file-name name version)) > (sha256 > (base32 > - "1mw535zsw7xlvpgwnk1dan76z3f7lh5imlg0s6kdyhfg0iqisjd7"))= )) > + "0ckd87rcmcz11iyhhm5qnmy27jbdffx6n1fr06hvrqqrzi00jljh"))= )) > (build-system dune-build-system) > (arguments `(#:package "opam-core" > ;; tests are run with the opam package > @@ -1037,7 +1024,10 @@ (define-public opam > (("diff opamroot-versions.test opamroot-versions.out") "r= un true") > ;; Disable a failing test, probably because the repositor= y we > ;; replaced is not as expected > - (("diff opamrt-big-upgrade.test opamrt-big-upgrade.out") = "run true")) > + (("diff opamrt-big-upgrade.test opamrt-big-upgrade.out") = "run true") > + ;; Disable a failing test because of missing sandboxing > + ;; functionality > + (("diff init.test init.out") "run true")) > (substitute* "tests/reftests/dune" > ;; Because of our changes to the previous file, we cannot= check > ;; it can be regenerated > @@ -1073,18 +1063,42 @@ (define-public opam > ("which" ,which) > =20 > ;; Data for tests > - ("opam-repo-009e00fa" ,(opam-repo "009e00fa86300d11c311309a2544= e5c6c3eb8de2" > - "1wwy0rwrsjf4q10j1rh1dazk32fb= zhzy6f7zl6qmndidx9b1bq7w")) > - ("opam-repo-7090735c" ,(opam-repo "7090735c9d1dd2dc481c4128c5ef= 4d3667238f15" > - "1bccsgjhlp64lmvfjfn6viywf3x7= 3ji75myg9ssf1ij1fkmabn0z")) > - ("opam-repo-a5d7cdc0" ,(opam-repo "a5d7cdc0c91452b0aef4fa71c331= ee5237f6dddd" > - "0z7kawqisy07088p5xjxwpvmvzlb= j1d9cgdipsj90yx7nc5qh369")) > - ("opam-repo-ad4dd344" ,(opam-repo "ad4dd344fe5cd1cab49ced49d675= 8a9844549fb4" > - "1a1qj47kj8xjdnc4zc50ijrix1ky= m1n7k20n3viki80a7518baw8")) > - ("opam-repo-c1d23f0e" ,(opam-repo "c1d23f0e17ec83a036ebfbad1c78= 311b898a2ca0" > - "0j9abisx3ifzm66ci3p45mngmz4f= 0fx7yd9jjxrz3f8w5jffc9ii")) > - ("opam-repo-f372039d" ,(opam-repo "f372039db86a970ef3e662adbfe0= d4f5cd980701" > - "0ld7fcry6ss6fmrpswvr6bikgx29= 9w97h0gwrjjh7kd7rydsjdws"))))) > + ("opam-repo-0070613707" > + ,(opam-repo "00706137074d536d2019d2d222fbe1bea929deda" > + "1gv1vvmfscj7wirfv6qncp8pf81wygnpzjwd0lyqcxm7g8r8l= b4w")) > + ("opam-repo-009e00fa" > + ,(opam-repo "009e00fa86300d11c311309a2544e5c6c3eb8de2" > + "1wwy0rwrsjf4q10j1rh1dazk32fbzhzy6f7zl6qmndidx9b1b= q7w")) > + ("opam-repo-7090735c" > + ,(opam-repo "7090735c9d1dd2dc481c4128c5ef4d3667238f15" > + "1bccsgjhlp64lmvfjfn6viywf3x73ji75myg9ssf1ij1fkmab= n0z")) > + ("opam-repo-a5d7cdc0" > + ,(opam-repo "a5d7cdc0c91452b0aef4fa71c331ee5237f6dddd" > + "0z7kawqisy07088p5xjxwpvmvzlbj1d9cgdipsj90yx7nc5qh= 369")) > + ("opam-repo-ad4dd344" > + ,(opam-repo "ad4dd344fe5cd1cab49ced49d6758a9844549fb4" > + "1a1qj47kj8xjdnc4zc50ijrix1kym1n7k20n3viki80a7518b= aw8")) > + ("opam-repo-c1842d168d" > + ,(opam-repo "c1842d168de956caf06d7ac8588e65020d7594d8" > + "142y1ac7sprygyh91shcp0zcyfxjjkshi9g44qgg4rx60rbsb= hai")) > + ("opam-repo-c1d23f0e" > + ,(opam-repo "c1d23f0e17ec83a036ebfbad1c78311b898a2ca0" > + "0j9abisx3ifzm66ci3p45mngmz4f0fx7yd9jjxrz3f8w5jffc= 9ii")) > + ("opam-repo-f372039d" > + ,(opam-repo "f372039db86a970ef3e662adbfe0d4f5cd980701" > + "0ld7fcry6ss6fmrpswvr6bikgx299w97h0gwrjjh7kd7rydsj= dws")) > + ("opam-repo-11ea1cb" > + ,(opam-repo "11ea1cb6f2418b1f8a6679e4422771a04c9c3655" > + "1s4p0wfn3bx97yvm8xvj3yhzv2pz0jwml68g2ybv37hj9mpbr= sq0")) > + ("opam-repo-297366c" > + ,(opam-repo "297366cd01c3aaf29b967bf0b34ccc7989d4d5b3" > + "1ysg69gys37nc2cxivs2ikh6xp0gj85if4rcrr874mqb9z12d= m0j")) > + ("opam-repo-3235916" > + ,(opam-repo "3235916a162a59d7c82dac3fe24214975d48f1aa" > + "1yf73rv2n740a4s9g7a9k4j91b4k7al88nwnw9cdw0k2ncbmr= 486")) > + ("opam-repo-de897adf36c4230dfea812f40c98223b31c4521a" > + ,(opam-repo "de897adf36c4230dfea812f40c98223b31c4521a" > + "1m18x9gcwnbar8yv9sbfz8a3qpw412fp9cf4d6fb7syn0p0h9= 6jw"))))) > (inputs (list ocaml-opam-client)) > (properties > ;; OPAM is used as a tool and not as a library, we can use the OCam= l 4.14 > @@ -4409,8 +4423,7 @@ (define-public ocaml-base64 > (base32 > "068hwdbpl7vx9jjpxdc6a10zqd8xa55j3xx7ga6fnwrlfsbs2pjj"))= )) > (build-system dune-build-system) > - (native-inputs > - (list ocaml-alcotest ocaml-bos ocaml-rresult)) > + (native-inputs (list ocaml-alcotest ocaml-bos ocaml-rresult)) > (properties `((ocaml4.07-variant . ,(delay ocaml4.07-base64)))) > (home-page "https://github.com/mirage/ocaml-base64") > (synopsis "Base64 encoding for OCaml") > @@ -4419,6 +4432,14 @@ (define-public ocaml-base64 > radix-64 representation. It is specified in RFC 4648.") > (license license:isc))) > =20 > +;; A variant without tests that is used to prevent a cyclic dependency w= hen > +;; compiling ocaml-dose3. > +(define ocaml-base64-boot > + (package > + (inherit ocaml-base64) > + (arguments `(#:tests? #f)) > + (native-inputs '()))) > + > (define-public ocaml4.07-base64 > (package-with-ocaml4.07 > (package > @@ -5291,27 +5312,22 @@ (define-public ocaml4.07-uuidm > (define-public ocaml-graph > (package > (name "ocaml-graph") > - (version "1.8.8") > + (home-page "https://github.com/backtracking/ocamlgraph/") > + (version "2.0.0") > (source (origin > - (method url-fetch) > - (uri (string-append "http://ocamlgraph.lri.fr/download/" > - "ocamlgraph-" version ".tar.gz")) > + (method git-fetch) > + (uri (git-reference > + (url home-page) > + (commit version))) > + (file-name (git-file-name name version)) > (sha256 > (base32 > - "0m9g16wrrr86gw4fz2fazrh8nkqms0n863w7ndcvrmyafgxvxsnr"))= )) > - (build-system ocaml-build-system) > - (arguments > - `(#:install-target "install-findlib" > - #:tests? #f > - #:phases > - (modify-phases %standard-phases > - (add-before 'configure 'set-shell > - (lambda* (#:key inputs #:allow-other-keys) > - (setenv "CONFIG_SHELL" > - (search-input-file inputs "/bin/sh"))))))) > - (inputs (list lablgtk)) > + "1gjrsyyamvvn2rd9n9yjx6hsglhw0dbm4cgazq0dpx0bbr4inwc3"))= )) > + (build-system dune-build-system) > + (arguments `(#:package "ocamlgraph")) > + (propagated-inputs (list ocaml-stdlib-shims)) > + (native-inputs (list ocaml-graphics)) > (properties `((upstream-name . "ocamlgraph"))) > - (home-page "https://ocamlgraph.lri.fr/") > (synopsis "Graph library for OCaml") > (description "OCamlgraph is a generic graph library for OCaml.") > (license license:lgpl2.1))) > diff --git a/gnu/packages/patches/ocaml-dose3-Fix-for-ocaml-4.06.patch b/= gnu/packages/patches/ocaml-dose3-Fix-for-ocaml-4.06.patch > deleted file mode 100644 > index 2c344af821..0000000000 > --- a/gnu/packages/patches/ocaml-dose3-Fix-for-ocaml-4.06.patch > +++ /dev/null > @@ -1,52 +0,0 @@ > -From aeca7656f499d7f4595319858f242276920e31bb Mon Sep 17 00:00:00 2001 > -From: Louis Gesbert > -Date: Sat, 2 Dec 2017 12:51:01 +0100 > -Subject: [PATCH] Fix for ocaml 4.06 > - > ---- > - common/criteria_lexer.mll | 8 ++++---- > - common/util.ml | 2 +- > - 2 files changed, 5 insertions(+), 5 deletions(-) > - > -diff --git a/common/criteria_lexer.mll b/common/criteria_lexer.mll > -index 71f9178..fc4eae3 100644 > ---- a/common/criteria_lexer.mll > -+++ b/common/criteria_lexer.mll > -@@ -18,7 +18,7 @@ > - let c =3D Lexing.lexeme_char lexbuf 2 in (* the delimiter can be an= y character *) > - (* find the terminating delimiter *) > - let endpos =3D > -- try String.index_from lexbuf.lex_buffer (lexbuf.lex_start_pos + 3= ) c with > -+ try Bytes.index_from lexbuf.lex_buffer (lexbuf.lex_start_pos + 3)= c with > - |Invalid_argument _ -> > - raise (Format822.Syntax_error ( > - Format822.error lexbuf "String too short")) > -@@ -27,9 +27,9 @@ > - Format822.error lexbuf (Printf.sprintf "cannot find: %c" c)= )) > - in > - let len =3D endpos - (lexbuf.lex_start_pos + 3) in > -- let s =3D String.sub lexbuf.lex_buffer (lexbuf.lex_start_pos + 3) l= en in > -- lexbuf.Lexing.lex_curr_pos <- lexbuf.Lexing.lex_start_pos + ((Strin= g.length s)+4); > -- s > -+ let s =3D Bytes.sub lexbuf.lex_buffer (lexbuf.lex_start_pos + 3) le= n in > -+ lexbuf.Lexing.lex_curr_pos <- lexbuf.Lexing.lex_start_pos + ((Bytes= =2Elength s)+4); > -+ Bytes.to_string s > -=20 > - } > -=20 > -diff --git a/common/util.ml b/common/util.ml > -index 598f266..36ca3d1 100644 > ---- a/common/util.ml > -+++ b/common/util.ml > -@@ -87,7 +87,7 @@ module MakeMessages(X : sig val label : string end) = =3D struct > - let clean label =3D > - try=20 > - let s =3D Filename.chop_extension (Filename.basename label) in > -- String.capitalize s > -+ String.capitalize_ascii s > - with Invalid_argument _ -> label > -=20 > - let create ?(enabled=3Dfalse) label =3D > ---=20 > -2.11.0 > - > diff --git a/gnu/packages/patches/ocaml-dose3-Install-mli-cmx-etc.patch b= /gnu/packages/patches/ocaml-dose3-Install-mli-cmx-etc.patch > deleted file mode 100644 > index 41494e7b3c..0000000000 > --- a/gnu/packages/patches/ocaml-dose3-Install-mli-cmx-etc.patch > +++ /dev/null > @@ -1,133 +0,0 @@ > -From b5314c20d8e3caf62fe0dc96ad937a2950158b23 Mon Sep 17 00:00:00 2001 > -From: Louis Gesbert > -Date: Thu, 2 Mar 2017 12:19:56 +0100 > -Subject: [PATCH] Install mli, cmx, etc. > - > ---- > - Makefile | 26 +++++++++++++------------- > - 1 file changed, 13 insertions(+), 13 deletions(-) > - > -diff --git a/Makefile b/Makefile > -index 09464ff..5044d7f 100644 > ---- a/Makefile > -+++ b/Makefile > -@@ -56,7 +56,7 @@ $(DOSELIBS)/cudf.%: > - @for i in _build/cudf/cudf.*; do \ > - if [ -e $$i ]; then \ > - cp $$i $(DOSELIBS) ; \ > -- rm -f $(DOSELIBS)/*.mlpack $(DOSELIBS)/*.cmx ; \ > -+ rm -f $(DOSELIBS)/*.mlpack ; \ > - fi ; \ > - done > -=20 > -@@ -67,7 +67,7 @@ $(DOSELIBS)/common.%: common/*.ml common/*.mli > - if [ -e $$i ]; then \ > - cp $$i $(DOSELIBS) ; \ > - rm $$i ;\ > -- rm -f $(DOSELIBS)/*.mlpack $(DOSELIBS)/*.cmx ; \ > -+ rm -f $(DOSELIBS)/*.mlpack ; \ > - fi ; \ > - done > -=20 > -@@ -78,7 +78,7 @@ $(DOSELIBS)/versioning.%: versioning/*.ml versioning/*= =2Emli > - if [ -e $$i ]; then \ > - cp $$i $(DOSELIBS) ; \ > - rm $$i ;\ > -- rm -f $(DOSELIBS)/*.mlpack $(DOSELIBS)/*.cmx ; \ > -+ rm -f $(DOSELIBS)/*.mlpack ; \ > - fi ; \ > - done > -=20 > -@@ -88,7 +88,7 @@ $(DOSELIBS)/algo.%: algo/*.ml algo/*.mli $(DOSELIBS)/c= ommon.% > - if [ -e $$i ]; then \ > - cp $$i $(DOSELIBS) ; \ > - rm $$i ;\ > -- rm -f $(DOSELIBS)/*.mlpack $(DOSELIBS)/*.cmx ; \ > -+ rm -f $(DOSELIBS)/*.mlpack ; \ > - fi ; \ > - done > -=20 > -@@ -98,7 +98,7 @@ $(DOSELIBS)/debian.%: deb/*.ml deb/*.mli $(DOSELIBS)/p= ef.% > - if [ -e $$i ]; then \ > - cp $$i $(DOSELIBS) ; \ > - rm $$i ;\ > -- rm -f $(DOSELIBS)/*.mlpack $(DOSELIBS)/*.cmx ; \ > -+ rm -f $(DOSELIBS)/*.mlpack ; \ > - fi ; \ > - done > -=20 > -@@ -108,7 +108,7 @@ $(DOSELIBS)/opam.%: opam/*.ml opam/*.mli $(DOSELIBS)= /pef.% > - if [ -e $$i ]; then \ > - cp $$i $(DOSELIBS) ; \ > - rm $$i ;\ > -- rm -f $(DOSELIBS)/*.mlpack $(DOSELIBS)/*.cmx ; \ > -+ rm -f $(DOSELIBS)/*.mlpack ; \ > - fi ; \ > - done > -=20 > -@@ -118,7 +118,7 @@ $(DOSELIBS)/npm.%: npm/*.ml npm/*.mli $(DOSELIBS)/ve= rsioning.% $(DOSELIBS)/pef.% > - if [ -e $$i ]; then \ > - cp $$i $(DOSELIBS) ; \ > - rm $$i ;\ > -- rm -f $(DOSELIBS)/*.mlpack $(DOSELIBS)/*.cmx ; \ > -+ rm -f $(DOSELIBS)/*.mlpack ; \ > - fi ; \ > - done > -=20 > -@@ -128,7 +128,7 @@ $(DOSELIBS)/rpm.%: rpm/*.ml $(DOSELIBS)/algo.% > - if [ -e $$i ]; then \ > - cp $$i $(DOSELIBS) ; \ > - rm $$i ;\ > -- rm -f $(DOSELIBS)/*.mlpack $(DOSELIBS)/*.cmx ; \ > -+ rm -f $(DOSELIBS)/*.mlpack ; \ > - fi ; \ > - done > -=20 > -@@ -138,7 +138,7 @@ $(DOSELIBS)/pef.%: pef/*.ml pef/*.mli > - if [ -e $$i ]; then \ > - cp $$i $(DOSELIBS) ; \ > - rm $$i ;\ > -- rm -f $(DOSELIBS)/*.mlpack $(DOSELIBS)/*.cmx ; \ > -+ rm -f $(DOSELIBS)/*.mlpack ; \ > - fi ; \ > - done > -=20 > -@@ -148,7 +148,7 @@ $(DOSELIBS)/csw.%: opencsw/*.ml $(DOSELIBS)/versioni= ng.% > - if [ -e $$i ]; then \ > - cp $$i $(DOSELIBS) ; \ > - rm $$i ;\ > -- rm -f $(DOSELIBS)/*.mlpack $(DOSELIBS)/*.cmx ; \ > -+ rm -f $(DOSELIBS)/*.mlpack ; \ > - fi ; \ > - done > -=20 > -@@ -158,7 +158,7 @@ $(DOSELIBS)/doseparse.%: $(DOSELIBS)/pef.% $(DOSELIB= S)/debian.% > - if [ -e $$i ]; then \ > - cp $$i $(DOSELIBS) ; \ > - rm $$i ;\ > -- rm -f $(DOSELIBS)/*.mlpack $(DOSELIBS)/*.cmx $(DOSELIBS)/*.ml ; \ > -+ rm -f $(DOSELIBS)/*.mlpack $(DOSELIBS)/*.ml ; \ > - fi ; \ > - done > -=20 > -@@ -168,7 +168,7 @@ $(DOSELIBS)/doseparseNoRpm.%: $(DOSELIBS)/pef.% $(DO= SELIBS)/debian.% > - if [ -e $$i ]; then \ > - cp $$i $(DOSELIBS) ;\ > - rm $$i ;\ > -- rm -f $(DOSELIBS)/*.mlpack $(DOSELIBS)/*.cmx ;\ > -+ rm -f $(DOSELIBS)/*.mlpack ;\ > - fi ; \ > - done > -=20 > -@@ -223,7 +223,7 @@ INSTALL_STUFF_ =3D META > - INSTALL_STUFF_ +=3D $(wildcard _build/doselibs/*.cma _build/doselibs/*.= cmi) > - INSTALL_STUFF_ +=3D $(wildcard _build/doselibs/*.cmxa _build/doselibs/*= =2Ecmxs) > - INSTALL_STUFF_ +=3D $(wildcard _build/doselibs/*.a) > --#INSTALL_STUFF_ +=3D $(wildcard _build/*/*.mli) > -+INSTALL_STUFF_ +=3D $(wildcard _build/doselibs/*.mli) $(wildcard _build= /doselibs/*.cmti) $(wildcard _build/doselibs/*.cmx) > - INSTALL_STUFF_ +=3D $(wildcard _build/rpm/*.so) > -=20 > - exclude_cudf =3D $(wildcard _build/doselibs/*cudf* _build/cudf/*) > ---=20 > -2.11.0 > - > diff --git a/gnu/packages/patches/ocaml-dose3-add-unix-dependency.patch b= /gnu/packages/patches/ocaml-dose3-add-unix-dependency.patch > deleted file mode 100644 > index d2cc44c784..0000000000 > --- a/gnu/packages/patches/ocaml-dose3-add-unix-dependency.patch > +++ /dev/null > @@ -1,25 +0,0 @@ > -From b94cf24739818e5aff397e0a83b19ea32dc81f42 Mon Sep 17 00:00:00 2001 > -From: Louis Gesbert > -Date: Tue, 6 Feb 2018 10:15:45 +0100 > -Subject: [PATCH 3/3] Add "unix" as dependency to dose3.common in META.in > - > ---- > - META.in | 2 +- > - 1 file changed, 1 insertion(+), 1 deletion(-) > - > -diff --git a/META.in b/META.in > -index aa2cd8d..0f9d337 100644 > ---- a/META.in > -+++ b/META.in > -@@ -8,7 +8,7 @@ package "common" ( > - version =3D "@PACKAGE_VERSION@" > - archive(byte) =3D "common.cma" > - archive(native) =3D "common.cmxa" > --requires =3D "extlib, re.pcre, cudf, @ZIP@, @BZ2@" > -+requires =3D "extlib, re.pcre, cudf, unix, @ZIP@, @BZ2@" > - ) > -=20 > - package "algo" ( > ---=20 > -2.11.0 > - > diff --git a/gnu/packages/patches/ocaml-dose3-dont-make-printconf.patch b= /gnu/packages/patches/ocaml-dose3-dont-make-printconf.patch > deleted file mode 100644 > index 84b6a3b81b..0000000000 > --- a/gnu/packages/patches/ocaml-dose3-dont-make-printconf.patch > +++ /dev/null > @@ -1,9 +0,0 @@ > ---- a/configure > -+++ b/configure > -@@ -6552,6 +6552,3 @@ if test -n "$ac_unrecognized_opts" && test "$enabl= e_option_checking" !=3D no; then > - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized option= s: $ac_unrecognized_opts" >&5 > - $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts"= >&2;} > - fi > -- > -- > --make printconf > --=20 > 2.41.0 >=20 >=20 >=20 >=20 --1hVIeNX3usid+aq1 Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAEBCgAdFiEEMgqfJ4U0fby1t860ojLKXoMTiAwFAmVL3i0ACgkQojLKXoMT iAwm2Q//STwE8RsxllEcIpV/BEl+Pp6rGqURCLyqwil7Bhcf0f8ks8tygC+3yhVX TRgwHGMD9GfSUUU6e/QlFzaF8DxDEion0zLOYm3aBXtXy9Yo7kQf2RkG6pgJyMVZ CEYq0V34c1L7aKRvjvxg63e6CMUmiGmo7hOoXTPZLEqYCRKjRucdWOsBgkMV5pA6 LB6UPkUliiFaUUJX1H/JYpAaiA3TpxykrmT0twGnIWUBPsOvd0r5dbchOzxL2dp3 6BZsJ/kLFfHeriKt3mH6BGEnvIDgEhd2k4MmKyN/dM1+QK3zseWrROqG+Fx9YbVt hm4o7NDFFnKN84bLkmG+cR7KbPPzLLeO/UNyZ9yXOhUg8X5LNeDNWt8xZwn8Id/x bHz/8KpCMXC5biT8nipAA2ht7QRH+z3BlBQrH5yjGinCe1HVaSov/IBimya0Nbcq 7hO0WctAWFw/GoW4tvGi5/zah02NsLGGHhIl1AjzJ4qsua9nM+NA2vkps8TydODb ktzDkT39/OE7X/9BEzz4jv7RTgQf9m6YiMJ9HQV/jQK1mSq5Nhqrppn2jkchogMW +nOqW0+TcFAyswGMQtgNzK9X+Qf3VjrPt7GNkZFSHPZ/7P0abDZUT32V7VDAVbB+ HefIAUzi/f5R3TwK+8Ell5B2y2eB4IdV2ufe4gQaqNdSiZv3aSE= =/U7Y -----END PGP SIGNATURE----- --1hVIeNX3usid+aq1--