From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp12.migadu.com ([2001:41d0:403:478a::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms8.migadu.com with LMTPS id SDKJH1gQN2Wd+gAAauVa8A:P1 (envelope-from ) for ; Tue, 24 Oct 2023 02:31:20 +0200 Received: from aspmx1.migadu.com ([2001:41d0:403:478a::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp12.migadu.com with LMTPS id SDKJH1gQN2Wd+gAAauVa8A (envelope-from ) for ; Tue, 24 Oct 2023 02:31:20 +0200 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 4C7C34718F for ; Tue, 24 Oct 2023 02:31:20 +0200 (CEST) Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=ultrarare.space header.s=dkim header.b=Hm4MBkwF; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"; dmarc=pass (policy=none) header.from=gnu.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1698107480; h=from:from:sender:sender:reply-to: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:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=0S6DAQvHdp/6yIF2oYb+QuNoDImqsDxVlGlbdkTy8HI=; b=KQqODB9Ybqi/QLqNUSGPVk5etNoM/wJjJpTeGq7hRL7L38263GMuhjeTCb6A9SjA4PeX1L oxMQxkjR4RCXEso/TzWTvaP/qOnPf32bqemZj0BR9GRAtLTchl9rgbgWpZ4qJlMM7pFYzP AYljXuKqzqy8xtrXxuQAJyCXSzYsjRg6sZCZz2+XkKS4XLwy7PJ5fDqf7SQIXsw3CgKHLi 89Ls6dBw8m9WvYMfev6helqqY2x5KgL3wXY5g7HEpeZZoyDPAIGj7Msa42tSePZANuY5gv 2SFmwa7VYClJJdP7aRXgFM1201ahao0yG6Zx3jlrci/am3BmtbtP8aPdTJVuiw== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1698107480; a=rsa-sha256; cv=none; b=UeBm1g3ZPJl0S5aHdxP7JzQvGq+BLZuYfD1FwlPujpGoLHGNfRuytqNbDT2eZMP4rDlAZO sqyks5VI8ZdWTg4q29z2yNKQArT4DoW85q08a0xVJVkw0B3BDBanZ/T6ExoZueOMVLJngX DZfhUOEneNvOtTzRKzw27RUQ5N+01Jvat2BF45QKqRyWoPNfdvdnwoAS/pIN9TO2Hwgvr6 rtpUw4IWcZFZuvSIfW+ZFYfrDY6D/6VjkJa70AJUzW2UzoyovIOAF8p+ZuyDUDusSGqVyC sB/DLwrJmfwBUIa9YwwyMALwvP5iS0xxldOrCWumYCFrq0It+xsf2HV14WUc5A== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=ultrarare.space header.s=dkim header.b=Hm4MBkwF; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"; dmarc=pass (policy=none) header.from=gnu.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qv5Jp-000887-5j; Mon, 23 Oct 2023 20:30:49 -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 1qv5Jb-00085c-Os for guix-patches@gnu.org; Mon, 23 Oct 2023 20:30:36 -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 1qv5Jb-0004gW-Gn for guix-patches@gnu.org; Mon, 23 Oct 2023 20:30:35 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qv5K2-0004Pj-0x; Mon, 23 Oct 2023 20:31:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#66718] [PATCH 1/6] gnu: mbedtls-apache: Rename to mbedtls-apache-lts. Resent-From: Hilton Chain Original-Sender: "Debbugs-submit" Resent-CC: hako@ultrarare.space, efraim@flashner.co.il, leo@famulari.name, liliana.prikler@gmail.com, maxim.cournoyer@gmail.com, zimon.toutoune@gmail.com, me@tobias.gr, iyzsong@envs.net, guix-patches@gnu.org Resent-Date: Tue, 24 Oct 2023 00:31:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 66718 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 66718@debbugs.gnu.org Cc: Hilton Chain , Hilton Chain , Efraim Flashner , Leo Famulari , Liliana Marie Prikler , Maxim Cournoyer , Simon Tournier , Tobias Geerinckx-Rice , =?UTF-8?Q?=E5=AE=8B=E6=96=87=E6=AD=A6?= X-Debbugs-Original-Xcc: Hilton Chain , Efraim Flashner , Leo Famulari , Liliana Marie Prikler , Maxim Cournoyer , Simon Tournier , Tobias Geerinckx-Rice , =?UTF-8?Q?=E5=AE=8B=E6=96=87=E6=AD=A6?= Received: via spool by 66718-submit@debbugs.gnu.org id=B66718.169810742716836 (code B ref 66718); Tue, 24 Oct 2023 00:31:01 +0000 Received: (at 66718) by debbugs.gnu.org; 24 Oct 2023 00:30:27 +0000 Received: from localhost ([127.0.0.1]:52548 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qv5JS-0004NU-HO for submit@debbugs.gnu.org; Mon, 23 Oct 2023 20:30:27 -0400 Received: from mail.boiledscript.com ([144.168.59.46]:36468) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qv5JQ-0004NJ-17 for 66718@debbugs.gnu.org; Mon, 23 Oct 2023 20:30:24 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ultrarare.space; s=dkim; t=1698107239; 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=0S6DAQvHdp/6yIF2oYb+QuNoDImqsDxVlGlbdkTy8HI=; b=Hm4MBkwF22flzK3vLz2m9bBiDx35yUIuXFJjVxOJS+wG6Xc57Ryy8OSAXFFrVzJgW2GwMy FXSMUQQ9kBI3YQ3rsl6lASEVtHGmBcNpYWS6L4M3dzednOadUd7FAdY48p5hLxo+rdseNb bf0rWrCdF18UcbUvCs42xU2gsepBhUOyQ1n09+kKIapfh/lPGuasgunnUmMz0rZQjdQURd ij2jAoFCPh1sozmdvfRSaY5y6x3SsujbghnTGahj926ubLZQhyK5oE69WaSAZiSX3umh8G k5L8Ta3YFI47jx1rfLdWL352fOAUWxGEgnRiUDTvip4hXtUqxrlLm68eunc45w== Date: Tue, 24 Oct 2023 08:28:00 +0800 Message-ID: <1cac11485e5583829bbe97d1e1aa87e03debff4f.1698107129.git.hako@ultrarare.space> In-Reply-To: References: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 From: Hilton Chain via Guix-patches via Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Flow: FLOW_IN X-Migadu-Country: US X-Spam-Score: -2.12 X-Migadu-Queue-Id: 4C7C34718F X-Migadu-Scanner: mx0.migadu.com X-Migadu-Spam-Score: -2.12 X-TUID: o5jKCVXY8t+e * 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. Change-Id: I0c58b3cd0bcf6e44e7b16a69f6d2739aa3c1545b --- 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 0cb947c58a..7d64ed996b 100644 --- a/gnu/packages/emulators.scm +++ b/gnu/packages/emulators.scm @@ -349,7 +349,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 eb1d74d1e1..2155fe8254 100644 --- a/gnu/packages/game-development.scm +++ b/gnu/packages/game-development.scm @@ -2034,7 +2034,7 @@ (define-public godot-lts libxi libxinerama libxrandr - mbedtls-apache + mbedtls-apache-lts mesa opusfile pcre2 @@ -2276,7 +2276,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 e1514fb40b..c9fbbf8f6e 100644 --- a/gnu/packages/hardware.scm +++ b/gnu/packages/hardware.scm @@ -695,7 +695,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: @@ -1097,7 +1097,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 46961ccb7e..1c44bb6d54 100644 --- a/gnu/packages/irc.scm +++ b/gnu/packages/irc.scm @@ -912,7 +912,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 1c03b7e589..9bd1c1e57a 100644 --- a/gnu/packages/julia-jll.scm +++ b/gnu/packages/julia-jll.scm @@ -1403,7 +1403,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 8ba2b480ce..3ee11d73f8 100644 --- a/gnu/packages/julia.scm +++ b/gnu/packages/julia.scm @@ -515,7 +515,7 @@ (define-public julia ("libunwind" ,libunwind-julia) ("libuv" ,libuv-julia) ("llvm" ,llvm-julia) - ("mbedtls-apache" ,mbedtls-apache) + ("mbedtls-apache" ,mbedtls-apache-lts) ("mpfr" ,mpfr) ,@(if (target-x86-64?) `(("openblas" ,openblas-ilp64)) diff --git a/gnu/packages/linphone.scm b/gnu/packages/linphone.scm index 48a30f32d0..3ce92f2c6e 100644 --- a/gnu/packages/linphone.scm +++ b/gnu/packages/linphone.scm @@ -184,7 +184,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 f02577d2d5..ee66be7fab 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -2345,7 +2345,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 86309e4ab3..3722f07b49 100644 --- a/gnu/packages/networking.scm +++ b/gnu/packages/networking.scm @@ -842,7 +842,7 @@ (define-public nng (substitute* "src/supplemental/websocket/CMakeLists.txt" (("nng_test\\(wssfile_test\\)") ""))))))) (native-inputs (list oksh)) - (inputs (list mbedtls-apache)) + (inputs (list 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 5e86d1a76c..4331c14121 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 6a0aaf7f14..72b53e004e 100644 --- a/gnu/packages/tls.scm +++ b/gnu/packages/tls.scm @@ -986,7 +986,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 @@ -1026,7 +1026,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 @@ -1048,7 +1048,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 b4dd7c27ae..145d0ec1a2 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -3503,7 +3503,7 @@ (define-public obs libxcomposite libxkbcommon luajit - mbedtls-apache + mbedtls-apache-lts mesa pciutils pipewire base-commit: 4d748d344bb1891e2e32bf15db24131703d2f78c -- 2.41.0