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: I0c58b3cd0bcf6e44e7b16a69f6d2739aa3c1545bmaster
parent
0f86c1c6f8
commit
2b296427d7
|
@ -9850,7 +9850,7 @@ MbedTLS package:
|
||||||
(("generate_wrapper_header.*")
|
(("generate_wrapper_header.*")
|
||||||
(string-append
|
(string-append
|
||||||
"generate_wrapper_header(\"MbedTLS\", \""
|
"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.
|
;; There's a Julia file for each platform, override them all.
|
||||||
(find-files "src/wrappers/" "\\.jl$"))))
|
(find-files "src/wrappers/" "\\.jl$"))))
|
||||||
@end lisp
|
@end lisp
|
||||||
|
|
|
@ -351,7 +351,7 @@ console.")
|
||||||
libxi
|
libxi
|
||||||
libxrandr
|
libxrandr
|
||||||
lzo
|
lzo
|
||||||
mbedtls-apache
|
mbedtls-lts
|
||||||
mesa
|
mesa
|
||||||
miniupnpc
|
miniupnpc
|
||||||
openal
|
openal
|
||||||
|
@ -1490,7 +1490,7 @@ as RetroArch.")
|
||||||
libxml2
|
libxml2
|
||||||
libxrandr
|
libxrandr
|
||||||
libxv
|
libxv
|
||||||
mbedtls-apache
|
mbedtls-lts
|
||||||
mesa
|
mesa
|
||||||
openal
|
openal
|
||||||
openssl
|
openssl
|
||||||
|
|
|
@ -2038,7 +2038,7 @@ games.")
|
||||||
libxi
|
libxi
|
||||||
libxinerama
|
libxinerama
|
||||||
libxrandr
|
libxrandr
|
||||||
mbedtls-apache
|
mbedtls-lts
|
||||||
mesa
|
mesa
|
||||||
opusfile
|
opusfile
|
||||||
pcre2
|
pcre2
|
||||||
|
@ -2280,7 +2280,7 @@ scripted in a Python-like language.")
|
||||||
libxinerama
|
libxinerama
|
||||||
libxkbcommon
|
libxkbcommon
|
||||||
libxrandr
|
libxrandr
|
||||||
mbedtls-apache
|
mbedtls-lts
|
||||||
mesa
|
mesa
|
||||||
openxr
|
openxr
|
||||||
opusfile
|
opusfile
|
||||||
|
|
|
@ -703,7 +703,7 @@ battery state, controlling LEDs, and setting the inactive time.")
|
||||||
(arguments
|
(arguments
|
||||||
`(#:tests? #f)) ;; Tests require Google's gtest and gmock
|
`(#:tests? #f)) ;; Tests require Google's gtest and gmock
|
||||||
(inputs
|
(inputs
|
||||||
(list mbedtls-apache))
|
(list mbedtls-lts))
|
||||||
(synopsis "C++ library to control Philips Hue lights")
|
(synopsis "C++ library to control Philips Hue lights")
|
||||||
(description "Hueplusplus is a library for controlling Philips Hue lights.
|
(description "Hueplusplus is a library for controlling Philips Hue lights.
|
||||||
Features:
|
Features:
|
||||||
|
@ -1112,7 +1112,7 @@ technology, such as head mounted displays with built in head tracking.")
|
||||||
hueplusplus
|
hueplusplus
|
||||||
nlohmann-json
|
nlohmann-json
|
||||||
libusb
|
libusb
|
||||||
mbedtls-apache
|
mbedtls-lts
|
||||||
qtbase-5))
|
qtbase-5))
|
||||||
(native-inputs
|
(native-inputs
|
||||||
(list pkg-config
|
(list pkg-config
|
||||||
|
|
|
@ -78,7 +78,7 @@
|
||||||
apr-util
|
apr-util
|
||||||
gtk+-2
|
gtk+-2
|
||||||
libgc
|
libgc
|
||||||
mbedtls-apache
|
mbedtls-lts
|
||||||
(list mariadb "dev")
|
(list mariadb "dev")
|
||||||
(list mariadb "lib")
|
(list mariadb "lib")
|
||||||
openssl
|
openssl
|
||||||
|
@ -171,7 +171,7 @@ interactive languages.")
|
||||||
(lambda _
|
(lambda _
|
||||||
(invoke "make" "install"))))))
|
(invoke "make" "install"))))))
|
||||||
(inputs (list libuv
|
(inputs (list libuv
|
||||||
mbedtls-apache
|
mbedtls-lts
|
||||||
neko
|
neko
|
||||||
ocaml-extlib
|
ocaml-extlib
|
||||||
ocaml-luv
|
ocaml-luv
|
||||||
|
@ -255,7 +255,7 @@ includes the compiler and library manager.")
|
||||||
libpng
|
libpng
|
||||||
libuv
|
libuv
|
||||||
libvorbis
|
libvorbis
|
||||||
mbedtls-apache
|
mbedtls-lts
|
||||||
mikktspace
|
mikktspace
|
||||||
minimp3
|
minimp3
|
||||||
openal
|
openal
|
||||||
|
|
|
@ -912,7 +912,7 @@ but can also be used independently as a logging bot.")
|
||||||
(list argon2
|
(list argon2
|
||||||
gnutls
|
gnutls
|
||||||
libmaxminddb
|
libmaxminddb
|
||||||
mbedtls-apache
|
mbedtls-lts
|
||||||
(list mariadb "dev")
|
(list mariadb "dev")
|
||||||
openldap
|
openldap
|
||||||
openssl
|
openssl
|
||||||
|
|
|
@ -1399,11 +1399,11 @@ build tree Yggdrasil.")
|
||||||
(("generate_wrapper_header.*")
|
(("generate_wrapper_header.*")
|
||||||
(string-append
|
(string-append
|
||||||
"generate_wrapper_header(\"MbedTLS\", \""
|
"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
|
;; There's a Julia file for each platform, override them all
|
||||||
(find-files "src/wrappers/" "\\.jl$"))
|
(find-files "src/wrappers/" "\\.jl$"))
|
||||||
#t)))))
|
#t)))))
|
||||||
(inputs (list mbedtls-apache))
|
(inputs (list mbedtls-lts))
|
||||||
(propagated-inputs (list julia-jllwrappers))
|
(propagated-inputs (list julia-jllwrappers))
|
||||||
(home-page "https://github.com/JuliaBinaryWrappers/MbedTLS_jll.jl")
|
(home-page "https://github.com/JuliaBinaryWrappers/MbedTLS_jll.jl")
|
||||||
(synopsis "Apache's mbed TLS binary wrappers")
|
(synopsis "Apache's mbed TLS binary wrappers")
|
||||||
|
|
|
@ -186,7 +186,7 @@ libraries. It is also a bit like @code{ldd} and @code{otool -L}.")
|
||||||
"gmp" "lapack"
|
"gmp" "lapack"
|
||||||
"libssh2" "libnghttp2" "libgit2"
|
"libssh2" "libnghttp2" "libgit2"
|
||||||
"libblastrampoline"
|
"libblastrampoline"
|
||||||
"mbedtls-apache" "mpfr"
|
"mbedtls" "mpfr"
|
||||||
"openblas" "openlibm" "pcre2"
|
"openblas" "openlibm" "pcre2"
|
||||||
"suitesparse" "gfortran:lib"))
|
"suitesparse" "gfortran:lib"))
|
||||||
":"))))
|
":"))))
|
||||||
|
@ -263,9 +263,9 @@ libraries. It is also a bit like @code{ldd} and @code{otool -L}.")
|
||||||
(substitute* (jlpath "MPFR")
|
(substitute* (jlpath "MPFR")
|
||||||
(((from "libmpfr")) (to "mpfr" "libmpfr")))
|
(((from "libmpfr")) (to "mpfr" "libmpfr")))
|
||||||
(substitute* (jlpath "MbedTLS")
|
(substitute* (jlpath "MbedTLS")
|
||||||
(((from "libmbedcrypto")) (to "mbedtls-apache" "libmbedcrypto"))
|
(((from "libmbedcrypto")) (to "mbedtls" "libmbedcrypto"))
|
||||||
(((from "libmbedtls")) (to "mbedtls-apache" "libmbedtls"))
|
(((from "libmbedtls")) (to "mbedtls" "libmbedtls"))
|
||||||
(((from "libmbedx509")) (to "mbedtls-apache" "libmbedx509")))
|
(((from "libmbedx509")) (to "mbedtls" "libmbedx509")))
|
||||||
(substitute* (jlpath "nghttp2")
|
(substitute* (jlpath "nghttp2")
|
||||||
(((from "libnghttp2")) (to "libnghttp2" "libnghttp2")))
|
(((from "libnghttp2")) (to "libnghttp2" "libnghttp2")))
|
||||||
(substitute* (jlpath "OpenBLAS")
|
(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"
|
(substitute* "stdlib/PCRE2_jll/test/runtests.jl"
|
||||||
(("10.40.0") ,(package-version (this-package-input "pcre2"))))
|
(("10.40.0") ,(package-version (this-package-input "pcre2"))))
|
||||||
(substitute* "stdlib/MbedTLS_jll/test/runtests.jl"
|
(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"
|
(substitute* "stdlib/MPFR_jll/test/runtests.jl"
|
||||||
(("4.1.0") ,(package-version (this-package-input "mpfr"))))
|
(("4.1.0") ,(package-version (this-package-input "mpfr"))))
|
||||||
(substitute* "stdlib/GMP_jll/test/runtests.jl"
|
(substitute* "stdlib/GMP_jll/test/runtests.jl"
|
||||||
|
@ -515,7 +515,7 @@ using Dates: @dateformat_str, Date, DateTime, DateFormat, Time"))
|
||||||
("libunwind" ,libunwind-julia)
|
("libunwind" ,libunwind-julia)
|
||||||
("libuv" ,libuv-julia)
|
("libuv" ,libuv-julia)
|
||||||
("llvm" ,llvm-julia)
|
("llvm" ,llvm-julia)
|
||||||
("mbedtls-apache" ,mbedtls-apache)
|
("mbedtls" ,mbedtls-lts)
|
||||||
("mpfr" ,mpfr)
|
("mpfr" ,mpfr)
|
||||||
,@(if (target-x86-64?)
|
,@(if (target-x86-64?)
|
||||||
`(("openblas" ,openblas-ilp64))
|
`(("openblas" ,openblas-ilp64))
|
||||||
|
|
|
@ -184,7 +184,7 @@ writing, administering, and running unit tests in C.")
|
||||||
(with-directory-excursion "tester"
|
(with-directory-excursion "tester"
|
||||||
(invoke "./bctoolbox_tester"))))))))
|
(invoke "./bctoolbox_tester"))))))))
|
||||||
(inputs
|
(inputs
|
||||||
(list bcunit libdecaf mbedtls-apache))
|
(list bcunit libdecaf mbedtls-lts))
|
||||||
(synopsis "Belledonne Communications Tool Box")
|
(synopsis "Belledonne Communications Tool Box")
|
||||||
(description "BcToolBox is an utilities library used by Belledonne
|
(description "BcToolBox is an utilities library used by Belledonne
|
||||||
Communications software like belle-sip, mediastreamer2 and linphone.")
|
Communications software like belle-sip, mediastreamer2 and linphone.")
|
||||||
|
|
|
@ -2335,7 +2335,7 @@ by Robert Shea and Robert Anton Wilson.")
|
||||||
(build-system cmake-build-system)
|
(build-system cmake-build-system)
|
||||||
(arguments
|
(arguments
|
||||||
'(#:tests? #f)) ;no test suite
|
'(#: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")
|
(synopsis "FUSE driver to read/write Windows BitLocker drives")
|
||||||
(description
|
(description
|
||||||
"This package provides means to to read BitLocker encrypted
|
"This package provides means to to read BitLocker encrypted
|
||||||
|
|
|
@ -832,7 +832,7 @@ at the link-layer level.")
|
||||||
(substitute* "src/supplemental/websocket/CMakeLists.txt"
|
(substitute* "src/supplemental/websocket/CMakeLists.txt"
|
||||||
(("nng_test\\(wssfile_test\\)") "")))))))
|
(("nng_test\\(wssfile_test\\)") "")))))))
|
||||||
(native-inputs (list oksh))
|
(native-inputs (list oksh))
|
||||||
(inputs (list mbedtls-apache))
|
(inputs (list mbedtls-lts))
|
||||||
(synopsis "Lightweight messaging library")
|
(synopsis "Lightweight messaging library")
|
||||||
(description "NNG project is a rewrite of the scalability protocols library
|
(description "NNG project is a rewrite of the scalability protocols library
|
||||||
known as libnanomsg, and adds significant new capabilities, while retaining
|
known as libnanomsg, and adds significant new capabilities, while retaining
|
||||||
|
|
|
@ -374,7 +374,7 @@ for parsing HTML files.")
|
||||||
(list aspell
|
(list aspell
|
||||||
c-ares
|
c-ares
|
||||||
libextractor
|
libextractor
|
||||||
mbedtls-apache
|
mbedtls-lts
|
||||||
postgresql
|
postgresql
|
||||||
zlib))
|
zlib))
|
||||||
(synopsis "Feature rich search engine")
|
(synopsis "Feature rich search engine")
|
||||||
|
|
|
@ -973,9 +973,9 @@ correct OpenSSL include path. It is intended for use in your
|
||||||
number generator")
|
number generator")
|
||||||
(license license:perl-license)))
|
(license license:perl-license)))
|
||||||
|
|
||||||
(define-public mbedtls-apache
|
(define-public mbedtls-lts
|
||||||
(package
|
(package
|
||||||
(name "mbedtls-apache")
|
(name "mbedtls")
|
||||||
(version "2.28.7")
|
(version "2.28.7")
|
||||||
(source
|
(source
|
||||||
(origin
|
(origin
|
||||||
|
@ -1007,13 +1007,16 @@ coding footprint.")
|
||||||
(home-page "https://www.trustedfirmware.org/projects/mbed-tls/")
|
(home-page "https://www.trustedfirmware.org/projects/mbed-tls/")
|
||||||
(license (list license:asl2.0 license:gpl2+)))) ;dual licensed
|
(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.
|
;; The Hiawatha Web server requires some specific features to be enabled.
|
||||||
(define-public mbedtls-for-hiawatha
|
(define-public mbedtls-for-hiawatha
|
||||||
(hidden-package
|
(hidden-package
|
||||||
(package
|
(package
|
||||||
(inherit mbedtls-apache)
|
(inherit mbedtls-lts)
|
||||||
(arguments
|
(arguments
|
||||||
(substitute-keyword-arguments (package-arguments mbedtls-apache)
|
(substitute-keyword-arguments (package-arguments mbedtls-lts)
|
||||||
((#:phases phases)
|
((#:phases phases)
|
||||||
#~(modify-phases #$phases
|
#~(modify-phases #$phases
|
||||||
(add-before 'configure 'configure-extra-features
|
(add-before 'configure 'configure-extra-features
|
||||||
|
|
|
@ -3954,7 +3954,7 @@ be used for realtime video capture via Linux-specific APIs.")
|
||||||
libxcomposite
|
libxcomposite
|
||||||
libxkbcommon
|
libxkbcommon
|
||||||
luajit
|
luajit
|
||||||
mbedtls-apache
|
mbedtls-lts
|
||||||
mesa
|
mesa
|
||||||
pciutils
|
pciutils
|
||||||
pipewire
|
pipewire
|
||||||
|
|
|
@ -6490,7 +6490,7 @@ functions of Tidy.")
|
||||||
;; Make sure 'hiawatha' finds 'mbedtls'.
|
;; Make sure 'hiawatha' finds 'mbedtls'.
|
||||||
(let* ((out (assoc-ref outputs "out"))
|
(let* ((out (assoc-ref outputs "out"))
|
||||||
(sbin (string-append out "/sbin"))
|
(sbin (string-append out "/sbin"))
|
||||||
(mbed (assoc-ref inputs "mbedtls-apache")))
|
(mbed (assoc-ref inputs "mbedtls")))
|
||||||
(wrap-program (string-append sbin "/hiawatha")
|
(wrap-program (string-append sbin "/hiawatha")
|
||||||
`("PATH" ":" prefix (,mbed)))))))))
|
`("PATH" ":" prefix (,mbed)))))))))
|
||||||
(inputs
|
(inputs
|
||||||
|
|
Reference in New Issue