all messages for Guix-related lists mirrored at yhetil.org
 help / color / mirror / code / Atom feed
From: Hilton Chain via Guix-patches via <guix-patches@gnu.org>
To: 66718@debbugs.gnu.org
Cc: "Hilton Chain" <hako@ultrarare.space>,
	"Hilton Chain" <hako@ultrarare.space>,
	"Efraim Flashner" <efraim@flashner.co.il>,
	"Leo Famulari" <leo@famulari.name>,
	"Liliana Marie Prikler" <liliana.prikler@gmail.com>,
	"Maxim Cournoyer" <maxim.cournoyer@gmail.com>,
	"Simon Tournier" <zimon.toutoune@gmail.com>,
	"Tobias Geerinckx-Rice" <me@tobias.gr>, 宋文武 <iyzsong@envs.net>
Subject: [bug#66718] [PATCH 1/6] gnu: mbedtls-apache: Rename to mbedtls-apache-lts.
Date: Tue, 24 Oct 2023 08:28:00 +0800	[thread overview]
Message-ID: <1cac11485e5583829bbe97d1e1aa87e03debff4f.1698107129.git.hako@ultrarare.space> (raw)
In-Reply-To: <cover.1698106578.git.hako@ultrarare.space>

* 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





  reply	other threads:[~2023-10-24  0:31 UTC|newest]

Thread overview: 22+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-10-24  0:20 [bug#66718] [PATCH 0/6] gnu: mbedtls-apache: Update to 3.5.0 Hilton Chain via Guix-patches via
2023-10-24  0:28 ` Hilton Chain via Guix-patches via [this message]
2023-10-24  0:28   ` [bug#66718] [PATCH 2/6] gnu: mbedtls-for-hiawatha: Use inherited source Hilton Chain via Guix-patches via
2023-10-24  0:28   ` [bug#66718] [PATCH 3/6] gnu: mbedtls-for-hiawatha: Update package style Hilton Chain via Guix-patches via
2023-10-24  0:28   ` [bug#66718] [PATCH 4/6] gnu: mbedtls-apache-lts: Update to 2.28.5 Hilton Chain via Guix-patches via
2023-10-24  0:28   ` [bug#66718] [PATCH 5/6] gnu: mbedtls-apache-lts: Use gexp Hilton Chain via Guix-patches via
2023-10-24  0:28   ` [bug#66718] [PATCH 6/6] gnu: Add mbedtls-apache, version 3.5.0 Hilton Chain via Guix-patches via
2023-11-18  6:47 ` [bug#66718] [PATCH v2 0/6] gnu: Add mbedtls, version 3.5.1 Hilton Chain via Guix-patches via
2023-11-18  6:49   ` [bug#66718] [PATCH v2 1/6] gnu: mbedtls-for-hiawatha: Use inherited source Hilton Chain via Guix-patches via
2023-11-18  6:49   ` [bug#66718] [PATCH v2 2/6] gnu: mbedtls-for-hiawatha: Update package style Hilton Chain via Guix-patches via
2023-11-18  6:49   ` [bug#66718] [PATCH v2 3/6] gnu: mbedtls-apache: Update to 2.28.6 Hilton Chain via Guix-patches via
2023-11-18  6:49   ` [bug#66718] [PATCH v2 4/6] gnu: mbedtls-apache: Use gexp Hilton Chain via Guix-patches via
2023-11-18  6:49   ` [bug#66718] [PATCH v2 5/6] gnu: mbedtls-apache: Rename to mbedtls-lts Hilton Chain via Guix-patches via
2023-11-18  6:49   ` [bug#66718] [PATCH v2 6/6] gnu: Add mbedtls, version 3.5.1 Hilton Chain via Guix-patches via
2024-01-28 13:11 ` [bug#66718] [PATCH v3 0/6] gnu: Add mbedtls, version 3.5.2 Hilton Chain via Guix-patches via
2024-01-28 13:12   ` [bug#66718] [PATCH v3 1/6] gnu: mbedtls-for-hiawatha: Use inherited source Hilton Chain via Guix-patches via
2024-01-28 13:12   ` [bug#66718] [PATCH v3 2/6] gnu: mbedtls-for-hiawatha: Update package style Hilton Chain via Guix-patches via
2024-01-28 13:12   ` [bug#66718] [PATCH v3 3/6] gnu: mbedtls-apache: Update to 2.28.7 Hilton Chain via Guix-patches via
2024-01-28 13:12   ` [bug#66718] [PATCH v3 4/6] gnu: mbedtls-apache: Use gexps Hilton Chain via Guix-patches via
2024-01-28 13:12   ` [bug#66718] [PATCH v3 5/6] gnu: mbedtls-apache: Rename to mbedtls-lts Hilton Chain via Guix-patches via
2024-01-28 13:12   ` [bug#66718] [PATCH v3 6/6] gnu: Add mbedtls, version 3.5.2 Hilton Chain via Guix-patches via
2024-02-05  7:32   ` bug#66718: [PATCH v3 0/6] " Hilton Chain via Guix-patches via

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1cac11485e5583829bbe97d1e1aa87e03debff4f.1698107129.git.hako@ultrarare.space \
    --to=guix-patches@gnu.org \
    --cc=66718@debbugs.gnu.org \
    --cc=efraim@flashner.co.il \
    --cc=hako@ultrarare.space \
    --cc=iyzsong@envs.net \
    --cc=leo@famulari.name \
    --cc=liliana.prikler@gmail.com \
    --cc=maxim.cournoyer@gmail.com \
    --cc=me@tobias.gr \
    --cc=zimon.toutoune@gmail.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this external index

	https://git.savannah.gnu.org/cgit/guix.git

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.