From patchwork Sun Jun 19 07:51:47 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Julien Lepiller X-Patchwork-Id: 3212 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 A11C227BBEA; Sun, 19 Jun 2022 08:53:18 +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=-3.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS, URIBL_BLOCKED autolearn=unavailable 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 674BF27BBE9 for ; Sun, 19 Jun 2022 08:53:18 +0100 (BST) Received: from localhost ([::1]:58476 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1o2pkD-0006fZ-Fu for patchwork@mira.cbaines.net; Sun, 19 Jun 2022 03:53:17 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:38462) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1o2pjy-0006e7-Pm for guix-patches@gnu.org; Sun, 19 Jun 2022 03:53:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:56659) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1o2pjy-000109-HI for guix-patches@gnu.org; Sun, 19 Jun 2022 03:53:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1o2pjy-0002u8-Dm for guix-patches@gnu.org; Sun, 19 Jun 2022 03:53:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#56080] [PATCH 1/4] gnu: Add ocaml-linenoise. References: <20220619091824.15586c91@sybil.lepiller.eu> In-Reply-To: <20220619091824.15586c91@sybil.lepiller.eu> Resent-From: Julien Lepiller Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 19 Jun 2022 07:53:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 56080 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 56080@debbugs.gnu.org Received: via spool by 56080-submit@debbugs.gnu.org id=B56080.165562512711080 (code B ref 56080); Sun, 19 Jun 2022 07:53:02 +0000 Received: (at 56080) by debbugs.gnu.org; 19 Jun 2022 07:52:07 +0000 Received: from localhost ([127.0.0.1]:50549 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1o2pj5-0002sS-6N for submit@debbugs.gnu.org; Sun, 19 Jun 2022 03:52:07 -0400 Received: from lepiller.eu ([89.234.186.109]:40980) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1o2pj1-0002rr-GE for 56080@debbugs.gnu.org; Sun, 19 Jun 2022 03:52:05 -0400 Received: from lepiller.eu (localhost [127.0.0.1]) by lepiller.eu (OpenSMTPD) with ESMTP id f3384cbc for <56080@debbugs.gnu.org>; Sun, 19 Jun 2022 07:52:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed; d=lepiller.eu; h=from:to :subject:date:message-id:mime-version:content-transfer-encoding; s=dkim; bh=QbS4qq1qQJ3lUE5aR1cHTlQi90xzjYTrgrO314Z2eu4=; b=VnLI zL6TsMQUbRJoEZ9Y3uAiy7GlNwLDoX4wY5p0O4HLLvd5kkoUrhB3gpeaapqql6IQ clhkH4pyN0nAG43teVy7GKiL3BexsNrOBFaG19rtF6FhFR0LMnMQUGQFjSYVjKIT ygacVTYGrKP11R7YVBprOIpq1f/PEu3NKDlKYBP0z/Lu/N/GoYsZvacpn4X5/q4p l6jB3b3qwXHuQmJt7S2k1TxK4miHHdormBdEO7xRwECJyCnaTiOBxJ8ub6UkeGE+ 40pRAIqtycWMopa3NEeDsNUce1JuA6l73TBgU9tVLObjFeikQaI6liPOjqsNabO3 U1B/xCcM4hGYinJhmw== Received: by lepiller.eu (OpenSMTPD) with ESMTPSA id 1bf170cf (TLSv1.3:AEAD-AES256-GCM-SHA384:256:NO) for <56080@debbugs.gnu.org>; Sun, 19 Jun 2022 07:52:00 +0000 (UTC) From: Julien Lepiller Date: Sun, 19 Jun 2022 09:51:47 +0200 Message-Id: <20220619075150.10754-1-julien@lepiller.eu> X-Mailer: git-send-email 2.36.1 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" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/ocaml.scm (ocaml-linenoise): New variable. --- gnu/packages/ocaml.scm | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 4569c526ab..a8f328a266 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -1939,6 +1939,30 @@ (define-public ocaml4.07-ppx-tools-versioned ocaml-migrate-parsetree") (license license:expat)))) +(define-public ocaml-linenoise + (package + (name "ocaml-linenoise") + (version "1.3.1") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/ocaml-community/ocaml-linenoise") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0s98695skz1wvrak0rdlh80w3cv6piic1dxqpn9rv1yymbklafg4")))) + (build-system dune-build-system) + (arguments + ;; No tests + `(#:tests? #f)) + (propagated-inputs (list ocaml-result ocaml-odoc)) + (home-page "https://github.com/ocaml-community/ocaml-linenoise") + (synopsis "Lightweight readline alternative") + (description "This package is a line-reading library for OCaml that aims +to replace readline.") + (license license:bsd-2))) + (define-public ocaml-bitstring (package (name "ocaml-bitstring") From patchwork Sun Jun 19 07:51:48 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Julien Lepiller X-Patchwork-Id: 3213 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 45DF227BBEA; Sun, 19 Jun 2022 08:53:25 +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=-3.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS, URIBL_BLOCKED autolearn=unavailable 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 080B127BBE9 for ; Sun, 19 Jun 2022 08:53:25 +0100 (BST) Received: from localhost ([::1]:59146 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1o2pkK-00076t-6j for patchwork@mira.cbaines.net; Sun, 19 Jun 2022 03:53:24 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:38464) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1o2pjz-0006eE-5P for guix-patches@gnu.org; Sun, 19 Jun 2022 03:53:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:56660) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1o2pjy-00010E-T0 for guix-patches@gnu.org; Sun, 19 Jun 2022 03:53:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1o2pjy-0002uG-QS for guix-patches@gnu.org; Sun, 19 Jun 2022 03:53:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#56080] [PATCH 2/4] gnu: Add ocaml-ppx-bap. Resent-From: Julien Lepiller Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 19 Jun 2022 07:53:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 56080 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 56080@debbugs.gnu.org Received: via spool by 56080-submit@debbugs.gnu.org id=B56080.165562512811086 (code B ref 56080); Sun, 19 Jun 2022 07:53:02 +0000 Received: (at 56080) by debbugs.gnu.org; 19 Jun 2022 07:52:08 +0000 Received: from localhost ([127.0.0.1]:50552 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1o2pj5-0002sf-LW for submit@debbugs.gnu.org; Sun, 19 Jun 2022 03:52:07 -0400 Received: from lepiller.eu ([89.234.186.109]:40982) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1o2pj3-0002sF-S7 for 56080@debbugs.gnu.org; Sun, 19 Jun 2022 03:52:06 -0400 Received: from lepiller.eu (localhost [127.0.0.1]) by lepiller.eu (OpenSMTPD) with ESMTP id 4f803c76 for <56080@debbugs.gnu.org>; Sun, 19 Jun 2022 07:52:01 +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=J3hH05Cids0R3KBELRAS8cgTv fOg0P+Gio0BP163bHo=; b=GvkQEN/9mNW7Y6XQC4NLFDejGDA1mwoQcXwKHFKfM wHWZe08liyPCyj2OpYPTFkKLA6coYqyteMn9rwAxuE5xa3gzaf9G53xfOXArtOnZ d3gVCesJsHtoVs9KSFlgEaw4AH0D5rSkx5/M4PdCsI15jnVtG6FQMLfYCRaeL0wA H9QHDr6A7QdYzSz2brlWKlSzNloFx/OZ75q+8ywJV/Eohdpj/yDyMYLRg4tm7pkF 57bdplh9hWhRnnK+XsNSZmabMuSDaHY765XQKAej35rkwoLdAqT21k81E79bVrQu Vw4aNGZnzz+ph8gLiFmORah29VZqXwZRfag72dqhQ3T6g== Received: by lepiller.eu (OpenSMTPD) with ESMTPSA id 11ac88f9 (TLSv1.3:AEAD-AES256-GCM-SHA384:256:NO) for <56080@debbugs.gnu.org>; Sun, 19 Jun 2022 07:52:00 +0000 (UTC) From: Julien Lepiller Date: Sun, 19 Jun 2022 09:51:48 +0200 Message-Id: <20220619075150.10754-2-julien@lepiller.eu> X-Mailer: git-send-email 2.36.1 In-Reply-To: <20220619075150.10754-1-julien@lepiller.eu> References: <20220619075150.10754-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" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/ocaml.scm (ocaml-ppx-bap): New variable. --- gnu/packages/ocaml.scm | 42 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 42 insertions(+) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index a8f328a266..6e9170e929 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -4013,6 +4013,48 @@ (define-public ocaml-piqi XML and Protocol Buffers formats.") (license license:asl2.0))) +(define-public ocaml-ppx-bap + (package + (name "ocaml-ppx-bap") + (version "0.14.0") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/BinaryAnalysisPlatform/ppx_bap") + (commit (string-append "v" (version-major+minor version))))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1c6rcdp8bicdiwqc2mb59cl9l2vxlp3y8hmnr9x924fq7acly248")))) + (build-system dune-build-system) + (arguments + ;; No tests + `(#:tests? #f)) + (propagated-inputs (list ocaml-base-quickcheck + ocaml-ppx-assert + ocaml-ppx-bench + ocaml-ppx-bin-prot + ocaml-ppx-cold + ocaml-ppx-compare + ocaml-ppx-enumerate + ocaml-ppx-fields-conv + ocaml-ppx-hash + ocaml-ppx-here + ocaml-ppx-optcomp + ocaml-ppx-sexp-conv + ocaml-ppx-sexp-value + ocaml-ppx-variants-conv + ocaml-ppxlib)) + (properties `((upstream-name . "ppx_bap"))) + (home-page "https://github.com/BinaryAnalysisPlatform/ppx_bap") + (synopsis "The set of ppx rewriters for BAP") + (description + "@code{ppx_bap} is the set of blessed ppx rewriters used in BAP projects. +It fills the same role as @code{ppx_base} or @code{ppx_jane} (from which it is +derived), but doesn't impose any style requirements and has only the minimal +necessary set of rewriters.") + (license license:expat))) + (define-public bap (package (name "bap") From patchwork Sun Jun 19 07:51:49 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Julien Lepiller X-Patchwork-Id: 3211 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 3AE3C27BBEA; Sun, 19 Jun 2022 08:53:18 +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=-3.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS, URIBL_BLOCKED autolearn=unavailable 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 0A5B827BBE9 for ; Sun, 19 Jun 2022 08:53:18 +0100 (BST) Received: from localhost ([::1]:58494 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1o2pkD-0006gU-3v for patchwork@mira.cbaines.net; Sun, 19 Jun 2022 03:53:17 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:38468) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1o2pjz-0006eV-Sr for guix-patches@gnu.org; Sun, 19 Jun 2022 03:53:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:56662) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1o2pjz-00010Y-LJ for guix-patches@gnu.org; Sun, 19 Jun 2022 03:53:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1o2pjz-0002uU-Kc for guix-patches@gnu.org; Sun, 19 Jun 2022 03:53:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#56080] [PATCH 3/4] gnu: Add ocaml-ppx-bitstring. Resent-From: Julien Lepiller Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 19 Jun 2022 07:53:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 56080 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 56080@debbugs.gnu.org Received: via spool by 56080-submit@debbugs.gnu.org id=B56080.165562513211106 (code B ref 56080); Sun, 19 Jun 2022 07:53:03 +0000 Received: (at 56080) by debbugs.gnu.org; 19 Jun 2022 07:52:12 +0000 Received: from localhost ([127.0.0.1]:50556 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1o2pjA-0002sy-Bc for submit@debbugs.gnu.org; Sun, 19 Jun 2022 03:52:12 -0400 Received: from lepiller.eu ([89.234.186.109]:40980) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1o2pj3-0002rr-Vo for 56080@debbugs.gnu.org; Sun, 19 Jun 2022 03:52:07 -0400 Received: from lepiller.eu (localhost [127.0.0.1]) by lepiller.eu (OpenSMTPD) with ESMTP id bb70b637 for <56080@debbugs.gnu.org>; Sun, 19 Jun 2022 07:52:01 +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=5BHFBL+7X7ex0VZR+afoNPlQC b30v8acfaolWVyndFw=; b=VLo+3l4T7Rgs9Z8jDjm5tXGrPWvorV3wprLWlhQHm eSBgcT7UTX5DxITGGy9rdBE+wHBYBPs869W/c997DGe8hnOGHvqdTeX4+IPAKQqO fyaiB5modykN/KCE4yQfwTT0AyiCrwFdu5T7+C4fY+YVsok5b27Tw4+D5AceCeha veeqP+gd6zFl3SY7ntN+M3rVNEhNN5JsKuQbvQJ5dihWN6NWvqd3DU7hF0VUj6xq 6u1+nArJ+gBwdIioiIVLK/XFmbNXtweceVbahJDsqgX/2e6fw9nmJhkRUX7SSkCx KKdTbxdLZAoEBkldiXcpqylIGX1OgHI+oR8ltV7auO8dw== Received: by lepiller.eu (OpenSMTPD) with ESMTPSA id 45607a49 (TLSv1.3:AEAD-AES256-GCM-SHA384:256:NO) for <56080@debbugs.gnu.org>; Sun, 19 Jun 2022 07:52:00 +0000 (UTC) From: Julien Lepiller Date: Sun, 19 Jun 2022 09:51:49 +0200 Message-Id: <20220619075150.10754-3-julien@lepiller.eu> X-Mailer: git-send-email 2.36.1 In-Reply-To: <20220619075150.10754-1-julien@lepiller.eu> References: <20220619075150.10754-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" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/ocaml.scm (ocaml-ppx-bitstring): New variable. --- gnu/packages/ocaml.scm | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 6e9170e929..59a883b400 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -2016,6 +2016,22 @@ (define-public ocaml4.07-bitstring (propagated-inputs `(("ocaml-ppx-tools-versioned" ,ocaml4.07-ppx-tools-versioned))) (properties '())))) + +(define-public ocaml-ppx-bitstring + (package + (inherit ocaml-bitstring) + (name "ocaml-ppx-bitstring") + (arguments + `(#:package "ppx_bitstring" + ;; No tests + #:tests? #f)) + (propagated-inputs (list ocaml-bitstring ocaml-ppxlib)) + (native-inputs (list ocaml-ounit)) + (properties `((upstream-name . "ppx_bitstring"))) + (synopsis "PPX extension for bitstrings and bitstring matching") + (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 From patchwork Sun Jun 19 07:51:50 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Julien Lepiller X-Patchwork-Id: 3210 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 B50C427BBEA; Sun, 19 Jun 2022 08:53:16 +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=-3.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS, URIBL_BLOCKED autolearn=unavailable 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 1CFC027BBE9 for ; Sun, 19 Jun 2022 08:53:16 +0100 (BST) Received: from localhost ([::1]:58460 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1o2pkB-0006ef-8T for patchwork@mira.cbaines.net; Sun, 19 Jun 2022 03:53:15 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:38466) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1o2pjz-0006eM-Ft for guix-patches@gnu.org; Sun, 19 Jun 2022 03:53:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:56661) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1o2pjz-00010L-8b for guix-patches@gnu.org; Sun, 19 Jun 2022 03:53:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1o2pjz-0002uN-7Y for guix-patches@gnu.org; Sun, 19 Jun 2022 03:53:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#56080] [PATCH 4/4] gnu: bap: Update to 2.5.0-alpha. Resent-From: Julien Lepiller Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 19 Jun 2022 07:53:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 56080 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 56080@debbugs.gnu.org Received: via spool by 56080-submit@debbugs.gnu.org id=B56080.165562513211099 (code B ref 56080); Sun, 19 Jun 2022 07:53:03 +0000 Received: (at 56080) by debbugs.gnu.org; 19 Jun 2022 07:52:12 +0000 Received: from localhost ([127.0.0.1]:50554 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1o2pjA-0002sw-0K for submit@debbugs.gnu.org; Sun, 19 Jun 2022 03:52:12 -0400 Received: from lepiller.eu ([89.234.186.109]:40982) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1o2pj4-0002sF-Iu for 56080@debbugs.gnu.org; Sun, 19 Jun 2022 03:52:07 -0400 Received: from lepiller.eu (localhost [127.0.0.1]) by lepiller.eu (OpenSMTPD) with ESMTP id 353c00d2 for <56080@debbugs.gnu.org>; Sun, 19 Jun 2022 07:52:01 +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=mTDJDPSzuekvtLGNWkMRcQkD2 rSVKADdH3Eb5LO58Uc=; b=HPTEh+2U0D5MJ1iGOB4oV+26k/DuRMEV8IzGDRXA3 uRDVr/0uQUb6F0IPQ++qszH4oEQ/SRpYWciz1qdyDGZu/T4SHB2twppd680Ks9K3 /1NV6C339BNC4pM5Qr1qWtfm6jVs2fX9OFxVq67rIiFi86r8s69xKym+tL+Re9YM GGIrlzdro4yiIzO0j0h5Y2BGumpqE4xHhWmHFlIwQS39xTwLq3OP3hoTGnL+T/Yt i9Ey424bvXj0Z5uKjiuiltZ3m/PeUkFLUaZWR+fLbxU5orNm4B6JCf/46+kbgoEj yiHDiStz2MoyaUt0vuSzL5WyAckuTtW6F1LnQZ25Lr0iQ== Received: by lepiller.eu (OpenSMTPD) with ESMTPSA id b1d94805 (TLSv1.3:AEAD-AES256-GCM-SHA384:256:NO) for <56080@debbugs.gnu.org>; Sun, 19 Jun 2022 07:52:00 +0000 (UTC) From: Julien Lepiller Date: Sun, 19 Jun 2022 09:51:50 +0200 Message-Id: <20220619075150.10754-4-julien@lepiller.eu> X-Mailer: git-send-email 2.36.1 In-Reply-To: <20220619075150.10754-1-julien@lepiller.eu> References: <20220619075150.10754-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" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/ocaml.scm (bap): Update to 2.5.0-alpha. --- gnu/packages/ocaml.scm | 104 ++++++++++++++++++++++------------------- 1 file changed, 55 insertions(+), 49 deletions(-) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 59a883b400..06fee0ed59 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -4074,7 +4074,7 @@ (define-public ocaml-ppx-bap (define-public bap (package (name "bap") - (version "2.0.0") + (version "2.5.0-alpha") (home-page "https://github.com/BinaryAnalysisPlatform/bap") (source (origin (method git-fetch) @@ -4084,58 +4084,64 @@ (define-public bap (file-name (git-file-name name version)) (sha256 (base32 - "0lb9xkfp67wjjqr75p6krivmjra7l5673236v9ny4gp0xi0755bk")))) + "1fw9pp0xnssc08qqfkcafffap4f46hw7zmk80gif5yc4nazga8w5")))) (build-system ocaml-build-system) - (native-inputs - `(("ocaml-oasis" ,(package-with-ocaml4.07 ocaml-oasis)) - ("clang" ,clang-3.8) - ("ocaml-ounit" ,(package-with-ocaml4.07 ocaml-ounit)))) - (propagated-inputs - `(("camlzip" ,(package-with-ocaml4.07 camlzip)) - ("ocaml-bitstring" ,(package-with-ocaml4.07 ocaml-bitstring)) - ("ocaml-cmdliner" ,(package-with-ocaml4.07 ocaml-cmdliner)) - ("ocaml-core-kernel" ,ocaml4.07-core-kernel) - ("ocaml-ezjsonm" ,(package-with-ocaml4.07 ocaml-ezjsonm)) - ("ocaml-fileutils" ,(package-with-ocaml4.07 ocaml-fileutils)) - ("ocaml-frontc" ,(package-with-ocaml4.07 ocaml-frontc)) - ("ocaml-graph" ,(package-with-ocaml4.07 ocaml-graph)) - ("ocaml-ocurl" ,(package-with-ocaml4.07 ocaml-ocurl)) - ("ocaml-piqi" ,(package-with-ocaml4.07 ocaml-piqi)) - ("ocaml-ppx-jane" ,ocaml4.07-ppx-jane) - ("ocaml-utop" ,ocaml4.07-utop) - ("ocaml-uuidm" ,(package-with-ocaml4.07 ocaml-uuidm)) - ("ocaml-uri" ,ocaml4.07-uri) - ("ocaml-zarith" ,(package-with-ocaml4.07 ocaml-zarith)))) - (inputs - (list gmp llvm-3.8 ncurses)) (arguments - `(#:use-make? #t + (list + #:use-make? #t #:phases - (modify-phases %standard-phases - (add-before 'configure 'fix-ncurses - (lambda _ - (substitute* "oasis/llvm" - (("-lcurses") "-lncurses")) - #t)) - (replace 'configure - (lambda* (#:key outputs inputs #:allow-other-keys) - ;; add write for user, to prevent a failure in the install phase - (for-each - (lambda (file) - (let ((stat (stat file))) - (chmod file (+ #o200 (stat:mode stat))))) - (find-files "." ".")) - (invoke "./configure" "--prefix" - (assoc-ref outputs "out") - "--libdir" - (string-append + #~(modify-phases %standard-phases + (add-before 'configure 'fix-ncurses + (lambda _ + (substitute* "oasis/llvm" + (("-lcurses") "-lncurses")) + #t)) + (replace 'configure + (lambda* (#:key outputs inputs #:allow-other-keys) + (for-each make-file-writable (find-files "." ".")) + ;; Package name changed + (substitute* "oasis/elf-loader" + (("bitstring.ppx") "ppx_bitstring")) + ;; We don't have a monolithic llvm + (substitute* "oasis/llvm.setup.ml.in" + (("llvm_static = \"true\"") "true")) + (invoke "./configure" "--prefix" (assoc-ref outputs "out") - "/lib/ocaml/site-lib") - "--with-llvm-version=3.8" - "--with-llvm-config=llvm-config" - "--enable-everything")))) - #:ocaml ,ocaml-4.07 - #:findlib ,ocaml4.07-findlib)) + "--libdir" + (string-append + (assoc-ref outputs "out") + "/lib/ocaml/site-lib") + (string-append "--with-llvm-version=" #$(package-version llvm)) + "--with-llvm-config=llvm-config" + "--disable-ghidra" + "--disable-llvm-static" + "--enable-llvm" + "--enable-everything")))))) + (native-inputs (list clang ocaml-oasis ocaml-ounit)) + (propagated-inputs + (list + camlzip + ocaml-bitstring + ocaml-cmdliner + ocaml-core-kernel + ocaml-ezjsonm + ocaml-fileutils + ocaml-frontc + ocaml-graph + ocaml-linenoise + ocaml-ocurl + ocaml-piqi + ocaml-ppx-bap + ocaml-ppx-bitstring + ocaml-re + ocaml-uri + ocaml-utop + ocaml-uuidm + ocaml-yojson + ocaml-z3 + ocaml-zarith)) + (inputs + (list gmp llvm ncurses)) (synopsis "Binary Analysis Platform") (description "Binary Analysis Platform is a framework for writing program analysis tools, that target binary files. The framework consists of a plethora