From patchwork Wed Jan 10 07:43:17 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Julien Lepiller X-Patchwork-Id: 58735 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 C05EC27BBE9; Wed, 10 Jan 2024 07:45:19 +0000 (GMT) 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 DD41927BBE2 for ; Wed, 10 Jan 2024 07:45:18 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rNTGp-0002BS-Ud; Wed, 10 Jan 2024 02:45:04 -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 1rNTGl-00026I-Dc for guix-patches@gnu.org; Wed, 10 Jan 2024 02:44:59 -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 1rNTGk-00040W-P7 for guix-patches@gnu.org; Wed, 10 Jan 2024 02:44:58 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rNTGs-0008RH-17 for guix-patches@gnu.org; Wed, 10 Jan 2024 02:45:06 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#64249] [PATCH v9 16/34] gnu: ocaml-bin-prot: Update to 0.16.0. Resent-From: Julien Lepiller Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 10 Jan 2024 07:45:05 +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 Received: via spool by 64249-submit@debbugs.gnu.org id=B64249.170487265231064 (code B ref 64249); Wed, 10 Jan 2024 07:45:05 +0000 Received: (at 64249) by debbugs.gnu.org; 10 Jan 2024 07:44:12 +0000 Received: from localhost ([127.0.0.1]:41714 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rNTFz-00084s-Ob for submit@debbugs.gnu.org; Wed, 10 Jan 2024 02:44:12 -0500 Received: from lepiller.eu ([89.234.186.109]:59318 helo=hermes.lepiller.eu) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rNTFl-0007zZ-L2 for 64249@debbugs.gnu.org; Wed, 10 Jan 2024 02:43:58 -0500 Received: from hermes.lepiller.eu (localhost [127.0.0.1]) by hermes.lepiller.eu (OpenSMTPD) with ESMTP id bcba2b2b for <64249@debbugs.gnu.org>; Wed, 10 Jan 2024 07:43:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed; d=lepiller.eu; h=from:to :subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; s=dkim; bh=urxdlNiPNXMdrHU5gHXcG114q /yDOetUG2Lgk2olLng=; b=MgLE1Go9o+oMUullHukGij90tEA29DnKLDjgybnkr 8x8NlruozxzxgOOOgii0c5ElXHuSeKWas4tw0NhQkI2DFL3NQKEu4YuGD9MxwCAM MwBoZ6GlHkqHxw9REX0cq/+RdfRhaqPVViL552/d5CKowNfc/bN6bsiJDN0Iep+6 KqDvXydW5zLkel4i3MK7HJtUtHQw2b5Fu2yk5tkDaT+ghTUX2UFvfG3IHqwkjF3y QqXPuXRIxXCpwcbvQAHG3BHNCkJ7wgC0DmQWl7hGsvkDz6/ZUbPw8fC6+39eORSG Y07BJdCYW+4QAqrx4fAa8zY663KRLyHV+OMmaVKBIwLtw== Received: by hermes.lepiller.eu (OpenSMTPD) with ESMTPSA id 71241bc1 (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO) for <64249@debbugs.gnu.org>; Wed, 10 Jan 2024 07:43:44 +0000 (UTC) From: Julien Lepiller Date: Wed, 10 Jan 2024 08:43:17 +0100 Message-ID: <20240110074336.24651-16-julien@lepiller.eu> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20240110074336.24651-1-julien@lepiller.eu> References: <20240110074336.24651-1-julien@lepiller.eu> 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 (ocam-bin-prot): Update to 0.16.0. (bap)[arguments]: Fix code after ocaml-bin-prot changes. --- gnu/packages/ocaml.scm | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 062bef401a..dcb66d7f59 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -5036,6 +5036,11 @@ (define-public bap ;; We don't have a monolithic llvm (substitute* "oasis/llvm.setup.ml.in" (("llvm_static = \"true\"") "true")) + ;; Package update removed Make_binable, which was an alias + ;; for Make_binable_without_uuid + (substitute* (find-files "." ".") + (("Utils.Make_binable1\\(") "Utils.Make_binable1_without_uuid(") + (("Utils.Make_binable\\(") "Utils.Make_binable_without_uuid(")) (invoke "./configure" "--prefix" (assoc-ref outputs "out") "--libdir" @@ -6494,7 +6499,7 @@ (define-public ocaml-ppx-stable-witness (define-public ocaml-bin-prot (package (name "ocaml-bin-prot") - (version "0.15.0") + (version "0.16.0") (source (origin (method git-fetch) @@ -6503,7 +6508,7 @@ (define-public ocaml-bin-prot (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "1qfqglscc25wwnjx7byqmjcnjww1msnr8940gyg8h93wdq43fjnh")))) + (base32 "1ybs0152ilgr8sa1hqnc2jj0gbvg855ixl3c5b2pjbnk7blhqnd8")))) (build-system dune-build-system) (propagated-inputs (list ocaml-base @@ -6512,6 +6517,7 @@ (define-public ocaml-bin-prot ocaml-ppx-fields-conv ocaml-ppx-optcomp ocaml-ppx-sexp-conv + ocaml-ppx-stable-witness ocaml-ppx-variants-conv)) (properties `((upstream-name . "bin_prot"))) (home-page "https://github.com/janestreet/bin_prot")