aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--doc/guix.texi2
-rw-r--r--gnu/packages/emulators.scm4
-rw-r--r--gnu/packages/game-development.scm4
-rw-r--r--gnu/packages/hardware.scm4
-rw-r--r--gnu/packages/haxe.scm6
-rw-r--r--gnu/packages/irc.scm2
-rw-r--r--gnu/packages/julia-jll.scm4
-rw-r--r--gnu/packages/julia.scm12
-rw-r--r--gnu/packages/linphone.scm2
-rw-r--r--gnu/packages/linux.scm2
-rw-r--r--gnu/packages/networking.scm2
-rw-r--r--gnu/packages/search.scm2
-rw-r--r--gnu/packages/tls.scm11
-rw-r--r--gnu/packages/video.scm2
-rw-r--r--gnu/packages/web.scm2
15 files changed, 32 insertions, 29 deletions
diff --git a/doc/guix.texi b/doc/guix.texi
index c71d7e94cf..b76df868f8 100644
--- a/doc/guix.texi
+++ b/doc/guix.texi
@@ -9850,7 +9850,7 @@ MbedTLS package:
(("generate_wrapper_header.*")
(string-append
"generate_wrapper_header(\"MbedTLS\", \""
- (assoc-ref inputs "mbedtls-apache") "\")\n"))))
+ (assoc-ref inputs "mbedtls") "\")\n"))))
;; There's a Julia file for each platform, override them all.
(find-files "src/wrappers/" "\\.jl$"))))
@end lisp
diff --git a/gnu/packages/emulators.scm b/gnu/packages/emulators.scm
index cde3ee052c..17d981a9d8 100644
--- a/gnu/packages/emulators.scm
+++ b/gnu/packages/emulators.scm
@@ -351,7 +351,7 @@ console.")
libxi
libxrandr
lzo
- mbedtls-apache
+ mbedtls-lts
mesa
miniupnpc
openal
@@ -1490,7 +1490,7 @@ as RetroArch.")
libxml2
libxrandr
libxv
- mbedtls-apache
+ mbedtls-lts
mesa
openal
openssl
diff --git a/gnu/packages/game-development.scm b/gnu/packages/game-development.scm
index 5f1331183d..5335166d19 100644
--- a/gnu/packages/game-development.scm
+++ b/gnu/packages/game-development.scm
@@ -2038,7 +2038,7 @@ games.")
libxi
libxinerama
libxrandr
- mbedtls-apache
+ mbedtls-lts
mesa
opusfile
pcre2
@@ -2280,7 +2280,7 @@ scripted in a Python-like language.")
libxinerama
libxkbcommon
libxrandr
- mbedtls-apache
+ mbedtls-lts
mesa
openxr
opusfile
diff --git a/gnu/packages/hardware.scm b/gnu/packages/hardware.scm
index 4765d1c55d..72b6decd81 100644
--- a/gnu/packages/hardware.scm
+++ b/gnu/packages/hardware.scm
@@ -703,7 +703,7 @@ battery state, controlling LEDs, and setting the inactive time.")
(arguments
`(#:tests? #f)) ;; Tests require Google's gtest and gmock
(inputs
- (list mbedtls-apache))
+ (list mbedtls-lts))
(synopsis "C++ library to control Philips Hue lights")
(description "Hueplusplus is a library for controlling Philips Hue lights.
Features:
@@ -1112,7 +1112,7 @@ technology, such as head mounted displays with built in head tracking.")
hueplusplus
nlohmann-json
libusb
- mbedtls-apache
+ mbedtls-lts
qtbase-5))
(native-inputs
(list pkg-config
diff --git a/gnu/packages/haxe.scm b/gnu/packages/haxe.scm
index 6fc30ce02f..859941df70 100644
--- a/gnu/packages/haxe.scm
+++ b/gnu/packages/haxe.scm
@@ -78,7 +78,7 @@
apr-util
gtk+-2
libgc
- mbedtls-apache
+ mbedtls-lts
(list mariadb "dev")
(list mariadb "lib")
openssl
@@ -171,7 +171,7 @@ interactive languages.")
(lambda _
(invoke "make" "install"))))))
(inputs (list libuv
- mbedtls-apache
+ mbedtls-lts
neko
ocaml-extlib
ocaml-luv
@@ -255,7 +255,7 @@ includes the compiler and library manager.")
libpng
libuv
libvorbis
- mbedtls-apache
+ mbedtls-lts
mikktspace
minimp3
openal
diff --git a/gnu/packages/irc.scm b/gnu/packages/irc.scm
index 46961ccb7e..3200ccc135 100644
--- a/gnu/packages/irc.scm
+++ b/gnu/packages/irc.scm
@@ -912,7 +912,7 @@ but can also be used independently as a logging bot.")
(list argon2
gnutls
libmaxminddb
- mbedtls-apache
+ mbedtls-lts
(list mariadb "dev")
openldap
openssl
diff --git a/gnu/packages/julia-jll.scm b/gnu/packages/julia-jll.scm
index 1c03b7e589..50bbd40a84 100644
--- a/gnu/packages/julia-jll.scm
+++ b/gnu/packages/julia-jll.scm
@@ -1399,11 +1399,11 @@ build tree Yggdrasil.")
(("generate_wrapper_header.*")
(string-append
"generate_wrapper_header(\"MbedTLS\", \""
- (assoc-ref inputs "mbedtls-apache") "\")\n"))))
+ (assoc-ref inputs "mbedtls") "\")\n"))))
;; There's a Julia file for each platform, override them all
(find-files "src/wrappers/" "\\.jl$"))
#t)))))
- (inputs (list mbedtls-apache))
+ (inputs (list mbedtls-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..18f0d6c7d3 100644
--- a/gnu/packages/julia.scm
+++ b/gnu/packages/julia.scm
@@ -186,7 +186,7 @@ libraries. It is also a bit like @code{ldd} and @code{otool -L}.")
"gmp" "lapack"
"libssh2" "libnghttp2" "libgit2"
"libblastrampoline"
- "mbedtls-apache" "mpfr"
+ "mbedtls" "mpfr"
"openblas" "openlibm" "pcre2"
"suitesparse" "gfortran:lib"))
":"))))
@@ -263,9 +263,9 @@ libraries. It is also a bit like @code{ldd} and @code{otool -L}.")
(substitute* (jlpath "MPFR")
(((from "libmpfr")) (to "mpfr" "libmpfr")))
(substitute* (jlpath "MbedTLS")
- (((from "libmbedcrypto")) (to "mbedtls-apache" "libmbedcrypto"))
- (((from "libmbedtls")) (to "mbedtls-apache" "libmbedtls"))
- (((from "libmbedx509")) (to "mbedtls-apache" "libmbedx509")))
+ (((from "libmbedcrypto")) (to "mbedtls" "libmbedcrypto"))
+ (((from "libmbedtls")) (to "mbedtls" "libmbedtls"))
+ (((from "libmbedx509")) (to "mbedtls" "libmbedx509")))
(substitute* (jlpath "nghttp2")
(((from "libnghttp2")) (to "libnghttp2" "libnghttp2")))
(substitute* (jlpath "OpenBLAS")
@@ -318,7 +318,7 @@ libraries. It is also a bit like @code{ldd} and @code{otool -L}.")
(substitute* "stdlib/PCRE2_jll/test/runtests.jl"
(("10.40.0") ,(package-version (this-package-input "pcre2"))))
(substitute* "stdlib/MbedTLS_jll/test/runtests.jl"
- (("2.28.0") ,(package-version (this-package-input "mbedtls-apache"))))
+ (("2.28.0") ,(package-version (this-package-input "mbedtls"))))
(substitute* "stdlib/MPFR_jll/test/runtests.jl"
(("4.1.0") ,(package-version (this-package-input "mpfr"))))
(substitute* "stdlib/GMP_jll/test/runtests.jl"
@@ -515,7 +515,7 @@ using Dates: @dateformat_str, Date, DateTime, DateFormat, Time"))
("libunwind" ,libunwind-julia)
("libuv" ,libuv-julia)
("llvm" ,llvm-julia)
- ("mbedtls-apache" ,mbedtls-apache)
+ ("mbedtls" ,mbedtls-lts)
("mpfr" ,mpfr)
,@(if (target-x86-64?)
`(("openblas" ,openblas-ilp64))
diff --git a/gnu/packages/linphone.scm b/gnu/packages/linphone.scm
index 48a30f32d0..be011fd976 100644
--- a/gnu/packages/linphone.scm
+++ b/gnu/packages/linphone.scm
@@ -184,7 +184,7 @@ writing, administering, and running unit tests in C.")
(with-directory-excursion "tester"
(invoke "./bctoolbox_tester"))))))))
(inputs
- (list bcunit libdecaf mbedtls-apache))
+ (list bcunit libdecaf mbedtls-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 e748b2cb8e..a50e52b537 100644
--- a/gnu/packages/linux.scm
+++ b/gnu/packages/linux.scm
@@ -2335,7 +2335,7 @@ by Robert Shea and Robert Anton Wilson.")
(build-system cmake-build-system)
(arguments
'(#:tests? #f)) ;no test suite
- (inputs (list fuse-2 mbedtls-apache))
+ (inputs (list fuse-2 mbedtls-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 f2dfc67585..4adaa12dfd 100644
--- a/gnu/packages/networking.scm
+++ b/gnu/packages/networking.scm
@@ -832,7 +832,7 @@ at the link-layer level.")
(substitute* "src/supplemental/websocket/CMakeLists.txt"
(("nng_test\\(wssfile_test\\)") "")))))))
(native-inputs (list oksh))
- (inputs (list mbedtls-apache))
+ (inputs (list mbedtls-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 cdf4a50b5d..78a735c96a 100644
--- a/gnu/packages/search.scm
+++ b/gnu/packages/search.scm
@@ -374,7 +374,7 @@ for parsing HTML files.")
(list aspell
c-ares
libextractor
- mbedtls-apache
+ mbedtls-lts
postgresql
zlib))
(synopsis "Feature rich search engine")
diff --git a/gnu/packages/tls.scm b/gnu/packages/tls.scm
index 29b3da6f3d..69136db6f3 100644
--- a/gnu/packages/tls.scm
+++ b/gnu/packages/tls.scm
@@ -973,9 +973,9 @@ correct OpenSSL include path. It is intended for use in your
number generator")
(license license:perl-license)))
-(define-public mbedtls-apache
+(define-public mbedtls-lts
(package
- (name "mbedtls-apache")
+ (name "mbedtls")
(version "2.28.7")
(source
(origin
@@ -1007,13 +1007,16 @@ coding footprint.")
(home-page "https://www.trustedfirmware.org/projects/mbed-tls/")
(license (list license:asl2.0 license:gpl2+)))) ;dual licensed
+(define-public mbedtls-apache
+ (deprecated-package "mbedtls-apache" mbedtls-lts))
+
;; The Hiawatha Web server requires some specific features to be enabled.
(define-public mbedtls-for-hiawatha
(hidden-package
(package
- (inherit mbedtls-apache)
+ (inherit mbedtls-lts)
(arguments
- (substitute-keyword-arguments (package-arguments mbedtls-apache)
+ (substitute-keyword-arguments (package-arguments mbedtls-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 ef69c1dcc8..1123fd0a44 100644
--- a/gnu/packages/video.scm
+++ b/gnu/packages/video.scm
@@ -3954,7 +3954,7 @@ be used for realtime video capture via Linux-specific APIs.")
libxcomposite
libxkbcommon
luajit
- mbedtls-apache
+ mbedtls-lts
mesa
pciutils
pipewire
diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm
index 1a97dd8dec..43a8e7ad15 100644
--- a/gnu/packages/web.scm
+++ b/gnu/packages/web.scm
@@ -6490,7 +6490,7 @@ functions of Tidy.")
;; Make sure 'hiawatha' finds 'mbedtls'.
(let* ((out (assoc-ref outputs "out"))
(sbin (string-append out "/sbin"))
- (mbed (assoc-ref inputs "mbedtls-apache")))
+ (mbed (assoc-ref inputs "mbedtls")))
(wrap-program (string-append sbin "/hiawatha")
`("PATH" ":" prefix (,mbed)))))))))
(inputs
generated by cgit v1.2.3 (git 2.25.4) at 2024-06-02 16:15:01 +0000