me
/
guix
Archived
1
0
Fork 0
Code

gnu: mbedtls-apache: Rename to mbedtls-lts. 

* gnu/packages/tls.scm (mbedtls-apache): Rename package to "mbedtls".
Rename variable to…
(mbedtls-lts): …this.
(mbedtls-apache): Define as deprecated by mbedtls-lts.
(mbedtls-for-hiawatha): Adjust accordingly.
* doc/guix.texi: Likewise.
* gnu/packages/emulators.scm (dolphin-emu,retroarch)[inputs]: Likewise.
* 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)[arguments]<#:phases>,[inputs]:
Likewise.
* gnu/packages/julia.scm (julia)[arguments]<#:phases>,[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/web.scm (hiawatha)[arguments]<#:phases>: Likewise.

Change-Id: I0c58b3cd0bcf6e44e7b16a69f6d2739aa3c1545b
master
Hilton Chain 2023-05-27 19:27:33 +08:00
parent 0f86c1c6f8
commit 2b296427d7
No known key found for this signature in database
GPG Key ID: ACC66D09CA528292
15 changed files with 32 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
doc/guix.texi
View File

@ -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

4
gnu/packages/emulators.scm
View File

@ -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

4
gnu/packages/game-development.scm
View File

@ -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

4
gnu/packages/hardware.scm
View File

@ -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

6
gnu/packages/haxe.scm
View File

@ -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

2
gnu/packages/irc.scm
View File

@ -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

4
gnu/packages/julia-jll.scm
View File

@ -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")

12
gnu/packages/julia.scm
View File

@ -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))

2
gnu/packages/linphone.scm
View File

@ -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.")

2
gnu/packages/linux.scm
View File

@ -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

2
gnu/packages/networking.scm
View File

@ -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

2
gnu/packages/search.scm
View File

@ -374,7 +374,7 @@ for parsing HTML files.")
(list aspell
c-ares
libextractor
mbedtls-apache
mbedtls-lts
postgresql
zlib))
(synopsis "Feature rich search engine")

11
gnu/packages/tls.scm
View File

@ -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

2
gnu/packages/video.scm
View File

@ -3954,7 +3954,7 @@ be used for realtime video capture via Linux-specific APIs.")
libxcomposite
libxkbcommon
luajit
mbedtls-apache
mbedtls-lts
mesa
pciutils
pipewire

2
gnu/packages/web.scm
View File

@ -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