From patchwork Fri Jun 23 06:24:42 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hilton Chain X-Patchwork-Id: 51197 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 63DD827BBE9; Fri, 23 Jun 2023 07:25: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=-0.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FROM_SUSPICIOUS_NTLD,MAILING_LIST_MULTI,PDS_OTHER_BAD_TLD, SPF_HELO_PASS,URIBL_BLOCKED autolearn=no 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 3286927BBE2 for ; Fri, 23 Jun 2023 07:25:15 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qCaEJ-0002oj-IW; Fri, 23 Jun 2023 02:25:11 -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 1qCaEC-0002nz-75 for guix-patches@gnu.org; Fri, 23 Jun 2023 02:25:05 -0400 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qCaEA-0001tR-Br for guix-patches@gnu.org; Fri, 23 Jun 2023 02:25:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qCaEA-0000Y9-7O for guix-patches@gnu.org; Fri, 23 Jun 2023 02:25:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#63765] [PATCH v3 1/8] gnu: Add ftest-for-utfcpp. Resent-From: Hilton Chain Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 23 Jun 2023 06:25:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 63765 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 63765@debbugs.gnu.org Cc: Hilton Chain Received: via spool by 63765-submit@debbugs.gnu.org id=B63765.16875014952053 (code B ref 63765); Fri, 23 Jun 2023 06:25:02 +0000 Received: (at 63765) by debbugs.gnu.org; 23 Jun 2023 06:24:55 +0000 Received: from localhost ([127.0.0.1]:37291 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qCaE2-0000X3-LD for submit@debbugs.gnu.org; Fri, 23 Jun 2023 02:24:54 -0400 Received: from mail.boiledscript.com ([144.168.59.46]:46322) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qCaE0-0000Wu-V9 for 63765@debbugs.gnu.org; Fri, 23 Jun 2023 02:24:53 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ultrarare.space; s=dkim; t=1687501301; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=TD6lY7H4QcPzAfWApS72DYYeYUDS5UcgeJlg1R1hWBo=; b=U8JH5ghyq3Ui7yVCJEIowvNE3vBflrJSuJA+F55TP5sYqtUNSK/Yss5d4Vt95ORqsUaYj+ Nav88DtIp35f5H99P1yXTg7dxfEIyW9z6w2CXhM/GMAAnEkgwFrBes8Li7vYunzjJHRrNL bcfhPp5amY/+JKysyFpLMx/NwUfpFD5LcSdNvWvsGU0V4Vj9FG4ChkEQ20OjH4+MaCXTtc dKmQwj/l7OKcyCqw6djTpJLnxQtOOkc2JKOgco8FasKf1trvYPqgl/+ksySlWghQKFz4yg XKUjgL//WSBeRomNpRgfJ3kkHbEtfUnCjtwl0ykUNJCi6pCgbn5zwhz0XCq7zA== Date: Fri, 23 Jun 2023 14:24:42 +0800 Message-Id: <29315a7b68e6def2928cdb4ec6c5532753ce49aa.1687500984.git.hako@ultrarare.space> In-Reply-To: References: MIME-Version: 1.0 X-Spamd-Bar: -- Authentication-Results: mail.boiledscript.com; auth=pass smtp.mailfrom=hako@ultrarare.space 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: , Reply-to: Hilton Chain X-ACL-Warn: , Hilton Chain via Guix-patches X-Patchwork-Original-From: Hilton Chain via Guix-patches via From: Hilton Chain 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/textutils.scm (ftest-for-utfcpp): New variable. --- gnu/packages/textutils.scm | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/gnu/packages/textutils.scm b/gnu/packages/textutils.scm index 51df3748cd..26d0234390 100644 --- a/gnu/packages/textutils.scm +++ b/gnu/packages/textutils.scm @@ -684,6 +684,20 @@ (define-public catdoc @command{catppt}, which extracts data from PowerPoint presentations.") (license license:gpl2+))) +(define ftest-for-utfcpp + (let* ((commit "c4ad4af0946b73ce1a40cbc72205d15d196c7e06") + (revision "0") + (version (git-version "0" revision commit))) + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/nemtrif/ftest") + (commit commit))) + (file-name (git-file-name "ftest-for-utfcpp" version)) + (sha256 + (base32 + "1jcd76zjhx5f2nsi80hj7gmywgpz1f7vcw8lv5yf7gx0l99dn86x"))))) + (define-public utfcpp (package (name "utfcpp") From patchwork Fri Jun 23 06:24:43 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hilton Chain X-Patchwork-Id: 51200 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 1A85127BBE9; Fri, 23 Jun 2023 07:26:03 +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=-0.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FROM_SUSPICIOUS_NTLD,MAILING_LIST_MULTI,PDS_OTHER_BAD_TLD, SPF_HELO_PASS,URIBL_BLOCKED autolearn=no 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 3D62127BBE2 for ; Fri, 23 Jun 2023 07:26:02 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qCaEK-0002pT-CC; Fri, 23 Jun 2023 02:25:12 -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 1qCaEC-0002ny-6c for guix-patches@gnu.org; Fri, 23 Jun 2023 02:25:05 -0400 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qCaEB-0001up-7u for guix-patches@gnu.org; Fri, 23 Jun 2023 02:25:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qCaEB-0000YR-1A; Fri, 23 Jun 2023 02:25:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#63765] [PATCH v3 2/8] gnu: utfcpp: Update to 3.2.3. Resent-From: Hilton Chain Original-Sender: "Debbugs-submit" Resent-CC: liliana.prikler@gmail.com, iyzsong@envs.net, guix-patches@gnu.org Resent-Date: Fri, 23 Jun 2023 06:25:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 63765 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 63765@debbugs.gnu.org Cc: Hilton Chain , Liliana Marie Prikler , =?utf-8?b?5a6L5paH5q2m?= X-Debbugs-Original-Xcc: Liliana Marie Prikler , =?utf-8?b?5a6L5paH5q2m?= Received: via spool by 63765-submit@debbugs.gnu.org id=B63765.16875014992084 (code B ref 63765); Fri, 23 Jun 2023 06:25:02 +0000 Received: (at 63765) by debbugs.gnu.org; 23 Jun 2023 06:24:59 +0000 Received: from localhost ([127.0.0.1]:37297 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qCaE6-0000XT-FS for submit@debbugs.gnu.org; Fri, 23 Jun 2023 02:24:58 -0400 Received: from mail.boiledscript.com ([144.168.59.46]:46336) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qCaE2-0000X2-RP for 63765@debbugs.gnu.org; Fri, 23 Jun 2023 02:24:57 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ultrarare.space; s=dkim; t=1687501303; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=vnA8rqvUNrE/4uCkekbCDyHObpcrLVeNOKiL1vRGJLM=; b=tfyD0736fz2RRURaUoMhEpILR3bwD8XSoaw4TWIvzqoX3pLFZxREH2vBqaEsaS05K3/P4B D7HmrVcBC/t5WdzAM5EC5SgLBmouiadafRiWdIs6D4XxywMNG0eoNSlLfXhdHn/77H/Rz7 wk7TspRAZQDeEkz5sTcSk6FCBpD2vGTWxonWuwxMYaOkchVRFi2AB1yOf2+enVOPO4J0GQ ngcUeamOrXLYWKOB1PjLd7PfXpxUqW/8hlmFtdJDsi/kGFEpUJl9W5yqqcHiqQlSUadvzU BmViQXvnsWMqX55GD8Vfy0eyX57asuO3UH9cj+P08K6wSc9TLyQyH5hv4D1XoQ== Date: Fri, 23 Jun 2023 14:24:43 +0800 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Spamd-Bar: -- Authentication-Results: mail.boiledscript.com; auth=pass smtp.mailfrom=hako@ultrarare.space 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: , Reply-to: Hilton Chain X-ACL-Warn: , Hilton Chain via Guix-patches X-Patchwork-Original-From: Hilton Chain via Guix-patches via From: Hilton Chain 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/textutils.scm (utfcpp): Update to 3.2.3. [arguments]: Remove arguments, then... <#:phases>: ...Add 'unpack-ftest. * gnu/packages/games.scm (warzone2100)<#:phases>: Adjust 'fix-utfcpp-include. * gnu/packages/video.scm (mkvtoolnix)<#:phases>: Add 'fix-utfcpp-include. --- gnu/packages/games.scm | 2 +- gnu/packages/textutils.scm | 20 +++++++------------- gnu/packages/video.scm | 5 +++++ 3 files changed, 13 insertions(+), 14 deletions(-) diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index 83704dd720..9dbf5a3739 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -5510,7 +5510,7 @@ (define-public warzone2100 (lambda _ (substitute* "lib/framework/wzstring.cpp" (("") - "")))) + "")))) (add-after 'unpack 'link-tests-with-qt (lambda _ (substitute* "tests/Makefile.am" diff --git a/gnu/packages/textutils.scm b/gnu/packages/textutils.scm index 26d0234390..81b403d559 100644 --- a/gnu/packages/textutils.scm +++ b/gnu/packages/textutils.scm @@ -701,7 +701,7 @@ (define ftest-for-utfcpp (define-public utfcpp (package (name "utfcpp") - (version "2.3.5") + (version "3.2.3") (source (origin (method git-fetch) (uri (git-reference @@ -710,20 +710,14 @@ (define-public utfcpp (file-name (git-file-name name version)) (sha256 (base32 - "1gr98d826z6wa58r1s5i7rz7q2x3r31v7zj0pjjlrc7gfxwklr4s")))) + "00hzh39iddbc6nxg13813qd6d55g2kccwjf5dr96wykfhway9wbr")))) (build-system cmake-build-system) (arguments - `(#:out-of-source? #f - #:phases - (modify-phases %standard-phases - (replace 'install ; no install target - (lambda* (#:key outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (include (string-append out "/include")) - (doc (string-append out "/share/doc/" ,name))) - (copy-recursively "source" include) - (install-file "README.md" doc) - #t)))))) + (list #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'unpack-ftest + (lambda* (#:key native-inputs #:allow-other-keys) + (copy-recursively #$ftest-for-utfcpp "extern/ftest")))))) (home-page "https://github.com/nemtrif/utfcpp") (synopsis "Portable C++ library for handling UTF-8") (description "UTF8-CPP is a C++ library for handling UTF-8 encoded text diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index 55eab972b9..43ae3899f9 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -1048,6 +1048,11 @@ (define-public mkvtoolnix "--enable-precompiled-headers=no") #:phases (modify-phases %standard-phases + (add-after 'unpack 'fix-utfcpp-include + (lambda _ + (substitute* "src/common/strings/utf8.cpp" + (("") + "")))) (add-after 'unpack 'patch-relative-file-names (lambda* (#:key outputs #:allow-other-keys) (let ((out (assoc-ref outputs "out"))) From patchwork Fri Jun 23 06:24:44 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Hilton Chain X-Patchwork-Id: 51199 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 5DF7A27BBE9; Fri, 23 Jun 2023 07:25:49 +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=-0.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FROM_SUSPICIOUS_NTLD,MAILING_LIST_MULTI,PDS_OTHER_BAD_TLD, SPF_HELO_PASS,URIBL_BLOCKED autolearn=no 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 EB13327BBE2 for ; Fri, 23 Jun 2023 07:25:47 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qCaEM-0002pg-7D; Fri, 23 Jun 2023 02:25:14 -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 1qCaEC-0002o0-7K for guix-patches@gnu.org; Fri, 23 Jun 2023 02:25:05 -0400 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qCaEB-0001v4-N9 for guix-patches@gnu.org; Fri, 23 Jun 2023 02:25:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qCaEA-0000YG-KS; Fri, 23 Jun 2023 02:25:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#63765] [PATCH v3 3/8] gnu: mbedtls-apache: Rename package to mbedtls-apache-lts. Resent-From: Hilton Chain Original-Sender: "Debbugs-submit" Resent-CC: efraim@flashner.co.il, leo@famulari.name, liliana.prikler@gmail.com, zimon.toutoune@gmail.com, me@tobias.gr, iyzsong@envs.net, guix-patches@gnu.org Resent-Date: Fri, 23 Jun 2023 06:25:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 63765 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 63765@debbugs.gnu.org Cc: Hilton Chain , Efraim Flashner , Leo Famulari , Liliana Marie Prikler , Simon Tournier , Tobias Geerinckx-Rice , =?utf-8?b?5a6L5paH5q2m?= X-Debbugs-Original-Xcc: Efraim Flashner , Leo Famulari , Liliana Marie Prikler , Simon Tournier , Tobias Geerinckx-Rice , =?utf-8?b?5a6L5paH5q2m?= Received: via spool by 63765-submit@debbugs.gnu.org id=B63765.16875014982078 (code B ref 63765); Fri, 23 Jun 2023 06:25:02 +0000 Received: (at 63765) by debbugs.gnu.org; 23 Jun 2023 06:24:58 +0000 Received: from localhost ([127.0.0.1]:37295 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qCaE5-0000XP-UT for submit@debbugs.gnu.org; Fri, 23 Jun 2023 02:24:58 -0400 Received: from mail.boiledscript.com ([144.168.59.46]:46350) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qCaE4-0000XC-OU for 63765@debbugs.gnu.org; Fri, 23 Jun 2023 02:24:57 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ultrarare.space; s=dkim; t=1687501305; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=EuwoCmhKXOm1J9nUohSQiT0mc3Cw/zMZRI1S+nuhhfQ=; b=sVwnLsE//PK7K/Kmm19wCXuBbKtmpc04aTXDmZQqt9vvcrDmOxUkQZSaHnAk5l0PzZcisR zB3xJujKbw0tt+Ao1tFPuclcOC9lhHTJiPbHzEC3lGivC8QPfgqBDu8zyZyWO330x/qFwv WMeYLwtQSK18SfQaz4F+m9oiuoHVsCLpT5x9W7RbhDN0obEMduUBlbpiRT/ojl1PfOWss9 XuuRn16et4G1wHJzuqDktOzaOtU3pu7qXyAsaai+2xWrk2mTjGwvOzMz1SzNqBhlStXH0I W++RJ/oT9Ce/mV9TNPcQdlhRgJwvatLTRVOpOzyNNDm+A6VvCZ2wGpdbhnr33A== Date: Fri, 23 Jun 2023 14:24:44 +0800 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Spamd-Bar: --- Authentication-Results: mail.boiledscript.com; auth=pass smtp.mailfrom=hako@ultrarare.space 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: , Reply-to: Hilton Chain X-ACL-Warn: , Hilton Chain via Guix-patches X-Patchwork-Original-From: Hilton Chain via Guix-patches via From: Hilton Chain 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/tls.scm (mbedtls-apache-lts): New variable, formerly known as "mbedtls-apache". --- gnu/packages/emulators.scm | 2 +- gnu/packages/game-development.scm | 2 +- gnu/packages/hardware.scm | 4 ++-- gnu/packages/haxe.scm | 6 +++--- gnu/packages/irc.scm | 2 +- gnu/packages/julia-jll.scm | 2 +- gnu/packages/julia.scm | 2 +- gnu/packages/linphone.scm | 2 +- gnu/packages/linux.scm | 2 +- gnu/packages/networking.scm | 2 +- gnu/packages/search.scm | 2 +- gnu/packages/tls.scm | 6 +++--- gnu/packages/video.scm | 2 +- 13 files changed, 18 insertions(+), 18 deletions(-) diff --git a/gnu/packages/emulators.scm b/gnu/packages/emulators.scm index be76f81ff4..52921e79a6 100644 --- a/gnu/packages/emulators.scm +++ b/gnu/packages/emulators.scm @@ -341,7 +341,7 @@ (define-public dolphin-emu libxi libxrandr lzo - mbedtls-apache + mbedtls-apache-lts mesa miniupnpc openal diff --git a/gnu/packages/game-development.scm b/gnu/packages/game-development.scm index aa99109cca..4131b85a20 100644 --- a/gnu/packages/game-development.scm +++ b/gnu/packages/game-development.scm @@ -1964,7 +1964,7 @@ (define-public godot libxi libxinerama libxrandr - mbedtls-apache + mbedtls-apache-lts mesa opusfile pcre2 diff --git a/gnu/packages/hardware.scm b/gnu/packages/hardware.scm index c23299d1db..d1ad38adbd 100644 --- a/gnu/packages/hardware.scm +++ b/gnu/packages/hardware.scm @@ -703,7 +703,7 @@ (define-public hueplusplus (arguments `(#:tests? #f)) ;; Tests require Google's gtest and gmock (inputs - (list mbedtls-apache)) + (list mbedtls-apache-lts)) (synopsis "C++ library to control Philips Hue lights") (description "Hueplusplus is a library for controlling Philips Hue lights. Features: @@ -1069,7 +1069,7 @@ (define-public openrgb hueplusplus nlohmann-json libusb - mbedtls-apache + mbedtls-apache-lts qtbase-5)) (native-inputs (list pkg-config diff --git a/gnu/packages/haxe.scm b/gnu/packages/haxe.scm index 6fc30ce02f..60495630b9 100644 --- a/gnu/packages/haxe.scm +++ b/gnu/packages/haxe.scm @@ -78,7 +78,7 @@ (define-public neko apr-util gtk+-2 libgc - mbedtls-apache + mbedtls-apache-lts (list mariadb "dev") (list mariadb "lib") openssl @@ -171,7 +171,7 @@ (define-public haxe (lambda _ (invoke "make" "install")))))) (inputs (list libuv - mbedtls-apache + mbedtls-apache-lts neko ocaml-extlib ocaml-luv @@ -255,7 +255,7 @@ (define-public hashlink libpng libuv libvorbis - mbedtls-apache + mbedtls-apache-lts mikktspace minimp3 openal diff --git a/gnu/packages/irc.scm b/gnu/packages/irc.scm index b31bb6b11a..d442787d97 100644 --- a/gnu/packages/irc.scm +++ b/gnu/packages/irc.scm @@ -748,7 +748,7 @@ (define-public inspircd (list argon2 gnutls libmaxminddb - mbedtls-apache + mbedtls-apache-lts (list mariadb "dev") openldap openssl diff --git a/gnu/packages/julia-jll.scm b/gnu/packages/julia-jll.scm index 2320b03595..78ec186bf2 100644 --- a/gnu/packages/julia-jll.scm +++ b/gnu/packages/julia-jll.scm @@ -1404,7 +1404,7 @@ (define-public julia-mbedtls-jll ;; There's a Julia file for each platform, override them all (find-files "src/wrappers/" "\\.jl$")) #t))))) - (inputs (list mbedtls-apache)) + (inputs (list mbedtls-apache-lts)) (propagated-inputs (list julia-jllwrappers)) (home-page "https://github.com/JuliaBinaryWrappers/MbedTLS_jll.jl") (synopsis "Apache's mbed TLS binary wrappers") diff --git a/gnu/packages/julia.scm b/gnu/packages/julia.scm index ba54175822..82891525c2 100644 --- a/gnu/packages/julia.scm +++ b/gnu/packages/julia.scm @@ -511,7 +511,7 @@ (define-public julia ("libunwind" ,libunwind-julia) ("libuv" ,libuv-julia) ("llvm" ,llvm-julia) - ("mbedtls-apache" ,mbedtls-apache) + ("mbedtls-apache" ,mbedtls-apache-lts) ("mpfr" ,mpfr) ("openblas" ,openblas) ("openlibm" ,openlibm) diff --git a/gnu/packages/linphone.scm b/gnu/packages/linphone.scm index 7d87ee602c..f26c5efd3c 100644 --- a/gnu/packages/linphone.scm +++ b/gnu/packages/linphone.scm @@ -188,7 +188,7 @@ (define-public bctoolbox (with-directory-excursion "tester" (invoke "./bctoolbox_tester")))))))) (inputs - (list bcunit libdecaf mbedtls-apache)) + (list bcunit libdecaf mbedtls-apache-lts)) (synopsis "Belledonne Communications Tool Box") (description "BcToolBox is an utilities library used by Belledonne Communications software like belle-sip, mediastreamer2 and linphone.") diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 52fb883467..c13f220613 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -2262,7 +2262,7 @@ (define-public dislocker (build-system cmake-build-system) (arguments '(#:tests? #f)) ;no test suite - (inputs (list fuse mbedtls-apache)) + (inputs (list fuse mbedtls-apache-lts)) (synopsis "FUSE driver to read/write Windows BitLocker drives") (description "This package provides means to to read BitLocker encrypted diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm index b0cdcdf6a3..58f8249a36 100644 --- a/gnu/packages/networking.scm +++ b/gnu/packages/networking.scm @@ -822,7 +822,7 @@ (define-public nng (native-inputs `(("ksh" ,oksh))) (inputs - `(("mbedtls" ,mbedtls-apache))) + `(("mbedtls" ,mbedtls-apache-lts))) (synopsis "Lightweight messaging library") (description "NNG project is a rewrite of the scalability protocols library known as libnanomsg, and adds significant new capabilities, while retaining diff --git a/gnu/packages/search.scm b/gnu/packages/search.scm index 3e3e8e00c6..a0640799bc 100644 --- a/gnu/packages/search.scm +++ b/gnu/packages/search.scm @@ -373,7 +373,7 @@ (define-public dataparksearch (list aspell c-ares libextractor - mbedtls-apache + mbedtls-apache-lts postgresql zlib)) (synopsis "Feature rich search engine") diff --git a/gnu/packages/tls.scm b/gnu/packages/tls.scm index 140932a809..fdf9121a6d 100644 --- a/gnu/packages/tls.scm +++ b/gnu/packages/tls.scm @@ -940,7 +940,7 @@ (define-public perl-crypt-openssl-random ;; The "-apache" variant is the upstreamed prefered variant. A "-gpl" ;; variant exists in addition to the "-apache" one. -(define-public mbedtls-apache +(define-public mbedtls-apache-lts (package (name "mbedtls-apache") ;; XXX Check whether ‘-Wformat-signedness’ still breaks mbedtls-for-hiawatha @@ -980,7 +980,7 @@ (define-public mbedtls-apache (define-public mbedtls-for-hiawatha (hidden-package (package - (inherit mbedtls-apache) + (inherit mbedtls-apache-lts) (name "mbedtls-apache") (version "2.26.0") (source @@ -1002,7 +1002,7 @@ (define-public mbedtls-for-hiawatha (("Wformat-truncation=2") "Wformat-truncation")) #t)))) (arguments - (substitute-keyword-arguments (package-arguments mbedtls-apache) + (substitute-keyword-arguments (package-arguments mbedtls-apache-lts) ((#:phases phases) `(modify-phases ,phases (add-before 'configure 'configure-extra-features diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index 43ae3899f9..1fe11dcc8a 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -3456,7 +3456,7 @@ (define-public obs libxcomposite libxkbcommon luajit - mbedtls-apache + mbedtls-apache-lts mesa pciutils pipewire From patchwork Fri Jun 23 06:24:45 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Hilton Chain X-Patchwork-Id: 51205 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 B6B8C27BBEA; Fri, 23 Jun 2023 07:27:09 +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=-0.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FROM_SUSPICIOUS_NTLD,MAILING_LIST_MULTI,PDS_OTHER_BAD_TLD, SPF_HELO_PASS,URIBL_BLOCKED autolearn=no 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 08EB527BBE2 for ; Fri, 23 Jun 2023 07:27:09 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qCaFM-0003Az-Kg; Fri, 23 Jun 2023 02:26:16 -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 1qCaF9-00038C-Rb for guix-patches@gnu.org; Fri, 23 Jun 2023 02:26:05 -0400 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qCaF7-0002Mq-PK for guix-patches@gnu.org; Fri, 23 Jun 2023 02:26:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qCaF7-0000ay-LP for guix-patches@gnu.org; Fri, 23 Jun 2023 02:26:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#63765] [PATCH v3 4/8] gnu: mbedtls-apache-for-hiawatha: Use inherited source. Resent-From: Hilton Chain Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 23 Jun 2023 06:26:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 63765 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 63765@debbugs.gnu.org Cc: Hilton Chain Received: via spool by 63765-submit@debbugs.gnu.org id=B63765.16875015062185 (code B ref 63765); Fri, 23 Jun 2023 06:26:01 +0000 Received: (at 63765) by debbugs.gnu.org; 23 Jun 2023 06:25:06 +0000 Received: from localhost ([127.0.0.1]:37315 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qCaED-0000Z3-Vk for submit@debbugs.gnu.org; Fri, 23 Jun 2023 02:25:06 -0400 Received: from mail.boiledscript.com ([144.168.59.46]:46360) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qCaE6-0000XR-L6 for 63765@debbugs.gnu.org; Fri, 23 Jun 2023 02:24:59 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ultrarare.space; s=dkim; t=1687501307; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=oV8zIkZ+R6DiplMqv4nayVJPA9eTwccWxsssEwdP+oc=; b=bb1+tIaGo1pVk6CqjV/i59/68UKS2KJLX8s92WI1J163zUk8iLsxOUhMUr6vUa0idUbzYQ kKJWgh7SyB5F/+S4WkWQSXAFJSrcdvCI+jurUSmHI7ctHirgpB2pTsd3gGr/njysxBO8Tq Pl81Wn4crpFnBp/G8/aPuvPvEIzHtpsMKa0wXHnKDWBaamounPVfZuVK2wkDQz1R+msXKB +MFVIiuFtEVKmKYZuMIpX3PVwzFMjFK4UvUFlg9BT3UZbACDbTvjRyPwl96vnc3nth1qUX ihWxzpf4JL3fVK+IjuiZa08FgMHCP4VEZMTMhNPHzcufv4fg+T1lSa51T7/kng== Date: Fri, 23 Jun 2023 14:24:45 +0800 Message-Id: <75eabf89eba5fc57e953d8cbe9428e60f955b458.1687500984.git.hako@ultrarare.space> In-Reply-To: References: MIME-Version: 1.0 X-Spamd-Bar: --- Authentication-Results: mail.boiledscript.com; auth=pass smtp.mailfrom=hako@ultrarare.space 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: , Reply-to: Hilton Chain X-ACL-Warn: , Hilton Chain via Guix-patches X-Patchwork-Original-From: Hilton Chain via Guix-patches via From: Hilton Chain 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/tls.scm (mbedtls-apache-for-hiawatha): Use inherited source. [arguments]<#:phases>: Keep "-Wformat-signedness". --- gnu/packages/tls.scm | 25 ------------------------- 1 file changed, 25 deletions(-) diff --git a/gnu/packages/tls.scm b/gnu/packages/tls.scm index fdf9121a6d..6d2dc8d0c3 100644 --- a/gnu/packages/tls.scm +++ b/gnu/packages/tls.scm @@ -943,8 +943,6 @@ (define-public perl-crypt-openssl-random (define-public mbedtls-apache-lts (package (name "mbedtls-apache") - ;; XXX Check whether ‘-Wformat-signedness’ still breaks mbedtls-for-hiawatha - ;; when updating. (version "2.28.0") (source (origin @@ -981,26 +979,6 @@ (define-public mbedtls-for-hiawatha (hidden-package (package (inherit mbedtls-apache-lts) - (name "mbedtls-apache") - (version "2.26.0") - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/ARMmbed/mbedtls") - (commit (string-append "mbedtls-" version)))) - (sha256 - (base32 "0scwpmrgvg6q7rvqkc352d2fqlsx0aylcbyibcp1f1rsn8iiif2m")) - (file-name (git-file-name name version)) - (modules '((guix build utils))) - (snippet - '(begin - ;; Can be removed with the next version. - ;; Reduce level of format truncation warnings due to false positives. - ;; https://github.com/ARMmbed/mbedtls/commit/2065a8d8af27c6cb1e40c9462b5933336dca7434 - (substitute* "CMakeLists.txt" - (("Wformat-truncation=2") "Wformat-truncation")) - #t)))) (arguments (substitute-keyword-arguments (package-arguments mbedtls-apache-lts) ((#:phases phases) @@ -1011,9 +989,6 @@ (define-public mbedtls-for-hiawatha (invoke "scripts/config.pl" "set" feature)) (list "MBEDTLS_THREADING_C" "MBEDTLS_THREADING_PTHREAD")) - ;; XXX The above enables code that breaks with -Werror… - (substitute* "CMakeLists.txt" - ((" -Wformat-signedness") "")) #t))))))))) (define-public dehydrated From patchwork Fri Jun 23 06:24:46 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hilton Chain X-Patchwork-Id: 51202 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 6613127BBE9; Fri, 23 Jun 2023 07:26:52 +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=-0.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FROM_SUSPICIOUS_NTLD,MAILING_LIST_MULTI,PDS_OTHER_BAD_TLD, SPF_HELO_PASS,URIBL_BLOCKED autolearn=no 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 E280927BBE2 for ; Fri, 23 Jun 2023 07:26:51 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qCaFI-0003A0-Tf; Fri, 23 Jun 2023 02:26:13 -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 1qCaF9-00038F-RU for guix-patches@gnu.org; Fri, 23 Jun 2023 02:26:05 -0400 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qCaF8-0002NI-5l for guix-patches@gnu.org; Fri, 23 Jun 2023 02:26:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qCaF8-0000b6-1z for guix-patches@gnu.org; Fri, 23 Jun 2023 02:26:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#63765] [PATCH v3 5/8] gnu: mbedtls-apache-lts: Update to 2.28.3. Resent-From: Hilton Chain Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 23 Jun 2023 06:26:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 63765 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 63765@debbugs.gnu.org Cc: Hilton Chain Received: via spool by 63765-submit@debbugs.gnu.org id=B63765.16875015062192 (code B ref 63765); Fri, 23 Jun 2023 06:26:02 +0000 Received: (at 63765) by debbugs.gnu.org; 23 Jun 2023 06:25:06 +0000 Received: from localhost ([127.0.0.1]:37318 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qCaEE-0000ZC-D3 for submit@debbugs.gnu.org; Fri, 23 Jun 2023 02:25:06 -0400 Received: from mail.boiledscript.com ([144.168.59.46]:60106) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qCaE8-0000Xl-QF for 63765@debbugs.gnu.org; Fri, 23 Jun 2023 02:25:01 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ultrarare.space; s=dkim; t=1687501309; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=mpoJbo2upML3NPbiMeBUokgm6Z3YX3mvJtsXCyBiIyg=; b=yLIYYmJlB+OYVo4mqIpFyjjduLK4PsWzhcoUy4QGRLakxagdSgvDkeGWYthFnKjnWrKA0R Yn7a9IfZoYxJEMO6nRyWL5ae8/rgh1WBWHGs71+tztFLkw0JXWerHkgbDP6lKO9khucDyp sYPA0NyEhgqF+V+JTodnQTf2bxQV81B0FU2lyuqi4pd9PAH+XNw8YyYHGlXUnIrOmBT6YJ juUyRFnEeCKjN++k8p02szDbAFB9hvVHzku9j9w2MMwRI39TtEfT6penKYoXBKV7c8bmKq YM9J0iYMSo8B1zCY3hVq7PXNWKc7f9R38ed5SYRp3ZcwhLNCaQL5HYx4yAoiBA== Date: Fri, 23 Jun 2023 14:24:46 +0800 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Spamd-Bar: -- Authentication-Results: mail.boiledscript.com; auth=pass smtp.mailfrom=hako@ultrarare.space 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: , Reply-to: Hilton Chain X-ACL-Warn: , Hilton Chain via Guix-patches X-Patchwork-Original-From: Hilton Chain via Guix-patches via From: Hilton Chain 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/tls.scm (mbedtls-apache-lts): Update to 2.28.3. --- gnu/packages/tls.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/tls.scm b/gnu/packages/tls.scm index 6d2dc8d0c3..f23058f4a7 100644 --- a/gnu/packages/tls.scm +++ b/gnu/packages/tls.scm @@ -943,7 +943,7 @@ (define-public perl-crypt-openssl-random (define-public mbedtls-apache-lts (package (name "mbedtls-apache") - (version "2.28.0") + (version "2.28.3") (source (origin (method git-fetch) @@ -952,7 +952,7 @@ (define-public mbedtls-apache-lts (commit (string-append "mbedtls-" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "0s37dsi29v7146fi9k4frvx5rz2snxdm6c3rwq2fvnca2r80hfjl")))) + (base32 "177925jkr73x536g703vbxxamcyx9acvkp5iyb294icdn09ck5n3")))) (build-system cmake-build-system) (arguments `(#:configure-flags From patchwork Fri Jun 23 06:24:47 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hilton Chain X-Patchwork-Id: 51203 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 6748827BBE9; Fri, 23 Jun 2023 07:26:54 +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=-0.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FROM_SUSPICIOUS_NTLD,MAILING_LIST_MULTI,PDS_OTHER_BAD_TLD, SPF_HELO_PASS,URIBL_BLOCKED autolearn=no 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 E29A327BBE2 for ; Fri, 23 Jun 2023 07:26:53 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qCaFO-0003Bt-82; Fri, 23 Jun 2023 02:26:18 -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 1qCaF9-00038H-Tc for guix-patches@gnu.org; Fri, 23 Jun 2023 02:26:05 -0400 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qCaF8-0002NJ-HH for guix-patches@gnu.org; Fri, 23 Jun 2023 02:26:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qCaF8-0000bD-Dn for guix-patches@gnu.org; Fri, 23 Jun 2023 02:26:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#63765] [PATCH v3 6/8] gnu: Add mbedtls-apache, version 3.4.0. Resent-From: Hilton Chain Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 23 Jun 2023 06:26:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 63765 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 63765@debbugs.gnu.org Cc: Hilton Chain Received: via spool by 63765-submit@debbugs.gnu.org id=B63765.16875015072199 (code B ref 63765); Fri, 23 Jun 2023 06:26:02 +0000 Received: (at 63765) by debbugs.gnu.org; 23 Jun 2023 06:25:07 +0000 Received: from localhost ([127.0.0.1]:37320 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qCaEE-0000ZJ-Mm for submit@debbugs.gnu.org; Fri, 23 Jun 2023 02:25:07 -0400 Received: from mail.boiledscript.com ([144.168.59.46]:60110) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qCaEB-0000YT-9Y for 63765@debbugs.gnu.org; Fri, 23 Jun 2023 02:25:03 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ultrarare.space; s=dkim; t=1687501311; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=EczTidCX46dNwD2bKlFE+fJk3wzzknOL/HU1b8bxslk=; b=PQpYBmP1/2mJVd34WemPJwWOjb4eONDAsYg6+CgFv7hcyw/ur114hFeFN7ZwL4zz5tJa+B zDfSbFr/dwHy2FtTm96daKy8snNloUpgrFP9vwppZIr7kvNjYCHcUAJ8/cq1/cM1AVWklY 1Xh0isau7IDvvieFNVnbSxIrknPpoqAQkPjsDnw3+vzo0X4TWF/fKHbhUuo087+Yk0A5j6 m8Q/P6E2AeTPJyXC/Z32zHG2ADVvaSMHQZ4mTL+/yzIZXfKwhVtlM6xhurKe5MlFy49JM5 cOxnszpa6KNn5r3bswY3GsjLB3YX1+oqylNr3tqy0MR/AjkTu1yNHvDIjOBzRg== Date: Fri, 23 Jun 2023 14:24:47 +0800 Message-Id: <88126c3e4feaa97be30d76823e24bba750f0c312.1687500984.git.hako@ultrarare.space> In-Reply-To: References: MIME-Version: 1.0 X-Spamd-Bar: -- Authentication-Results: mail.boiledscript.com; auth=pass smtp.mailfrom=hako@ultrarare.space 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: , Reply-to: Hilton Chain X-ACL-Warn: , Hilton Chain via Guix-patches X-Patchwork-Original-From: Hilton Chain via Guix-patches via From: Hilton Chain 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/tls.scm (mbedtls-apache): New variable. --- gnu/packages/tls.scm | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/gnu/packages/tls.scm b/gnu/packages/tls.scm index f23058f4a7..05ec84dab5 100644 --- a/gnu/packages/tls.scm +++ b/gnu/packages/tls.scm @@ -974,6 +974,21 @@ (define-public mbedtls-apache-lts (home-page "https://www.trustedfirmware.org/projects/mbed-tls/") (license license:asl2.0))) +(define-public mbedtls-apache + (package + (inherit mbedtls-apache-lts) + (name "mbedtls-apache") + (version "3.4.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/ARMmbed/mbedtls") + (commit (string-append "mbedtls-" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1y2mwkrvmadmjylyshpp6dnw328zc6l2cajdwrhkl4nmky33i06m")))))) + ;; The Hiawatha Web server requires some specific features to be enabled. (define-public mbedtls-for-hiawatha (hidden-package From patchwork Fri Jun 23 06:24:48 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hilton Chain X-Patchwork-Id: 51204 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 3147E27BBEA; Fri, 23 Jun 2023 07:26:58 +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=-0.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FROM_SUSPICIOUS_NTLD,MAILING_LIST_MULTI,PDS_OTHER_BAD_TLD, SPF_HELO_PASS,URIBL_BLOCKED autolearn=no 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 A8C2727BBE2 for ; Fri, 23 Jun 2023 07:26:57 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qCaFM-0003BU-VG; Fri, 23 Jun 2023 02:26:16 -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 1qCaF9-00038G-TL for guix-patches@gnu.org; Fri, 23 Jun 2023 02:26:05 -0400 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qCaF8-0002NK-Sj for guix-patches@gnu.org; Fri, 23 Jun 2023 02:26:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qCaF8-0000bK-PH for guix-patches@gnu.org; Fri, 23 Jun 2023 02:26:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#63765] [PATCH v3 7/8] gnu: Add frozen. Resent-From: Hilton Chain Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 23 Jun 2023 06:26:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 63765 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 63765@debbugs.gnu.org Cc: Hilton Chain Received: via spool by 63765-submit@debbugs.gnu.org id=B63765.16875015132223 (code B ref 63765); Fri, 23 Jun 2023 06:26:02 +0000 Received: (at 63765) by debbugs.gnu.org; 23 Jun 2023 06:25:13 +0000 Received: from localhost ([127.0.0.1]:37323 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qCaEL-0000Zm-3B for submit@debbugs.gnu.org; Fri, 23 Jun 2023 02:25:13 -0400 Received: from mail.boiledscript.com ([144.168.59.46]:60126) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qCaED-0000Yy-FF for 63765@debbugs.gnu.org; Fri, 23 Jun 2023 02:25:05 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ultrarare.space; s=dkim; t=1687501313; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=fzsKsDoFRxRpBThTMo/PF0N6TqyP9pz/NqIj6HMDQis=; b=1A1eGQjmxstG7oJAJ27B46IzLhQt/ChtCpIPlHdwbYFvIuS6CBekw3yQcybzb6e8iUmhjs fSQX8G0jkj2peZOrfuGH57KV2+hq2DIUzgA0A1iz1hYl3JXG0PFrh2CzCcvCeV8ZpYNjT7 8g8EmzSiJTVqq8RRyqm4/X/RqNoIymjBlLLAydt7w4QND2icchOzgO6HOsqTA/qHWmRZVH nOQ8X3zT8Vko84vrjNphsowK4fA+6NYtab/NovNvYRlbiHvJ3Ue98t6ELh3/FbTS66x70o vaPhEQLLnVeMzfeZtOJhoaY4KCBeN/AfzMYz+tzJRPmT+uMPSu1rpKbgquXwwA== Date: Fri, 23 Jun 2023 14:24:48 +0800 Message-Id: <30f967da450ab503656bb0533c8cd7ddfa5621f4.1687500984.git.hako@ultrarare.space> In-Reply-To: References: MIME-Version: 1.0 X-Spamd-Bar: -- Authentication-Results: mail.boiledscript.com; auth=pass smtp.mailfrom=hako@ultrarare.space 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: , Reply-to: Hilton Chain X-ACL-Warn: , Hilton Chain via Guix-patches X-Patchwork-Original-From: Hilton Chain via Guix-patches via From: Hilton Chain 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/cpp.scm (frozen): New variable. --- gnu/packages/cpp.scm | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/gnu/packages/cpp.scm b/gnu/packages/cpp.scm index 39a34c20dd..63ac700760 100644 --- a/gnu/packages/cpp.scm +++ b/gnu/packages/cpp.scm @@ -567,6 +567,29 @@ (define-public fifo-map as ordering relation.") (license license:expat))) +(define-public frozen + (let ((commit "f6dbec6d03debc68d18ae3e2d32ff408c6d52468") + (revision "7")) + (package + (name "frozen") + (version (git-version "1.1.1" revision commit)) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/serge-sans-paille/frozen") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1yzxj8ia8fbdikb4hh4bc2iyr1fnl9cjllv8xgilzaivgiv7xmjk")))) + (build-system cmake-build-system) + (home-page "https://github.com/serge-sans-paille/frozen") + (synopsis "Header-only, constexpr alternative to gperf for C++14 users") + (description + "Frozen is a header-only library that provides 0 cost initialization +for immutable containers, fixed-size containers, and various algorithms.") + (license license:asl2.0)))) + (define-public json-dto (package (name "json-dto") From patchwork Fri Jun 23 06:24:49 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hilton Chain X-Patchwork-Id: 51201 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 4A7DE27BBEA; Fri, 23 Jun 2023 07:26:34 +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=-0.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FROM_SUSPICIOUS_NTLD,MAILING_LIST_MULTI,PDS_OTHER_BAD_TLD, SPF_HELO_PASS,URIBL_BLOCKED autolearn=no 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 ECE8727BBE9 for ; Fri, 23 Jun 2023 07:26:32 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qCaFN-0003Bl-Bs; Fri, 23 Jun 2023 02:26:17 -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 1qCaFB-00038o-Tw for guix-patches@gnu.org; Fri, 23 Jun 2023 02:26:06 -0400 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qCaFB-0002ON-La for guix-patches@gnu.org; Fri, 23 Jun 2023 02:26:05 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qCaF9-0000bS-5V; Fri, 23 Jun 2023 02:26:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#63765] [PATCH v3 8/8] gnu: python-lief: Update to 0.13.2. Resent-From: Hilton Chain Original-Sender: "Debbugs-submit" Resent-CC: lars@6xq.net, jgart@dismail.de, guix-patches@gnu.org Resent-Date: Fri, 23 Jun 2023 06:26:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 63765 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 63765@debbugs.gnu.org Cc: Hilton Chain , Lars-Dominik Braun , jgart X-Debbugs-Original-Xcc: Lars-Dominik Braun , jgart Received: via spool by 63765-submit@debbugs.gnu.org id=B63765.16875015142230 (code B ref 63765); Fri, 23 Jun 2023 06:26:03 +0000 Received: (at 63765) by debbugs.gnu.org; 23 Jun 2023 06:25:14 +0000 Received: from localhost ([127.0.0.1]:37325 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qCaEL-0000Zo-Ei for submit@debbugs.gnu.org; Fri, 23 Jun 2023 02:25:13 -0400 Received: from mail.boiledscript.com ([144.168.59.46]:60138) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qCaEF-0000ZQ-94 for 63765@debbugs.gnu.org; Fri, 23 Jun 2023 02:25:08 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ultrarare.space; s=dkim; t=1687501315; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=8PY1wna++oA4YARQk474ZMcRyR1WvDeVltZlgGNkQe0=; b=eMKzHsN+DP4RukpIUK5jf1kZaI0r9TtrJqidkRJE6FuUASvEM8iochrWeAp4ZyIwI8U2z2 fg6D336wvItuOXaRx1GZcSvJHkp055wKLkRJUvANXsuWolPyzFCNf2UEsqKF2Pj+jRzAr5 pLw2PCs4xy1XaBpzIMcuAOVKx9rfLgX0XpxkEg36vpOV4E9b2zs2Do2MRIflHxd60pBt1G yGuyz27HUj7hDxH10tjBCsUAUj8Dp4EhlUjtUn6ybv1YTmvHiOHyGeAlrVVEJl71NdI1fL BRScByN/Nu8SBOxfKPqaOe78lLFdJgUjm2JnMLPrEn7jC+EyjXO/NwGn2VYdMg== Date: Fri, 23 Jun 2023 14:24:49 +0800 Message-Id: <74a181c4bb48d32681bea5046c9b145a76b3c9a8.1687500984.git.hako@ultrarare.space> In-Reply-To: References: MIME-Version: 1.0 X-Spamd-Bar: -- Authentication-Results: mail.boiledscript.com; auth=pass smtp.mailfrom=hako@ultrarare.space 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: , Reply-to: Hilton Chain X-ACL-Warn: , Hilton Chain via Guix-patches X-Patchwork-Original-From: Hilton Chain via Guix-patches via From: Hilton Chain 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-lief): Update to 0.13.2. [snippet]: Unbundle third-party dependencies. [build-system]: Change to cmake-build-system [native-inputs]: Add python-minimal-wrapper, python-tomli. Remove cmake. [inputs]: Add frozen, mbedtls-apache, nlohmann-json, pybind11, utfcpp, spdlog. [outputs]: Add "python" output. [home-page]: Update homepage. (shrinkwrap)[inputs]: Replace python-lief to its "python" output. --- gnu/packages/python-xyz.scm | 96 +++++++++++++++++++++++++++++++------ 1 file changed, 81 insertions(+), 15 deletions(-) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index b650b71f3b..622867a499 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -212,6 +212,7 @@ (define-module (gnu packages python-xyz) #:use-module (gnu packages libusb) #:use-module (gnu packages linux) #:use-module (gnu packages llvm) + #:use-module (gnu packages logging) #:use-module (gnu packages machine-learning) #:use-module (gnu packages man) #:use-module (gnu packages markup) @@ -33141,29 +33142,94 @@ (define-public python-misskey (define-public python-lief (package (name "python-lief") - (version "0.12.3") + (version "0.13.2") (source (origin (method git-fetch) (uri (git-reference (url "https://github.com/lief-project/LIEF") (commit version))) (file-name (git-file-name name version)) + (modules '((guix build utils))) + (snippet + '(begin + ;; Configure build for Python bindings. + (substitute* "api/python/config-default.toml" + (("(ninja = )true" all m) + (string-append m "false")) + (("(parallel-jobs = )0" all m) + (string-append m (number->string (parallel-job-count))))) + ;; Unbundle third-party dependencies. + (for-each delete-file + (find-files "third-party/" + (string-join '("spdlog" + "frozen" + "json" + "mbedtls" + "pybind11" + "utfcpp") + "|" ))) + ;; Same in argument #:configure-flags. + (substitute* "api/python/setup.py" + (("self\\._get_third_party_opt\\(\\)") + "[\"-DLIEF_EXTERNAL_SPDLOG=ON\", + \"-DLIEF_OPT_FROZEN_EXTERNAL=ON\", + \"-DLIEF_OPT_MBEDTLS_EXTERNAL=ON\", + \"-DLIEF_OPT_NLOHMANN_JSON_EXTERNAL=ON\", + \"-DLIEF_OPT_PYBIND11_EXTERNAL=ON\", + \"-DLIEF_OPT_UTFCPP_EXTERNAL=ON\"]")))) (sha256 (base32 - "11i6hqmcjh56y554kqhl61698n9v66j2qk1c1g63mv2w07h2z661")))) - (build-system python-build-system) - (native-inputs (list cmake)) + "0y48x358ppig5xp97ahcphfipx7cg9chldj2q5zrmn610fmi4zll")))) + (build-system cmake-build-system) (arguments - (list - #:tests? #f ;needs network - #:phases #~(modify-phases %standard-phases - (replace 'build - (lambda _ - (invoke - "python" "setup.py" "--sdk" "build" - (string-append - "-j" (number->string (parallel-job-count))))))))) - (home-page "https://github.com/lief-project/LIEF") + (list #:modules + '((guix build utils) + (guix build cmake-build-system) + ((guix build python-build-system) #:prefix python:)) + #:imported-modules + (append %cmake-build-system-modules + '((guix build python-build-system))) + #:configure-flags + #~'("-DCMAKE_LINK_WHAT_YOU_USE=ON" + "-DBUILD_SHARED_LIBS=ON" + "-DLIEF_INSTALL_COMPILED_EXAMPLES=ON" + "-DLIEF_TESTS=ON" + ;; Unbundle third-party dependencies + "-DLIEF_EXTERNAL_SPDLOG=ON" + "-DLIEF_OPT_FROZEN_EXTERNAL=ON" + "-DLIEF_OPT_MBEDTLS_EXTERNAL=ON" + "-DLIEF_OPT_NLOHMANN_JSON_EXTERNAL=ON" + "-DLIEF_OPT_PYBIND11_EXTERNAL=ON" + "-DLIEF_OPT_UTFCPP_EXTERNAL=ON") + #:phases + ;; Phases from python-build-system, for Python bindings. + #~(modify-phases %standard-phases + (add-after 'install 'chdir + (lambda _ + (chdir "../source/api/python/"))) + (add-after 'chdir 'ensure-no-mtimes-pre-1980 + (assoc-ref python:%standard-phases 'ensure-no-mtimes-pre-1980)) + (add-after 'ensure-no-mtimes-pre-1980 'enable-bytecode-determinism + (assoc-ref python:%standard-phases 'enable-bytecode-determinism)) + (add-after 'enable-bytecode-determinism 'ensure-no-cythonized-files + (assoc-ref python:%standard-phases 'ensure-no-cythonized-files)) + (add-after 'ensure-no-cythonized-files 'python-install + (lambda* (#:key inputs outputs #:allow-other-keys) + ((assoc-ref python:%standard-phases 'install) + #:inputs inputs + #:outputs outputs + #:configure-flags '() + #:use-setuptools? #t))) + (add-after 'python-install 'add-install-to-pythonpath + (assoc-ref python:%standard-phases 'add-install-to-pythonpath)) + (add-after 'add-install-to-pythonpath 'add-install-to-path + (assoc-ref python:%standard-phases 'add-install-to-path)) + (add-after 'add-install-to-path 'python-wrap + (assoc-ref python:%standard-phases 'wrap))))) + (native-inputs (list python-minimal-wrapper python-tomli)) + (inputs (list frozen mbedtls-apache nlohmann-json pybind11 utfcpp spdlog)) + (outputs '("out" "python")) + (home-page "https://lief-project.github.io/") (synopsis "Library to instrument executable formats") (description "@code{python-lief} is a cross platform library which can parse, modify @@ -33211,7 +33277,7 @@ (define-public shrinkwrap python-poetry-core python-pypa-build python-pytest)) - (inputs (list python-lief python-sh)) + (inputs (list `(,python-lief "python") python-sh)) (home-page "https://github.com/fzakaria/shrinkwrap") (synopsis "Emboss needed dependencies on the top level executable") (description