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 From patchwork Fri Sep 15 19:10:38 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Tournier X-Patchwork-Id: 53935 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 594BE27BBEA; Fri, 15 Sep 2023 20:12:42 +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 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 D9E4827BBE2 for ; Fri, 15 Sep 2023 20:12:41 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qhEER-00082a-Oq; 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-000819-Vu for guix-patches@gnu.org; Fri, 15 Sep 2023 15:11:58 -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 1qhEEP-0001hH-Ng for guix-patches@gnu.org; Fri, 15 Sep 2023 15:11:57 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qhEEW-0006yh-8K for guix-patches@gnu.org; Fri, 15 Sep 2023 15:12:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#66013] [PATCH 2/4] gnu: bap: Update to 2.6.0-alpha-0.f995d28. Resent-From: Simon Tournier Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 15 Sep 2023 19:12:04 +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.169480507726695 (code B ref 66013); Fri, 15 Sep 2023 19:12:04 +0000 Received: (at 66013) by debbugs.gnu.org; 15 Sep 2023 19:11:17 +0000 Received: from localhost ([127.0.0.1]:44767 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qhEDk-0006wP-To for submit@debbugs.gnu.org; Fri, 15 Sep 2023 15:11:17 -0400 Received: from mail-wm1-x332.google.com ([2a00:1450:4864:20::332]:38159) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qhEDb-0006vM-Nv for 66013@debbugs.gnu.org; Fri, 15 Sep 2023 15:11:10 -0400 Received: by mail-wm1-x332.google.com with SMTP id 5b1f17b1804b1-4047ef37f55so2076405e9.1 for <66013@debbugs.gnu.org>; Fri, 15 Sep 2023 12:11:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1694805055; x=1695409855; 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=znUufqRkD9pQfGYoU2s7pcDwFN5jcU7nJjHXi58SdQg=; b=GkrMW/Si91PaL3TVlQIP6YuMKFNa/DxjYfvo6eGqjY1lEtP8YoGYiqU15IzJ+Ma1CT ZNsWDXFp+snLy/thiyaxOoPKSBVykLwDTA9M80y+0u+9BZ6ezGxJKLbrwo9nDq0EgZQO 1+XGYffe0pxT3Fj7Vi2f4Fx+gF+r4kLbqEdD7EYQs1qe3pKJQu9SyhI+Qxcd3Eibj2fq gII7QgCsbgjLnVvWbcp/f70K1PFWTgrJ+eGsR092nQKG5UucI6zqmNYXUspROIcXG6f4 KSXi5u3qX3DwGat6GvORQfYqoSFY4mUWRS4IUxn8eXV5GIheA7KnDSKaQCBC2WY9Ir3/ EY6w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1694805055; x=1695409855; 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=znUufqRkD9pQfGYoU2s7pcDwFN5jcU7nJjHXi58SdQg=; b=dEN8YMJv7GmgdFZE9cAIcoUi45idXME6JVwnTbW/76oBwIMNHQ7Fr4VF5V+Y8pQL6P n0NjT5KG2jWweNY6GrtFe+nRcay05d2YIbhNFQP15/1qv/qYeklUCQxohvVXaE/2p9u6 7Od1Czk0zzUK8O6vFf9oMWYKTUFP6JbzJT0fcFKhzqS0dhbw1ofQhDn5U5WBh2sH/mI1 2BkNv57M74HDp333lbQGhOyHWSuPNVrtiGvjpCUSm9ud3THkugTXv8siZKG6lrfLTAgx XM5zttILKv8PiiaEl1KRKhGQfVk7vXnvSdgGNJpjVP7h+CQyexFU59zYJazcpzV5qn1l SP8g== X-Gm-Message-State: AOJu0YxklPEvsuO5Z87icOPmAUTDS0OogBR/g/Ptzmi3zoY8OBFCky1p 0dwz364eE7CDe0Ajtk6fG8H2vArfgy8= X-Google-Smtp-Source: AGHT+IHB5PK+j9q/0c3JXZcBOY+xaAa2osQr2DyrIiiQuFRnE0QILcZDiH/7pvAsIr8GRnMqoALWew== X-Received: by 2002:adf:e592:0:b0:31a:d2f9:736b with SMTP id l18-20020adfe592000000b0031ad2f9736bmr2176304wrm.1.1694805055145; Fri, 15 Sep 2023 12:10:55 -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.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 15 Sep 2023 12:10:53 -0700 (PDT) From: Simon Tournier Date: Fri, 15 Sep 2023 21:10:38 +0200 Message-Id: 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): Update to 2.6.0-alpha-0.f995d28. --- gnu/packages/ocaml.scm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index c026433b0ef1..0f4b72e29799 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -5325,11 +5325,12 @@ (define-public ocaml-ppx-bap (define-public bap (let (;; Let pin one commit because -alpha is subject to change. + ;; The last stable release v2.5.0 is from July 2022. (revision "0") - (commit "a972f8a419294dfb21847db5172ba58c5d7767eb")) + (commit "f995d28a4a34abb4cef8e0b3bd3c41cd710ccf1a")) (package (name "bap") - (version (git-version "2.5.0-alpha" revision commit)) + (version (git-version "2.6.0-alpha" revision commit)) (home-page "https://github.com/BinaryAnalysisPlatform/bap") (source (origin (method git-fetch) @@ -5339,7 +5340,7 @@ (define-public bap (file-name (git-file-name name version)) (sha256 (base32 - "1fw9pp0xnssc08qqfkcafffap4f46hw7zmk80gif5yc4nazga8w5")))) + "1zfkc8nagf8kvxbypalbhf6gs0c7i48zx53hlpak2ipjwhvm5im5")))) (build-system ocaml-build-system) (arguments (list From patchwork Fri Sep 15 19:10:39 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Tournier X-Patchwork-Id: 53932 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 0227627BBEA; Fri, 15 Sep 2023 20:12:23 +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 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 DD51527BBE2 for ; Fri, 15 Sep 2023 20:12:21 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qhEEQ-00081n-US; Fri, 15 Sep 2023 15:11:58 -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-00080y-Hv 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 1qhEEP-0001gy-9P for guix-patches@gnu.org; Fri, 15 Sep 2023 15:11:57 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qhEEV-0006yY-Qc for guix-patches@gnu.org; Fri, 15 Sep 2023 15:12:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#66013] [PATCH 3/4] gnu: python-glcontext: Update to 2.4.0-0.beebc1f. 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.169480507726688 (code B ref 66013); Fri, 15 Sep 2023 19:12:03 +0000 Received: (at 66013) by debbugs.gnu.org; 15 Sep 2023 19:11:17 +0000 Received: from localhost ([127.0.0.1]:44765 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qhEDk-0006wN-Ew for submit@debbugs.gnu.org; Fri, 15 Sep 2023 15:11:16 -0400 Received: from mail-wr1-x435.google.com ([2a00:1450:4864:20::435]:39004) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qhEDc-0006vY-WA for 66013@debbugs.gnu.org; Fri, 15 Sep 2023 15:11:10 -0400 Received: by mail-wr1-x435.google.com with SMTP id ffacd0b85a97d-31ffc8ead75so35237f8f.0 for <66013@debbugs.gnu.org>; Fri, 15 Sep 2023 12:11:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1694805056; x=1695409856; 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=9x//yOdSW6cLxQZDPc9G9wv286y3Q1h2zUG6GtQCK24=; b=BQL8LSE/jkC3DOoPq5ckdVYJt76dDZxLLZ0SrG+J/QyyzhtcDkE68M690VMXX7xx6l lxUUhy6vWMhFC+H5AyyZvHObylGj6jJxqqOFtBgIoMFIqgk60Edr3eSnWjnOy03fpR+q W2VjScIqZQ8/82r2ICU0JqCurKF3UapMQA5m7ZQ/qE3XFtbv3GDm+PmENETrNLBtME1f L+XSI7Xy3NiAPQ4pal0YxjzFHzNBKoloey7KjWZ0DNwWYBMzH4vVYFaKqtxUC3nIX5yM Xcsu6VaIbtUagyQODRDvPx+8PrQTEh1o4HaqfLP8hlFxzbSiodUcl1fBC4LEGDqhs833 En/A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1694805056; x=1695409856; 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=9x//yOdSW6cLxQZDPc9G9wv286y3Q1h2zUG6GtQCK24=; b=FVmTs6mU/2uJNQ5Iqur0oeawLvvYBrLZzGydhwB+fCX0Faz293uSyZJf8CHWBOJJ/i FFkV3me5tZqp6iI/O7pNZqm2TXwT4nkqQjdFaoJXU3TBqwQh66FAhc4vSDYI61NJ05Ob ClPQ1UqG1rLR3FIU4MSJ9svZxAx7RccIo07lKrSvjzn6y3iNsUYA/ONvY6k+Gc0ZPDam wyLRrw3LswUhqhuwJkCJwqHQnwJIsHM6VfVE4coXkzZqHjCdbvAxFUJzrN0AAJOolom4 Q7pOlhDWAXPgfe8zD6V/Y/AhV39G9aTomJuhz8MukhNCqPQfLPw9h7b39JOWav2r9UsT Od9Q== X-Gm-Message-State: AOJu0YyAVDzoRbxzMXBQNy22CxeR6KeqMrsdltfJVqyOkVz5teY9pqfZ uMJ4yg5ID8A4X6f1Cs6Xw4Kfv3gMoDw= X-Google-Smtp-Source: AGHT+IFXQ0+wnSaHS62872Wzc4b9X3a+xJeG+9R8UEaRKYoj5/8Me/cZwwv51NtjToauNyxWapdw6A== X-Received: by 2002:a05:6000:91:b0:317:3da0:7606 with SMTP id m17-20020a056000009100b003173da07606mr2246698wrx.4.1694805056251; Fri, 15 Sep 2023 12:10:56 -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.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 15 Sep 2023 12:10:55 -0700 (PDT) From: Simon Tournier Date: Fri, 15 Sep 2023 21:10:39 +0200 Message-Id: <375535045b489ea3432fe79940db0f36d18021aa.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/python-xyz.scm (python-glcontext): Explicitly refer to commit instead of mutable Git tag. --- gnu/packages/python-xyz.scm | 100 +++++++++++++++++++----------------- 1 file changed, 52 insertions(+), 48 deletions(-) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 2230310a0350..481326b8e162 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -22986,55 +22986,59 @@ (define-public python-pyopengl-accelerate "This is the Cython-coded accelerator module for PyOpenGL."))) (define-public python-glcontext - (package - (name "python-glcontext") - (version "2.4.0") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/moderngl/glcontext") - (commit version))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "0zzpwyqg19y600n09xz07cxk4jimh9vjraszda7g7ipijq6iasac")))) - (build-system pyproject-build-system) - (arguments - (list #:phases #~(modify-phases %standard-phases - (add-before 'build 'fix-lib-paths - (lambda* (#:key inputs outputs #:allow-other-keys) - (let ((mesa (assoc-ref inputs "mesa")) - (libx11 (assoc-ref inputs "libx11"))) - (substitute* '("glcontext/x11.cpp" - "glcontext/egl.cpp") - (("\"libGL.so\"") - (string-append "\"" mesa "/lib/libGL.so\"")) - (("\"libEGL.so\"") - (string-append "\"" mesa "/lib/libEGL.so\"")) - (("\"libX11.so\"") - (string-append "\"" libx11 "/lib/libX11.so\""))) - (substitute* '("glcontext/__init__.py") - (("find_library\\('GL'\\)") - (string-append "'" mesa "/lib/libGL.so'")) - (("find_library\\('EGL'\\)") - (string-append "'" mesa "/lib/libEGL.so'")) - (("find_library\\(\"X11\"\\)") - (string-append "'" libx11 "/lib/libX11.so'")))))) - (replace 'check - (lambda* (#:key inputs outputs tests? - #:allow-other-keys) - (when tests? - (system "Xvfb :1 &") - (setenv "DISPLAY" ":1") - (add-installed-pythonpath inputs outputs) - (invoke "pytest" "tests"))))))) - (inputs (list libx11 mesa)) - (native-inputs (list xorg-server-for-tests python-pytest python-psutil)) - (home-page "https://github.com/moderngl/glcontext") - (synopsis "Portable OpenGL Context for ModernGL") - (description "Python-glcontext is a library providing an OpenGL + (let (;; Upstream is known for abusing mutable tag, hence pinpoint the + ;; relevant commit. + (revision "0") + (commit "beebc1fd08ee850f06f4390be4b280824e383074")) + (package + (name "python-glcontext") + (version (git-version "2.4.0" revision commit)) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/moderngl/glcontext") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0zzpwyqg19y600n09xz07cxk4jimh9vjraszda7g7ipijq6iasac")))) + (build-system pyproject-build-system) + (arguments + (list #:phases #~(modify-phases %standard-phases + (add-before 'build 'fix-lib-paths + (lambda* (#:key inputs outputs #:allow-other-keys) + (let ((mesa (assoc-ref inputs "mesa")) + (libx11 (assoc-ref inputs "libx11"))) + (substitute* '("glcontext/x11.cpp" + "glcontext/egl.cpp") + (("\"libGL.so\"") + (string-append "\"" mesa "/lib/libGL.so\"")) + (("\"libEGL.so\"") + (string-append "\"" mesa "/lib/libEGL.so\"")) + (("\"libX11.so\"") + (string-append "\"" libx11 "/lib/libX11.so\""))) + (substitute* '("glcontext/__init__.py") + (("find_library\\('GL'\\)") + (string-append "'" mesa "/lib/libGL.so'")) + (("find_library\\('EGL'\\)") + (string-append "'" mesa "/lib/libEGL.so'")) + (("find_library\\(\"X11\"\\)") + (string-append "'" libx11 "/lib/libX11.so'")))))) + (replace 'check + (lambda* (#:key inputs outputs tests? + #:allow-other-keys) + (when tests? + (system "Xvfb :1 &") + (setenv "DISPLAY" ":1") + (add-installed-pythonpath inputs outputs) + (invoke "pytest" "tests"))))))) + (inputs (list libx11 mesa)) + (native-inputs (list xorg-server-for-tests python-pytest python-psutil)) + (home-page "https://github.com/moderngl/glcontext") + (synopsis "Portable OpenGL Context for ModernGL") + (description "Python-glcontext is a library providing an OpenGL implementation for ModernGL on multiple platforms.") - (license license:expat))) + (license license:expat)))) (define-public python-rencode (package From patchwork Fri Sep 15 19:10:40 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Tournier X-Patchwork-Id: 53933 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 956FF27BBEA; Fri, 15 Sep 2023 20:12:28 +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 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 0BE9527BBE2 for ; Fri, 15 Sep 2023 20:12:28 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qhEES-00082i-9r; Fri, 15 Sep 2023 15:12:00 -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 1qhEEQ-00081R-FE for guix-patches@gnu.org; Fri, 15 Sep 2023 15:11:58 -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 1qhEEQ-0001hO-75 for guix-patches@gnu.org; Fri, 15 Sep 2023 15:11:58 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qhEEW-0006yo-Om for guix-patches@gnu.org; Fri, 15 Sep 2023 15:12:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#66013] [PATCH 4/4] gnu: python-glcontext: Update to 2.4.0-1.0af21b7. Resent-From: Simon Tournier Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 15 Sep 2023 19:12:04 +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.169480507726702 (code B ref 66013); Fri, 15 Sep 2023 19:12:04 +0000 Received: (at 66013) by debbugs.gnu.org; 15 Sep 2023 19:11:17 +0000 Received: from localhost ([127.0.0.1]:44769 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qhEDl-0006wW-8E for submit@debbugs.gnu.org; Fri, 15 Sep 2023 15:11:17 -0400 Received: from mail-wm1-x332.google.com ([2a00:1450:4864:20::332]:41321) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qhEDd-0006va-VD for 66013@debbugs.gnu.org; Fri, 15 Sep 2023 15:11:11 -0400 Received: by mail-wm1-x332.google.com with SMTP id 5b1f17b1804b1-401e6ce2d9fso7200375e9.1 for <66013@debbugs.gnu.org>; Fri, 15 Sep 2023 12:11:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1694805057; x=1695409857; 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=zJD0BKdDo+gtVRa9/rzoeCWVIUUky+K4t6dDspiYceY=; b=cqJeLQOrFsELml59egjVrkVuU6Pl60jO/88RX0noH0f/B2U1dZy5B46je//auDPlNg EaoP2/6qpNul+UNnd4r1OUHcSzhpBW55ttdruH3aRH3KJIB3MSn34oQBC4n7eQFBnCkG UflbMp43yIDCCFK1SQA3rrNZKSdcw/iGfL18pUE3DKrEKs3sSJSOhnj884ObzbY1ABkg HxOq/6o2aFs+E9orkHZ5/7WnrslbIu4Na5DM82glv0j3ZjkZUrXofHz8x1tjjl9z5S5J /bmcD1fvB65fjGEoX55QGIMTYCA1biulH1jRoWH5MMDRfZIWuJKcvEG6Xm35+QPycpsl hSVw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1694805057; x=1695409857; 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=zJD0BKdDo+gtVRa9/rzoeCWVIUUky+K4t6dDspiYceY=; b=XkAfT1LGoWH6V7+AADSdn6wz0rdqA5xHH88HDCOyBkCuXYiMGRbd9P6wzGH1my6oDX QkEXK27IbvaYFNwHRYeanvi7bYtFRtfChMRybrCZ+rfwJBOGCjr+YXMrbgqy0jI+Pu1P +NrZzY4Mfv6OctnwTABZFL/L1UTSDzyo75eLw62DaQ/dKfmb9a0M9LEAEW5b13lMnGd2 oIPSgW93KyZ17HoI5eece5ZLj+l7GVtWTg32/uuIo8SthZPldyjs/dETGjn8Aqzv8TcF jXLc4/5QwTi/neKkpPJHsQS+CNf7LDOlw2gSNWzf7uzLAktX47ZY9e9vqnr8Zp2gSHaq 0MEQ== X-Gm-Message-State: AOJu0YxqbwvQMJtB0ZIUD88oPMzZcgZqCf6IN7CRVN6k2t48UbUdHmB1 VV+yNy/Krm1zca0YrIH3tdPS0hq199g= X-Google-Smtp-Source: AGHT+IHFauAdOakEf2XTEKrFM5YJo4ukozyw8XLDzb9kotPYUlogJmDxegD1Tad3iQp3n4mW8a48/A== X-Received: by 2002:a05:600c:3b9d:b0:3ff:c342:f296 with SMTP id n29-20020a05600c3b9d00b003ffc342f296mr2306146wms.1.1694805057609; Fri, 15 Sep 2023 12:10:57 -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.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 15 Sep 2023 12:10:56 -0700 (PDT) From: Simon Tournier Date: Fri, 15 Sep 2023 21:10:40 +0200 Message-Id: <4413530e2475d4e37194e87cf983c883ef2ad3a1.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/python-xyz.scm (python-glcontext): Update to 2.4.0-1.0af21b7. --- gnu/packages/python-xyz.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 481326b8e162..fc6caf93912c 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -22988,8 +22988,8 @@ (define-public python-pyopengl-accelerate (define-public python-glcontext (let (;; Upstream is known for abusing mutable tag, hence pinpoint the ;; relevant commit. - (revision "0") - (commit "beebc1fd08ee850f06f4390be4b280824e383074")) + (revision "1") + (commit "0af21b7c8a8cc0e76f4d9aff6a4f156f43d37333")) (package (name "python-glcontext") (version (git-version "2.4.0" revision commit)) @@ -23001,7 +23001,7 @@ (define-public python-glcontext (file-name (git-file-name name version)) (sha256 (base32 - "0zzpwyqg19y600n09xz07cxk4jimh9vjraszda7g7ipijq6iasac")))) + "03xpw776pvv8c5n58049yczlkgcqdh9vfcpjlghh3p6cal3yiq8a")))) (build-system pyproject-build-system) (arguments (list #:phases #~(modify-phases %standard-phases