From patchwork Fri Jun 30 07:44:19 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Hilton Chain X-Patchwork-Id: 51451 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 E590A27BBE2; Fri, 30 Jun 2023 08:46:10 +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 D87CD27BBE9 for ; Fri, 30 Jun 2023 08:46:08 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qF8pK-00071D-Rd; Fri, 30 Jun 2023 03:45:58 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qF8oV-0006QU-Mq for guix-patches@gnu.org; Fri, 30 Jun 2023 03:45:08 -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 1qF8oV-0001nI-Dh for guix-patches@gnu.org; Fri, 30 Jun 2023 03:45:07 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qF8oQ-0001UI-40; Fri, 30 Jun 2023 03:45:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#63765] [PATCH v5 1/6] 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, 30 Jun 2023 07:45: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.16881110675594 (code B ref 63765); Fri, 30 Jun 2023 07:45:02 +0000 Received: (at 63765) by debbugs.gnu.org; 30 Jun 2023 07:44:27 +0000 Received: from localhost ([127.0.0.1]:54452 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qF8nr-0001SA-09 for submit@debbugs.gnu.org; Fri, 30 Jun 2023 03:44:27 -0400 Received: from mail.boiledscript.com ([144.168.59.46]:36046) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qF8no-0001S0-Px for 63765@debbugs.gnu.org; Fri, 30 Jun 2023 03:44:25 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ultrarare.space; s=dkim; t=1688110855; 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=9xlpnwDSHxvGwFb9FkWyvxPKzLytsYITRH0nHqtMAiI=; b=VRtARVPZQT8cQs5SmotJADLZxYDvgz+Ya7DWGgeV3t8UJh1UG6yXsh9hiJuOEXyBMboaDT 59/lTUlBXl1JmjAeOzYj2nQiAALRqM3DXzaoM70tj0nniyi14/hu+2Uia6+8FjThNAvPwM BdkUg5kRVzL+hM7xfRRUZaJWTlhHmgWCimAy+8eZSMRQflJwuZd26yKDSsqlXHFjbvNFMk EyTMmUu76BrTDQcmHX/7WLKTMbXhpYfh5DttEFBQXRHbsYp31tK8xbr4FXyesxp5boJG2y hhlj55HFRJAGRXKlyQVhNCZktFfhCozcjHLx0EQ46KGlpJyOW+hM+yZ8q/gO7Q== Date: Fri, 30 Jun 2023 15:44:19 +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): Rename from this... (mbedtls-apache-lts): ... to this. (mbedtls-for-hiawatha): Adjust accordingly. * gnu/packages/emulators.scm (dolphin-emu)[inputs]: Adjust inputs accordingly. * gnu/packages/game-development.scm (godot)[inputs]: Likewise. * gnu/packages/hardware.scm (hueplusplus,openrgb)[inputs]: Likewise. * gnu/packages/haxe.scm (neko,haxe,hashlink)[inputs]: Likewise. * gnu/packages/irc.scm (inspircd)[inputs]: Likewise. * gnu/packages/julia-jll.scm (julia-mbedtls-jll)[inputs]: Likewise. * gnu/packages/julia.scm (julia)[inputs]: Likewise. * gnu/packages/linphone.scm (bctoolbox)[inputs]: Likewise. * gnu/packages/linux.scm (dislocker)[inputs]: Likewise. * gnu/packages/networking.scm (nng)[inputs]: Likewise. * gnu/packages/search.scm (dataparksearch)[inputs]: Likewise. * gnu/packages/video.scm (obs)[inputs]: Likewise. --- 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 ffb736f447..eb65c06a66 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 2f118bccb2..f150c77b78 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 d94b7c27f5..c2011976ff 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 aa46da0c5e..f6895a56d1 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -3450,7 +3450,7 @@ (define-public obs libxcomposite libxkbcommon luajit - mbedtls-apache + mbedtls-apache-lts mesa pciutils pipewire From patchwork Fri Jun 30 07:44:20 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Hilton Chain X-Patchwork-Id: 51450 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 3D4CA27BBEA; Fri, 30 Jun 2023 08:46:01 +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 8290727BBE2 for ; Fri, 30 Jun 2023 08:46:00 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qF8oW-0006OY-Oj; Fri, 30 Jun 2023 03:45:08 -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 1qF8oR-0006Hf-1M for guix-patches@gnu.org; Fri, 30 Jun 2023 03:45:03 -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 1qF8oQ-0001fn-Ln for guix-patches@gnu.org; Fri, 30 Jun 2023 03:45:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qF8oQ-0001UQ-GO for guix-patches@gnu.org; Fri, 30 Jun 2023 03:45:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#63765] [PATCH v5 2/6] 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, 30 Jun 2023 07:45: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.16881110725618 (code B ref 63765); Fri, 30 Jun 2023 07:45:02 +0000 Received: (at 63765) by debbugs.gnu.org; 30 Jun 2023 07:44:32 +0000 Received: from localhost ([127.0.0.1]:54456 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qF8nv-0001ST-Kc for submit@debbugs.gnu.org; Fri, 30 Jun 2023 03:44:32 -0400 Received: from mail.boiledscript.com ([144.168.59.46]:58474) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qF8nt-0001SI-7K for 63765@debbugs.gnu.org; Fri, 30 Jun 2023 03:44:30 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ultrarare.space; s=dkim; t=1688110859; 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=evY8DNbQZdTUzBO4p0SjdVRQut4Ll5ixOFS2hb/mLuU=; b=SOE335HT6hXAK4jdgxdcwm+/OXF4h/gp2JAnjGK8wzl9NvL4FC6/fM4Mm6o4R+9CkF00mu cCdzOea/Dcy+rU3mWBkTWI5HaiFQWBOjQkjQYUoSOFmRrSNSjfXNy5rtNZjO21MoBQHxKm 4P8UTgMqoxlhghke+wQCLBtuYColD7AIU9Kj4ivgryoucghRjHSDtkevRjg4F8GTXnhUH5 pBvD/FKj0qgQCmxcmoM+OWaZI3xW8PJM4ddXuLNPTJ2jSZ+kPPA6IWIk82p0bfxIKQ1SxK bV/aeilQp4zeUFP1FjQSmS37Z3zNb2LgVGgBHlmg2UX2ZE8H3Vpeo6KziAEyew== Date: Fri, 30 Jun 2023 15:44:20 +0800 Message-Id: <5218cd17201513f1c352a1c27e7dbd932dffd0bb.1688110709.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 c2011976ff..2a0c81f559 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 30 07:44:21 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hilton Chain X-Patchwork-Id: 51446 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 E0DE727BBEA; Fri, 30 Jun 2023 08:45:44 +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 748C627BBE2 for ; Fri, 30 Jun 2023 08:45:44 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qF8oW-0006QL-QT; Fri, 30 Jun 2023 03:45:08 -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 1qF8oR-0006Hs-DC for guix-patches@gnu.org; Fri, 30 Jun 2023 03:45:03 -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 1qF8oR-0001kM-43 for guix-patches@gnu.org; Fri, 30 Jun 2023 03:45:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qF8oQ-0001UZ-W8 for guix-patches@gnu.org; Fri, 30 Jun 2023 03:45:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#63765] [PATCH v5 3/6] 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, 30 Jun 2023 07:45: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.16881110755634 (code B ref 63765); Fri, 30 Jun 2023 07:45:02 +0000 Received: (at 63765) by debbugs.gnu.org; 30 Jun 2023 07:44:35 +0000 Received: from localhost ([127.0.0.1]:54459 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qF8nz-0001Sj-8L for submit@debbugs.gnu.org; Fri, 30 Jun 2023 03:44:35 -0400 Received: from mail.boiledscript.com ([144.168.59.46]:58476) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qF8nv-0001SR-HT for 63765@debbugs.gnu.org; Fri, 30 Jun 2023 03:44:31 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ultrarare.space; s=dkim; t=1688110863; 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=OeKVGs7We/QtBNRvCZDnW9p89otTwbgfGf7ihh0X7Zk=; b=mMYTAZ6oBOm3B3ELHmeXcql3H+wLhIYJP8RjIxa8G6r/wDewANyfKufcFSK8AN/A3+02Oa CrSV3C8BjvdNsODqUb7taJjxQIBdiOukmhcMCiFM/mVOUmiipc6lgkpgelK3AOocmNhGX8 gQi8Sy9APQPTdQh37DSt8TzoT122Tf4CLFrF9mB7yAgKcNVJ4XD7XCtoz2JdbXy0ycfooE fgFYeIKxzE08HjHBLiCe55z271w5XywayG4d3aQhby+KOyiEfyhLONDQ1TqUCQq7bUXJlV zkGAfRY8AzKp5zW/HU8Q5wXkqWLc2RWSI8cqcx5XEVmAVKiCzkcp4tqZZ4XHgw== Date: Fri, 30 Jun 2023 15:44:21 +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 2a0c81f559..f25834c7ca 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 30 07:44:22 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hilton Chain X-Patchwork-Id: 51448 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 2774827BBEA; Fri, 30 Jun 2023 08:45:56 +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 AAC9327BBE2 for ; Fri, 30 Jun 2023 08:45:55 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qF8op-0006fK-Rh; Fri, 30 Jun 2023 03:45:30 -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 1qF8oR-0006I6-Px for guix-patches@gnu.org; Fri, 30 Jun 2023 03:45:03 -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 1qF8oR-0001mT-GM for guix-patches@gnu.org; Fri, 30 Jun 2023 03:45:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qF8oR-0001Ug-CG for guix-patches@gnu.org; Fri, 30 Jun 2023 03:45:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#63765] [PATCH v5 4/6] 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, 30 Jun 2023 07:45: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.16881110795652 (code B ref 63765); Fri, 30 Jun 2023 07:45:03 +0000 Received: (at 63765) by debbugs.gnu.org; 30 Jun 2023 07:44:39 +0000 Received: from localhost ([127.0.0.1]:54462 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qF8o2-0001T5-JZ for submit@debbugs.gnu.org; Fri, 30 Jun 2023 03:44:38 -0400 Received: from mail.boiledscript.com ([144.168.59.46]:58478) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qF8ny-0001Si-VA for 63765@debbugs.gnu.org; Fri, 30 Jun 2023 03:44:35 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ultrarare.space; s=dkim; t=1688110866; 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=BjyJI9Y+NuDeu4CkNyzGechrxPgLvIQe6yPSz4f9n7Y=; b=MXZdJ2FbIPskY/4BhP6UPMdKefCnf+nv78tcTa8Z4rMZ9eQW+6IAY9TOJUe7oIFoTUfHq4 tK1RnhVfMji62QLsvZn8T+vFz3Neso6DRkYlIDt7BMNdwwCnwENPU8WprP6r/7jJEC7Er9 4Gd7yUFzLJimQTj/sf2ZnNP9OlC+zX4OJDu5MtpjGigJAYTlXVibuTn5VIQDQZXM3m7wRp 99JivURtL1Y3pCAiE0rNPFT0A5dBN1jeCFoh0gPAFD/NoHwFp2WnzGBHzzGtA3wuhadXmD KFtI2h/yQQ7w8v/0NLpvpcZPpME89NE5sb6kfAGpJXAoAlRIp1G1XctOJ4ljXg== Date: Fri, 30 Jun 2023 15:44:22 +0800 Message-Id: <4008cd72948121c8eb5429e17d73b0c6f6b97748.1688110709.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 f25834c7ca..5cc7cdd96b 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 30 07:44:23 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hilton Chain X-Patchwork-Id: 51447 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 3AE9627BBEA; Fri, 30 Jun 2023 08:45:50 +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 A013E27BBE9 for ; Fri, 30 Jun 2023 08:45:49 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qF8oh-0006b8-8Q; Fri, 30 Jun 2023 03:45:21 -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 1qF8oS-0006IK-5p for guix-patches@gnu.org; Fri, 30 Jun 2023 03:45:04 -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 1qF8oR-0001md-SP for guix-patches@gnu.org; Fri, 30 Jun 2023 03:45:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qF8oR-0001Un-Nd for guix-patches@gnu.org; Fri, 30 Jun 2023 03:45:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#63765] [PATCH v5 5/6] gnu: Add frozen. Resent-From: Hilton Chain Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 30 Jun 2023 07:45: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.16881110795659 (code B ref 63765); Fri, 30 Jun 2023 07:45:03 +0000 Received: (at 63765) by debbugs.gnu.org; 30 Jun 2023 07:44:39 +0000 Received: from localhost ([127.0.0.1]:54464 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qF8o2-0001T7-Sz for submit@debbugs.gnu.org; Fri, 30 Jun 2023 03:44:39 -0400 Received: from mail.boiledscript.com ([144.168.59.46]:36582) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qF8o1-0001Sx-HB for 63765@debbugs.gnu.org; Fri, 30 Jun 2023 03:44:37 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ultrarare.space; s=dkim; t=1688110869; 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=4hRPUG+3BMQa8Vns9xKFzYMi8qazNsLGongmXK1o1BY=; b=W8rdztmyHWADmAMUay2FTuMAq8fsXPldTTsNeKn+Mj7QMK+4+gNZFM646hTzZtUn3r/CGR W7L5DOGfokuOk6r8Lr0WIVyzha4kmDq2s7/e+C7g+4w7sTgRzsm7S9T5wdwQvT8RL91gJA j3IKbrDo6Ga6VC6qaLrViGpyBNro5iiEJBCB8fUrWvN+qAak4bPsh0oKJyVkm8isv25tXz tQ9f5Ki3f8PvKx3G6g2iTfiOLnuD0c6WXmzaNs7y+AJQbHXtn0zc9DW0F8gIj5vv4caFJt g4/B9Tty32BogLS8PnvpHqi65e/Q8qmY2+2YUf2YXDaXEGWq5j4E3fIFN1T9Zg== Date: Fri, 30 Jun 2023 15:44:23 +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/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 d61bcd25fd..b80939183c 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 "5af40b3f9e03116aa2de4d55b53b9629e5988480") + (revision "8")) + (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 + "02snxdfmrzcqwnkazhlagsfamr3mcg10iskpz5l8yscckzvyhzfs")))) + (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 30 07:44:24 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hilton Chain X-Patchwork-Id: 51449 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 ADD1227BBEA; Fri, 30 Jun 2023 08:45: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 7D63827BBE2 for ; Fri, 30 Jun 2023 08:45:58 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qF8oz-0006iK-OX; Fri, 30 Jun 2023 03:45:39 -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 1qF8oV-0006QM-DV for guix-patches@gnu.org; Fri, 30 Jun 2023 03:45:08 -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 1qF8oV-0001nA-4n for guix-patches@gnu.org; Fri, 30 Jun 2023 03:45:07 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qF8oS-0001Ux-37; Fri, 30 Jun 2023 03:45:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#63765] [PATCH v5 6/6] 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, 30 Jun 2023 07:45: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 , Lars-Dominik Braun , jgart X-Debbugs-Original-Xcc: Lars-Dominik Braun , jgart Received: via spool by 63765-submit@debbugs.gnu.org id=B63765.16881110855677 (code B ref 63765); Fri, 30 Jun 2023 07:45:04 +0000 Received: (at 63765) by debbugs.gnu.org; 30 Jun 2023 07:44:45 +0000 Received: from localhost ([127.0.0.1]:54467 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qF8o9-0001TV-6H for submit@debbugs.gnu.org; Fri, 30 Jun 2023 03:44:45 -0400 Received: from mail.boiledscript.com ([144.168.59.46]:36596) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qF8o3-0001TK-NC for 63765@debbugs.gnu.org; Fri, 30 Jun 2023 03:44:40 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ultrarare.space; s=dkim; t=1688110871; 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=rhe9/epdoDDD1NFEv0N1iuXSD7gukkYI4vNZK0xJElM=; b=RarTHkxFnQ1G1OW3rXMnsU/vVMgFip4FqmATy2i4iEWe2Ur0kOCbjTQVNTVntgxm22q5Jx FG7F4q9t4LK69sM/UG0MfthuDBV65mGTDkYcpuwocLtjxw4Nfe6kyvR6X/rZmtNo6AK+wu 25omWee+bBySGaqTtroL2GSdOHXOZAw0kR7i1eXPcacr8KNbtn8FDu/mQ6EgyRWzV3LH7T rQK58/dxfvwfx78knTObZKRWdhz2mv7NBKy4Scq51Q+iZpAJrqB+IgNgfDfrpDZn1Iqoca H6Gsi3xitpF0Rx8jz1CssqFud+2sfVurYpeoXTmX9eZBa/JIfCXUWdfOox7+Dg== Date: Fri, 30 Jun 2023 15:44:24 +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/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 c4105c4685..dc84a8f8bc 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) @@ -33278,29 +33279,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 @@ -33348,7 +33414,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