From patchwork Sat Aug 5 13:18:57 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Hilton Chain X-Patchwork-Id: 52535 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 848BC27BBEC; Sat, 5 Aug 2023 14:21: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 9233627BBE2 for ; Sat, 5 Aug 2023 14:21:26 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qSHDV-0003RR-CL; Sat, 05 Aug 2023 09:21:13 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qSHDR-0003QJ-KU for guix-patches@gnu.org; Sat, 05 Aug 2023 09:21:09 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qSHDR-0003ZF-CQ for guix-patches@gnu.org; Sat, 05 Aug 2023 09:21:09 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qSHDK-00066W-G4; Sat, 05 Aug 2023 09:21:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#63765] [PATCH v6 01/10] gnu: mbedtls-apache: Rename 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: Sat, 05 Aug 2023 13:21: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.169124162523315 (code B ref 63765); Sat, 05 Aug 2023 13:21:02 +0000 Received: (at 63765) by debbugs.gnu.org; 5 Aug 2023 13:20:25 +0000 Received: from localhost ([127.0.0.1]:56124 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qSHCi-00063y-MA for submit@debbugs.gnu.org; Sat, 05 Aug 2023 09:20:25 -0400 Received: from mail.boiledscript.com ([144.168.59.46]:44114) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qSHCf-00063p-Tr for 63765@debbugs.gnu.org; Sat, 05 Aug 2023 09:20:22 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ultrarare.space; s=dkim; t=1691241614; 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=urL2wneKo2jfa4jn6N9iqc+1wtZLlKuPfvTGcNoLHns=; b=vlyw6HnWjpP41sMEbRC714C2jPeo8GBXQd3Mji3kKfQOqAO6pdPA6eAKS4tSeu1vAurA92 IAd32DaC1KIl3e8AxCvcwhYDCK/82/pAsOylQAEvAkU18DNs/CpFu/+FG3TRt3aZX1H9OX IfxdI8TfIFdL0a9DJyjG7qH3EklwpAJC3pscxljnDt2T7WAWV39PP69aRgSrWinCsdHzgX AbrP3oQutsxdsSthop4cb2Tgt6TqhL4fNCLoFeBJbON9Ln4ty8YjTn4mf+yj7x1C/LQ5jV WzxC9/8yZXPW88uMkdQYn08KzS7VouJ9asZFx3whEeM4PTlMEEBeE55ZrNDXAg== Date: Sat, 5 Aug 2023 21:18:57 +0800 Message-ID: In-Reply-To: References: MIME-Version: 1.0 Authentication-Results: mail.boiledscript.com; auth=pass smtp.mailfrom=hako@ultrarare.space X-Spamd-Bar: --- 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-lts,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 | 4 ++-- 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, 19 insertions(+), 19 deletions(-) diff --git a/gnu/packages/emulators.scm b/gnu/packages/emulators.scm index 67950c1603..8123ec764b 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 5771b7530f..dffdf18aed 100644 --- a/gnu/packages/game-development.scm +++ b/gnu/packages/game-development.scm @@ -1971,7 +1971,7 @@ (define-public godot-lts libxi libxinerama libxrandr - mbedtls-apache + mbedtls-apache-lts mesa opusfile pcre2 @@ -2213,7 +2213,7 @@ (define-public godot libxinerama libxkbcommon libxrandr - mbedtls-apache + mbedtls-apache-lts mesa openxr opusfile diff --git a/gnu/packages/hardware.scm b/gnu/packages/hardware.scm index ab343d1dac..02db432810 100644 --- a/gnu/packages/hardware.scm +++ b/gnu/packages/hardware.scm @@ -692,7 +692,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: @@ -1058,7 +1058,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 f966724022..407d3f4b08 100644 --- a/gnu/packages/irc.scm +++ b/gnu/packages/irc.scm @@ -815,7 +815,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 9c49cc0b3a..40e24c39bc 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -2309,7 +2309,7 @@ (define-public dislocker (build-system cmake-build-system) (arguments '(#:tests? #f)) ;no test suite - (inputs (list fuse-2 mbedtls-apache)) + (inputs (list fuse-2 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 488d015107..e1d48a82f0 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 f51c47db04..a986d2e578 100644 --- a/gnu/packages/tls.scm +++ b/gnu/packages/tls.scm @@ -955,7 +955,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 @@ -995,7 +995,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 @@ -1017,7 +1017,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 f75a528b13..38489beea7 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -3505,7 +3505,7 @@ (define-public obs libxcomposite libxkbcommon luajit - mbedtls-apache + mbedtls-apache-lts mesa pciutils pipewire From patchwork Sat Aug 5 13:18:58 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Hilton Chain X-Patchwork-Id: 52534 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 E54CB27BBE9; Sat, 5 Aug 2023 14:21:25 +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 9202927BBE2 for ; Sat, 5 Aug 2023 14:21:24 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qSHDM-0003Mc-Ks; Sat, 05 Aug 2023 09:21:04 -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 1qSHDL-0003Ly-95 for guix-patches@gnu.org; Sat, 05 Aug 2023 09:21:03 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qSHDL-0003YY-19 for guix-patches@gnu.org; Sat, 05 Aug 2023 09:21:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qSHDK-00066d-Sk for guix-patches@gnu.org; Sat, 05 Aug 2023 09:21:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#63765] [PATCH v6 02/10] gnu: mbedtls-apache-for-hiawatha: Use inherited source. Resent-From: Hilton Chain Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 05 Aug 2023 13:21: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.169124162723329 (code B ref 63765); Sat, 05 Aug 2023 13:21:02 +0000 Received: (at 63765) by debbugs.gnu.org; 5 Aug 2023 13:20:27 +0000 Received: from localhost ([127.0.0.1]:56127 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qSHCl-00064D-8Y for submit@debbugs.gnu.org; Sat, 05 Aug 2023 09:20:27 -0400 Received: from mail.boiledscript.com ([144.168.59.46]:44124) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qSHCj-00063z-Bt for 63765@debbugs.gnu.org; Sat, 05 Aug 2023 09:20:26 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ultrarare.space; s=dkim; t=1691241617; 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=qIiBeZ+cKPm7eW3kIOnoTMfa2IfJ41+SismYK2olc50=; b=Z8BcYIWAA8AerACfYeGiDlfg1ToeB8tIqDCG5AHJ3UIB+JtpaJJm/455CixMtCU4grvqt3 x496RfrLj5+eIyzve5EKB7PdmcPpeWUe3a0g10u26jNuqkxfDQJ9iRlIK6mkUNwJ3TISm4 KeWwkEKn3w5D3Lj5eEypUzYrPQhYPN8GrpmnDNo4/Kh6SG55JtSKyj86HL9MlWAP5v9y7W ZFtrAEbUntHHzSgVBBDvUIyNQkkWpp3R/abnwKIR8ZycpZj9rpLTeo6QTdV2g2tWhzXEwS Vy70qEwWGzoB+uvkw5v0uYu4+ChOLHCmr8e9ubKE1ptacJGJAvQ2Xv9/KpdjLA== Date: Sat, 5 Aug 2023 21:18:58 +0800 Message-ID: <7a9f62deba5523028dc2ac9f111f0fef3c6e926d.1691240736.git.hako@ultrarare.space> In-Reply-To: References: MIME-Version: 1.0 Authentication-Results: mail.boiledscript.com; auth=pass smtp.mailfrom=hako@ultrarare.space X-Spamd-Bar: --- 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 a986d2e578..5723956357 100644 --- a/gnu/packages/tls.scm +++ b/gnu/packages/tls.scm @@ -958,8 +958,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 @@ -996,26 +994,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) @@ -1026,9 +1004,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 Sat Aug 5 13:18:59 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hilton Chain X-Patchwork-Id: 52539 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 E29B827BBEA; Sat, 5 Aug 2023 14:21:52 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-0.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FROM_SUSPICIOUS_NTLD,MAILING_LIST_MULTI,PDS_OTHER_BAD_TLD, SPF_HELO_PASS,URIBL_BLOCKED autolearn=no autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 67CF627BBE2 for ; Sat, 5 Aug 2023 14:21:52 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qSHDN-0003Mw-D0; Sat, 05 Aug 2023 09:21:05 -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 1qSHDL-0003M7-KL for guix-patches@gnu.org; Sat, 05 Aug 2023 09:21:03 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qSHDL-0003Yd-CG for guix-patches@gnu.org; Sat, 05 Aug 2023 09:21:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qSHDL-00066w-7x for guix-patches@gnu.org; Sat, 05 Aug 2023 09:21:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#63765] [PATCH v6 03/10] gnu: mbedtls-apache-lts: Update to 2.28.4. Resent-From: Hilton Chain Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 05 Aug 2023 13:21: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.169124163323348 (code B ref 63765); Sat, 05 Aug 2023 13:21:03 +0000 Received: (at 63765) by debbugs.gnu.org; 5 Aug 2023 13:20:33 +0000 Received: from localhost ([127.0.0.1]:56130 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qSHCq-00064W-J4 for submit@debbugs.gnu.org; Sat, 05 Aug 2023 09:20:32 -0400 Received: from mail.boiledscript.com ([144.168.59.46]:44524) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qSHCo-00064O-LV for 63765@debbugs.gnu.org; Sat, 05 Aug 2023 09:20:31 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ultrarare.space; s=dkim; t=1691241622; 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=gC5CXo+/sYMdIlxpkUQ7VIUKqWKzb75U2To2b2Diqx8=; b=Gkqrlkth2w//CbTdJGZh2QaGtaNrwf+pK49uiwgfbx7jyCwtB2kXUkXZ9wUByTT3E8MRhq pJOdGWaCbAKqQYQqRFuSnsENaDqRbr+0aiawZKSZtBJANPglJRS/uzKAeIdBIQpR8umh6d /W1rklSJff+c/FDphk/Vo12RnQKgZ8uiJ0gIDdAFRqZLQaaE0ZY5IJiUBqQ6soCQf/gQx+ LOtQi5aOAx22lufQ0KTVdSAkdN/3DSeaUMkC0ieC8FWHaOhwgCYFsI9XfrcjQL4ytOoVV5 ep2ZhgYqcZMBbwOaEWAfHPeOczEICPtyTjCBeMF54G/5DWoOdy3KT1cfcJAz/A== Date: Sat, 5 Aug 2023 21:18:59 +0800 Message-ID: In-Reply-To: References: MIME-Version: 1.0 Authentication-Results: mail.boiledscript.com; auth=pass smtp.mailfrom=hako@ultrarare.space X-Spamd-Bar: -- 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.4. --- 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 5723956357..7e8f2921d2 100644 --- a/gnu/packages/tls.scm +++ b/gnu/packages/tls.scm @@ -958,7 +958,7 @@ (define-public perl-crypt-openssl-random (define-public mbedtls-apache-lts (package (name "mbedtls-apache") - (version "2.28.0") + (version "2.28.4") (source (origin (method git-fetch) @@ -967,7 +967,7 @@ (define-public mbedtls-apache-lts (commit (string-append "mbedtls-" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "0s37dsi29v7146fi9k4frvx5rz2snxdm6c3rwq2fvnca2r80hfjl")))) + (base32 "1lcsccnkgxj1j4pl7pa6l2rvl23kzpv7cwk8hgb96jv0sf7yghpk")))) (build-system cmake-build-system) (arguments `(#:configure-flags From patchwork Sat Aug 5 13:19:00 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hilton Chain X-Patchwork-Id: 52540 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 0383827BBE9; Sat, 5 Aug 2023 14:21:55 +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 E5CF127BBEA for ; Sat, 5 Aug 2023 14:21:53 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qSHDN-0003O2-Kn; Sat, 05 Aug 2023 09:21:05 -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 1qSHDM-0003MF-2T for guix-patches@gnu.org; Sat, 05 Aug 2023 09:21:04 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qSHDL-0003Yk-QW for guix-patches@gnu.org; Sat, 05 Aug 2023 09:21:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qSHDL-000676-M7 for guix-patches@gnu.org; Sat, 05 Aug 2023 09:21:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#63765] [PATCH v6 04/10] gnu: Add mbedtls-apache, version 3.4.1. Resent-From: Hilton Chain Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 05 Aug 2023 13:21: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.169124164523379 (code B ref 63765); Sat, 05 Aug 2023 13:21:03 +0000 Received: (at 63765) by debbugs.gnu.org; 5 Aug 2023 13:20:45 +0000 Received: from localhost ([127.0.0.1]:56133 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qSHD3-00064z-0d for submit@debbugs.gnu.org; Sat, 05 Aug 2023 09:20:45 -0400 Received: from mail.boiledscript.com ([144.168.59.46]:37338) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qSHD0-00064p-BS for 63765@debbugs.gnu.org; Sat, 05 Aug 2023 09:20:43 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ultrarare.space; s=dkim; t=1691241625; 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=oZjfCO9mOS62mBcQF5wil6uXxOaJm88fHKpOi87zaDA=; b=09//2S8MRTsLeL87ICvsXj3wbphT4DSMK2Q9RIUrpfDRZ5kO2ODIoHtmzIIouSdqTOjqYM +SPWUnQuPiOp9k8xKTLe5KJxJF87iOZExvZVxWstj24DI7v6v//eV0Ix5dDjKItsqWcBSt G1/SErGb3QVOSejtn9kOrEdKMZC5nUxdTgKTcmVzN3jowtHo7wxGtn42/DblQgLzcZRkzg FHkFVpeKwVE28rnZ0QD3bEOVqGwu4KffuVrnbwCeVlRKVCqeDNOgl1xeSY1Fz88kpGP2Sk EIDM1JVHiGhw2fMyUHT1n5IoOar/4s/3pWHX0Y4BMei9bYx1dOTWxKfDtNJRow== Date: Sat, 5 Aug 2023 21:19:00 +0800 Message-ID: In-Reply-To: References: MIME-Version: 1.0 Authentication-Results: mail.boiledscript.com; auth=pass smtp.mailfrom=hako@ultrarare.space X-Spamd-Bar: -- 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 7e8f2921d2..ac8d6c552c 100644 --- a/gnu/packages/tls.scm +++ b/gnu/packages/tls.scm @@ -989,6 +989,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.1") + (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 + "0fzm1a02r4mkhawxdgk6rr7pv9dp94z4yrg4xd9sk0svqm2z521l")))))) + ;; The Hiawatha Web server requires some specific features to be enabled. (define-public mbedtls-for-hiawatha (hidden-package From patchwork Sat Aug 5 13:19:01 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hilton Chain X-Patchwork-Id: 52537 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 34FE027BBEB; Sat, 5 Aug 2023 14:21:38 +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 8F03027BBE2 for ; Sat, 5 Aug 2023 14:21:37 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qSHDR-0003Pp-GI; Sat, 05 Aug 2023 09:21:09 -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 1qSHDM-0003Mb-KG for guix-patches@gnu.org; Sat, 05 Aug 2023 09:21:04 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qSHDM-0003Yq-8W for guix-patches@gnu.org; Sat, 05 Aug 2023 09:21:04 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qSHDM-00067D-3N for guix-patches@gnu.org; Sat, 05 Aug 2023 09:21:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#63765] [PATCH v6 05/10] gnu: Add frozen. Resent-From: Hilton Chain Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 05 Aug 2023 13:21: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.169124164623393 (code B ref 63765); Sat, 05 Aug 2023 13:21:04 +0000 Received: (at 63765) by debbugs.gnu.org; 5 Aug 2023 13:20:46 +0000 Received: from localhost ([127.0.0.1]:56136 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qSHD4-00065E-Cg for submit@debbugs.gnu.org; Sat, 05 Aug 2023 09:20:46 -0400 Received: from mail.boiledscript.com ([144.168.59.46]:37346) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qSHD3-00064y-6U for 63765@debbugs.gnu.org; Sat, 05 Aug 2023 09:20:45 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ultrarare.space; s=dkim; t=1691241636; 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=wqFEdBPY6hLM9xNjeQOoRdLYe5+HlrwrXg8VcPgcJcM=; b=D56C7UeiqW3Pu7ehoABDTIvq8p6sFqUiY0UfgrZLtYnTa93BVdsoYIorfY9anf0a5k70Zn WNsxIXUMxki6MhtXFUiWS8FNnZrYHguONbCnMgPnsHZ0gdHqmyt6Lt9ZjSfqknQbkX2CJh SVerWU0jUZslPhXADMoxyvZZv2QgDkf0JXNFC+TzVvZ3C6TZ7RCZlBfLsuWNM5RmfSuPkN ObFpNSF1Tjq7v+/t/1UiCcvdwfDu6GfiZiNeX8/h6vs1eOcSKBHs3TBmTxDIqBsA0EeJnr ymSIDM3qQ0kgZtUV0OsurjB/LaVaI0wD8/vk6QuioRA+gpozq/IFZaICJagzwg== Date: Sat, 5 Aug 2023 21:19:01 +0800 Message-ID: In-Reply-To: References: MIME-Version: 1.0 Authentication-Results: mail.boiledscript.com; auth=pass smtp.mailfrom=hako@ultrarare.space X-Spamd-Bar: -- 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 1a71c86c3c..5d1361173f 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") + (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 Sat Aug 5 13:19:02 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hilton Chain X-Patchwork-Id: 52541 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 7BD2D27BBE2; Sat, 5 Aug 2023 14:21: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 01EA727BBEB for ; Sat, 5 Aug 2023 14:21:54 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qSHDO-0003PS-Ri; Sat, 05 Aug 2023 09:21:06 -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 1qSHDM-0003Ml-Vf for guix-patches@gnu.org; Sat, 05 Aug 2023 09:21:04 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qSHDM-0003Yx-OC for guix-patches@gnu.org; Sat, 05 Aug 2023 09:21:04 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qSHDM-00067M-KS for guix-patches@gnu.org; Sat, 05 Aug 2023 09:21:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#63765] [PATCH v6 06/10] gnu: Add boost-leaf. Resent-From: Hilton Chain Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 05 Aug 2023 13:21: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.169124165223410 (code B ref 63765); Sat, 05 Aug 2023 13:21:04 +0000 Received: (at 63765) by debbugs.gnu.org; 5 Aug 2023 13:20:52 +0000 Received: from localhost ([127.0.0.1]:56139 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qSHD9-00065W-NL for submit@debbugs.gnu.org; Sat, 05 Aug 2023 09:20:52 -0400 Received: from mail.boiledscript.com ([144.168.59.46]:37354) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qSHD6-00065N-UC for 63765@debbugs.gnu.org; Sat, 05 Aug 2023 09:20:50 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ultrarare.space; s=dkim; t=1691241640; 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=xS+f8xjhhBsj3Wp+quriZ1olj9YP2zG3Q6iVrUiiuCM=; b=KpCAR4ERTjoI7WxyFebZzsroHCFiPYIocpNqg8+WxVv79Nyw1ifa8mXcrc1fVdmo3DBYxu 95D8cCvg/dy6ZJwFZ+uZkpKYSJEXu1Ans5g/sPpathFuef0bTgYTcsP/emnNd9X9CVtbFj dtEHDAukgRfrvuIsLk4g4qF1Zs5xhrkbkWTiKRQJ+dH/IdHilfVXbNwZBtT4lvrlb0KOwK 4FrgOzyPvdgYax2qOVmShDqAbB87UfQnF3pQVSpEIz0zWxrl1CWYQJXFQzxbGHo3/y69ya EkiEQgsR9SlVV0wv8rKi1MwUrmj83WtZlqRlEV3eLrx0/3mVKjLQnkYCuupT+Q== Date: Sat, 5 Aug 2023 21:19:02 +0800 Message-ID: In-Reply-To: References: MIME-Version: 1.0 Authentication-Results: mail.boiledscript.com; auth=pass smtp.mailfrom=hako@ultrarare.space X-Spamd-Bar: -- 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/boost.scm (boost-leaf): New variable. --- gnu/packages/boost.scm | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/gnu/packages/boost.scm b/gnu/packages/boost.scm index d2b676cc73..9b522a54fb 100644 --- a/gnu/packages/boost.scm +++ b/gnu/packages/boost.scm @@ -42,6 +42,7 @@ (define-module (gnu packages boost) #:use-module (guix download) #:use-module (guix git-download) #:use-module (guix build-system gnu) + #:use-module (guix build-system meson) #:use-module (guix build-system trivial) #:use-module (gnu packages) #:use-module (gnu packages compression) @@ -363,6 +364,38 @@ (define-public boost-for-mysql (delete "python-minimal-wrapper"))) (properties '((hidden? . #t))))) +(define-public boost-leaf + (package + (name "boost-leaf") + (version "1.82.0") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/boostorg/leaf") + (commit (string-append "boost-" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1awxidipj54rz82mk48axaajiy5na8qsglqrv9iqr50kvjil39z1")))) + (build-system meson-build-system) + (arguments + (list #:configure-flags + #~'("-Dleaf_enable_examples=false") + #:phases + #~(modify-phases %standard-phases + (replace 'install + (lambda _ + (mkdir-p #$output) + (copy-recursively + "../source/include" + (string-append #$output "/include"))))))) + (home-page "https://boostorg.github.io/leaf/") + (synopsis "C++11 error handling library") + (description + "@acronym{LEAF, Lightweight Error Augmentation Framework} is a lightweight +error handling library for C++11.") + (license license:boost1.0))) + (define-public boost-sync (let ((commit "e690de2d30e2f1649ff500c9a6f3539814994b1c") (version "1.55") From patchwork Sat Aug 5 13:19:03 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hilton Chain X-Patchwork-Id: 52536 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 9E49F27BBE2; Sat, 5 Aug 2023 14:21:29 +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 3051D27BBEA for ; Sat, 5 Aug 2023 14:21:27 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qSHDP-0003PY-J8; Sat, 05 Aug 2023 09:21:07 -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 1qSHDN-0003N0-Ev for guix-patches@gnu.org; Sat, 05 Aug 2023 09:21:05 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qSHDN-0003Z3-5D for guix-patches@gnu.org; Sat, 05 Aug 2023 09:21:05 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qSHDN-00067U-1Z for guix-patches@gnu.org; Sat, 05 Aug 2023 09:21:05 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#63765] [PATCH v6 07/10] gnu: Add tcb-span. Resent-From: Hilton Chain Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 05 Aug 2023 13:21:05 +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.169124165623428 (code B ref 63765); Sat, 05 Aug 2023 13:21:05 +0000 Received: (at 63765) by debbugs.gnu.org; 5 Aug 2023 13:20:56 +0000 Received: from localhost ([127.0.0.1]:56142 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qSHDE-00065o-3G for submit@debbugs.gnu.org; Sat, 05 Aug 2023 09:20:56 -0400 Received: from mail.boiledscript.com ([144.168.59.46]:57234) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qSHDC-00065g-I3 for 63765@debbugs.gnu.org; Sat, 05 Aug 2023 09:20:54 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ultrarare.space; s=dkim; t=1691241646; 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=FygTZswsdRyK/PqSJE15v4RuoxE878smeuc17Mga9WU=; b=MJLx3hvVIoT0Xwo6JAHKAD/Ve47iwgXROKL/oZWBfeZrqSLBQrxUqNPSbzlsqDzVj2dApU uUWui0K45Ghh6u0tMv4tJHHdqBSsF5meo470pjx0CocMxsDQJhOU4BIC6Cgfwh1RUu0C4e z8vs3M8YnncUeklyueEz0wB0f8CBzFNE7ScStYYJKk1UtKi6YNFeIGIKo25oLwBAl77WLo XkiPubqd9O+/b3VhOxo0eS+0ApJqFINQCDB3YA9Xt1jb+UtV8MfmSeErdOCisnE/8ghgIC 66FwwKhmnwnu7N1LAS1ke1B0Pxx2KEN8PbYvbP3iouhNkrhQr5vHHkr2gtH9wA== Date: Sat, 5 Aug 2023 21:19:03 +0800 Message-ID: <90badab8a63e441ca70c8b4a7decf3e7e676fafa.1691240736.git.hako@ultrarare.space> In-Reply-To: References: MIME-Version: 1.0 Authentication-Results: mail.boiledscript.com; auth=pass smtp.mailfrom=hako@ultrarare.space X-Spamd-Bar: -- 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 (tcb-span): New variable. --- gnu/packages/cpp.scm | 44 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 44 insertions(+) diff --git a/gnu/packages/cpp.scm b/gnu/packages/cpp.scm index 5d1361173f..8d20e698bb 100644 --- a/gnu/packages/cpp.scm +++ b/gnu/packages/cpp.scm @@ -1023,6 +1023,50 @@ (define-public sobjectizer development of concurrent and multithreaded applications in C++.") (license license:bsd-3))) +(define-public tcb-span + ;; No released versions + (let ((commit "836dc6a0efd9849cb194e88e4aa2387436bb079b") + (revision "0")) + (package + (name "tcb-span") + (version (git-version "0.0.0" revision commit)) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/tcbrindle/span") + (commit commit))) + (file-name (git-file-name name version)) + (modules '((guix build utils))) + (snippet + '(begin + (delete-file "test/catch.hpp") + (substitute* "test/CMakeLists.txt" + (("add_library.*" line) + (string-append + line "find_package(Catch2 REQUIRED)\n"))) + (substitute* (find-files "test" "\\.cpp") + (("\"catch.hpp\"") "")))) + (sha256 + (base32 + "1v3x1mj4if8jrr7cmrcbhv8n8ygla0liqb0dic6g6ji7px2pr6jf")))) + (build-system cmake-build-system) + (arguments + (list #:phases + #~(modify-phases %standard-phases + (replace 'install + (lambda _ + (copy-recursively + "../source/include" + (string-append #$output "/include"))))))) + (native-inputs (list catch2)) + (home-page "https://github.com/tcbrindle/span") + (synopsis "@code{std::span} implementation for older compilers") + (description + "This package provides a single-header implementation of C++20's +@code{std::span}, conforming to the C++20 committee draft. It is compatible +with C++11, but will use newer language features if they are available.") + (license license:boost1.0)))) + (define-public tweeny (package (name "tweeny") From patchwork Sat Aug 5 13:19:04 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hilton Chain X-Patchwork-Id: 52538 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 A2A8C27BBE9; Sat, 5 Aug 2023 14:21:47 +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=-1.9 required=5.0 tests=BAYES_00,FROM_SUSPICIOUS_NTLD, MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable 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 E831F27BBE2 for ; Sat, 5 Aug 2023 14:21:45 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qSHDT-0003Qh-Dv; Sat, 05 Aug 2023 09:21:11 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qSHDN-0003P4-So for guix-patches@gnu.org; Sat, 05 Aug 2023 09:21:05 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qSHDN-0003Z9-Jy for guix-patches@gnu.org; Sat, 05 Aug 2023 09:21:05 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qSHDN-00067d-G0 for guix-patches@gnu.org; Sat, 05 Aug 2023 09:21:05 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#63765] [PATCH v6 08/10] gnu: Add melkor. Resent-From: Hilton Chain Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 05 Aug 2023 13:21:05 +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.169124166023445 (code B ref 63765); Sat, 05 Aug 2023 13:21:05 +0000 Received: (at 63765) by debbugs.gnu.org; 5 Aug 2023 13:21:00 +0000 Received: from localhost ([127.0.0.1]:56145 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qSHDI-000665-ES for submit@debbugs.gnu.org; Sat, 05 Aug 2023 09:21:00 -0400 Received: from mail.boiledscript.com ([144.168.59.46]:57236) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qSHDG-00065w-8Z for 63765@debbugs.gnu.org; Sat, 05 Aug 2023 09:20:58 -0400 Date: Sat, 5 Aug 2023 21:19:04 +0800 Message-ID: <5156b60a34961e48e9cba8fa9ba86990eb35cfa4.1691240736.git.hako@ultrarare.space> In-Reply-To: References: MIME-Version: 1.0 Authentication-Results: mail.boiledscript.com; auth=pass smtp.mailfrom=hako@ultrarare.space X-Spamd-Bar: -- 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/elf.scm (melkor): New variable. --- gnu/packages/elf.scm | 37 +++++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) diff --git a/gnu/packages/elf.scm b/gnu/packages/elf.scm index a100038f14..3ddb6c4064 100644 --- a/gnu/packages/elf.scm +++ b/gnu/packages/elf.scm @@ -28,6 +28,7 @@ ;;; along with GNU Guix. If not, see . (define-module (gnu packages elf) + #:use-module (guix gexp) #:use-module (guix utils) #:use-module (guix packages) #:use-module (guix download) @@ -340,3 +341,39 @@ (define-public libdwarf debugging information format.") ;; See https://www.prevanders.net/dwarflicense.html: (license (list lgpl2.1 gpl2 bsd-2)))) + +(define-public melkor + (let ((commit "ac2495bef2a744e7931537e023b1129229b001c4") + (revision "8")) + (package + (name "melkor") + (version (git-version "1.0" revision commit)) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/romainthomas/elf_fuzzer") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1czg0dgvzxcsi04myjvvdcl3vcf59d5l328ydmm01lh892wdf4dy")))) + (build-system gnu-build-system) + (arguments + (list #:tests? #f ;No tests. + #:make-flags + #~(list (string-append "CC=" #$(cc-for-target)) + (format #f "INSTALLPATH=~a/bin/" #$output)) + #:phases + #~(modify-phases %standard-phases + ;; No configure script. + (delete 'configure) + (add-before 'install 'create-/bin + (lambda _ + (mkdir-p (string-append #$output "/bin"))))))) + ;; Fork of + (home-page "https://github.com/romainthomas/elf_fuzzer") + (synopsis "ELF File Format Fuzzer") + (description + "Melkor is an intuitive and easy-to-use ELF file format fuzzer for +finding functional and security bugs in ELF parsers.") + (license gpl3+)))) From patchwork Sat Aug 5 13:19:05 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hilton Chain X-Patchwork-Id: 52542 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 DA72F27BBE9; Sat, 5 Aug 2023 14:22: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 C8EC627BBE2 for ; Sat, 5 Aug 2023 14:22:17 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qSHEO-000415-3L; Sat, 05 Aug 2023 09:22: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 1qSHEK-0003yr-Vy for guix-patches@gnu.org; Sat, 05 Aug 2023 09:22:06 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qSHEK-0003m2-Ng for guix-patches@gnu.org; Sat, 05 Aug 2023 09:22:04 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qSHEH-00069c-RU; Sat, 05 Aug 2023 09:22:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#63765] [PATCH v6 09/10] 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: Sat, 05 Aug 2023 13:22: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 , Lars-Dominik Braun , jgart X-Debbugs-Original-Xcc: Lars-Dominik Braun , jgart Received: via spool by 63765-submit@debbugs.gnu.org id=B63765.169124166823570 (code B ref 63765); Sat, 05 Aug 2023 13:22:01 +0000 Received: (at 63765) by debbugs.gnu.org; 5 Aug 2023 13:21:08 +0000 Received: from localhost ([127.0.0.1]:56159 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qSHDP-000683-Ro for submit@debbugs.gnu.org; Sat, 05 Aug 2023 09:21:08 -0400 Received: from mail.boiledscript.com ([144.168.59.46]:35192) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qSHDN-00067T-75 for 63765@debbugs.gnu.org; Sat, 05 Aug 2023 09:21:06 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ultrarare.space; s=dkim; t=1691241656; 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=zqIT7MxidQLRqmNmR4f3++5bvP3jlLbDTSxBycka7FY=; b=HUJhNN4N37FbgSHePpBWSh0zh0TZk+WwmdnKCXT4bk3sYZAk8FYpodKIcbmUSye1CEc99v 0/heM+DYqslIjPML9UPGcz4d9YwPoFzoT1FEBZ7r6BOHHT21J+nP4kuFgb2SWVw5bKsBrd uyFGEJymZ0Cx2dGGToafreuT3q4bnzi6RTl7eOeL/Pk41kM4TuVhV5C9RSP7iV1ys83Jqb u7kZwQNtSWm0Ft3LSE4kXKeqVV9wQPneTU5Spi63267JUKK5PEucJu+pB2Aabf/S2EubrN ajv0JAsLn62XFtoVQTdNqrBlBPYpdVxg5ZG05TaZlLYDTEa9XzShvQKFZ4rvXw== Date: Sat, 5 Aug 2023 21:19:05 +0800 Message-ID: In-Reply-To: References: MIME-Version: 1.0 Authentication-Results: mail.boiledscript.com; auth=pass smtp.mailfrom=hako@ultrarare.space X-Spamd-Bar: -- 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/patches/lief-unbundle-test-dependencies.patch: New file. * gnu/local.mk (dist_patch_DATA): Add it. * gnu/packages/python-xyz.scm (python-lief): Update to 0.13.2. [snippet]: Unbundle third-party dependencies. [build-system]: Switch to cmake-build-system [native-inputs]: Add catch2, melkor, python-wrapper, python-tomli. Remove cmake. [inputs]: Add boost-leaf, frozen, mbedtls-apache, nlohmann-json, pybind11, spdlog, tcb-span, utfcpp. [outputs]: Add "python" output. [home-page]: Update homepage. (shrinkwrap)[inputs]: Replace python-lief to its "python" output. --- gnu/local.mk | 1 + .../lief-unbundle-test-dependencies.patch | 103 ++++++++++++++++ gnu/packages/python-xyz.scm | 112 +++++++++++++++--- 3 files changed, 202 insertions(+), 14 deletions(-) create mode 100644 gnu/packages/patches/lief-unbundle-test-dependencies.patch diff --git a/gnu/local.mk b/gnu/local.mk index 77707127a7..c79299a592 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1544,6 +1544,7 @@ dist_patch_DATA = \ %D%/packages/patches/libwpd-gcc-compat.patch \ %D%/packages/patches/libxslt-generated-ids.patch \ %D%/packages/patches/libxt-guix-search-paths.patch \ + %D%/packages/patches/lief-unbundle-test-dependencies.patch \ %D%/packages/patches/lierolibre-check-unaligned-access.patch \ %D%/packages/patches/lierolibre-is-free-software.patch \ %D%/packages/patches/lierolibre-newer-libconfig.patch \ diff --git a/gnu/packages/patches/lief-unbundle-test-dependencies.patch b/gnu/packages/patches/lief-unbundle-test-dependencies.patch new file mode 100644 index 0000000000..d86126c657 --- /dev/null +++ b/gnu/packages/patches/lief-unbundle-test-dependencies.patch @@ -0,0 +1,103 @@ +From 0e0f105e984eeac51147b5fd87cf95668e8fa235 Mon Sep 17 00:00:00 2001 +From: Hilton Chain +Date: Fri, 4 Aug 2023 10:57:32 +0800 +Subject: [PATCH] Use system Catch2 and Melkor. + +--- + tests/CMakeLists.txt | 47 ++++------------------------------------ + tests/test_iterators.cpp | 2 +- + 2 files changed, 5 insertions(+), 44 deletions(-) + +diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt +index 1d34b711..cf79ab74 100644 +--- a/tests/CMakeLists.txt ++++ b/tests/CMakeLists.txt +@@ -8,23 +8,6 @@ set(LIEF_EXAMPLES_DIRECTORY "${PROJECT_SOURCE_DIR}/examples") + set(LIEF_EXAMPLES_BINARY_DIR "${PROJECT_BINARY_DIR}/examples") + + +-# Catch +-# ===== +-set(CATCH_VERSION 2.13.8) +-set(CATCH_SHA256 SHA256=532f163e4f2db66dae33f1d0a279e8d9befec8bc6cca60d7b82155f7d06bd89c) +-set(CATCH_URL "${THIRD_PARTY_DIRECTORY}/Catch2-${CATCH_VERSION}.zip" CACHE STRING "URL to the Catch repo") +- +-ExternalProject_Add(catch +- PREFIX ${CATCH_PREFIX} +- URL ${CATCH_URL} +- URL_HASH ${CATCH_SHA256} +- CONFIGURE_COMMAND "" +- BUILD_COMMAND "" +- INSTALL_COMMAND "" +-) +-ExternalProject_Get_Property(catch source_dir) +-set(CATCH_INCLUDE_DIR "${source_dir}" CACHE INTERNAL "Path to include folder for Catch") +- + # Code covergage + # ============== + if(LIEF_COVERAGE) +@@ -58,31 +41,6 @@ if(LIEF_COVERAGE) + endif() + + +-# Fuzzing +-# ======= +-if(UNIX AND NOT APPLE) +- set(MELKOR_VERSION ac2495b) # From the fork: https://github.com/romainthomas/elf_fuzzer +- set(MELKOR_SHA256 SHA256=8cccc4ca5e05e305215cc74761413746b660b76f5869a563f52cec1f23d79f2e) +- set(MELKOR_URL "${THIRD_PARTY_DIRECTORY}/Melkor_ELF_Fuzzer-${MELKOR_VERSION}.zip" CACHE STRING "URL to the Melkor package") +- +- set(MELKOR_PREFIX "${CMAKE_CURRENT_BINARY_DIR}/Melkor") +- set(MELKOR_INSTALL_DIR "${CMAKE_CURRENT_BINARY_DIR}/Melkor") +- ExternalProject_Add(MELKOR +- PREFIX ${MELKOR_PREFIX} +- URL ${MELKOR_URL} +- URL_HASH ${MELKOR_SHA256} +- INSTALL_DIR ${MELKOR_INSTALL_DIR} +- UPDATE_COMMAND "" +- CONFIGURE_COMMAND "" +- INSTALL_COMMAND "" +- BUILD_COMMAND make clean && make +- BUILD_IN_SOURCE ON) +- +- ExternalProject_get_property(MELKOR SOURCE_DIR) +- set(MELKOR_BINARY "${SOURCE_DIR}/melkor") +- message(STATUS "${MELKOR_BINARY}") +-endif() +- + # Tests + # ===== + add_executable(test_iterators "${CMAKE_CURRENT_SOURCE_DIR}/test_iterators.cpp") +@@ -100,10 +58,13 @@ if (LIEF_COVERAGE) + target_link_libraries(test_iterators gcov) + endif() + +-add_dependencies(test_iterators catch LIB_LIEF) ++find_package(Catch2 REQUIRED) ++add_dependencies(test_iterators Catch2::Catch2 LIB_LIEF) + + target_link_libraries(test_iterators LIB_LIEF) + ++find_program(MELKOR_FOUND melkor REQUIRED) ++ + add_test(test_iterators + ${CMAKE_CURRENT_BINARY_DIR}/test_iterators) + +diff --git a/tests/test_iterators.cpp b/tests/test_iterators.cpp +index 2d837371..df3d2ed5 100644 +--- a/tests/test_iterators.cpp ++++ b/tests/test_iterators.cpp +@@ -14,7 +14,7 @@ + * limitations under the License. + */ + #define CATCH_CONFIG_MAIN +-#include ++#include + + #include + + +base-commit: 2d9855fc7f9d4ce6325245f8b75c98eb7663db60 +-- +2.41.0 + diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index b8e8097c7b..5066fcd1dd 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -167,6 +167,7 @@ (define-module (gnu packages python-xyz) #:use-module (gnu packages base) #:use-module (gnu packages bash) #:use-module (gnu packages bdw-gc) + #:use-module (gnu packages boost) #:use-module (gnu packages check) #:use-module (gnu packages cmake) #:use-module (gnu packages compression) @@ -180,6 +181,7 @@ (define-module (gnu packages python-xyz) #:use-module (gnu packages djvu) #:use-module (gnu packages docker) #:use-module (gnu packages documentation) + #:use-module (gnu packages elf) #:use-module (gnu packages enchant) #:use-module (gnu packages file) #:use-module (gnu packages fonts) @@ -213,6 +215,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) @@ -33438,29 +33441,110 @@ (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)) + (patches (search-patches "lief-unbundle-test-dependencies.patch")) + (modules '((guix build utils))) + (snippet + '(begin (delete-file-recursively "third-party") + (substitute* "api/python/config-default.toml" + (("(ninja *= ).*" _ m) + (string-append m "false\n"))))) (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") + #:imported-modules + `(,@%cmake-build-system-modules + (guix build python-build-system)) + #:modules + '(((guix build python-build-system) #:prefix python:) + (guix build cmake-build-system) + (guix build utils)) + #:configure-flags + #~'("-DBUILD_SHARED_LIBS=ON" + "-DLIEF_INSTALL_COMPILED_EXAMPLES=ON" + "-DLIEF_TESTS=ON" + ;; Use dependencies from Guix. + "-DLIEF_EXTERNAL_SPDLOG=ON" + "-DLIEF_OPT_EXTERNAL_LEAF=ON" + "-DLIEF_OPT_EXTERNAL_SPAN=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 + ;; Python bindings. + #~(modify-phases %standard-phases + (add-after 'unpack 'configure-python-build + (lambda* (#:key configure-flags build-type parallel-build? + #:allow-other-keys) + (with-directory-excursion "api/python" + (substitute* "config-default.toml" + ;; Honor `#:build-type'. + (("(type *)= .*" _ m) + (format #f "~a= \"~a\"~%" + m build-type)) + ;; Honor `#:parallel-build?'. + (("(parallel-jobs *)= .*" _ m) + (format #f "~a= ~a~%" + m (if parallel-build? + (parallel-job-count) + 1)))) + (substitute* "setup.py" + ;; Honor `#:configure-flags'. + (("(configure_cmd = .*)\n" _ m) + (format #f "~a + [~a]~%" + m (apply string-append + (map (lambda (flag) + (format #f "\"~a\"," flag)) + (append configure-flags + '("-DBUILD_SHARED_LIBS=OFF")))) + )))))) + (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 '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 catch2 + melkor + python-wrapper + python-tomli)) + (inputs + (list boost-leaf + frozen + mbedtls-apache + nlohmann-json + pybind11 + spdlog + tcb-span + utfcpp)) + (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 @@ -33508,7 +33592,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 From patchwork Sat Aug 5 13:19: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: 52543 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 C66A527BBEA; Sat, 5 Aug 2023 14:22:30 +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 3C47C27BBE2 for ; Sat, 5 Aug 2023 14:22:28 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qSHEM-0003yo-6K; Sat, 05 Aug 2023 09:22:06 -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 1qSHEI-0003yU-Pp for guix-patches@gnu.org; Sat, 05 Aug 2023 09:22:02 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qSHEI-0003lo-Gd for guix-patches@gnu.org; Sat, 05 Aug 2023 09:22:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qSHEI-00069n-80; Sat, 05 Aug 2023 09:22:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#63765] [PATCH v6 10/10] gnu: python-lief: Rename to lief. Resent-From: Hilton Chain Original-Sender: "Debbugs-submit" Resent-CC: lars@6xq.net, jgart@dismail.de, guix-patches@gnu.org Resent-Date: Sat, 05 Aug 2023 13:22: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 , Lars-Dominik Braun , jgart X-Debbugs-Original-Xcc: Lars-Dominik Braun , jgart Received: via spool by 63765-submit@debbugs.gnu.org id=B63765.169124167923595 (code B ref 63765); Sat, 05 Aug 2023 13:22:02 +0000 Received: (at 63765) by debbugs.gnu.org; 5 Aug 2023 13:21:19 +0000 Received: from localhost ([127.0.0.1]:56165 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qSHDa-00068U-Kh for submit@debbugs.gnu.org; Sat, 05 Aug 2023 09:21:19 -0400 Received: from mail.boiledscript.com ([144.168.59.46]:51120) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qSHDY-00068L-7A for 63765@debbugs.gnu.org; Sat, 05 Aug 2023 09:21:17 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ultrarare.space; s=dkim; t=1691241659; 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=onURQWPth0U3hqEu3CnUjkGgWNvLcMj/NZT7f0Y/Le4=; b=q2bDpH5pyMREuwFlPN3v9/vHh9X/a1WHI8xVhlseJx+uqPxSfgHIBayAFcu0dq/Gpmg65L zy6i4WkYDiduakK/n17sbBWBEbTZrSOLkYVOrbLZRZG6kbgK/k8wQtRjAoew02wvND2Xtk WR9UiO0Z4gFOrCnxr0Lfvm5BL2W2BWUehojpWZQdBVG+o+HUodAzJ8NWq91U2T4iWHHHJv Ks9mbsY1zXuEkSqsa+a8/mGPHTjtfpkB0xjRYaoBKkeCRmzP4EW9hfj87mv1Vzb23aD9L0 Hhwx4dNlTVN9vaL/mrVk4UjICyRNpg2k2GYTvuhYQGrbU/PGaYNd4GV9GTIWuA== Date: Sat, 5 Aug 2023 21:19:06 +0800 Message-ID: <830b737f3fc3f03303daee9d53169d5676db9598.1691240736.git.hako@ultrarare.space> In-Reply-To: References: MIME-Version: 1.0 Authentication-Results: mail.boiledscript.com; auth=pass smtp.mailfrom=hako@ultrarare.space X-Spamd-Bar: -- 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/elf.scm(lief): Renamed from ... * gnu/packages/python-xyz.scm (python-lief): ...this. (shrinkwrap)[inputs]: Adjust accordingly. --- gnu/packages/elf.scm | 125 +++++++++++++++++++++++++++++++++++- gnu/packages/python-xyz.scm | 117 +-------------------------------- 2 files changed, 125 insertions(+), 117 deletions(-) diff --git a/gnu/packages/elf.scm b/gnu/packages/elf.scm index 3ddb6c4064..41fd1c72f2 100644 --- a/gnu/packages/elf.scm +++ b/gnu/packages/elf.scm @@ -33,18 +33,27 @@ (define-module (gnu packages elf) #:use-module (guix packages) #:use-module (guix download) #:use-module (guix git-download) + #:use-module (guix build-system cmake) #:use-module (guix build-system gnu) - #:use-module ((guix licenses) #:select (gpl3+ lgpl3+ lgpl2.0+ lgpl2.1 gpl2 bsd-2)) + #:use-module ((guix licenses) #:select (gpl3+ lgpl3+ lgpl2.0+ lgpl2.1 gpl2 asl2.0 bsd-2)) #:use-module (gnu packages) #:use-module (gnu packages autotools) + #:use-module (gnu packages boost) + #:use-module (gnu packages check) #:use-module (gnu packages compression) + #:use-module (gnu packages cpp) #:use-module (gnu packages documentation) #:use-module (gnu packages gcc) + #:use-module (gnu packages logging) #:use-module (gnu packages m4) #:use-module (gnu packages pkg-config) #:use-module (gnu packages python) + #:use-module (gnu packages python-build) + #:use-module (gnu packages python-xyz) #:use-module (gnu packages sphinx) #:use-module (gnu packages texinfo) + #:use-module (gnu packages textutils) + #:use-module (gnu packages tls) #:use-module (gnu packages xml) #:use-module (srfi srfi-1) #:use-module (srfi srfi-26)) @@ -342,6 +351,120 @@ (define-public libdwarf ;; See https://www.prevanders.net/dwarflicense.html: (license (list lgpl2.1 gpl2 bsd-2)))) +(define-public lief + (package + (name "lief") + (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)) + (patches (search-patches "lief-unbundle-test-dependencies.patch")) + (modules '((guix build utils))) + (snippet + '(begin (delete-file-recursively "third-party") + (substitute* "api/python/config-default.toml" + (("(ninja *= ).*" _ m) + (string-append m "false\n"))))) + (sha256 + (base32 + "0y48x358ppig5xp97ahcphfipx7cg9chldj2q5zrmn610fmi4zll")))) + (build-system cmake-build-system) + (arguments + (list + #:imported-modules + `(,@%cmake-build-system-modules + (guix build python-build-system)) + #:modules + '(((guix build python-build-system) #:prefix python:) + (guix build cmake-build-system) + (guix build utils)) + #:configure-flags + #~'("-DBUILD_SHARED_LIBS=ON" + "-DLIEF_INSTALL_COMPILED_EXAMPLES=ON" + "-DLIEF_TESTS=ON" + ;; Use dependencies from Guix. + "-DLIEF_EXTERNAL_SPDLOG=ON" + "-DLIEF_OPT_EXTERNAL_LEAF=ON" + "-DLIEF_OPT_EXTERNAL_SPAN=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 + ;; Python bindings. + #~(modify-phases %standard-phases + (add-after 'unpack 'configure-python-build + (lambda* (#:key configure-flags build-type parallel-build? + #:allow-other-keys) + (with-directory-excursion "api/python" + (substitute* "config-default.toml" + ;; Honor `#:build-type'. + (("(type *)= .*" _ m) + (format #f "~a= \"~a\"~%" + m build-type)) + ;; Honor `#:parallel-build?'. + (("(parallel-jobs *)= .*" _ m) + (format #f "~a= ~a~%" + m (if parallel-build? + (parallel-job-count) + 1)))) + (substitute* "setup.py" + ;; Honor `#:configure-flags'. + (("(configure_cmd = .*)\n" _ m) + (format #f "~a + [~a]~%" + m (apply string-append + (map (lambda (flag) + (format #f "\"~a\"," flag)) + (append configure-flags + '("-DBUILD_SHARED_LIBS=OFF")))) + )))))) + (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 '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 catch2 + melkor + python-wrapper + python-tomli)) + (inputs + (list boost-leaf + frozen + mbedtls-apache + nlohmann-json + pybind11 + spdlog + tcb-span + utfcpp)) + (outputs '("out" "python")) + (home-page "https://lief-project.github.io/") + (synopsis "Library to instrument executable formats") + (description + "@acronym{LIEF, Library to Instrument Executable Formats} is a cross +platform library which can parse, modify and abstract ELF, PE and MachO +formats.") + (license asl2.0))) + (define-public melkor (let ((commit "ac2495bef2a744e7931537e023b1129229b001c4") (revision "8")) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 5066fcd1dd..8aa39f679a 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -167,7 +167,6 @@ (define-module (gnu packages python-xyz) #:use-module (gnu packages base) #:use-module (gnu packages bash) #:use-module (gnu packages bdw-gc) - #:use-module (gnu packages boost) #:use-module (gnu packages check) #:use-module (gnu packages cmake) #:use-module (gnu packages compression) @@ -215,7 +214,6 @@ (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) @@ -33438,119 +33436,6 @@ (define-public python-misskey platform using the ActivityPub protocol.") (license license:expat))) -(define-public python-lief - (package - (name "python-lief") - (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)) - (patches (search-patches "lief-unbundle-test-dependencies.patch")) - (modules '((guix build utils))) - (snippet - '(begin (delete-file-recursively "third-party") - (substitute* "api/python/config-default.toml" - (("(ninja *= ).*" _ m) - (string-append m "false\n"))))) - (sha256 - (base32 - "0y48x358ppig5xp97ahcphfipx7cg9chldj2q5zrmn610fmi4zll")))) - (build-system cmake-build-system) - (arguments - (list - #:imported-modules - `(,@%cmake-build-system-modules - (guix build python-build-system)) - #:modules - '(((guix build python-build-system) #:prefix python:) - (guix build cmake-build-system) - (guix build utils)) - #:configure-flags - #~'("-DBUILD_SHARED_LIBS=ON" - "-DLIEF_INSTALL_COMPILED_EXAMPLES=ON" - "-DLIEF_TESTS=ON" - ;; Use dependencies from Guix. - "-DLIEF_EXTERNAL_SPDLOG=ON" - "-DLIEF_OPT_EXTERNAL_LEAF=ON" - "-DLIEF_OPT_EXTERNAL_SPAN=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 - ;; Python bindings. - #~(modify-phases %standard-phases - (add-after 'unpack 'configure-python-build - (lambda* (#:key configure-flags build-type parallel-build? - #:allow-other-keys) - (with-directory-excursion "api/python" - (substitute* "config-default.toml" - ;; Honor `#:build-type'. - (("(type *)= .*" _ m) - (format #f "~a= \"~a\"~%" - m build-type)) - ;; Honor `#:parallel-build?'. - (("(parallel-jobs *)= .*" _ m) - (format #f "~a= ~a~%" - m (if parallel-build? - (parallel-job-count) - 1)))) - (substitute* "setup.py" - ;; Honor `#:configure-flags'. - (("(configure_cmd = .*)\n" _ m) - (format #f "~a + [~a]~%" - m (apply string-append - (map (lambda (flag) - (format #f "\"~a\"," flag)) - (append configure-flags - '("-DBUILD_SHARED_LIBS=OFF")))) - )))))) - (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 '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 catch2 - melkor - python-wrapper - python-tomli)) - (inputs - (list boost-leaf - frozen - mbedtls-apache - nlohmann-json - pybind11 - spdlog - tcb-span - utfcpp)) - (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 -and abstract ELF, PE and MachO formats.") - (license license:asl2.0))) - (define-public python-eris (package (name "python-eris") @@ -33592,7 +33477,7 @@ (define-public shrinkwrap python-poetry-core python-pypa-build python-pytest)) - (inputs (list `(,python-lief "python") python-sh)) + (inputs (list `(,lief "python") python-sh)) (home-page "https://github.com/fzakaria/shrinkwrap") (synopsis "Emboss needed dependencies on the top level executable") (description