From patchwork Fri Sep 15 19:10:37 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Tournier X-Patchwork-Id: 53934 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 5AAB227BBEA; Fri, 15 Sep 2023 20:12:40 +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_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,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 4210F27BBE2 for ; Fri, 15 Sep 2023 20:12:39 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qhEER-000824-A8; Fri, 15 Sep 2023 15:11:59 -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 1qhEEP-00080i-2n for guix-patches@gnu.org; Fri, 15 Sep 2023 15:11:57 -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 1qhEEO-0001gr-Qm for guix-patches@gnu.org; Fri, 15 Sep 2023 15:11:56 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qhEEV-0006yR-C9 for guix-patches@gnu.org; Fri, 15 Sep 2023 15:12:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#66013] [PATCH 1/4] gnu: bap: Update to 2.5.0-alpha-0.a972f8a. Resent-From: Simon Tournier Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 15 Sep 2023 19:12:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 66013 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 66013@debbugs.gnu.org Cc: Simon Tournier Received: via spool by 66013-submit@debbugs.gnu.org id=B66013.169480507126666 (code B ref 66013); Fri, 15 Sep 2023 19:12:03 +0000 Received: (at 66013) by debbugs.gnu.org; 15 Sep 2023 19:11:11 +0000 Received: from localhost ([127.0.0.1]:44763 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qhEDf-0006w2-0Q for submit@debbugs.gnu.org; Fri, 15 Sep 2023 15:11:11 -0400 Received: from mail-wr1-x434.google.com ([2a00:1450:4864:20::434]:38004) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qhEDZ-0006vC-VR for 66013@debbugs.gnu.org; Fri, 15 Sep 2023 15:11:10 -0400 Received: by mail-wr1-x434.google.com with SMTP id ffacd0b85a97d-31f7c87353eso445703f8f.0 for <66013@debbugs.gnu.org>; Fri, 15 Sep 2023 12:10:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1694805053; x=1695409853; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=bXOHEBtlnRXZe/qBbEOp50KK4QNSn2dgVHxUrDOl1fo=; b=IUoEyP2MqYlZUc3VkkWu0pkHzJE9FaHNjsKY3q/E/V9UOxi1edMT1ad6OdsCjeYj03 kvD3ekm9BpqqhpYW7Oa5QCKUUY667O083YZf0gNE3fWJnDw3zMR1uADHeHhHmiEc5l4A sBdAklOB1j3CZq/vAYgmFVp/uk93p/GHSpav2oOxvW+nvm2ENhFHT+uwFKmwiMf/Th5O WpxcxZBdpEtfqxIzSGozIIGJbJRe6KwOSlbrE0ZeKfXoCOwcgBgMFRVQMZ22wFZFA2EM QIodho1sjPsHGgORcj7cmuFCH2T7CbYWXlobvluqfFEo5UDhZk2LwCXfdnFJw8PFO7qq cDJg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1694805053; x=1695409853; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=bXOHEBtlnRXZe/qBbEOp50KK4QNSn2dgVHxUrDOl1fo=; b=qwoalxObIQDpAN1SeTo47nUy5AH5TLmNL8Jsu9Mu+/fvDP1o8ztWO/V0+g+29mKv95 c7jWc2Y8FyNzXNA3rZ84bwFCDt0MUPei3JC1o9kRqrqXxynWNscsgczJua5QjxjiFNwb OEihJ20idml30vTMWfgOaoWOfFarsUJjw3Zw1sxot0ZDhM1WEAvtrOMF1EztG/KfvDhw tTcvrTmsjpQ7puQTPpZfLrWpFQi0s1AHf5VMYI6/jp0VKQ+ib2uGhMJrRZLKY6tfKxXf kuzBJJNtsSrob1zsKvjKpKIgxEavcVUdU0U4i/xIfzk1PK9KwpYEM4nouR8r9zekupFX FzTg== X-Gm-Message-State: AOJu0YyswI0cb8ieBu/s7xMicRiYCWQCS1xyiMLDqSn34JZvsvStdXUz FGxzjfs0ynwqMjD9SV25xbTwy5/8r4s= X-Google-Smtp-Source: AGHT+IFeIKBg9lwVaBIXxL5e6v4ZUW8AATIojkgf8uPNxnGZ1a38CFNGPJqLGIskLNy/0/cHyuSH+w== X-Received: by 2002:adf:e592:0:b0:31a:d2f9:736b with SMTP id l18-20020adfe592000000b0031ad2f9736bmr2176257wrm.1.1694805053157; Fri, 15 Sep 2023 12:10:53 -0700 (PDT) Received: from localhost.localdomain ([193.48.40.241]) by smtp.gmail.com with ESMTPSA id s10-20020a5d510a000000b0031971ab70c9sm5142381wrt.73.2023.09.15.12.10.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 15 Sep 2023 12:10:51 -0700 (PDT) From: Simon Tournier Date: Fri, 15 Sep 2023 21:10:37 +0200 Message-Id: <89bb3fe4dbd60e640d2614b4e26711fd63c9a669.1694800551.git.zimon.toutoune@gmail.com> X-Mailer: git-send-email 2.39.2 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 (bap): Explicitly refer to commit instead of mutable Git tag. --- gnu/packages/ocaml.scm | 147 +++++++++++++++++++++-------------------- 1 file changed, 75 insertions(+), 72 deletions(-) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 8ff755aea9fb..c026433b0ef1 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -5324,82 +5324,85 @@ (define-public ocaml-ppx-bap (license license:expat))) (define-public bap - (package - (name "bap") - (version "2.5.0-alpha") - (home-page "https://github.com/BinaryAnalysisPlatform/bap") - (source (origin - (method git-fetch) - (uri (git-reference - (url home-page) - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "1fw9pp0xnssc08qqfkcafffap4f46hw7zmk80gif5yc4nazga8w5")))) - (build-system ocaml-build-system) - (arguments - (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) - (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") - "--libdir" - (string-append + (let (;; Let pin one commit because -alpha is subject to change. + (revision "0") + (commit "a972f8a419294dfb21847db5172ba58c5d7767eb")) + (package + (name "bap") + (version (git-version "2.5.0-alpha" revision commit)) + (home-page "https://github.com/BinaryAnalysisPlatform/bap") + (source (origin + (method git-fetch) + (uri (git-reference + (url home-page) + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1fw9pp0xnssc08qqfkcafffap4f46hw7zmk80gif5yc4nazga8w5")))) + (build-system ocaml-build-system) + (arguments + (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) + (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") - (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 + "--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 of libraries, plugins, and frontends. The libraries provide code reusability, the plugins facilitate extensibility, and the frontends serve as entry points.") - (license license:expat))) + (license license:expat)))) (define-public ocaml-camomile (package