From patchwork Sun May 28 12:56:06 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hilton Chain X-Patchwork-Id: 50383 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 6E82E27BBEC; Sun, 28 May 2023 13:58: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 DE1F127BBE9 for ; Sun, 28 May 2023 13:58:08 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1q3Fxx-0004YC-IK; Sun, 28 May 2023 08:57:45 -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 1q3Fxd-0004Vg-03 for guix-patches@gnu.org; Sun, 28 May 2023 08:57:31 -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 1q3FxF-00026O-LH for guix-patches@gnu.org; Sun, 28 May 2023 08:57:24 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1q3FxF-00014R-Gw for guix-patches@gnu.org; Sun, 28 May 2023 08:57:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#63765] [PATCH v2 1/8] gnu: Add ftest-for-utfcpp. Resent-From: Hilton Chain Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 28 May 2023 12:57: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.16852785863963 (code B ref 63765); Sun, 28 May 2023 12:57:01 +0000 Received: (at 63765) by debbugs.gnu.org; 28 May 2023 12:56:26 +0000 Received: from localhost ([127.0.0.1]:53558 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1q3Fwf-00011r-Tz for submit@debbugs.gnu.org; Sun, 28 May 2023 08:56:26 -0400 Received: from mail.boiledscript.com ([144.168.59.46]:45258) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1q3Fwe-00011j-Cp for 63765@debbugs.gnu.org; Sun, 28 May 2023 08:56:24 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ultrarare.space; s=dkim; t=1685278451; 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=WYk9dVZMDHc8UwRJeC4D2G4ZoitOEa7Zi7V4wMZFu6E=; b=TTcRIms0BxL0sdRV9kWz0jJWTca71ZajSRwxFpGOtPTdPkCpn223lzMulB2T2W55rWz9SC 2yRvtejI7bNxL7Bv41uZC7Y5PwDIcNmxz52k8DiOcPXrD7bfEPZ7edAVQ+7qEbQVShQ3Ex 8shVWmcVhfpFd8XHqcVLc1QoJb8UaDfuWZbvEgS4usIPY6BtfXTwFxogSEc8jKl7n50nE9 TGslgWZi8DGrDZdzF4dN8XAFGrVdFjTyjY7ihvb/dTLr6fTeVGDQG1LtGcL7Ypj+8g1qW9 Wh+i5t35xbKzsWMgMVDN73GXT5HulvRQyN+5yrEtka+h3dtIotYszULcw+f/Og== Date: Sun, 28 May 2023 20:56:06 +0800 Message-Id: <20230528125613.9423-1-hako@ultrarare.space> In-Reply-To: <20230528125423.9240-1-hako@ultrarare.space> References: <20230528125423.9240-1-hako@ultrarare.space> 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 24fc689a0a..da0f2023a9 100644 --- a/gnu/packages/textutils.scm +++ b/gnu/packages/textutils.scm @@ -682,6 +682,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 Sun May 28 12:56:07 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hilton Chain X-Patchwork-Id: 50382 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 9EAC227BBEB; Sun, 28 May 2023 13:57:59 +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 7040627BBE9 for ; Sun, 28 May 2023 13:57:58 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1q3Fxo-0004Wx-GW; Sun, 28 May 2023 08:57:36 -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 1q3Fxc-0004Vc-VQ for guix-patches@gnu.org; Sun, 28 May 2023 08:57:25 -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 1q3FxG-00026W-3Q for guix-patches@gnu.org; Sun, 28 May 2023 08:57:24 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1q3FxF-00014Y-VV for guix-patches@gnu.org; Sun, 28 May 2023 08:57:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#63765] [PATCH v2 2/8] gnu: utfcpp: Update to 3.2.3. Resent-From: Hilton Chain Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 28 May 2023 12:57: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.16852785903986 (code B ref 63765); Sun, 28 May 2023 12:57:01 +0000 Received: (at 63765) by debbugs.gnu.org; 28 May 2023 12:56:30 +0000 Received: from localhost ([127.0.0.1]:53562 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1q3Fwk-000129-6k for submit@debbugs.gnu.org; Sun, 28 May 2023 08:56:30 -0400 Received: from mail.boiledscript.com ([144.168.59.46]:45268) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1q3Fwh-00011z-Po for 63765@debbugs.gnu.org; Sun, 28 May 2023 08:56:28 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ultrarare.space; s=dkim; t=1685278454; 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=YCtHOGHktizPcyp7pb+Ii+nkzw3vG+cHn0hF8HkTVJQ=; b=IK2BKxhYL8gHXVt8TRfnneIBtJlPZ/x6yAJ0tpCTeS+7WTrrpwWeUllRBxPBUmVeQdUCD4 0P/1kbDeDXetpa1nVcoshS77sRWtev9WhkXWq3WLwJFgUCbwK7Gyza2xEJ9zmYcDGEW85S aBydfjPKz1g2qIbJAarW9yXhm/E/M6qSyQTreZjGoaSskswQNtt/WZeRUKqBT+ulLhBMoJ tob1gfSjjHFliD7oV/5t4m3wLODTVNz/ydbR7gKUqvTuPI/KfallEZHu7+VBT6VvZ1T+gT 0oeJfheI3Imz6iLbbJ2BQKfYtv9NI7GU98uqbXJTzsZhExVU7ZOVc9ehQIIzZA== Date: Sun, 28 May 2023 20:56:07 +0800 Message-Id: <20230528125613.9423-2-hako@ultrarare.space> In-Reply-To: <20230528125613.9423-1-hako@ultrarare.space> References: <20230528125423.9240-1-hako@ultrarare.space> <20230528125613.9423-1-hako@ultrarare.space> 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]<#:phases>: Add phase 'unpack-ftest. --- gnu/packages/textutils.scm | 20 +++++++------------- 1 file changed, 7 insertions(+), 13 deletions(-) diff --git a/gnu/packages/textutils.scm b/gnu/packages/textutils.scm index da0f2023a9..a49167c991 100644 --- a/gnu/packages/textutils.scm +++ b/gnu/packages/textutils.scm @@ -699,7 +699,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 @@ -708,20 +708,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 From patchwork Sun May 28 12:56:08 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Hilton Chain X-Patchwork-Id: 50384 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 D709D27BBE9; Sun, 28 May 2023 13:58:11 +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 CEB0C27BBE2 for ; Sun, 28 May 2023 13:58:08 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1q3Fxo-0004Ww-8M; Sun, 28 May 2023 08:57:36 -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 1q3Fxc-0004Vd-VY for guix-patches@gnu.org; Sun, 28 May 2023 08:57:25 -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 1q3FxG-00026Z-I9 for guix-patches@gnu.org; Sun, 28 May 2023 08:57:24 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1q3FxG-00014f-E8 for guix-patches@gnu.org; Sun, 28 May 2023 08:57:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#63765] [PATCH v2 3/8] gnu: mbedtls-apache: Rename package to mbedtls-apache-lts. Resent-From: Hilton Chain Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 28 May 2023 12:57: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.16852785954012 (code B ref 63765); Sun, 28 May 2023 12:57:02 +0000 Received: (at 63765) by debbugs.gnu.org; 28 May 2023 12:56:35 +0000 Received: from localhost ([127.0.0.1]:53566 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1q3Fwo-00012X-PO for submit@debbugs.gnu.org; Sun, 28 May 2023 08:56:35 -0400 Received: from mail.boiledscript.com ([144.168.59.46]:38752) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1q3Fwj-000127-Oc for 63765@debbugs.gnu.org; Sun, 28 May 2023 08:56:30 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ultrarare.space; s=dkim; t=1685278458; 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=wJivRXf2xEVOoVWP0nNlRmTzwpQw9lRLpBZ79Vqj2p8=; b=2zEIUorNUEoZkUpS/F90ymAar85jCleUUWNU9A3mLymh0T48CDtKAK53HgmBlXhDKFZDZ2 ED2MJJ4ecYYZf/a6iW3AGuM3N93qQXlTuJNE5mmTxsH2zpRZh7tt5udf+gJNBShu876ar8 JesnYzXhhkHZgUPIjBbb6Cui49AiOBFqVvHYadhcOVs1QfbruAGBzHnBq6gzlmC2F1jZcA 6q6wfvIa7ABwcSllTPFB2IpPlQ557SyIZQlYut2PBBmSHulAgloiAHkrANFFhdOdzyDsA5 3evmUn/q2Bb2cTwv+0u0irwSdP323N+jgh67PivF9hgbu5m4lXwdch6VddT+pQ== Date: Sun, 28 May 2023 20:56:08 +0800 Message-Id: <20230528125613.9423-3-hako@ultrarare.space> In-Reply-To: <20230528125613.9423-1-hako@ultrarare.space> References: <20230528125423.9240-1-hako@ultrarare.space> <20230528125613.9423-1-hako@ultrarare.space> 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 13b6022308..9608d535c4 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 75957f7a6b..9c2a322c57 100644 --- a/gnu/packages/game-development.scm +++ b/gnu/packages/game-development.scm @@ -1959,7 +1959,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 1be505d949..61d8f5c88c 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -2294,7 +2294,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 30e67d3a98..7e8a1c69f7 100644 --- a/gnu/packages/networking.scm +++ b/gnu/packages/networking.scm @@ -821,7 +821,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 d162094ed4..cd5933a270 100644 --- a/gnu/packages/tls.scm +++ b/gnu/packages/tls.scm @@ -941,7 +941,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 @@ -981,7 +981,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 @@ -1003,7 +1003,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 ab19c2dd8c..6486dfe2ed 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -3451,7 +3451,7 @@ (define-public obs libxcomposite libxkbcommon luajit - mbedtls-apache + mbedtls-apache-lts mesa pciutils pipewire From patchwork Sun May 28 12:56:09 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Hilton Chain X-Patchwork-Id: 50381 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 1B36827BBEA; Sun, 28 May 2023 13:57: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 6ABD127BBE2 for ; Sun, 28 May 2023 13:57:57 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1q3Fxp-0004XY-Pc; Sun, 28 May 2023 08:57:41 -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 1q3Fxc-0004Vb-V5 for guix-patches@gnu.org; Sun, 28 May 2023 08:57:25 -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 1q3FxH-00026e-1E for guix-patches@gnu.org; Sun, 28 May 2023 08:57:24 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1q3FxG-00014n-Tb for guix-patches@gnu.org; Sun, 28 May 2023 08:57:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#63765] [PATCH v2 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: Sun, 28 May 2023 12:57: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.16852785964018 (code B ref 63765); Sun, 28 May 2023 12:57:02 +0000 Received: (at 63765) by debbugs.gnu.org; 28 May 2023 12:56:36 +0000 Received: from localhost ([127.0.0.1]:53568 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1q3Fwp-00012e-NW for submit@debbugs.gnu.org; Sun, 28 May 2023 08:56:36 -0400 Received: from mail.boiledscript.com ([144.168.59.46]:38764) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1q3Fwm-00012N-55 for 63765@debbugs.gnu.org; Sun, 28 May 2023 08:56:32 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ultrarare.space; s=dkim; t=1685278460; 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=0XlrYRsu7OdBsS7RNm7aRcAD92KVtd/2E2zI39rDx0U=; b=2GibPxReQSBYxSAADfZFh8dGQ854BgI8NRdcUVLcdCrIH4m1Zm5Ks+ajMyiZYF0px+BpcU wVKM+pNbHrJA06vX0ESccPQQkB+qlaBc0PdvwKc9REBKQWBCNA62SkU1h+P0RkXeLZMSIZ i6oscTdeYHXP55EDYzS+AVQbvIsJolxthrDPww5Twyut02vfC31SZX+jyL2QiwIb3Fc6gf vfsm3sebrhoSokXGvZvaWNM27Nq8Zu+3E8fNo6InDn1FBWoElM8llNYpH9wwSfXLCXwnfF hSk5XBLQR/vDy0HAxHwOKBTob0xc0iCdYBpglw+LxWQyry/TpgxdOXiHQodD6A== Date: Sun, 28 May 2023 20:56:09 +0800 Message-Id: <20230528125613.9423-4-hako@ultrarare.space> In-Reply-To: <20230528125613.9423-1-hako@ultrarare.space> References: <20230528125423.9240-1-hako@ultrarare.space> <20230528125613.9423-1-hako@ultrarare.space> 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 cd5933a270..1e2b0fcc20 100644 --- a/gnu/packages/tls.scm +++ b/gnu/packages/tls.scm @@ -944,8 +944,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 @@ -982,26 +980,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) @@ -1012,9 +990,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 Sun May 28 12:56:10 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hilton Chain X-Patchwork-Id: 50387 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 9550927BBEA; Sun, 28 May 2023 13:58: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=-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 F05D627BBE2 for ; Sun, 28 May 2023 13:58:27 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1q3Fxx-0004YG-Qe; Sun, 28 May 2023 08:57:45 -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 1q3Fxd-0004Vf-00 for guix-patches@gnu.org; Sun, 28 May 2023 08:57:26 -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 1q3FxH-00026l-DC for guix-patches@gnu.org; Sun, 28 May 2023 08:57:24 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1q3FxH-00014u-96 for guix-patches@gnu.org; Sun, 28 May 2023 08:57:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#63765] [PATCH v2 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: Sun, 28 May 2023 12:57: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 Received: via spool by 63765-submit@debbugs.gnu.org id=B63765.16852786014046 (code B ref 63765); Sun, 28 May 2023 12:57:03 +0000 Received: (at 63765) by debbugs.gnu.org; 28 May 2023 12:56:41 +0000 Received: from localhost ([127.0.0.1]:53572 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1q3Fwv-000139-88 for submit@debbugs.gnu.org; Sun, 28 May 2023 08:56:41 -0400 Received: from mail.boiledscript.com ([144.168.59.46]:38766) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1q3Fwo-00012V-Kt for 63765@debbugs.gnu.org; Sun, 28 May 2023 08:56:35 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ultrarare.space; s=dkim; t=1685278463; 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=FTz/GAYomCDSwcvIaO2VHxuZ5Sv+ihEjHtOdCEH17eI=; b=o87C30Vqmaxb8Y0QolWe9e/42MIrOOb56eX9Abg8LxkiK7C1UruAnzlePifSuMJ01DNMcP OBSUL7yvbChDUnOut72Kj/h+7VMxXN75NkgZQ0KyVW8Up3pwKRYXMMlnX61W0djMomPv+a HBk+Gg9gWfPZouQpHp4yaIeDmj0kL22rlgRdt3wTVGn4PFDh6Ambk1tDmV8aOQYs7cGo9W GiO9BlRDXSVxw/StWYVDKuotv74a+m+1tJ53oiml/EXEjgODWw/kOFn7mNTaDdLvfXkHBc DcH9vuIADRmtzifNiO+NRl83ESR3kBPAej/TiG6NMr0CQwo1vJ/JMjX3cKqL6Q== Date: Sun, 28 May 2023 20:56:10 +0800 Message-Id: <20230528125613.9423-5-hako@ultrarare.space> In-Reply-To: <20230528125613.9423-1-hako@ultrarare.space> References: <20230528125423.9240-1-hako@ultrarare.space> <20230528125613.9423-1-hako@ultrarare.space> 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 1e2b0fcc20..eb40e68de2 100644 --- a/gnu/packages/tls.scm +++ b/gnu/packages/tls.scm @@ -944,7 +944,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) @@ -953,7 +953,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 Sun May 28 12:56:11 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hilton Chain X-Patchwork-Id: 50380 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 E1BA227BBEA; Sun, 28 May 2023 13:57:51 +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 B220827BBE2 for ; Sun, 28 May 2023 13:57:50 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1q3Fxp-0004XS-PJ; Sun, 28 May 2023 08:57:41 -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 1q3Fxc-0004Ve-W8 for guix-patches@gnu.org; Sun, 28 May 2023 08:57:31 -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 1q3FxH-00026p-SL for guix-patches@gnu.org; Sun, 28 May 2023 08:57:24 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1q3FxH-000152-OS for guix-patches@gnu.org; Sun, 28 May 2023 08:57:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#63765] [PATCH v2 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: Sun, 28 May 2023 12:57: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 Received: via spool by 63765-submit@debbugs.gnu.org id=B63765.16852786024053 (code B ref 63765); Sun, 28 May 2023 12:57:03 +0000 Received: (at 63765) by debbugs.gnu.org; 28 May 2023 12:56:42 +0000 Received: from localhost ([127.0.0.1]:53574 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1q3Fwv-00013C-Fg for submit@debbugs.gnu.org; Sun, 28 May 2023 08:56:41 -0400 Received: from mail.boiledscript.com ([144.168.59.46]:38776) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1q3Fwr-00012t-Aj for 63765@debbugs.gnu.org; Sun, 28 May 2023 08:56:38 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ultrarare.space; s=dkim; t=1685278464; 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=Du6vvQ2ccs7ufox0S4NY4M1d89oVZDAQz6EXeigPZOM=; b=jU8Fz3uUIuoRAujcVHvkLwzaP42jjYFyBHhsxvnFaSDLLgLnHM+P1hXyXPvhpZNF/X+1R9 OCBrvmbSfAtHpeoUKPkHJwqBPmCWiXOR58r3SbyGtV3AmFdGvdoaGAlWs2SSwiYTQivXTW WORecERG2jHijlaB/q5tjiu1YMhSVIX70pwv7S2Z/rOtRMwIDdzs4c92SVchmxmzIcrLfC KzgvOHZKZuvYOLMjErQtYPn9UYJUx25lR1koq02/4v6g84e5ReiHROQAd72x8S4wRnIiiY qF6D8Xx7Qgzzo0f3DN6KeIoDoN6Uv5qBNGBSqr3HvZ7fYFlXqgVVcV2mCQPJ/w== Date: Sun, 28 May 2023 20:56:11 +0800 Message-Id: <20230528125613.9423-6-hako@ultrarare.space> In-Reply-To: <20230528125613.9423-1-hako@ultrarare.space> References: <20230528125423.9240-1-hako@ultrarare.space> <20230528125613.9423-1-hako@ultrarare.space> 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 eb40e68de2..40e25a4303 100644 --- a/gnu/packages/tls.scm +++ b/gnu/packages/tls.scm @@ -975,6 +975,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 Sun May 28 12:56:12 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hilton Chain X-Patchwork-Id: 50385 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 2C2FE27BBEA; Sun, 28 May 2023 13:58:19 +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 7B15B27BBE2 for ; Sun, 28 May 2023 13:58:18 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1q3Fxz-0004Z4-1m; Sun, 28 May 2023 08:57:47 -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 1q3Fxd-0004Vh-Eq for guix-patches@gnu.org; Sun, 28 May 2023 08:57:34 -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 1q3FxI-00026y-AT for guix-patches@gnu.org; Sun, 28 May 2023 08:57:24 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1q3FxI-000159-62 for guix-patches@gnu.org; Sun, 28 May 2023 08:57:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#63765] [PATCH v2 7/8] gnu: Add frozen. Resent-From: Hilton Chain Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 28 May 2023 12:57:04 +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.16852786024061 (code B ref 63765); Sun, 28 May 2023 12:57:04 +0000 Received: (at 63765) by debbugs.gnu.org; 28 May 2023 12:56:42 +0000 Received: from localhost ([127.0.0.1]:53577 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1q3Fwv-00013K-Rc for submit@debbugs.gnu.org; Sun, 28 May 2023 08:56:42 -0400 Received: from mail.boiledscript.com ([144.168.59.46]:38792) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1q3Fwt-000132-AB for 63765@debbugs.gnu.org; Sun, 28 May 2023 08:56:39 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ultrarare.space; s=dkim; t=1685278467; 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=GYJQoW1bgOmKJPNDqWwmA7T7OF7ArdFo488Ftek7Owg=; b=Lv8lUhDOpwuJKlCze/FnrLcy/yUjCGAm1hzRmSKk8EEoIJN+/4lTJo9t0/cg5/GnmXKdUl 2+iQNdQPYojwwGZ9V5o9Vtk/Fj7FYETuWAkb7Ym6V+IAFGdfWqOnJAdbYJtaFS1G+8kA0Q M2PT8xcb5thBFHDoaMcM/EkvFClF3rMHhD2Hm+shmW5TiPrRtEt8qGd7wmXT9h4ri9AExT bqEsvjoHGqke4jXC46l7c4FEilNs99P1j5sOK2Ex27IWL8XanbRTLes2alNge1uryPcoAB Ps7+0hSkKwJt8qO0NxFqd+EVp0IAaWZE6uXAKAlDPuCueWSjrjM8Z2ZYDJElVg== Date: Sun, 28 May 2023 20:56:12 +0800 Message-Id: <20230528125613.9423-7-hako@ultrarare.space> In-Reply-To: <20230528125613.9423-1-hako@ultrarare.space> References: <20230528125423.9240-1-hako@ultrarare.space> <20230528125613.9423-1-hako@ultrarare.space> 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 64f923929e..2049793b02 100644 --- a/gnu/packages/cpp.scm +++ b/gnu/packages/cpp.scm @@ -566,6 +566,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 Sun May 28 12:56:13 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hilton Chain X-Patchwork-Id: 50386 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 01EB827BBEA; Sun, 28 May 2023 13:58:22 +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 DEE9827BBE2 for ; Sun, 28 May 2023 13:58:20 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1q3Fxz-0004ZC-K0; Sun, 28 May 2023 08:57:47 -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 1q3Fxd-0004Vi-F5 for guix-patches@gnu.org; Sun, 28 May 2023 08:57:31 -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 1q3FxI-000271-LT for guix-patches@gnu.org; Sun, 28 May 2023 08:57:24 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1q3FxI-00015G-H8 for guix-patches@gnu.org; Sun, 28 May 2023 08:57:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#63765] [PATCH v2 8/8] gnu: python-lief: Update to 0.13.1. Resent-From: Hilton Chain Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 28 May 2023 12:57:04 +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.16852786124088 (code B ref 63765); Sun, 28 May 2023 12:57:04 +0000 Received: (at 63765) by debbugs.gnu.org; 28 May 2023 12:56:52 +0000 Received: from localhost ([127.0.0.1]:53579 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1q3Fx5-00013q-FN for submit@debbugs.gnu.org; Sun, 28 May 2023 08:56:52 -0400 Received: from mail.boiledscript.com ([144.168.59.46]:48734) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1q3Fwv-00013F-O8 for 63765@debbugs.gnu.org; Sun, 28 May 2023 08:56:42 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ultrarare.space; s=dkim; t=1685278470; 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=MquNUVZ3uEoTinjDKyDozgEUuwOIMKwo4uy0g2liNxk=; b=v+fJRvzZFXWzcrzlf+nBcbpxQafAfiezN65Wpnkvg82Go256KGfIgcH0dXO/0SDsUWeIfy INq0gC3ipILS0H46/tSUj6eFvOKcP8CgHitjshQonFVl7M74J5UxesMBMx0gWLzcIG5sge GkbFPXaWbm6VcyvOvAW5nlfrheg73YvpQr30s0B/PmPXx80jwuTdu0yPUIC+Kct9iZ5QX/ TjoWqfMLDdNrs+Ne9MiitVcMOlghTHk4ohiBfIQna08/3re9ulF5KJYTSr3zdJ4aQUsHaq vOeS8E2ZrAR2cMRSeoy6IMq74XwzCmGxEj60yiZs2ZxBQZyIK33XZZo50a0uaQ== Date: Sun, 28 May 2023 20:56:13 +0800 Message-Id: <20230528125613.9423-8-hako@ultrarare.space> In-Reply-To: <20230528125613.9423-1-hako@ultrarare.space> References: <20230528125423.9240-1-hako@ultrarare.space> <20230528125613.9423-1-hako@ultrarare.space> 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.1. [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 f7e3f6f538..f46abaaf6c 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -208,6 +208,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) @@ -32815,29 +32816,94 @@ (define-public python-misskey (define-public python-lief (package (name "python-lief") - (version "0.12.3") + (version "0.13.1") (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)) + "0ms6zsb6mm6jys8nbfl2nml4l2y1zcgy26639adznj4n7b8n7lxk")))) + (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 @@ -32885,7 +32951,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