* [bug#63765] [PATCH 0/8] gnu: python-lief: Update to 0.13.0.
@ 2023-05-28 8:07 ` Hilton Chain via Guix-patches via
2023-05-28 8:11 ` [bug#63765] [PATCH 1/8] gnu: Add ftest-for-utfcpp Hilton Chain via Guix-patches via
` (7 more replies)
0 siblings, 8 replies; 69+ messages in thread
From: Hilton Chain via Guix-patches via @ 2023-05-28 8:07 UTC (permalink / raw)
To: 63765; +Cc: Hilton Chain
This patchset updates python-lief to 0.13.0 and unbundles its 3rd-party
dependencies.
1. Update details:
In previous version of python-lief, only Python bindings are installed. This
time its SDK is built and installed to "out" output, while Python bindings to a
new output, "python".
It would be better to rename the package to "lief" and move it out of
python-xyz.scm later, but at the moment I'm not sure where to put it.
2. Unbundle details:
Dependencies remain bundled:
* tcb-span-d6c6e30.zip (https://github.com/tcbrindle/span)
* leaf-1.81.0.zip (https://github.com/boostorg/leaf)
The two above are single-file headers and I'm currently failed to unbundle them.
* Melkor_ELF_Fuzzer-ac2495b.zip
This one is from a fork and I can't find the source.
* Catch2-2.13.8.zip
This one is used for testing and there's no option to unbundle it.
utfcpp and mbedtls-apache are updated for cmake files. mbedtls-apache 3.X is
needed so the previously packaged one (2.28.X, LTS version) is renamed to
mbedtls-apache-lts.
Hilton Chain (8):
gnu: Add ftest-for-utfcpp.
gnu: utfcpp: Update to 3.2.3.
gnu: mbedtls-apache: Rename package to mbedtls-apache-lts.
gnu: mbedtls-apache-for-hiawatha: Use inherited source.
gnu: mbedtls-apache-lts: Update to 2.28.3.
gnu: Add mbedtls-apache, version 3.4.0.
gnu: Add frozen.
gnu: python-lief: Update to 0.13.0.
gnu/packages/cpp.scm | 23 ++++++++
gnu/packages/emulators.scm | 2 +-
gnu/packages/game-development.scm | 2 +-
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/python-xyz.scm | 96 ++++++++++++++++++++++++++-----
gnu/packages/search.scm | 2 +-
gnu/packages/textutils.scm | 34 ++++++-----
gnu/packages/tls.scm | 50 +++++++---------
gnu/packages/video.scm | 2 +-
16 files changed, 160 insertions(+), 73 deletions(-)
base-commit: b96b82bcd4bc24529941ff74a91432481f1a71b5
--
2.40.1
^ permalink raw reply [flat|nested] 69+ messages in thread
* [bug#63765] [PATCH 1/8] gnu: Add ftest-for-utfcpp.
2023-05-28 8:07 ` [bug#63765] [PATCH 0/8] gnu: python-lief: Update to 0.13.0 Hilton Chain via Guix-patches via
@ 2023-05-28 8:11 ` Hilton Chain via Guix-patches via
2023-05-28 8:11 ` [bug#63765] [PATCH 2/8] gnu: utfcpp: Update to 3.2.3 Hilton Chain via Guix-patches via
` (6 more replies)
2023-05-28 12:54 ` [bug#63765] [PATCH v2 0/8] gnu: python-lief: Update to 0.13.1 Hilton Chain via Guix-patches via
` (6 subsequent siblings)
7 siblings, 7 replies; 69+ messages in thread
From: Hilton Chain via Guix-patches via @ 2023-05-28 8:11 UTC (permalink / raw)
To: 63765; +Cc: Hilton Chain
* gnu/packages/textutils.scm (ftest-for-utfcpp): New variable.
---
gnu/packages/textutils.scm | 14 ++++++++++++++
1 file changed, 14 insertions(+)
diff --git a/gnu/packages/textutils.scm b/gnu/packages/textutils.scm
index 24fc689a0a..da0f2023a9 100644
--- a/gnu/packages/textutils.scm
+++ b/gnu/packages/textutils.scm
@@ -682,6 +682,20 @@ (define-public catdoc
@command{catppt}, which extracts data from PowerPoint presentations.")
(license license:gpl2+)))
+(define ftest-for-utfcpp
+ (let* ((commit "c4ad4af0946b73ce1a40cbc72205d15d196c7e06")
+ (revision "0")
+ (version (git-version "0" revision commit)))
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/nemtrif/ftest")
+ (commit commit)))
+ (file-name (git-file-name "ftest-for-utfcpp" version))
+ (sha256
+ (base32
+ "1jcd76zjhx5f2nsi80hj7gmywgpz1f7vcw8lv5yf7gx0l99dn86x")))))
+
(define-public utfcpp
(package
(name "utfcpp")
--
2.40.1
^ permalink raw reply related [flat|nested] 69+ messages in thread
* [bug#63765] [PATCH 2/8] gnu: utfcpp: Update to 3.2.3.
2023-05-28 8:11 ` [bug#63765] [PATCH 1/8] gnu: Add ftest-for-utfcpp Hilton Chain via Guix-patches via
@ 2023-05-28 8:11 ` Hilton Chain via Guix-patches via
2023-05-28 8:11 ` [bug#63765] [PATCH 3/8] gnu: mbedtls-apache: Rename package to mbedtls-apache-lts Hilton Chain via Guix-patches via
` (5 subsequent siblings)
6 siblings, 0 replies; 69+ messages in thread
From: Hilton Chain via Guix-patches via @ 2023-05-28 8:11 UTC (permalink / raw)
To: 63765; +Cc: Hilton Chain
* gnu/packages/textutils.scm (utfcpp): Update to 3.2.3.
[arguments]<#:phases>: Add phase 'unpack-ftest.
---
gnu/packages/textutils.scm | 20 +++++++-------------
1 file changed, 7 insertions(+), 13 deletions(-)
diff --git a/gnu/packages/textutils.scm b/gnu/packages/textutils.scm
index da0f2023a9..a49167c991 100644
--- a/gnu/packages/textutils.scm
+++ b/gnu/packages/textutils.scm
@@ -699,7 +699,7 @@ (define ftest-for-utfcpp
(define-public utfcpp
(package
(name "utfcpp")
- (version "2.3.5")
+ (version "3.2.3")
(source (origin
(method git-fetch)
(uri (git-reference
@@ -708,20 +708,14 @@ (define-public utfcpp
(file-name (git-file-name name version))
(sha256
(base32
- "1gr98d826z6wa58r1s5i7rz7q2x3r31v7zj0pjjlrc7gfxwklr4s"))))
+ "00hzh39iddbc6nxg13813qd6d55g2kccwjf5dr96wykfhway9wbr"))))
(build-system cmake-build-system)
(arguments
- `(#:out-of-source? #f
- #:phases
- (modify-phases %standard-phases
- (replace 'install ; no install target
- (lambda* (#:key outputs #:allow-other-keys)
- (let* ((out (assoc-ref outputs "out"))
- (include (string-append out "/include"))
- (doc (string-append out "/share/doc/" ,name)))
- (copy-recursively "source" include)
- (install-file "README.md" doc)
- #t))))))
+ (list #:phases
+ #~(modify-phases %standard-phases
+ (add-after 'unpack 'unpack-ftest
+ (lambda* (#:key native-inputs #:allow-other-keys)
+ (copy-recursively #$ftest-for-utfcpp "extern/ftest"))))))
(home-page "https://github.com/nemtrif/utfcpp")
(synopsis "Portable C++ library for handling UTF-8")
(description "UTF8-CPP is a C++ library for handling UTF-8 encoded text
--
2.40.1
^ permalink raw reply related [flat|nested] 69+ messages in thread
* [bug#63765] [PATCH 3/8] gnu: mbedtls-apache: Rename package to mbedtls-apache-lts.
2023-05-28 8:11 ` [bug#63765] [PATCH 1/8] gnu: Add ftest-for-utfcpp Hilton Chain via Guix-patches via
2023-05-28 8:11 ` [bug#63765] [PATCH 2/8] gnu: utfcpp: Update to 3.2.3 Hilton Chain via Guix-patches via
@ 2023-05-28 8:11 ` Hilton Chain via Guix-patches via
2023-05-28 8:11 ` [bug#63765] [PATCH 4/8] gnu: mbedtls-apache-for-hiawatha: Use inherited source Hilton Chain via Guix-patches via
` (4 subsequent siblings)
6 siblings, 0 replies; 69+ messages in thread
From: Hilton Chain via Guix-patches via @ 2023-05-28 8:11 UTC (permalink / raw)
To: 63765; +Cc: Hilton Chain
* gnu/packages/tls.scm (mbedtls-apache-lts): New variable, formerly known as
"mbedtls-apache".
---
gnu/packages/emulators.scm | 2 +-
gnu/packages/game-development.scm | 2 +-
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, 18 insertions(+), 18 deletions(-)
diff --git a/gnu/packages/emulators.scm b/gnu/packages/emulators.scm
index 13b6022308..9608d535c4 100644
--- a/gnu/packages/emulators.scm
+++ b/gnu/packages/emulators.scm
@@ -341,7 +341,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 75957f7a6b..9c2a322c57 100644
--- a/gnu/packages/game-development.scm
+++ b/gnu/packages/game-development.scm
@@ -1959,7 +1959,7 @@ (define-public godot
libxi
libxinerama
libxrandr
- mbedtls-apache
+ mbedtls-apache-lts
mesa
opusfile
pcre2
diff --git a/gnu/packages/hardware.scm b/gnu/packages/hardware.scm
index c23299d1db..d1ad38adbd 100644
--- a/gnu/packages/hardware.scm
+++ b/gnu/packages/hardware.scm
@@ -703,7 +703,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:
@@ -1069,7 +1069,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 b31bb6b11a..d442787d97 100644
--- a/gnu/packages/irc.scm
+++ b/gnu/packages/irc.scm
@@ -748,7 +748,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 2320b03595..78ec186bf2 100644
--- a/gnu/packages/julia-jll.scm
+++ b/gnu/packages/julia-jll.scm
@@ -1404,7 +1404,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 ba54175822..82891525c2 100644
--- a/gnu/packages/julia.scm
+++ b/gnu/packages/julia.scm
@@ -511,7 +511,7 @@ (define-public julia
("libunwind" ,libunwind-julia)
("libuv" ,libuv-julia)
("llvm" ,llvm-julia)
- ("mbedtls-apache" ,mbedtls-apache)
+ ("mbedtls-apache" ,mbedtls-apache-lts)
("mpfr" ,mpfr)
("openblas" ,openblas)
("openlibm" ,openlibm)
diff --git a/gnu/packages/linphone.scm b/gnu/packages/linphone.scm
index 7d87ee602c..f26c5efd3c 100644
--- a/gnu/packages/linphone.scm
+++ b/gnu/packages/linphone.scm
@@ -188,7 +188,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 1be505d949..61d8f5c88c 100644
--- a/gnu/packages/linux.scm
+++ b/gnu/packages/linux.scm
@@ -2294,7 +2294,7 @@ (define-public dislocker
(build-system cmake-build-system)
(arguments
'(#:tests? #f)) ;no test suite
- (inputs (list fuse mbedtls-apache))
+ (inputs (list fuse 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 30e67d3a98..7e8a1c69f7 100644
--- a/gnu/packages/networking.scm
+++ b/gnu/packages/networking.scm
@@ -821,7 +821,7 @@ (define-public nng
(native-inputs
`(("ksh" ,oksh)))
(inputs
- `(("mbedtls" ,mbedtls-apache)))
+ `(("mbedtls" ,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 3e3e8e00c6..a0640799bc 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 d162094ed4..cd5933a270 100644
--- a/gnu/packages/tls.scm
+++ b/gnu/packages/tls.scm
@@ -941,7 +941,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
@@ -981,7 +981,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
@@ -1003,7 +1003,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 ab19c2dd8c..6486dfe2ed 100644
--- a/gnu/packages/video.scm
+++ b/gnu/packages/video.scm
@@ -3451,7 +3451,7 @@ (define-public obs
libxcomposite
libxkbcommon
luajit
- mbedtls-apache
+ mbedtls-apache-lts
mesa
pciutils
pipewire
--
2.40.1
^ permalink raw reply related [flat|nested] 69+ messages in thread
* [bug#63765] [PATCH 4/8] gnu: mbedtls-apache-for-hiawatha: Use inherited source.
2023-05-28 8:11 ` [bug#63765] [PATCH 1/8] gnu: Add ftest-for-utfcpp Hilton Chain via Guix-patches via
2023-05-28 8:11 ` [bug#63765] [PATCH 2/8] gnu: utfcpp: Update to 3.2.3 Hilton Chain via Guix-patches via
2023-05-28 8:11 ` [bug#63765] [PATCH 3/8] gnu: mbedtls-apache: Rename package to mbedtls-apache-lts Hilton Chain via Guix-patches via
@ 2023-05-28 8:11 ` Hilton Chain via Guix-patches via
2023-05-28 8:11 ` [bug#63765] [PATCH 5/8] gnu: mbedtls-apache-lts: Update to 2.28.3 Hilton Chain via Guix-patches via
` (3 subsequent siblings)
6 siblings, 0 replies; 69+ messages in thread
From: Hilton Chain via Guix-patches via @ 2023-05-28 8:11 UTC (permalink / raw)
To: 63765; +Cc: Hilton Chain
* gnu/packages/tls.scm (mbedtls-apache-for-hiawatha): Use inherited source.
[arguments]<#:phases>: Keep "-Wformat-signedness".
---
gnu/packages/tls.scm | 25 -------------------------
1 file changed, 25 deletions(-)
diff --git a/gnu/packages/tls.scm b/gnu/packages/tls.scm
index cd5933a270..1e2b0fcc20 100644
--- a/gnu/packages/tls.scm
+++ b/gnu/packages/tls.scm
@@ -944,8 +944,6 @@ (define-public perl-crypt-openssl-random
(define-public mbedtls-apache-lts
(package
(name "mbedtls-apache")
- ;; XXX Check whether ‘-Wformat-signedness’ still breaks mbedtls-for-hiawatha
- ;; when updating.
(version "2.28.0")
(source
(origin
@@ -982,26 +980,6 @@ (define-public mbedtls-for-hiawatha
(hidden-package
(package
(inherit mbedtls-apache-lts)
- (name "mbedtls-apache")
- (version "2.26.0")
- (source
- (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/ARMmbed/mbedtls")
- (commit (string-append "mbedtls-" version))))
- (sha256
- (base32 "0scwpmrgvg6q7rvqkc352d2fqlsx0aylcbyibcp1f1rsn8iiif2m"))
- (file-name (git-file-name name version))
- (modules '((guix build utils)))
- (snippet
- '(begin
- ;; Can be removed with the next version.
- ;; Reduce level of format truncation warnings due to false positives.
- ;; https://github.com/ARMmbed/mbedtls/commit/2065a8d8af27c6cb1e40c9462b5933336dca7434
- (substitute* "CMakeLists.txt"
- (("Wformat-truncation=2") "Wformat-truncation"))
- #t))))
(arguments
(substitute-keyword-arguments (package-arguments mbedtls-apache-lts)
((#:phases phases)
@@ -1012,9 +990,6 @@ (define-public mbedtls-for-hiawatha
(invoke "scripts/config.pl" "set" feature))
(list "MBEDTLS_THREADING_C"
"MBEDTLS_THREADING_PTHREAD"))
- ;; XXX The above enables code that breaks with -Werror…
- (substitute* "CMakeLists.txt"
- ((" -Wformat-signedness") ""))
#t)))))))))
(define-public dehydrated
--
2.40.1
^ permalink raw reply related [flat|nested] 69+ messages in thread
* [bug#63765] [PATCH 5/8] gnu: mbedtls-apache-lts: Update to 2.28.3.
2023-05-28 8:11 ` [bug#63765] [PATCH 1/8] gnu: Add ftest-for-utfcpp Hilton Chain via Guix-patches via
` (2 preceding siblings ...)
2023-05-28 8:11 ` [bug#63765] [PATCH 4/8] gnu: mbedtls-apache-for-hiawatha: Use inherited source Hilton Chain via Guix-patches via
@ 2023-05-28 8:11 ` Hilton Chain via Guix-patches via
2023-05-28 8:11 ` [bug#63765] [PATCH 6/8] gnu: Add mbedtls-apache, version 3.4.0 Hilton Chain via Guix-patches via
` (2 subsequent siblings)
6 siblings, 0 replies; 69+ messages in thread
From: Hilton Chain via Guix-patches via @ 2023-05-28 8:11 UTC (permalink / raw)
To: 63765; +Cc: Hilton Chain
* gnu/packages/tls.scm (mbedtls-apache-lts): Update to 2.28.3.
---
gnu/packages/tls.scm | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/gnu/packages/tls.scm b/gnu/packages/tls.scm
index 1e2b0fcc20..eb40e68de2 100644
--- a/gnu/packages/tls.scm
+++ b/gnu/packages/tls.scm
@@ -944,7 +944,7 @@ (define-public perl-crypt-openssl-random
(define-public mbedtls-apache-lts
(package
(name "mbedtls-apache")
- (version "2.28.0")
+ (version "2.28.3")
(source
(origin
(method git-fetch)
@@ -953,7 +953,7 @@ (define-public mbedtls-apache-lts
(commit (string-append "mbedtls-" version))))
(file-name (git-file-name name version))
(sha256
- (base32 "0s37dsi29v7146fi9k4frvx5rz2snxdm6c3rwq2fvnca2r80hfjl"))))
+ (base32 "177925jkr73x536g703vbxxamcyx9acvkp5iyb294icdn09ck5n3"))))
(build-system cmake-build-system)
(arguments
`(#:configure-flags
--
2.40.1
^ permalink raw reply related [flat|nested] 69+ messages in thread
* [bug#63765] [PATCH 6/8] gnu: Add mbedtls-apache, version 3.4.0.
2023-05-28 8:11 ` [bug#63765] [PATCH 1/8] gnu: Add ftest-for-utfcpp Hilton Chain via Guix-patches via
` (3 preceding siblings ...)
2023-05-28 8:11 ` [bug#63765] [PATCH 5/8] gnu: mbedtls-apache-lts: Update to 2.28.3 Hilton Chain via Guix-patches via
@ 2023-05-28 8:11 ` Hilton Chain via Guix-patches via
2023-05-28 8:11 ` [bug#63765] [PATCH 7/8] gnu: Add frozen Hilton Chain via Guix-patches via
2023-05-28 8:11 ` [bug#63765] [PATCH 8/8] gnu: python-lief: Update to 0.13.0 Hilton Chain via Guix-patches via
6 siblings, 0 replies; 69+ messages in thread
From: Hilton Chain via Guix-patches via @ 2023-05-28 8:11 UTC (permalink / raw)
To: 63765; +Cc: Hilton Chain
* gnu/packages/tls.scm (mbedtls-apache): New variable.
---
gnu/packages/tls.scm | 15 +++++++++++++++
1 file changed, 15 insertions(+)
diff --git a/gnu/packages/tls.scm b/gnu/packages/tls.scm
index eb40e68de2..40e25a4303 100644
--- a/gnu/packages/tls.scm
+++ b/gnu/packages/tls.scm
@@ -975,6 +975,21 @@ (define-public mbedtls-apache-lts
(home-page "https://www.trustedfirmware.org/projects/mbed-tls/")
(license license:asl2.0)))
+(define-public mbedtls-apache
+ (package
+ (inherit mbedtls-apache-lts)
+ (name "mbedtls-apache")
+ (version "3.4.0")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/ARMmbed/mbedtls")
+ (commit (string-append "mbedtls-" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "1y2mwkrvmadmjylyshpp6dnw328zc6l2cajdwrhkl4nmky33i06m"))))))
+
;; The Hiawatha Web server requires some specific features to be enabled.
(define-public mbedtls-for-hiawatha
(hidden-package
--
2.40.1
^ permalink raw reply related [flat|nested] 69+ messages in thread
* [bug#63765] [PATCH 7/8] gnu: Add frozen.
2023-05-28 8:11 ` [bug#63765] [PATCH 1/8] gnu: Add ftest-for-utfcpp Hilton Chain via Guix-patches via
` (4 preceding siblings ...)
2023-05-28 8:11 ` [bug#63765] [PATCH 6/8] gnu: Add mbedtls-apache, version 3.4.0 Hilton Chain via Guix-patches via
@ 2023-05-28 8:11 ` Hilton Chain via Guix-patches via
2023-05-28 8:11 ` [bug#63765] [PATCH 8/8] gnu: python-lief: Update to 0.13.0 Hilton Chain via Guix-patches via
6 siblings, 0 replies; 69+ messages in thread
From: Hilton Chain via Guix-patches via @ 2023-05-28 8:11 UTC (permalink / raw)
To: 63765; +Cc: Hilton Chain
* gnu/packages/cpp.scm (frozen): New variable.
---
gnu/packages/cpp.scm | 23 +++++++++++++++++++++++
1 file changed, 23 insertions(+)
diff --git a/gnu/packages/cpp.scm b/gnu/packages/cpp.scm
index 34ae9ef70e..03e0194685 100644
--- a/gnu/packages/cpp.scm
+++ b/gnu/packages/cpp.scm
@@ -570,6 +570,29 @@ (define-public fifo-map
as ordering relation.")
(license license:expat)))
+(define-public frozen
+ (let ((commit "f6dbec6d03debc68d18ae3e2d32ff408c6d52468")
+ (revision "7"))
+ (package
+ (name "frozen")
+ (version (git-version "1.1.1" revision commit))
+ (source (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/serge-sans-paille/frozen")
+ (commit commit)))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "1yzxj8ia8fbdikb4hh4bc2iyr1fnl9cjllv8xgilzaivgiv7xmjk"))))
+ (build-system cmake-build-system)
+ (home-page "https://github.com/serge-sans-paille/frozen")
+ (synopsis "Header-only, constexpr alternative to gperf for C++14 users")
+ (description
+ "Frozen is a header-only library that provides 0 cost initialization
+for immutable containers, fixed-size containers, and various algorithms.")
+ (license license:asl2.0))))
+
(define-public json-dto
(package
(name "json-dto")
--
2.40.1
^ permalink raw reply related [flat|nested] 69+ messages in thread
* [bug#63765] [PATCH 8/8] gnu: python-lief: Update to 0.13.0.
2023-05-28 8:11 ` [bug#63765] [PATCH 1/8] gnu: Add ftest-for-utfcpp Hilton Chain via Guix-patches via
` (5 preceding siblings ...)
2023-05-28 8:11 ` [bug#63765] [PATCH 7/8] gnu: Add frozen Hilton Chain via Guix-patches via
@ 2023-05-28 8:11 ` Hilton Chain via Guix-patches via
6 siblings, 0 replies; 69+ messages in thread
From: Hilton Chain via Guix-patches via @ 2023-05-28 8:11 UTC (permalink / raw)
To: 63765; +Cc: Hilton Chain
* gnu/packages/python-xyz.scm (python-lief): Update to 0.13.0.
[snippet]: Unbundle third-party dependencies.
[build-system]: Change to cmake-build-system
[native-inputs]: Add python-minimal-wrapper, python-tomli.
Remove cmake.
[inputs]: Add frozen, mbedtls-apache, nlohmann-json, pybind11, utfcpp, spdlog.
[outputs]: Add "python" output.
[home-page]: Update homepage.
(shrinkwrap)[inputs]: Replace python-lief to its "python" output.
---
gnu/packages/python-xyz.scm | 96 +++++++++++++++++++++++++++++++------
1 file changed, 81 insertions(+), 15 deletions(-)
diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index f7e3f6f538..f600ffc47b 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -208,6 +208,7 @@ (define-module (gnu packages python-xyz)
#:use-module (gnu packages libusb)
#:use-module (gnu packages linux)
#:use-module (gnu packages llvm)
+ #:use-module (gnu packages logging)
#:use-module (gnu packages machine-learning)
#:use-module (gnu packages man)
#:use-module (gnu packages markup)
@@ -32815,29 +32816,94 @@ (define-public python-misskey
(define-public python-lief
(package
(name "python-lief")
- (version "0.12.3")
+ (version "0.13.0")
(source (origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/lief-project/LIEF")
(commit version)))
(file-name (git-file-name name version))
+ (modules '((guix build utils)))
+ (snippet
+ '(begin
+ ;; Configure build for Python bindings.
+ (substitute* "api/python/config-default.toml"
+ (("(ninja = )true" all m)
+ (string-append m "false"))
+ (("(parallel-jobs = )0" all m)
+ (string-append m (number->string (parallel-job-count)))))
+ ;; Unbundle third-party dependencies.
+ (for-each delete-file
+ (find-files "third-party/"
+ (string-join '("spdlog"
+ "frozen"
+ "json"
+ "mbedtls"
+ "pybind11"
+ "utfcpp")
+ "|" )))
+ ;; Same in argument #:configure-flags.
+ (substitute* "api/python/setup.py"
+ (("self\\._get_third_party_opt\\(\\)")
+ "[\"-DLIEF_EXTERNAL_SPDLOG=ON\",
+ \"-DLIEF_OPT_FROZEN_EXTERNAL=ON\",
+ \"-DLIEF_OPT_MBEDTLS_EXTERNAL=ON\",
+ \"-DLIEF_OPT_NLOHMANN_JSON_EXTERNAL=ON\",
+ \"-DLIEF_OPT_PYBIND11_EXTERNAL=ON\",
+ \"-DLIEF_OPT_UTFCPP_EXTERNAL=ON\"]"))))
(sha256
(base32
- "11i6hqmcjh56y554kqhl61698n9v66j2qk1c1g63mv2w07h2z661"))))
- (build-system python-build-system)
- (native-inputs (list cmake))
+ "17901jddr9idzbi3ijq96m3hpfwzxnfyyf4pmxbpdj98czpqy75r"))))
+ (build-system cmake-build-system)
(arguments
- (list
- #:tests? #f ;needs network
- #:phases #~(modify-phases %standard-phases
- (replace 'build
- (lambda _
- (invoke
- "python" "setup.py" "--sdk" "build"
- (string-append
- "-j" (number->string (parallel-job-count)))))))))
- (home-page "https://github.com/lief-project/LIEF")
+ (list #:modules
+ '((guix build utils)
+ (guix build cmake-build-system)
+ ((guix build python-build-system) #:prefix python:))
+ #:imported-modules
+ (append %cmake-build-system-modules
+ '((guix build python-build-system)))
+ #:configure-flags
+ #~'("-DCMAKE_LINK_WHAT_YOU_USE=ON"
+ "-DBUILD_SHARED_LIBS=ON"
+ "-DLIEF_INSTALL_COMPILED_EXAMPLES=ON"
+ "-DLIEF_TESTS=ON"
+ ;; Unbundle third-party dependencies
+ "-DLIEF_EXTERNAL_SPDLOG=ON"
+ "-DLIEF_OPT_FROZEN_EXTERNAL=ON"
+ "-DLIEF_OPT_MBEDTLS_EXTERNAL=ON"
+ "-DLIEF_OPT_NLOHMANN_JSON_EXTERNAL=ON"
+ "-DLIEF_OPT_PYBIND11_EXTERNAL=ON"
+ "-DLIEF_OPT_UTFCPP_EXTERNAL=ON")
+ #:phases
+ ;; Phases from python-build-system, for Python bindings.
+ #~(modify-phases %standard-phases
+ (add-after 'install 'chdir
+ (lambda _
+ (chdir "../source/api/python/")))
+ (add-after 'chdir 'ensure-no-mtimes-pre-1980
+ (assoc-ref python:%standard-phases 'ensure-no-mtimes-pre-1980))
+ (add-after 'ensure-no-mtimes-pre-1980 'enable-bytecode-determinism
+ (assoc-ref python:%standard-phases 'enable-bytecode-determinism))
+ (add-after 'enable-bytecode-determinism 'ensure-no-cythonized-files
+ (assoc-ref python:%standard-phases 'ensure-no-cythonized-files))
+ (add-after 'ensure-no-cythonized-files 'python-install
+ (lambda* (#:key inputs outputs #:allow-other-keys)
+ ((assoc-ref python:%standard-phases 'install)
+ #:inputs inputs
+ #:outputs outputs
+ #:configure-flags '()
+ #:use-setuptools? #t)))
+ (add-after 'python-install 'add-install-to-pythonpath
+ (assoc-ref python:%standard-phases 'add-install-to-pythonpath))
+ (add-after 'add-install-to-pythonpath 'add-install-to-path
+ (assoc-ref python:%standard-phases 'add-install-to-path))
+ (add-after 'add-install-to-path 'python-wrap
+ (assoc-ref python:%standard-phases 'wrap)))))
+ (native-inputs (list python-minimal-wrapper python-tomli))
+ (inputs (list frozen mbedtls-apache nlohmann-json pybind11 utfcpp spdlog))
+ (outputs '("out" "python"))
+ (home-page "https://lief-project.github.io/")
(synopsis "Library to instrument executable formats")
(description
"@code{python-lief} is a cross platform library which can parse, modify
@@ -32885,7 +32951,7 @@ (define-public shrinkwrap
python-poetry-core
python-pypa-build
python-pytest))
- (inputs (list python-lief python-sh))
+ (inputs (list `(,python-lief "python") python-sh))
(home-page "https://github.com/fzakaria/shrinkwrap")
(synopsis "Emboss needed dependencies on the top level executable")
(description
--
2.40.1
^ permalink raw reply related [flat|nested] 69+ messages in thread
* [bug#63765] [PATCH v2 0/8] gnu: python-lief: Update to 0.13.1.
2023-05-28 8:07 ` [bug#63765] [PATCH 0/8] gnu: python-lief: Update to 0.13.0 Hilton Chain via Guix-patches via
2023-05-28 8:11 ` [bug#63765] [PATCH 1/8] gnu: Add ftest-for-utfcpp Hilton Chain via Guix-patches via
@ 2023-05-28 12:54 ` Hilton Chain via Guix-patches via
2023-05-28 12:56 ` [bug#63765] [PATCH v2 1/8] gnu: Add ftest-for-utfcpp Hilton Chain via Guix-patches via
2023-06-23 6:24 ` [bug#63765] [PATCH v3 0/8] gnu: python-lief: Update to 0.13.2 Hilton Chain via Guix-patches via
` (5 subsequent siblings)
7 siblings, 1 reply; 69+ messages in thread
From: Hilton Chain via Guix-patches via @ 2023-05-28 12:54 UTC (permalink / raw)
To: 63765; +Cc: Hilton Chain
*** BLURB HERE *** (See cover letter of v1)
v1->v2: python-lief 0.13.0->0.13.1
Hilton Chain (8):
gnu: Add ftest-for-utfcpp.
gnu: utfcpp: Update to 3.2.3.
gnu: mbedtls-apache: Rename package to mbedtls-apache-lts.
gnu: mbedtls-apache-for-hiawatha: Use inherited source.
gnu: mbedtls-apache-lts: Update to 2.28.3.
gnu: Add mbedtls-apache, version 3.4.0.
gnu: Add frozen.
gnu: python-lief: Update to 0.13.1.
gnu/packages/cpp.scm | 23 ++++++++
gnu/packages/emulators.scm | 2 +-
gnu/packages/game-development.scm | 2 +-
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/python-xyz.scm | 96 ++++++++++++++++++++++++++-----
gnu/packages/search.scm | 2 +-
gnu/packages/textutils.scm | 34 ++++++-----
gnu/packages/tls.scm | 50 +++++++---------
gnu/packages/video.scm | 2 +-
16 files changed, 160 insertions(+), 73 deletions(-)
base-commit: 6192acf8b77948384e75650ae79dfbaadb26bc37
--
2.40.1
^ permalink raw reply [flat|nested] 69+ messages in thread
* [bug#63765] [PATCH v2 1/8] gnu: Add ftest-for-utfcpp.
2023-05-28 12:54 ` [bug#63765] [PATCH v2 0/8] gnu: python-lief: Update to 0.13.1 Hilton Chain via Guix-patches via
@ 2023-05-28 12:56 ` Hilton Chain via Guix-patches via
2023-05-28 12:56 ` [bug#63765] [PATCH v2 2/8] gnu: utfcpp: Update to 3.2.3 Hilton Chain via Guix-patches via
` (6 more replies)
0 siblings, 7 replies; 69+ messages in thread
From: Hilton Chain via Guix-patches via @ 2023-05-28 12:56 UTC (permalink / raw)
To: 63765; +Cc: Hilton Chain
* gnu/packages/textutils.scm (ftest-for-utfcpp): New variable.
---
gnu/packages/textutils.scm | 14 ++++++++++++++
1 file changed, 14 insertions(+)
diff --git a/gnu/packages/textutils.scm b/gnu/packages/textutils.scm
index 24fc689a0a..da0f2023a9 100644
--- a/gnu/packages/textutils.scm
+++ b/gnu/packages/textutils.scm
@@ -682,6 +682,20 @@ (define-public catdoc
@command{catppt}, which extracts data from PowerPoint presentations.")
(license license:gpl2+)))
+(define ftest-for-utfcpp
+ (let* ((commit "c4ad4af0946b73ce1a40cbc72205d15d196c7e06")
+ (revision "0")
+ (version (git-version "0" revision commit)))
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/nemtrif/ftest")
+ (commit commit)))
+ (file-name (git-file-name "ftest-for-utfcpp" version))
+ (sha256
+ (base32
+ "1jcd76zjhx5f2nsi80hj7gmywgpz1f7vcw8lv5yf7gx0l99dn86x")))))
+
(define-public utfcpp
(package
(name "utfcpp")
--
2.40.1
^ permalink raw reply related [flat|nested] 69+ messages in thread
* [bug#63765] [PATCH v2 2/8] gnu: utfcpp: Update to 3.2.3.
2023-05-28 12:56 ` [bug#63765] [PATCH v2 1/8] gnu: Add ftest-for-utfcpp Hilton Chain via Guix-patches via
@ 2023-05-28 12:56 ` Hilton Chain via Guix-patches via
2023-05-28 12:56 ` [bug#63765] [PATCH v2 3/8] gnu: mbedtls-apache: Rename package to mbedtls-apache-lts Hilton Chain via Guix-patches via
` (5 subsequent siblings)
6 siblings, 0 replies; 69+ messages in thread
From: Hilton Chain via Guix-patches via @ 2023-05-28 12:56 UTC (permalink / raw)
To: 63765; +Cc: Hilton Chain
* gnu/packages/textutils.scm (utfcpp): Update to 3.2.3.
[arguments]<#:phases>: Add phase 'unpack-ftest.
---
gnu/packages/textutils.scm | 20 +++++++-------------
1 file changed, 7 insertions(+), 13 deletions(-)
diff --git a/gnu/packages/textutils.scm b/gnu/packages/textutils.scm
index da0f2023a9..a49167c991 100644
--- a/gnu/packages/textutils.scm
+++ b/gnu/packages/textutils.scm
@@ -699,7 +699,7 @@ (define ftest-for-utfcpp
(define-public utfcpp
(package
(name "utfcpp")
- (version "2.3.5")
+ (version "3.2.3")
(source (origin
(method git-fetch)
(uri (git-reference
@@ -708,20 +708,14 @@ (define-public utfcpp
(file-name (git-file-name name version))
(sha256
(base32
- "1gr98d826z6wa58r1s5i7rz7q2x3r31v7zj0pjjlrc7gfxwklr4s"))))
+ "00hzh39iddbc6nxg13813qd6d55g2kccwjf5dr96wykfhway9wbr"))))
(build-system cmake-build-system)
(arguments
- `(#:out-of-source? #f
- #:phases
- (modify-phases %standard-phases
- (replace 'install ; no install target
- (lambda* (#:key outputs #:allow-other-keys)
- (let* ((out (assoc-ref outputs "out"))
- (include (string-append out "/include"))
- (doc (string-append out "/share/doc/" ,name)))
- (copy-recursively "source" include)
- (install-file "README.md" doc)
- #t))))))
+ (list #:phases
+ #~(modify-phases %standard-phases
+ (add-after 'unpack 'unpack-ftest
+ (lambda* (#:key native-inputs #:allow-other-keys)
+ (copy-recursively #$ftest-for-utfcpp "extern/ftest"))))))
(home-page "https://github.com/nemtrif/utfcpp")
(synopsis "Portable C++ library for handling UTF-8")
(description "UTF8-CPP is a C++ library for handling UTF-8 encoded text
--
2.40.1
^ permalink raw reply related [flat|nested] 69+ messages in thread
* [bug#63765] [PATCH v2 3/8] gnu: mbedtls-apache: Rename package to mbedtls-apache-lts.
2023-05-28 12:56 ` [bug#63765] [PATCH v2 1/8] gnu: Add ftest-for-utfcpp Hilton Chain via Guix-patches via
2023-05-28 12:56 ` [bug#63765] [PATCH v2 2/8] gnu: utfcpp: Update to 3.2.3 Hilton Chain via Guix-patches via
@ 2023-05-28 12:56 ` Hilton Chain via Guix-patches via
2023-05-28 12:56 ` [bug#63765] [PATCH v2 4/8] gnu: mbedtls-apache-for-hiawatha: Use inherited source Hilton Chain via Guix-patches via
` (4 subsequent siblings)
6 siblings, 0 replies; 69+ messages in thread
From: Hilton Chain via Guix-patches via @ 2023-05-28 12:56 UTC (permalink / raw)
To: 63765; +Cc: Hilton Chain
* gnu/packages/tls.scm (mbedtls-apache-lts): New variable, formerly known as
"mbedtls-apache".
---
gnu/packages/emulators.scm | 2 +-
gnu/packages/game-development.scm | 2 +-
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, 18 insertions(+), 18 deletions(-)
diff --git a/gnu/packages/emulators.scm b/gnu/packages/emulators.scm
index 13b6022308..9608d535c4 100644
--- a/gnu/packages/emulators.scm
+++ b/gnu/packages/emulators.scm
@@ -341,7 +341,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 75957f7a6b..9c2a322c57 100644
--- a/gnu/packages/game-development.scm
+++ b/gnu/packages/game-development.scm
@@ -1959,7 +1959,7 @@ (define-public godot
libxi
libxinerama
libxrandr
- mbedtls-apache
+ mbedtls-apache-lts
mesa
opusfile
pcre2
diff --git a/gnu/packages/hardware.scm b/gnu/packages/hardware.scm
index c23299d1db..d1ad38adbd 100644
--- a/gnu/packages/hardware.scm
+++ b/gnu/packages/hardware.scm
@@ -703,7 +703,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:
@@ -1069,7 +1069,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 b31bb6b11a..d442787d97 100644
--- a/gnu/packages/irc.scm
+++ b/gnu/packages/irc.scm
@@ -748,7 +748,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 2320b03595..78ec186bf2 100644
--- a/gnu/packages/julia-jll.scm
+++ b/gnu/packages/julia-jll.scm
@@ -1404,7 +1404,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 ba54175822..82891525c2 100644
--- a/gnu/packages/julia.scm
+++ b/gnu/packages/julia.scm
@@ -511,7 +511,7 @@ (define-public julia
("libunwind" ,libunwind-julia)
("libuv" ,libuv-julia)
("llvm" ,llvm-julia)
- ("mbedtls-apache" ,mbedtls-apache)
+ ("mbedtls-apache" ,mbedtls-apache-lts)
("mpfr" ,mpfr)
("openblas" ,openblas)
("openlibm" ,openlibm)
diff --git a/gnu/packages/linphone.scm b/gnu/packages/linphone.scm
index 7d87ee602c..f26c5efd3c 100644
--- a/gnu/packages/linphone.scm
+++ b/gnu/packages/linphone.scm
@@ -188,7 +188,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 1be505d949..61d8f5c88c 100644
--- a/gnu/packages/linux.scm
+++ b/gnu/packages/linux.scm
@@ -2294,7 +2294,7 @@ (define-public dislocker
(build-system cmake-build-system)
(arguments
'(#:tests? #f)) ;no test suite
- (inputs (list fuse mbedtls-apache))
+ (inputs (list fuse 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 30e67d3a98..7e8a1c69f7 100644
--- a/gnu/packages/networking.scm
+++ b/gnu/packages/networking.scm
@@ -821,7 +821,7 @@ (define-public nng
(native-inputs
`(("ksh" ,oksh)))
(inputs
- `(("mbedtls" ,mbedtls-apache)))
+ `(("mbedtls" ,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 3e3e8e00c6..a0640799bc 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 d162094ed4..cd5933a270 100644
--- a/gnu/packages/tls.scm
+++ b/gnu/packages/tls.scm
@@ -941,7 +941,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
@@ -981,7 +981,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
@@ -1003,7 +1003,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 ab19c2dd8c..6486dfe2ed 100644
--- a/gnu/packages/video.scm
+++ b/gnu/packages/video.scm
@@ -3451,7 +3451,7 @@ (define-public obs
libxcomposite
libxkbcommon
luajit
- mbedtls-apache
+ mbedtls-apache-lts
mesa
pciutils
pipewire
--
2.40.1
^ permalink raw reply related [flat|nested] 69+ messages in thread
* [bug#63765] [PATCH v2 4/8] gnu: mbedtls-apache-for-hiawatha: Use inherited source.
2023-05-28 12:56 ` [bug#63765] [PATCH v2 1/8] gnu: Add ftest-for-utfcpp Hilton Chain via Guix-patches via
2023-05-28 12:56 ` [bug#63765] [PATCH v2 2/8] gnu: utfcpp: Update to 3.2.3 Hilton Chain via Guix-patches via
2023-05-28 12:56 ` [bug#63765] [PATCH v2 3/8] gnu: mbedtls-apache: Rename package to mbedtls-apache-lts Hilton Chain via Guix-patches via
@ 2023-05-28 12:56 ` Hilton Chain via Guix-patches via
2023-05-28 12:56 ` [bug#63765] [PATCH v2 5/8] gnu: mbedtls-apache-lts: Update to 2.28.3 Hilton Chain via Guix-patches via
` (3 subsequent siblings)
6 siblings, 0 replies; 69+ messages in thread
From: Hilton Chain via Guix-patches via @ 2023-05-28 12:56 UTC (permalink / raw)
To: 63765; +Cc: Hilton Chain
* gnu/packages/tls.scm (mbedtls-apache-for-hiawatha): Use inherited source.
[arguments]<#:phases>: Keep "-Wformat-signedness".
---
gnu/packages/tls.scm | 25 -------------------------
1 file changed, 25 deletions(-)
diff --git a/gnu/packages/tls.scm b/gnu/packages/tls.scm
index cd5933a270..1e2b0fcc20 100644
--- a/gnu/packages/tls.scm
+++ b/gnu/packages/tls.scm
@@ -944,8 +944,6 @@ (define-public perl-crypt-openssl-random
(define-public mbedtls-apache-lts
(package
(name "mbedtls-apache")
- ;; XXX Check whether ‘-Wformat-signedness’ still breaks mbedtls-for-hiawatha
- ;; when updating.
(version "2.28.0")
(source
(origin
@@ -982,26 +980,6 @@ (define-public mbedtls-for-hiawatha
(hidden-package
(package
(inherit mbedtls-apache-lts)
- (name "mbedtls-apache")
- (version "2.26.0")
- (source
- (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/ARMmbed/mbedtls")
- (commit (string-append "mbedtls-" version))))
- (sha256
- (base32 "0scwpmrgvg6q7rvqkc352d2fqlsx0aylcbyibcp1f1rsn8iiif2m"))
- (file-name (git-file-name name version))
- (modules '((guix build utils)))
- (snippet
- '(begin
- ;; Can be removed with the next version.
- ;; Reduce level of format truncation warnings due to false positives.
- ;; https://github.com/ARMmbed/mbedtls/commit/2065a8d8af27c6cb1e40c9462b5933336dca7434
- (substitute* "CMakeLists.txt"
- (("Wformat-truncation=2") "Wformat-truncation"))
- #t))))
(arguments
(substitute-keyword-arguments (package-arguments mbedtls-apache-lts)
((#:phases phases)
@@ -1012,9 +990,6 @@ (define-public mbedtls-for-hiawatha
(invoke "scripts/config.pl" "set" feature))
(list "MBEDTLS_THREADING_C"
"MBEDTLS_THREADING_PTHREAD"))
- ;; XXX The above enables code that breaks with -Werror…
- (substitute* "CMakeLists.txt"
- ((" -Wformat-signedness") ""))
#t)))))))))
(define-public dehydrated
--
2.40.1
^ permalink raw reply related [flat|nested] 69+ messages in thread
* [bug#63765] [PATCH v2 5/8] gnu: mbedtls-apache-lts: Update to 2.28.3.
2023-05-28 12:56 ` [bug#63765] [PATCH v2 1/8] gnu: Add ftest-for-utfcpp Hilton Chain via Guix-patches via
` (2 preceding siblings ...)
2023-05-28 12:56 ` [bug#63765] [PATCH v2 4/8] gnu: mbedtls-apache-for-hiawatha: Use inherited source Hilton Chain via Guix-patches via
@ 2023-05-28 12:56 ` Hilton Chain via Guix-patches via
2023-05-28 12:56 ` [bug#63765] [PATCH v2 6/8] gnu: Add mbedtls-apache, version 3.4.0 Hilton Chain via Guix-patches via
` (2 subsequent siblings)
6 siblings, 0 replies; 69+ messages in thread
From: Hilton Chain via Guix-patches via @ 2023-05-28 12:56 UTC (permalink / raw)
To: 63765; +Cc: Hilton Chain
* gnu/packages/tls.scm (mbedtls-apache-lts): Update to 2.28.3.
---
gnu/packages/tls.scm | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/gnu/packages/tls.scm b/gnu/packages/tls.scm
index 1e2b0fcc20..eb40e68de2 100644
--- a/gnu/packages/tls.scm
+++ b/gnu/packages/tls.scm
@@ -944,7 +944,7 @@ (define-public perl-crypt-openssl-random
(define-public mbedtls-apache-lts
(package
(name "mbedtls-apache")
- (version "2.28.0")
+ (version "2.28.3")
(source
(origin
(method git-fetch)
@@ -953,7 +953,7 @@ (define-public mbedtls-apache-lts
(commit (string-append "mbedtls-" version))))
(file-name (git-file-name name version))
(sha256
- (base32 "0s37dsi29v7146fi9k4frvx5rz2snxdm6c3rwq2fvnca2r80hfjl"))))
+ (base32 "177925jkr73x536g703vbxxamcyx9acvkp5iyb294icdn09ck5n3"))))
(build-system cmake-build-system)
(arguments
`(#:configure-flags
--
2.40.1
^ permalink raw reply related [flat|nested] 69+ messages in thread
* [bug#63765] [PATCH v2 6/8] gnu: Add mbedtls-apache, version 3.4.0.
2023-05-28 12:56 ` [bug#63765] [PATCH v2 1/8] gnu: Add ftest-for-utfcpp Hilton Chain via Guix-patches via
` (3 preceding siblings ...)
2023-05-28 12:56 ` [bug#63765] [PATCH v2 5/8] gnu: mbedtls-apache-lts: Update to 2.28.3 Hilton Chain via Guix-patches via
@ 2023-05-28 12:56 ` Hilton Chain via Guix-patches via
2023-05-28 12:56 ` [bug#63765] [PATCH v2 7/8] gnu: Add frozen Hilton Chain via Guix-patches via
2023-05-28 12:56 ` [bug#63765] [PATCH v2 8/8] gnu: python-lief: Update to 0.13.1 Hilton Chain via Guix-patches via
6 siblings, 0 replies; 69+ messages in thread
From: Hilton Chain via Guix-patches via @ 2023-05-28 12:56 UTC (permalink / raw)
To: 63765; +Cc: Hilton Chain
* gnu/packages/tls.scm (mbedtls-apache): New variable.
---
gnu/packages/tls.scm | 15 +++++++++++++++
1 file changed, 15 insertions(+)
diff --git a/gnu/packages/tls.scm b/gnu/packages/tls.scm
index eb40e68de2..40e25a4303 100644
--- a/gnu/packages/tls.scm
+++ b/gnu/packages/tls.scm
@@ -975,6 +975,21 @@ (define-public mbedtls-apache-lts
(home-page "https://www.trustedfirmware.org/projects/mbed-tls/")
(license license:asl2.0)))
+(define-public mbedtls-apache
+ (package
+ (inherit mbedtls-apache-lts)
+ (name "mbedtls-apache")
+ (version "3.4.0")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/ARMmbed/mbedtls")
+ (commit (string-append "mbedtls-" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "1y2mwkrvmadmjylyshpp6dnw328zc6l2cajdwrhkl4nmky33i06m"))))))
+
;; The Hiawatha Web server requires some specific features to be enabled.
(define-public mbedtls-for-hiawatha
(hidden-package
--
2.40.1
^ permalink raw reply related [flat|nested] 69+ messages in thread
* [bug#63765] [PATCH v2 7/8] gnu: Add frozen.
2023-05-28 12:56 ` [bug#63765] [PATCH v2 1/8] gnu: Add ftest-for-utfcpp Hilton Chain via Guix-patches via
` (4 preceding siblings ...)
2023-05-28 12:56 ` [bug#63765] [PATCH v2 6/8] gnu: Add mbedtls-apache, version 3.4.0 Hilton Chain via Guix-patches via
@ 2023-05-28 12:56 ` Hilton Chain via Guix-patches via
2023-05-28 12:56 ` [bug#63765] [PATCH v2 8/8] gnu: python-lief: Update to 0.13.1 Hilton Chain via Guix-patches via
6 siblings, 0 replies; 69+ messages in thread
From: Hilton Chain via Guix-patches via @ 2023-05-28 12:56 UTC (permalink / raw)
To: 63765; +Cc: Hilton Chain
* gnu/packages/cpp.scm (frozen): New variable.
---
gnu/packages/cpp.scm | 23 +++++++++++++++++++++++
1 file changed, 23 insertions(+)
diff --git a/gnu/packages/cpp.scm b/gnu/packages/cpp.scm
index 64f923929e..2049793b02 100644
--- a/gnu/packages/cpp.scm
+++ b/gnu/packages/cpp.scm
@@ -566,6 +566,29 @@ (define-public fifo-map
as ordering relation.")
(license license:expat)))
+(define-public frozen
+ (let ((commit "f6dbec6d03debc68d18ae3e2d32ff408c6d52468")
+ (revision "7"))
+ (package
+ (name "frozen")
+ (version (git-version "1.1.1" revision commit))
+ (source (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/serge-sans-paille/frozen")
+ (commit commit)))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "1yzxj8ia8fbdikb4hh4bc2iyr1fnl9cjllv8xgilzaivgiv7xmjk"))))
+ (build-system cmake-build-system)
+ (home-page "https://github.com/serge-sans-paille/frozen")
+ (synopsis "Header-only, constexpr alternative to gperf for C++14 users")
+ (description
+ "Frozen is a header-only library that provides 0 cost initialization
+for immutable containers, fixed-size containers, and various algorithms.")
+ (license license:asl2.0))))
+
(define-public json-dto
(package
(name "json-dto")
--
2.40.1
^ permalink raw reply related [flat|nested] 69+ messages in thread
* [bug#63765] [PATCH v2 8/8] gnu: python-lief: Update to 0.13.1.
2023-05-28 12:56 ` [bug#63765] [PATCH v2 1/8] gnu: Add ftest-for-utfcpp Hilton Chain via Guix-patches via
` (5 preceding siblings ...)
2023-05-28 12:56 ` [bug#63765] [PATCH v2 7/8] gnu: Add frozen Hilton Chain via Guix-patches via
@ 2023-05-28 12:56 ` Hilton Chain via Guix-patches via
6 siblings, 0 replies; 69+ messages in thread
From: Hilton Chain via Guix-patches via @ 2023-05-28 12:56 UTC (permalink / raw)
To: 63765; +Cc: Hilton Chain
* gnu/packages/python-xyz.scm (python-lief): Update to 0.13.1.
[snippet]: Unbundle third-party dependencies.
[build-system]: Change to cmake-build-system
[native-inputs]: Add python-minimal-wrapper, python-tomli.
Remove cmake.
[inputs]: Add frozen, mbedtls-apache, nlohmann-json, pybind11, utfcpp, spdlog.
[outputs]: Add "python" output.
[home-page]: Update homepage.
(shrinkwrap)[inputs]: Replace python-lief to its "python" output.
---
gnu/packages/python-xyz.scm | 96 +++++++++++++++++++++++++++++++------
1 file changed, 81 insertions(+), 15 deletions(-)
diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index f7e3f6f538..f46abaaf6c 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -208,6 +208,7 @@ (define-module (gnu packages python-xyz)
#:use-module (gnu packages libusb)
#:use-module (gnu packages linux)
#:use-module (gnu packages llvm)
+ #:use-module (gnu packages logging)
#:use-module (gnu packages machine-learning)
#:use-module (gnu packages man)
#:use-module (gnu packages markup)
@@ -32815,29 +32816,94 @@ (define-public python-misskey
(define-public python-lief
(package
(name "python-lief")
- (version "0.12.3")
+ (version "0.13.1")
(source (origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/lief-project/LIEF")
(commit version)))
(file-name (git-file-name name version))
+ (modules '((guix build utils)))
+ (snippet
+ '(begin
+ ;; Configure build for Python bindings.
+ (substitute* "api/python/config-default.toml"
+ (("(ninja = )true" all m)
+ (string-append m "false"))
+ (("(parallel-jobs = )0" all m)
+ (string-append m (number->string (parallel-job-count)))))
+ ;; Unbundle third-party dependencies.
+ (for-each delete-file
+ (find-files "third-party/"
+ (string-join '("spdlog"
+ "frozen"
+ "json"
+ "mbedtls"
+ "pybind11"
+ "utfcpp")
+ "|" )))
+ ;; Same in argument #:configure-flags.
+ (substitute* "api/python/setup.py"
+ (("self\\._get_third_party_opt\\(\\)")
+ "[\"-DLIEF_EXTERNAL_SPDLOG=ON\",
+ \"-DLIEF_OPT_FROZEN_EXTERNAL=ON\",
+ \"-DLIEF_OPT_MBEDTLS_EXTERNAL=ON\",
+ \"-DLIEF_OPT_NLOHMANN_JSON_EXTERNAL=ON\",
+ \"-DLIEF_OPT_PYBIND11_EXTERNAL=ON\",
+ \"-DLIEF_OPT_UTFCPP_EXTERNAL=ON\"]"))))
(sha256
(base32
- "11i6hqmcjh56y554kqhl61698n9v66j2qk1c1g63mv2w07h2z661"))))
- (build-system python-build-system)
- (native-inputs (list cmake))
+ "0ms6zsb6mm6jys8nbfl2nml4l2y1zcgy26639adznj4n7b8n7lxk"))))
+ (build-system cmake-build-system)
(arguments
- (list
- #:tests? #f ;needs network
- #:phases #~(modify-phases %standard-phases
- (replace 'build
- (lambda _
- (invoke
- "python" "setup.py" "--sdk" "build"
- (string-append
- "-j" (number->string (parallel-job-count)))))))))
- (home-page "https://github.com/lief-project/LIEF")
+ (list #:modules
+ '((guix build utils)
+ (guix build cmake-build-system)
+ ((guix build python-build-system) #:prefix python:))
+ #:imported-modules
+ (append %cmake-build-system-modules
+ '((guix build python-build-system)))
+ #:configure-flags
+ #~'("-DCMAKE_LINK_WHAT_YOU_USE=ON"
+ "-DBUILD_SHARED_LIBS=ON"
+ "-DLIEF_INSTALL_COMPILED_EXAMPLES=ON"
+ "-DLIEF_TESTS=ON"
+ ;; Unbundle third-party dependencies
+ "-DLIEF_EXTERNAL_SPDLOG=ON"
+ "-DLIEF_OPT_FROZEN_EXTERNAL=ON"
+ "-DLIEF_OPT_MBEDTLS_EXTERNAL=ON"
+ "-DLIEF_OPT_NLOHMANN_JSON_EXTERNAL=ON"
+ "-DLIEF_OPT_PYBIND11_EXTERNAL=ON"
+ "-DLIEF_OPT_UTFCPP_EXTERNAL=ON")
+ #:phases
+ ;; Phases from python-build-system, for Python bindings.
+ #~(modify-phases %standard-phases
+ (add-after 'install 'chdir
+ (lambda _
+ (chdir "../source/api/python/")))
+ (add-after 'chdir 'ensure-no-mtimes-pre-1980
+ (assoc-ref python:%standard-phases 'ensure-no-mtimes-pre-1980))
+ (add-after 'ensure-no-mtimes-pre-1980 'enable-bytecode-determinism
+ (assoc-ref python:%standard-phases 'enable-bytecode-determinism))
+ (add-after 'enable-bytecode-determinism 'ensure-no-cythonized-files
+ (assoc-ref python:%standard-phases 'ensure-no-cythonized-files))
+ (add-after 'ensure-no-cythonized-files 'python-install
+ (lambda* (#:key inputs outputs #:allow-other-keys)
+ ((assoc-ref python:%standard-phases 'install)
+ #:inputs inputs
+ #:outputs outputs
+ #:configure-flags '()
+ #:use-setuptools? #t)))
+ (add-after 'python-install 'add-install-to-pythonpath
+ (assoc-ref python:%standard-phases 'add-install-to-pythonpath))
+ (add-after 'add-install-to-pythonpath 'add-install-to-path
+ (assoc-ref python:%standard-phases 'add-install-to-path))
+ (add-after 'add-install-to-path 'python-wrap
+ (assoc-ref python:%standard-phases 'wrap)))))
+ (native-inputs (list python-minimal-wrapper python-tomli))
+ (inputs (list frozen mbedtls-apache nlohmann-json pybind11 utfcpp spdlog))
+ (outputs '("out" "python"))
+ (home-page "https://lief-project.github.io/")
(synopsis "Library to instrument executable formats")
(description
"@code{python-lief} is a cross platform library which can parse, modify
@@ -32885,7 +32951,7 @@ (define-public shrinkwrap
python-poetry-core
python-pypa-build
python-pytest))
- (inputs (list python-lief python-sh))
+ (inputs (list `(,python-lief "python") python-sh))
(home-page "https://github.com/fzakaria/shrinkwrap")
(synopsis "Emboss needed dependencies on the top level executable")
(description
--
2.40.1
^ permalink raw reply related [flat|nested] 69+ messages in thread
* [bug#63765] [PATCH v3 0/8] gnu: python-lief: Update to 0.13.2.
2023-05-28 8:07 ` [bug#63765] [PATCH 0/8] gnu: python-lief: Update to 0.13.0 Hilton Chain via Guix-patches via
2023-05-28 8:11 ` [bug#63765] [PATCH 1/8] gnu: Add ftest-for-utfcpp Hilton Chain via Guix-patches via
2023-05-28 12:54 ` [bug#63765] [PATCH v2 0/8] gnu: python-lief: Update to 0.13.1 Hilton Chain via Guix-patches via
@ 2023-06-23 6:24 ` Hilton Chain via Guix-patches via
2023-06-23 6:24 ` [bug#63765] [PATCH v3 1/8] gnu: Add ftest-for-utfcpp Hilton Chain via Guix-patches via
` (7 more replies)
2023-06-23 7:24 ` [bug#63765] ftest and utfcpp in issue 62473 reza via Guix-patches via
` (4 subsequent siblings)
7 siblings, 8 replies; 69+ messages in thread
From: Hilton Chain via Guix-patches via @ 2023-06-23 6:24 UTC (permalink / raw)
To: 63765; +Cc: Hilton Chain, Lars-Dominik Braun, jgart
v1/v2 -> v3:
* Update python-lief to 0.13.2
* Fix build for mkvtoolnix and warzone2100.
(Diff range from v2 to v3 attached at the end.)
Hilton Chain (8):
gnu: Add ftest-for-utfcpp.
gnu: utfcpp: Update to 3.2.3.
gnu: mbedtls-apache: Rename package to mbedtls-apache-lts.
gnu: mbedtls-apache-for-hiawatha: Use inherited source.
gnu: mbedtls-apache-lts: Update to 2.28.3.
gnu: Add mbedtls-apache, version 3.4.0.
gnu: Add frozen.
gnu: python-lief: Update to 0.13.2.
gnu/packages/cpp.scm | 23 ++++++++
gnu/packages/emulators.scm | 2 +-
gnu/packages/game-development.scm | 2 +-
gnu/packages/games.scm | 2 +-
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/python-xyz.scm | 96 ++++++++++++++++++++++++++-----
gnu/packages/search.scm | 2 +-
gnu/packages/textutils.scm | 34 ++++++-----
gnu/packages/tls.scm | 50 +++++++---------
gnu/packages/video.scm | 7 ++-
17 files changed, 166 insertions(+), 74 deletions(-)
base-commit: f25529b08e356f89ca7cecc44295085531a8faba
--
2.40.1
Diff range from v2 to v3:
diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm
index 83704dd720..9dbf5a3739 100644
--- a/gnu/packages/games.scm
+++ b/gnu/packages/games.scm
@@ -5510,7 +5510,7 @@ (define-public warzone2100
(lambda _
(substitute* "lib/framework/wzstring.cpp"
(("<utfcpp/source/utf8.h>")
- "<utf8.h>"))))
+ "<utf8cpp/utf8.h>"))))
(add-after 'unpack 'link-tests-with-qt
(lambda _
(substitute* "tests/Makefile.am"
diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index 901007bf4a..622867a499 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -33142,7 +33142,7 @@ (define-public python-misskey
(define-public python-lief
(package
(name "python-lief")
- (version "0.13.1")
+ (version "0.13.2")
(source (origin
(method git-fetch)
(uri (git-reference
@@ -33179,7 +33179,7 @@ (define-public python-lief
\"-DLIEF_OPT_UTFCPP_EXTERNAL=ON\"]"))))
(sha256
(base32
- "0ms6zsb6mm6jys8nbfl2nml4l2y1zcgy26639adznj4n7b8n7lxk"))))
+ "0y48x358ppig5xp97ahcphfipx7cg9chldj2q5zrmn610fmi4zll"))))
(build-system cmake-build-system)
(arguments
(list #:modules
diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm
index 49c7907260..1fe11dcc8a 100644
--- a/gnu/packages/video.scm
+++ b/gnu/packages/video.scm
@@ -1048,6 +1048,11 @@ (define-public mkvtoolnix
"--enable-precompiled-headers=no")
#:phases
(modify-phases %standard-phases
+ (add-after 'unpack 'fix-utfcpp-include
+ (lambda _
+ (substitute* "src/common/strings/utf8.cpp"
+ (("<utf8.h>")
+ "<utf8cpp/utf8.h>"))))
(add-after 'unpack 'patch-relative-file-names
(lambda* (#:key outputs #:allow-other-keys)
(let ((out (assoc-ref outputs "out")))
^ permalink raw reply related [flat|nested] 69+ messages in thread
* [bug#63765] [PATCH v3 1/8] gnu: Add ftest-for-utfcpp.
2023-06-23 6:24 ` [bug#63765] [PATCH v3 0/8] gnu: python-lief: Update to 0.13.2 Hilton Chain via Guix-patches via
@ 2023-06-23 6:24 ` Hilton Chain via Guix-patches via
2023-06-23 6:24 ` [bug#63765] [PATCH v3 2/8] gnu: utfcpp: Update to 3.2.3 Hilton Chain via Guix-patches via
` (6 subsequent siblings)
7 siblings, 0 replies; 69+ messages in thread
From: Hilton Chain via Guix-patches via @ 2023-06-23 6:24 UTC (permalink / raw)
To: 63765; +Cc: Hilton Chain
* gnu/packages/textutils.scm (ftest-for-utfcpp): New variable.
---
gnu/packages/textutils.scm | 14 ++++++++++++++
1 file changed, 14 insertions(+)
diff --git a/gnu/packages/textutils.scm b/gnu/packages/textutils.scm
index 51df3748cd..26d0234390 100644
--- a/gnu/packages/textutils.scm
+++ b/gnu/packages/textutils.scm
@@ -684,6 +684,20 @@ (define-public catdoc
@command{catppt}, which extracts data from PowerPoint presentations.")
(license license:gpl2+)))
+(define ftest-for-utfcpp
+ (let* ((commit "c4ad4af0946b73ce1a40cbc72205d15d196c7e06")
+ (revision "0")
+ (version (git-version "0" revision commit)))
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/nemtrif/ftest")
+ (commit commit)))
+ (file-name (git-file-name "ftest-for-utfcpp" version))
+ (sha256
+ (base32
+ "1jcd76zjhx5f2nsi80hj7gmywgpz1f7vcw8lv5yf7gx0l99dn86x")))))
+
(define-public utfcpp
(package
(name "utfcpp")
--
2.40.1
^ permalink raw reply related [flat|nested] 69+ messages in thread
* [bug#63765] [PATCH v3 2/8] gnu: utfcpp: Update to 3.2.3.
2023-06-23 6:24 ` [bug#63765] [PATCH v3 0/8] gnu: python-lief: Update to 0.13.2 Hilton Chain via Guix-patches via
2023-06-23 6:24 ` [bug#63765] [PATCH v3 1/8] gnu: Add ftest-for-utfcpp Hilton Chain via Guix-patches via
@ 2023-06-23 6:24 ` Hilton Chain via Guix-patches via
2023-06-23 6:24 ` [bug#63765] [PATCH v3 3/8] gnu: mbedtls-apache: Rename package to mbedtls-apache-lts Hilton Chain via Guix-patches via
` (5 subsequent siblings)
7 siblings, 0 replies; 69+ messages in thread
From: Hilton Chain via Guix-patches via @ 2023-06-23 6:24 UTC (permalink / raw)
To: 63765; +Cc: Hilton Chain, Liliana Marie Prikler, 宋文武
* gnu/packages/textutils.scm (utfcpp): Update to 3.2.3.
[arguments]: Remove arguments, then...
<#:phases>: ...Add 'unpack-ftest.
* gnu/packages/games.scm (warzone2100)<#:phases>: Adjust 'fix-utfcpp-include.
* gnu/packages/video.scm (mkvtoolnix)<#:phases>: Add 'fix-utfcpp-include.
---
gnu/packages/games.scm | 2 +-
gnu/packages/textutils.scm | 20 +++++++-------------
gnu/packages/video.scm | 5 +++++
3 files changed, 13 insertions(+), 14 deletions(-)
diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm
index 83704dd720..9dbf5a3739 100644
--- a/gnu/packages/games.scm
+++ b/gnu/packages/games.scm
@@ -5510,7 +5510,7 @@ (define-public warzone2100
(lambda _
(substitute* "lib/framework/wzstring.cpp"
(("<utfcpp/source/utf8.h>")
- "<utf8.h>"))))
+ "<utf8cpp/utf8.h>"))))
(add-after 'unpack 'link-tests-with-qt
(lambda _
(substitute* "tests/Makefile.am"
diff --git a/gnu/packages/textutils.scm b/gnu/packages/textutils.scm
index 26d0234390..81b403d559 100644
--- a/gnu/packages/textutils.scm
+++ b/gnu/packages/textutils.scm
@@ -701,7 +701,7 @@ (define ftest-for-utfcpp
(define-public utfcpp
(package
(name "utfcpp")
- (version "2.3.5")
+ (version "3.2.3")
(source (origin
(method git-fetch)
(uri (git-reference
@@ -710,20 +710,14 @@ (define-public utfcpp
(file-name (git-file-name name version))
(sha256
(base32
- "1gr98d826z6wa58r1s5i7rz7q2x3r31v7zj0pjjlrc7gfxwklr4s"))))
+ "00hzh39iddbc6nxg13813qd6d55g2kccwjf5dr96wykfhway9wbr"))))
(build-system cmake-build-system)
(arguments
- `(#:out-of-source? #f
- #:phases
- (modify-phases %standard-phases
- (replace 'install ; no install target
- (lambda* (#:key outputs #:allow-other-keys)
- (let* ((out (assoc-ref outputs "out"))
- (include (string-append out "/include"))
- (doc (string-append out "/share/doc/" ,name)))
- (copy-recursively "source" include)
- (install-file "README.md" doc)
- #t))))))
+ (list #:phases
+ #~(modify-phases %standard-phases
+ (add-after 'unpack 'unpack-ftest
+ (lambda* (#:key native-inputs #:allow-other-keys)
+ (copy-recursively #$ftest-for-utfcpp "extern/ftest"))))))
(home-page "https://github.com/nemtrif/utfcpp")
(synopsis "Portable C++ library for handling UTF-8")
(description "UTF8-CPP is a C++ library for handling UTF-8 encoded text
diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm
index 55eab972b9..43ae3899f9 100644
--- a/gnu/packages/video.scm
+++ b/gnu/packages/video.scm
@@ -1048,6 +1048,11 @@ (define-public mkvtoolnix
"--enable-precompiled-headers=no")
#:phases
(modify-phases %standard-phases
+ (add-after 'unpack 'fix-utfcpp-include
+ (lambda _
+ (substitute* "src/common/strings/utf8.cpp"
+ (("<utf8.h>")
+ "<utf8cpp/utf8.h>"))))
(add-after 'unpack 'patch-relative-file-names
(lambda* (#:key outputs #:allow-other-keys)
(let ((out (assoc-ref outputs "out")))
--
2.40.1
^ permalink raw reply related [flat|nested] 69+ messages in thread
* [bug#63765] [PATCH v3 3/8] gnu: mbedtls-apache: Rename package to mbedtls-apache-lts.
2023-06-23 6:24 ` [bug#63765] [PATCH v3 0/8] gnu: python-lief: Update to 0.13.2 Hilton Chain via Guix-patches via
2023-06-23 6:24 ` [bug#63765] [PATCH v3 1/8] gnu: Add ftest-for-utfcpp Hilton Chain via Guix-patches via
2023-06-23 6:24 ` [bug#63765] [PATCH v3 2/8] gnu: utfcpp: Update to 3.2.3 Hilton Chain via Guix-patches via
@ 2023-06-23 6:24 ` Hilton Chain via Guix-patches via
2023-06-26 18:59 ` Liliana Marie Prikler
2023-06-23 6:24 ` [bug#63765] [PATCH v3 4/8] gnu: mbedtls-apache-for-hiawatha: Use inherited source Hilton Chain via Guix-patches via
` (4 subsequent siblings)
7 siblings, 1 reply; 69+ messages in thread
From: Hilton Chain via Guix-patches via @ 2023-06-23 6:24 UTC (permalink / raw)
To: 63765
Cc: Hilton Chain, Efraim Flashner, Leo Famulari,
Liliana Marie Prikler, Simon Tournier, Tobias Geerinckx-Rice,
宋文武
* gnu/packages/tls.scm (mbedtls-apache-lts): New variable, formerly known as
"mbedtls-apache".
---
gnu/packages/emulators.scm | 2 +-
gnu/packages/game-development.scm | 2 +-
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, 18 insertions(+), 18 deletions(-)
diff --git a/gnu/packages/emulators.scm b/gnu/packages/emulators.scm
index be76f81ff4..52921e79a6 100644
--- a/gnu/packages/emulators.scm
+++ b/gnu/packages/emulators.scm
@@ -341,7 +341,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 aa99109cca..4131b85a20 100644
--- a/gnu/packages/game-development.scm
+++ b/gnu/packages/game-development.scm
@@ -1964,7 +1964,7 @@ (define-public godot
libxi
libxinerama
libxrandr
- mbedtls-apache
+ mbedtls-apache-lts
mesa
opusfile
pcre2
diff --git a/gnu/packages/hardware.scm b/gnu/packages/hardware.scm
index c23299d1db..d1ad38adbd 100644
--- a/gnu/packages/hardware.scm
+++ b/gnu/packages/hardware.scm
@@ -703,7 +703,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:
@@ -1069,7 +1069,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 b31bb6b11a..d442787d97 100644
--- a/gnu/packages/irc.scm
+++ b/gnu/packages/irc.scm
@@ -748,7 +748,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 2320b03595..78ec186bf2 100644
--- a/gnu/packages/julia-jll.scm
+++ b/gnu/packages/julia-jll.scm
@@ -1404,7 +1404,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 ba54175822..82891525c2 100644
--- a/gnu/packages/julia.scm
+++ b/gnu/packages/julia.scm
@@ -511,7 +511,7 @@ (define-public julia
("libunwind" ,libunwind-julia)
("libuv" ,libuv-julia)
("llvm" ,llvm-julia)
- ("mbedtls-apache" ,mbedtls-apache)
+ ("mbedtls-apache" ,mbedtls-apache-lts)
("mpfr" ,mpfr)
("openblas" ,openblas)
("openlibm" ,openlibm)
diff --git a/gnu/packages/linphone.scm b/gnu/packages/linphone.scm
index 7d87ee602c..f26c5efd3c 100644
--- a/gnu/packages/linphone.scm
+++ b/gnu/packages/linphone.scm
@@ -188,7 +188,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 52fb883467..c13f220613 100644
--- a/gnu/packages/linux.scm
+++ b/gnu/packages/linux.scm
@@ -2262,7 +2262,7 @@ (define-public dislocker
(build-system cmake-build-system)
(arguments
'(#:tests? #f)) ;no test suite
- (inputs (list fuse mbedtls-apache))
+ (inputs (list fuse 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 b0cdcdf6a3..58f8249a36 100644
--- a/gnu/packages/networking.scm
+++ b/gnu/packages/networking.scm
@@ -822,7 +822,7 @@ (define-public nng
(native-inputs
`(("ksh" ,oksh)))
(inputs
- `(("mbedtls" ,mbedtls-apache)))
+ `(("mbedtls" ,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 3e3e8e00c6..a0640799bc 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 140932a809..fdf9121a6d 100644
--- a/gnu/packages/tls.scm
+++ b/gnu/packages/tls.scm
@@ -940,7 +940,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
@@ -980,7 +980,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
@@ -1002,7 +1002,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 43ae3899f9..1fe11dcc8a 100644
--- a/gnu/packages/video.scm
+++ b/gnu/packages/video.scm
@@ -3456,7 +3456,7 @@ (define-public obs
libxcomposite
libxkbcommon
luajit
- mbedtls-apache
+ mbedtls-apache-lts
mesa
pciutils
pipewire
--
2.40.1
^ permalink raw reply related [flat|nested] 69+ messages in thread
* [bug#63765] [PATCH v3 4/8] gnu: mbedtls-apache-for-hiawatha: Use inherited source.
2023-06-23 6:24 ` [bug#63765] [PATCH v3 0/8] gnu: python-lief: Update to 0.13.2 Hilton Chain via Guix-patches via
` (2 preceding siblings ...)
2023-06-23 6:24 ` [bug#63765] [PATCH v3 3/8] gnu: mbedtls-apache: Rename package to mbedtls-apache-lts Hilton Chain via Guix-patches via
@ 2023-06-23 6:24 ` Hilton Chain via Guix-patches via
2023-06-23 6:24 ` [bug#63765] [PATCH v3 5/8] gnu: mbedtls-apache-lts: Update to 2.28.3 Hilton Chain via Guix-patches via
` (3 subsequent siblings)
7 siblings, 0 replies; 69+ messages in thread
From: Hilton Chain via Guix-patches via @ 2023-06-23 6:24 UTC (permalink / raw)
To: 63765; +Cc: Hilton Chain
* gnu/packages/tls.scm (mbedtls-apache-for-hiawatha): Use inherited source.
[arguments]<#:phases>: Keep "-Wformat-signedness".
---
gnu/packages/tls.scm | 25 -------------------------
1 file changed, 25 deletions(-)
diff --git a/gnu/packages/tls.scm b/gnu/packages/tls.scm
index fdf9121a6d..6d2dc8d0c3 100644
--- a/gnu/packages/tls.scm
+++ b/gnu/packages/tls.scm
@@ -943,8 +943,6 @@ (define-public perl-crypt-openssl-random
(define-public mbedtls-apache-lts
(package
(name "mbedtls-apache")
- ;; XXX Check whether ‘-Wformat-signedness’ still breaks mbedtls-for-hiawatha
- ;; when updating.
(version "2.28.0")
(source
(origin
@@ -981,26 +979,6 @@ (define-public mbedtls-for-hiawatha
(hidden-package
(package
(inherit mbedtls-apache-lts)
- (name "mbedtls-apache")
- (version "2.26.0")
- (source
- (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/ARMmbed/mbedtls")
- (commit (string-append "mbedtls-" version))))
- (sha256
- (base32 "0scwpmrgvg6q7rvqkc352d2fqlsx0aylcbyibcp1f1rsn8iiif2m"))
- (file-name (git-file-name name version))
- (modules '((guix build utils)))
- (snippet
- '(begin
- ;; Can be removed with the next version.
- ;; Reduce level of format truncation warnings due to false positives.
- ;; https://github.com/ARMmbed/mbedtls/commit/2065a8d8af27c6cb1e40c9462b5933336dca7434
- (substitute* "CMakeLists.txt"
- (("Wformat-truncation=2") "Wformat-truncation"))
- #t))))
(arguments
(substitute-keyword-arguments (package-arguments mbedtls-apache-lts)
((#:phases phases)
@@ -1011,9 +989,6 @@ (define-public mbedtls-for-hiawatha
(invoke "scripts/config.pl" "set" feature))
(list "MBEDTLS_THREADING_C"
"MBEDTLS_THREADING_PTHREAD"))
- ;; XXX The above enables code that breaks with -Werror…
- (substitute* "CMakeLists.txt"
- ((" -Wformat-signedness") ""))
#t)))))))))
(define-public dehydrated
--
2.40.1
^ permalink raw reply related [flat|nested] 69+ messages in thread
* [bug#63765] [PATCH v3 5/8] gnu: mbedtls-apache-lts: Update to 2.28.3.
2023-06-23 6:24 ` [bug#63765] [PATCH v3 0/8] gnu: python-lief: Update to 0.13.2 Hilton Chain via Guix-patches via
` (3 preceding siblings ...)
2023-06-23 6:24 ` [bug#63765] [PATCH v3 4/8] gnu: mbedtls-apache-for-hiawatha: Use inherited source Hilton Chain via Guix-patches via
@ 2023-06-23 6:24 ` Hilton Chain via Guix-patches via
2023-06-23 6:24 ` [bug#63765] [PATCH v3 6/8] gnu: Add mbedtls-apache, version 3.4.0 Hilton Chain via Guix-patches via
` (2 subsequent siblings)
7 siblings, 0 replies; 69+ messages in thread
From: Hilton Chain via Guix-patches via @ 2023-06-23 6:24 UTC (permalink / raw)
To: 63765; +Cc: Hilton Chain
* gnu/packages/tls.scm (mbedtls-apache-lts): Update to 2.28.3.
---
gnu/packages/tls.scm | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/gnu/packages/tls.scm b/gnu/packages/tls.scm
index 6d2dc8d0c3..f23058f4a7 100644
--- a/gnu/packages/tls.scm
+++ b/gnu/packages/tls.scm
@@ -943,7 +943,7 @@ (define-public perl-crypt-openssl-random
(define-public mbedtls-apache-lts
(package
(name "mbedtls-apache")
- (version "2.28.0")
+ (version "2.28.3")
(source
(origin
(method git-fetch)
@@ -952,7 +952,7 @@ (define-public mbedtls-apache-lts
(commit (string-append "mbedtls-" version))))
(file-name (git-file-name name version))
(sha256
- (base32 "0s37dsi29v7146fi9k4frvx5rz2snxdm6c3rwq2fvnca2r80hfjl"))))
+ (base32 "177925jkr73x536g703vbxxamcyx9acvkp5iyb294icdn09ck5n3"))))
(build-system cmake-build-system)
(arguments
`(#:configure-flags
--
2.40.1
^ permalink raw reply related [flat|nested] 69+ messages in thread
* [bug#63765] [PATCH v3 6/8] gnu: Add mbedtls-apache, version 3.4.0.
2023-06-23 6:24 ` [bug#63765] [PATCH v3 0/8] gnu: python-lief: Update to 0.13.2 Hilton Chain via Guix-patches via
` (4 preceding siblings ...)
2023-06-23 6:24 ` [bug#63765] [PATCH v3 5/8] gnu: mbedtls-apache-lts: Update to 2.28.3 Hilton Chain via Guix-patches via
@ 2023-06-23 6:24 ` Hilton Chain via Guix-patches via
2023-06-23 6:24 ` [bug#63765] [PATCH v3 7/8] gnu: Add frozen Hilton Chain via Guix-patches via
2023-06-23 6:24 ` [bug#63765] [PATCH v3 8/8] gnu: python-lief: Update to 0.13.2 Hilton Chain via Guix-patches via
7 siblings, 0 replies; 69+ messages in thread
From: Hilton Chain via Guix-patches via @ 2023-06-23 6:24 UTC (permalink / raw)
To: 63765; +Cc: Hilton Chain
* gnu/packages/tls.scm (mbedtls-apache): New variable.
---
gnu/packages/tls.scm | 15 +++++++++++++++
1 file changed, 15 insertions(+)
diff --git a/gnu/packages/tls.scm b/gnu/packages/tls.scm
index f23058f4a7..05ec84dab5 100644
--- a/gnu/packages/tls.scm
+++ b/gnu/packages/tls.scm
@@ -974,6 +974,21 @@ (define-public mbedtls-apache-lts
(home-page "https://www.trustedfirmware.org/projects/mbed-tls/")
(license license:asl2.0)))
+(define-public mbedtls-apache
+ (package
+ (inherit mbedtls-apache-lts)
+ (name "mbedtls-apache")
+ (version "3.4.0")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/ARMmbed/mbedtls")
+ (commit (string-append "mbedtls-" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "1y2mwkrvmadmjylyshpp6dnw328zc6l2cajdwrhkl4nmky33i06m"))))))
+
;; The Hiawatha Web server requires some specific features to be enabled.
(define-public mbedtls-for-hiawatha
(hidden-package
--
2.40.1
^ permalink raw reply related [flat|nested] 69+ messages in thread
* [bug#63765] [PATCH v3 7/8] gnu: Add frozen.
2023-06-23 6:24 ` [bug#63765] [PATCH v3 0/8] gnu: python-lief: Update to 0.13.2 Hilton Chain via Guix-patches via
` (5 preceding siblings ...)
2023-06-23 6:24 ` [bug#63765] [PATCH v3 6/8] gnu: Add mbedtls-apache, version 3.4.0 Hilton Chain via Guix-patches via
@ 2023-06-23 6:24 ` Hilton Chain via Guix-patches via
2023-06-23 6:24 ` [bug#63765] [PATCH v3 8/8] gnu: python-lief: Update to 0.13.2 Hilton Chain via Guix-patches via
7 siblings, 0 replies; 69+ messages in thread
From: Hilton Chain via Guix-patches via @ 2023-06-23 6:24 UTC (permalink / raw)
To: 63765; +Cc: Hilton Chain
* gnu/packages/cpp.scm (frozen): New variable.
---
gnu/packages/cpp.scm | 23 +++++++++++++++++++++++
1 file changed, 23 insertions(+)
diff --git a/gnu/packages/cpp.scm b/gnu/packages/cpp.scm
index 39a34c20dd..63ac700760 100644
--- a/gnu/packages/cpp.scm
+++ b/gnu/packages/cpp.scm
@@ -567,6 +567,29 @@ (define-public fifo-map
as ordering relation.")
(license license:expat)))
+(define-public frozen
+ (let ((commit "f6dbec6d03debc68d18ae3e2d32ff408c6d52468")
+ (revision "7"))
+ (package
+ (name "frozen")
+ (version (git-version "1.1.1" revision commit))
+ (source (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/serge-sans-paille/frozen")
+ (commit commit)))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "1yzxj8ia8fbdikb4hh4bc2iyr1fnl9cjllv8xgilzaivgiv7xmjk"))))
+ (build-system cmake-build-system)
+ (home-page "https://github.com/serge-sans-paille/frozen")
+ (synopsis "Header-only, constexpr alternative to gperf for C++14 users")
+ (description
+ "Frozen is a header-only library that provides 0 cost initialization
+for immutable containers, fixed-size containers, and various algorithms.")
+ (license license:asl2.0))))
+
(define-public json-dto
(package
(name "json-dto")
--
2.40.1
^ permalink raw reply related [flat|nested] 69+ messages in thread
* [bug#63765] [PATCH v3 8/8] gnu: python-lief: Update to 0.13.2.
2023-06-23 6:24 ` [bug#63765] [PATCH v3 0/8] gnu: python-lief: Update to 0.13.2 Hilton Chain via Guix-patches via
` (6 preceding siblings ...)
2023-06-23 6:24 ` [bug#63765] [PATCH v3 7/8] gnu: Add frozen Hilton Chain via Guix-patches via
@ 2023-06-23 6:24 ` Hilton Chain via Guix-patches via
7 siblings, 0 replies; 69+ messages in thread
From: Hilton Chain via Guix-patches via @ 2023-06-23 6:24 UTC (permalink / raw)
To: 63765; +Cc: Hilton Chain, Lars-Dominik Braun, jgart
* gnu/packages/python-xyz.scm (python-lief): Update to 0.13.2.
[snippet]: Unbundle third-party dependencies.
[build-system]: Change to cmake-build-system
[native-inputs]: Add python-minimal-wrapper, python-tomli.
Remove cmake.
[inputs]: Add frozen, mbedtls-apache, nlohmann-json, pybind11, utfcpp, spdlog.
[outputs]: Add "python" output.
[home-page]: Update homepage.
(shrinkwrap)[inputs]: Replace python-lief to its "python" output.
---
gnu/packages/python-xyz.scm | 96 +++++++++++++++++++++++++++++++------
1 file changed, 81 insertions(+), 15 deletions(-)
diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index b650b71f3b..622867a499 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -212,6 +212,7 @@ (define-module (gnu packages python-xyz)
#:use-module (gnu packages libusb)
#:use-module (gnu packages linux)
#:use-module (gnu packages llvm)
+ #:use-module (gnu packages logging)
#:use-module (gnu packages machine-learning)
#:use-module (gnu packages man)
#:use-module (gnu packages markup)
@@ -33141,29 +33142,94 @@ (define-public python-misskey
(define-public python-lief
(package
(name "python-lief")
- (version "0.12.3")
+ (version "0.13.2")
(source (origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/lief-project/LIEF")
(commit version)))
(file-name (git-file-name name version))
+ (modules '((guix build utils)))
+ (snippet
+ '(begin
+ ;; Configure build for Python bindings.
+ (substitute* "api/python/config-default.toml"
+ (("(ninja = )true" all m)
+ (string-append m "false"))
+ (("(parallel-jobs = )0" all m)
+ (string-append m (number->string (parallel-job-count)))))
+ ;; Unbundle third-party dependencies.
+ (for-each delete-file
+ (find-files "third-party/"
+ (string-join '("spdlog"
+ "frozen"
+ "json"
+ "mbedtls"
+ "pybind11"
+ "utfcpp")
+ "|" )))
+ ;; Same in argument #:configure-flags.
+ (substitute* "api/python/setup.py"
+ (("self\\._get_third_party_opt\\(\\)")
+ "[\"-DLIEF_EXTERNAL_SPDLOG=ON\",
+ \"-DLIEF_OPT_FROZEN_EXTERNAL=ON\",
+ \"-DLIEF_OPT_MBEDTLS_EXTERNAL=ON\",
+ \"-DLIEF_OPT_NLOHMANN_JSON_EXTERNAL=ON\",
+ \"-DLIEF_OPT_PYBIND11_EXTERNAL=ON\",
+ \"-DLIEF_OPT_UTFCPP_EXTERNAL=ON\"]"))))
(sha256
(base32
- "11i6hqmcjh56y554kqhl61698n9v66j2qk1c1g63mv2w07h2z661"))))
- (build-system python-build-system)
- (native-inputs (list cmake))
+ "0y48x358ppig5xp97ahcphfipx7cg9chldj2q5zrmn610fmi4zll"))))
+ (build-system cmake-build-system)
(arguments
- (list
- #:tests? #f ;needs network
- #:phases #~(modify-phases %standard-phases
- (replace 'build
- (lambda _
- (invoke
- "python" "setup.py" "--sdk" "build"
- (string-append
- "-j" (number->string (parallel-job-count)))))))))
- (home-page "https://github.com/lief-project/LIEF")
+ (list #:modules
+ '((guix build utils)
+ (guix build cmake-build-system)
+ ((guix build python-build-system) #:prefix python:))
+ #:imported-modules
+ (append %cmake-build-system-modules
+ '((guix build python-build-system)))
+ #:configure-flags
+ #~'("-DCMAKE_LINK_WHAT_YOU_USE=ON"
+ "-DBUILD_SHARED_LIBS=ON"
+ "-DLIEF_INSTALL_COMPILED_EXAMPLES=ON"
+ "-DLIEF_TESTS=ON"
+ ;; Unbundle third-party dependencies
+ "-DLIEF_EXTERNAL_SPDLOG=ON"
+ "-DLIEF_OPT_FROZEN_EXTERNAL=ON"
+ "-DLIEF_OPT_MBEDTLS_EXTERNAL=ON"
+ "-DLIEF_OPT_NLOHMANN_JSON_EXTERNAL=ON"
+ "-DLIEF_OPT_PYBIND11_EXTERNAL=ON"
+ "-DLIEF_OPT_UTFCPP_EXTERNAL=ON")
+ #:phases
+ ;; Phases from python-build-system, for Python bindings.
+ #~(modify-phases %standard-phases
+ (add-after 'install 'chdir
+ (lambda _
+ (chdir "../source/api/python/")))
+ (add-after 'chdir 'ensure-no-mtimes-pre-1980
+ (assoc-ref python:%standard-phases 'ensure-no-mtimes-pre-1980))
+ (add-after 'ensure-no-mtimes-pre-1980 'enable-bytecode-determinism
+ (assoc-ref python:%standard-phases 'enable-bytecode-determinism))
+ (add-after 'enable-bytecode-determinism 'ensure-no-cythonized-files
+ (assoc-ref python:%standard-phases 'ensure-no-cythonized-files))
+ (add-after 'ensure-no-cythonized-files 'python-install
+ (lambda* (#:key inputs outputs #:allow-other-keys)
+ ((assoc-ref python:%standard-phases 'install)
+ #:inputs inputs
+ #:outputs outputs
+ #:configure-flags '()
+ #:use-setuptools? #t)))
+ (add-after 'python-install 'add-install-to-pythonpath
+ (assoc-ref python:%standard-phases 'add-install-to-pythonpath))
+ (add-after 'add-install-to-pythonpath 'add-install-to-path
+ (assoc-ref python:%standard-phases 'add-install-to-path))
+ (add-after 'add-install-to-path 'python-wrap
+ (assoc-ref python:%standard-phases 'wrap)))))
+ (native-inputs (list python-minimal-wrapper python-tomli))
+ (inputs (list frozen mbedtls-apache nlohmann-json pybind11 utfcpp spdlog))
+ (outputs '("out" "python"))
+ (home-page "https://lief-project.github.io/")
(synopsis "Library to instrument executable formats")
(description
"@code{python-lief} is a cross platform library which can parse, modify
@@ -33211,7 +33277,7 @@ (define-public shrinkwrap
python-poetry-core
python-pypa-build
python-pytest))
- (inputs (list python-lief python-sh))
+ (inputs (list `(,python-lief "python") python-sh))
(home-page "https://github.com/fzakaria/shrinkwrap")
(synopsis "Emboss needed dependencies on the top level executable")
(description
--
2.40.1
^ permalink raw reply related [flat|nested] 69+ messages in thread
* [bug#63765] ftest and utfcpp in issue 62473
2023-05-28 8:07 ` [bug#63765] [PATCH 0/8] gnu: python-lief: Update to 0.13.0 Hilton Chain via Guix-patches via
` (2 preceding siblings ...)
2023-06-23 6:24 ` [bug#63765] [PATCH v3 0/8] gnu: python-lief: Update to 0.13.2 Hilton Chain via Guix-patches via
@ 2023-06-23 7:24 ` reza via Guix-patches via
2023-06-23 7:39 ` Hilton Chain via Guix-patches via
2023-06-23 15:33 ` [bug#63765] [PATCH 0/2] gnu: utfcpp: Update to 3.2.3 Hilton Chain via Guix-patches via
` (3 subsequent siblings)
7 siblings, 1 reply; 69+ messages in thread
From: reza via Guix-patches via @ 2023-06-23 7:24 UTC (permalink / raw)
To: 63765
[-- Attachment #1: Type: text/plain, Size: 204 bytes --]
Hi Hilton
I just saw your patch set with ftest and the updated utfcpp. I did
something similar in my issue here https://issues.guix.gnu.org/62473,
maybe we can merge this two approaches?
Cheers,
Reza
[-- Attachment #2: OpenPGP_0xC375C6AF05125C52.asc --]
[-- Type: application/pgp-keys, Size: 15557 bytes --]
[-- Attachment #3: OpenPGP_signature --]
[-- Type: application/pgp-signature, Size: 499 bytes --]
^ permalink raw reply [flat|nested] 69+ messages in thread
* [bug#63765] ftest and utfcpp in issue 62473
2023-06-23 7:24 ` [bug#63765] ftest and utfcpp in issue 62473 reza via Guix-patches via
@ 2023-06-23 7:39 ` Hilton Chain via Guix-patches via
[not found] ` <d4281dd0-6488-00bd-1ee0-8d92a1104c67@housseini.me>
0 siblings, 1 reply; 69+ messages in thread
From: Hilton Chain via Guix-patches via @ 2023-06-23 7:39 UTC (permalink / raw)
To: reza; +Cc: 63765
Hi Reza
On Fri, 23 Jun 2023 15:24:43 +0800,
reza via Guix-patches via wrote:
> I just saw your patch set with ftest and the updated utfcpp. I did
> something similar in my issue here https://issues.guix.gnu.org/62473,
> maybe we can merge this two approaches?
Adding the build fixes to your patchset and make my patchset depend on yours?
Or a new patchset for updating utfcpp? I'm OK with either.
^ permalink raw reply [flat|nested] 69+ messages in thread
* [bug#63765] ftest and utfcpp in issue 62473
[not found] ` <d4281dd0-6488-00bd-1ee0-8d92a1104c67@housseini.me>
@ 2023-06-23 7:58 ` reza via Guix-patches via
0 siblings, 0 replies; 69+ messages in thread
From: reza via Guix-patches via @ 2023-06-23 7:58 UTC (permalink / raw)
To: Hilton Chain; +Cc: 63765
[-- Attachment #1: Type: text/plain, Size: 277 bytes --]
Hi Hilton
> Adding the build fixes to your patchset and make my patchset depend on yours?
> Or a new patchset for updating utfcpp? I'm OK with either.
I would suggest a new patchset for updating utfcpp, as my patchset is
still a work in progress.
Cheers,
Reza
[-- Attachment #2: OpenPGP_0xC375C6AF05125C52.asc --]
[-- Type: application/pgp-keys, Size: 15557 bytes --]
[-- Attachment #3: OpenPGP_signature --]
[-- Type: application/pgp-signature, Size: 499 bytes --]
^ permalink raw reply [flat|nested] 69+ messages in thread
* [bug#63765] [PATCH 0/2] gnu: utfcpp: Update to 3.2.3
2023-05-28 8:07 ` [bug#63765] [PATCH 0/8] gnu: python-lief: Update to 0.13.0 Hilton Chain via Guix-patches via
` (3 preceding siblings ...)
2023-06-23 7:24 ` [bug#63765] ftest and utfcpp in issue 62473 reza via Guix-patches via
@ 2023-06-23 15:33 ` Hilton Chain via Guix-patches via
2023-06-23 15:35 ` [bug#64255] [PATCH 1/2] gnu: Add ftest Hilton Chain via Guix-patches via
` (4 more replies)
2023-06-28 18:33 ` [bug#63765] [PATCH v4 0/6] gnu: python-lief: Update to 0.13.2 Hilton Chain via Guix-patches via
` (2 subsequent siblings)
7 siblings, 5 replies; 69+ messages in thread
From: Hilton Chain via Guix-patches via @ 2023-06-23 15:33 UTC (permalink / raw)
To: 63765; +Cc: hako, 62473, Liliana Marie Prikler, 宋文武
This patchset:
* Updates utfcpp to 3.2.3.
* Unbundles its test framework ftest as a new package used in the native-inputs.
* Fixes build issues caused by utfcpp's include path change.
The patchset is a split from both #62473 and #63765 since they have a common
procedure to update utfcpp.
As utfcpp has less dependents, it might be better to get this applied first.
For #63765, there's no change besides "utfcpp update" removal, so I'll keep the
current version before reviews or the QA process.
Reza Housseini (2):
gnu: Add ftest.
gnu: utfcpp: Update to 3.2.3.
gnu/packages/check.scm | 41 ++++++++++++++++++++++++++++++++++++++
gnu/packages/games.scm | 2 +-
gnu/packages/textutils.scm | 27 ++++++++++++-------------
gnu/packages/video.scm | 5 +++++
4 files changed, 60 insertions(+), 15 deletions(-)
base-commit: f25529b08e356f89ca7cecc44295085531a8faba
--
2.40.1
^ permalink raw reply [flat|nested] 69+ messages in thread
* [bug#64255] [PATCH 1/2] gnu: Add ftest.
2023-06-23 15:33 ` [bug#63765] [PATCH 0/2] gnu: utfcpp: Update to 3.2.3 Hilton Chain via Guix-patches via
@ 2023-06-23 15:35 ` Hilton Chain via Guix-patches via
2023-06-23 15:35 ` [bug#64255] [PATCH 2/2] gnu: utfcpp: Update to 3.2.3 Hilton Chain via Guix-patches via
` (3 subsequent siblings)
4 siblings, 0 replies; 69+ messages in thread
From: Hilton Chain via Guix-patches via @ 2023-06-23 15:35 UTC (permalink / raw)
To: 64255; +Cc: Hilton Chain, Reza Housseini
From: Reza Housseini <reza@housseini.me>
* gnu/packages/check.scm (ftest): New variable.
Co-authored-by: Hilton Chain <hako@ultrarare.space>
---
gnu/packages/check.scm | 41 +++++++++++++++++++++++++++++++++++++++++
1 file changed, 41 insertions(+)
diff --git a/gnu/packages/check.scm b/gnu/packages/check.scm
index 87728fefa3..0aa519ad67 100644
--- a/gnu/packages/check.scm
+++ b/gnu/packages/check.scm
@@ -43,6 +43,8 @@
;;; Copyright © 2022 jgart <jgart@dismail.de>
;;; Copyright © 2023 Luis Felipe López Acevedo <luis.felipe.la@protonmail.com>
;;; Copyright © 2023 Timo Wilken <guix@twilken.net>
+;;; Copyright © 2023 Reza Housseini <reza@housseini.me>
+;;; Copyright © 2023 Hilton Chain <hako@ultrarare.space>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -65,6 +67,7 @@ (define-module (gnu packages check)
#:use-module (gnu packages autotools)
#:use-module (gnu packages base)
#:use-module (gnu packages bash)
+ #:use-module (gnu packages cmake)
#:use-module (gnu packages compression)
#:use-module (gnu packages linux)
#:use-module (gnu packages llvm)
@@ -92,6 +95,7 @@ (define-module (gnu packages check)
#:use-module (guix gexp)
#:use-module (guix git-download)
#:use-module (guix build-system cmake)
+ #:use-module (guix build-system copy)
#:use-module (guix build-system glib-or-gtk)
#:use-module (guix build-system gnu)
#:use-module (guix build-system go)
@@ -863,6 +867,43 @@ (define-public doctest
has been designed to be fast, light and unintrusive.")
(license license:expat)))
+(define-public ftest
+ ;; There aren't any releases and it looks more like a small side project.
+ ;; It is included for completness to run tests for package utfcpp.
+ (let ((commit "c4ad4af0946b73ce1a40cbc72205d15d196c7e06")
+ (revision "0"))
+ (package
+ (name "ftest")
+ (version (git-version "0" revision commit))
+ (source (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/nemtrif/ftest")
+ (commit commit)))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "1jcd76zjhx5f2nsi80hj7gmywgpz1f7vcw8lv5yf7gx0l99dn86x"))))
+ ;; No CMakeLists.txt file provided, only one to run tests
+ (build-system copy-build-system)
+ (arguments
+ (list #:install-plan
+ #~'(("ftest.h" "include/ftest/"))
+ #:phases
+ #~(modify-phases %standard-phases
+ (add-before 'install 'check
+ (lambda _
+ (with-directory-excursion "tests"
+ (invoke "cmake" ".")
+ (invoke "make")
+ (invoke "ctest")))))))
+ (native-inputs (list cmake-minimal))
+ (home-page "https://github.com/nemtrif/ftest")
+ (synopsis "C++ testing framework")
+ (description
+ "This package provides a simple and limited unit-test framework for C++.")
+ (license license:boost1.0))))
+
(define-public go-github.com-smartystreets-gunit
(package
(name "go-github.com-smartystreets-gunit")
--
2.40.1
^ permalink raw reply related [flat|nested] 69+ messages in thread
* [bug#64255] [PATCH 2/2] gnu: utfcpp: Update to 3.2.3.
2023-06-23 15:33 ` [bug#63765] [PATCH 0/2] gnu: utfcpp: Update to 3.2.3 Hilton Chain via Guix-patches via
2023-06-23 15:35 ` [bug#64255] [PATCH 1/2] gnu: Add ftest Hilton Chain via Guix-patches via
@ 2023-06-23 15:35 ` Hilton Chain via Guix-patches via
2023-08-03 14:05 ` [bug#64255] [PATCH v2 0/2] " Hilton Chain via Guix-patches via
` (2 subsequent siblings)
4 siblings, 0 replies; 69+ messages in thread
From: Hilton Chain via Guix-patches via @ 2023-06-23 15:35 UTC (permalink / raw)
To: 64255
Cc: Hilton Chain, Reza Housseini, Liliana Marie Prikler,
宋文武
From: Reza Housseini <reza@housseini.me>
* gnu/packages/textutils.scm (utfcpp): Update to 3.2.3.
[snippet]: Unbundle ftest.
[arguments]: Remove field.
[native-inputs]: Add ftest.
* gnu/packages/games.scm (warzone2100)<#:phases>: Adjust 'fix-utfcpp-include.
* gnu/packages/video.scm (mkvtoolnix)<#:phases>: Add 'fix-utfcpp-include.
Co-authored-by: Hilton Chain <hako@ultrarare.space>
---
gnu/packages/games.scm | 2 +-
gnu/packages/textutils.scm | 27 +++++++++++++--------------
gnu/packages/video.scm | 5 +++++
3 files changed, 19 insertions(+), 15 deletions(-)
diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm
index 83704dd720..9dbf5a3739 100644
--- a/gnu/packages/games.scm
+++ b/gnu/packages/games.scm
@@ -5510,7 +5510,7 @@ (define-public warzone2100
(lambda _
(substitute* "lib/framework/wzstring.cpp"
(("<utfcpp/source/utf8.h>")
- "<utf8.h>"))))
+ "<utf8cpp/utf8.h>"))))
(add-after 'unpack 'link-tests-with-qt
(lambda _
(substitute* "tests/Makefile.am"
diff --git a/gnu/packages/textutils.scm b/gnu/packages/textutils.scm
index 51df3748cd..5f7ab7a438 100644
--- a/gnu/packages/textutils.scm
+++ b/gnu/packages/textutils.scm
@@ -25,6 +25,8 @@
;;; Copyright © 2021 Felix Gruber <felgru@posteo.net>
;;; Copyright © 2021 Bonface Munyoki Kilyungi <me@bonfacemunyoki.com>
;;; Copyright © 2022 Gabriel Wicki <gabriel@erlikon.ch>
+;;; Copyright © 2023 Reza Housseini <reza@housseini.me>
+;;; Copyright © 2023 Hilton Chain <hako@ultrarare.space>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -687,29 +689,26 @@ (define-public catdoc
(define-public utfcpp
(package
(name "utfcpp")
- (version "2.3.5")
+ (version "3.2.3")
(source (origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/nemtrif/utfcpp")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
+ (modules '((guix build utils)))
+ ;; Unbundle ftest
+ (snippet
+ '(begin
+ (delete-file-recursively "extern")
+ (substitute* (find-files "tests" "\\.cpp")
+ (("\"../extern/ftest/ftest.h\"")
+ "<ftest/ftest.h>"))))
(sha256
(base32
- "1gr98d826z6wa58r1s5i7rz7q2x3r31v7zj0pjjlrc7gfxwklr4s"))))
+ "00hzh39iddbc6nxg13813qd6d55g2kccwjf5dr96wykfhway9wbr"))))
(build-system cmake-build-system)
- (arguments
- `(#:out-of-source? #f
- #:phases
- (modify-phases %standard-phases
- (replace 'install ; no install target
- (lambda* (#:key outputs #:allow-other-keys)
- (let* ((out (assoc-ref outputs "out"))
- (include (string-append out "/include"))
- (doc (string-append out "/share/doc/" ,name)))
- (copy-recursively "source" include)
- (install-file "README.md" doc)
- #t))))))
+ (native-inputs (list ftest))
(home-page "https://github.com/nemtrif/utfcpp")
(synopsis "Portable C++ library for handling UTF-8")
(description "UTF8-CPP is a C++ library for handling UTF-8 encoded text
diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm
index 55eab972b9..43ae3899f9 100644
--- a/gnu/packages/video.scm
+++ b/gnu/packages/video.scm
@@ -1048,6 +1048,11 @@ (define-public mkvtoolnix
"--enable-precompiled-headers=no")
#:phases
(modify-phases %standard-phases
+ (add-after 'unpack 'fix-utfcpp-include
+ (lambda _
+ (substitute* "src/common/strings/utf8.cpp"
+ (("<utf8.h>")
+ "<utf8cpp/utf8.h>"))))
(add-after 'unpack 'patch-relative-file-names
(lambda* (#:key outputs #:allow-other-keys)
(let ((out (assoc-ref outputs "out")))
--
2.40.1
^ permalink raw reply related [flat|nested] 69+ messages in thread
* [bug#63765] [PATCH v3 3/8] gnu: mbedtls-apache: Rename package to mbedtls-apache-lts.
2023-06-23 6:24 ` [bug#63765] [PATCH v3 3/8] gnu: mbedtls-apache: Rename package to mbedtls-apache-lts Hilton Chain via Guix-patches via
@ 2023-06-26 18:59 ` Liliana Marie Prikler
0 siblings, 0 replies; 69+ messages in thread
From: Liliana Marie Prikler @ 2023-06-26 18:59 UTC (permalink / raw)
To: Hilton Chain, 63765
Cc: Tobias Geerinckx-Rice, Simon Tournier, Efraim Flashner,
宋文武, Leo Famulari
Am Freitag, dem 23.06.2023 um 14:24 +0800 schrieb Hilton Chain:
> * gnu/packages/tls.scm (mbedtls-apache-lts): New variable, formerly
> known as "mbedtls-apache".
Proper format is
(old-name): Rename from this…
(new-name): … to this.
Also list the package updates in the ChangeLog as "Adjust accordingly".
> ---
> gnu/packages/emulators.scm | 2 +-
> gnu/packages/game-development.scm | 2 +-
> 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, 18 insertions(+), 18 deletions(-)
>
> diff --git a/gnu/packages/emulators.scm b/gnu/packages/emulators.scm
> index be76f81ff4..52921e79a6 100644
> --- a/gnu/packages/emulators.scm
> +++ b/gnu/packages/emulators.scm
> @@ -341,7 +341,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 aa99109cca..4131b85a20 100644
> --- a/gnu/packages/game-development.scm
> +++ b/gnu/packages/game-development.scm
> @@ -1964,7 +1964,7 @@ (define-public godot
> libxi
> libxinerama
> libxrandr
> - mbedtls-apache
> + mbedtls-apache-lts
> mesa
> opusfile
> pcre2
> diff --git a/gnu/packages/hardware.scm b/gnu/packages/hardware.scm
> index c23299d1db..d1ad38adbd 100644
> --- a/gnu/packages/hardware.scm
> +++ b/gnu/packages/hardware.scm
> @@ -703,7 +703,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:
> @@ -1069,7 +1069,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 b31bb6b11a..d442787d97 100644
> --- a/gnu/packages/irc.scm
> +++ b/gnu/packages/irc.scm
> @@ -748,7 +748,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 2320b03595..78ec186bf2 100644
> --- a/gnu/packages/julia-jll.scm
> +++ b/gnu/packages/julia-jll.scm
> @@ -1404,7 +1404,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 ba54175822..82891525c2 100644
> --- a/gnu/packages/julia.scm
> +++ b/gnu/packages/julia.scm
> @@ -511,7 +511,7 @@ (define-public julia
> ("libunwind" ,libunwind-julia)
> ("libuv" ,libuv-julia)
> ("llvm" ,llvm-julia)
> - ("mbedtls-apache" ,mbedtls-apache)
> + ("mbedtls-apache" ,mbedtls-apache-lts)
> ("mpfr" ,mpfr)
> ("openblas" ,openblas)
> ("openlibm" ,openlibm)
> diff --git a/gnu/packages/linphone.scm b/gnu/packages/linphone.scm
> index 7d87ee602c..f26c5efd3c 100644
> --- a/gnu/packages/linphone.scm
> +++ b/gnu/packages/linphone.scm
> @@ -188,7 +188,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 52fb883467..c13f220613 100644
> --- a/gnu/packages/linux.scm
> +++ b/gnu/packages/linux.scm
> @@ -2262,7 +2262,7 @@ (define-public dislocker
> (build-system cmake-build-system)
> (arguments
> '(#:tests? #f)) ;no test suite
> - (inputs (list fuse mbedtls-apache))
> + (inputs (list fuse 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 b0cdcdf6a3..58f8249a36 100644
> --- a/gnu/packages/networking.scm
> +++ b/gnu/packages/networking.scm
> @@ -822,7 +822,7 @@ (define-public nng
> (native-inputs
> `(("ksh" ,oksh)))
> (inputs
> - `(("mbedtls" ,mbedtls-apache)))
> + `(("mbedtls" ,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 3e3e8e00c6..a0640799bc 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 140932a809..fdf9121a6d 100644
> --- a/gnu/packages/tls.scm
> +++ b/gnu/packages/tls.scm
> @@ -940,7 +940,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
> @@ -980,7 +980,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
> @@ -1002,7 +1002,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 43ae3899f9..1fe11dcc8a 100644
> --- a/gnu/packages/video.scm
> +++ b/gnu/packages/video.scm
> @@ -3456,7 +3456,7 @@ (define-public obs
> libxcomposite
> libxkbcommon
> luajit
> - mbedtls-apache
> + mbedtls-apache-lts
> mesa
> pciutils
> pipewire
Cheers
^ permalink raw reply [flat|nested] 69+ messages in thread
* [bug#63765] [PATCH v4 0/6] gnu: python-lief: Update to 0.13.2.
2023-05-28 8:07 ` [bug#63765] [PATCH 0/8] gnu: python-lief: Update to 0.13.0 Hilton Chain via Guix-patches via
` (4 preceding siblings ...)
2023-06-23 15:33 ` [bug#63765] [PATCH 0/2] gnu: utfcpp: Update to 3.2.3 Hilton Chain via Guix-patches via
@ 2023-06-28 18:33 ` Hilton Chain via Guix-patches via
2023-06-28 18:35 ` [bug#64333] [PATCH v4 1/6] gnu: mbedtls-apache: Rename package to mbedtls-apache-lts Hilton Chain via Guix-patches via
` (5 more replies)
2023-06-30 7:43 ` [bug#63765] [PATCH v5 0/6] " Hilton Chain via Guix-patches via
2023-08-05 13:18 ` [bug#63765] [PATCH v6 00/10] " Hilton Chain via Guix-patches via
7 siblings, 6 replies; 69+ messages in thread
From: Hilton Chain via Guix-patches via @ 2023-06-28 18:33 UTC (permalink / raw)
To: 63765; +Cc: Hilton Chain, Lars-Dominik Braun, jgart
v3 -> v4:
1. Depends on #64255.
2. frozen updated to the latest commit.
3. Commit message adjusted.
Hilton Chain (6):
gnu: mbedtls-apache: Rename package to mbedtls-apache-lts.
gnu: mbedtls-apache-for-hiawatha: Use inherited source.
gnu: mbedtls-apache-lts: Update to 2.28.3.
gnu: Add mbedtls-apache, version 3.4.0.
gnu: Add frozen.
gnu: python-lief: Update to 0.13.2.
gnu/packages/cpp.scm | 23 ++++++++
gnu/packages/emulators.scm | 2 +-
gnu/packages/game-development.scm | 2 +-
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/python-xyz.scm | 96 ++++++++++++++++++++++++++-----
gnu/packages/search.scm | 2 +-
gnu/packages/tls.scm | 50 +++++++---------
gnu/packages/video.scm | 2 +-
15 files changed, 139 insertions(+), 60 deletions(-)
base-commit: b24a05830d11e3011eee4bc5f60a41e26188cde1
--
2.40.1
^ permalink raw reply [flat|nested] 69+ messages in thread
* [bug#64333] [PATCH v4 1/6] gnu: mbedtls-apache: Rename package to mbedtls-apache-lts.
2023-06-28 18:33 ` [bug#63765] [PATCH v4 0/6] gnu: python-lief: Update to 0.13.2 Hilton Chain via Guix-patches via
@ 2023-06-28 18:35 ` Hilton Chain via Guix-patches via
2023-06-29 4:22 ` Liliana Marie Prikler
2023-06-28 18:35 ` [bug#64332] [PATCH v4 2/6] gnu: mbedtls-apache-for-hiawatha: Use inherited source Hilton Chain via Guix-patches via
` (4 subsequent siblings)
5 siblings, 1 reply; 69+ messages in thread
From: Hilton Chain via Guix-patches via @ 2023-06-28 18:35 UTC (permalink / raw)
To: 64333
Cc: Hilton Chain, Efraim Flashner, Leo Famulari,
Liliana Marie Prikler, Simon Tournier, Tobias Geerinckx-Rice,
宋文武
* 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)[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.
---
gnu/packages/emulators.scm | 2 +-
gnu/packages/game-development.scm | 2 +-
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, 18 insertions(+), 18 deletions(-)
diff --git a/gnu/packages/emulators.scm b/gnu/packages/emulators.scm
index be76f81ff4..52921e79a6 100644
--- a/gnu/packages/emulators.scm
+++ b/gnu/packages/emulators.scm
@@ -341,7 +341,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 aa99109cca..4131b85a20 100644
--- a/gnu/packages/game-development.scm
+++ b/gnu/packages/game-development.scm
@@ -1964,7 +1964,7 @@ (define-public godot
libxi
libxinerama
libxrandr
- mbedtls-apache
+ mbedtls-apache-lts
mesa
opusfile
pcre2
diff --git a/gnu/packages/hardware.scm b/gnu/packages/hardware.scm
index c23299d1db..d1ad38adbd 100644
--- a/gnu/packages/hardware.scm
+++ b/gnu/packages/hardware.scm
@@ -703,7 +703,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:
@@ -1069,7 +1069,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 b31bb6b11a..d442787d97 100644
--- a/gnu/packages/irc.scm
+++ b/gnu/packages/irc.scm
@@ -748,7 +748,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 2320b03595..78ec186bf2 100644
--- a/gnu/packages/julia-jll.scm
+++ b/gnu/packages/julia-jll.scm
@@ -1404,7 +1404,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 ba54175822..82891525c2 100644
--- a/gnu/packages/julia.scm
+++ b/gnu/packages/julia.scm
@@ -511,7 +511,7 @@ (define-public julia
("libunwind" ,libunwind-julia)
("libuv" ,libuv-julia)
("llvm" ,llvm-julia)
- ("mbedtls-apache" ,mbedtls-apache)
+ ("mbedtls-apache" ,mbedtls-apache-lts)
("mpfr" ,mpfr)
("openblas" ,openblas)
("openlibm" ,openlibm)
diff --git a/gnu/packages/linphone.scm b/gnu/packages/linphone.scm
index 7d87ee602c..f26c5efd3c 100644
--- a/gnu/packages/linphone.scm
+++ b/gnu/packages/linphone.scm
@@ -188,7 +188,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 e9355f70e5..1852fd3cd1 100644
--- a/gnu/packages/linux.scm
+++ b/gnu/packages/linux.scm
@@ -2262,7 +2262,7 @@ (define-public dislocker
(build-system cmake-build-system)
(arguments
'(#:tests? #f)) ;no test suite
- (inputs (list fuse mbedtls-apache))
+ (inputs (list fuse 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 2f118bccb2..f150c77b78 100644
--- a/gnu/packages/networking.scm
+++ b/gnu/packages/networking.scm
@@ -822,7 +822,7 @@ (define-public nng
(native-inputs
`(("ksh" ,oksh)))
(inputs
- `(("mbedtls" ,mbedtls-apache)))
+ `(("mbedtls" ,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 3e3e8e00c6..a0640799bc 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 d94b7c27f5..c2011976ff 100644
--- a/gnu/packages/tls.scm
+++ b/gnu/packages/tls.scm
@@ -940,7 +940,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
@@ -980,7 +980,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
@@ -1002,7 +1002,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 aa46da0c5e..f6895a56d1 100644
--- a/gnu/packages/video.scm
+++ b/gnu/packages/video.scm
@@ -3450,7 +3450,7 @@ (define-public obs
libxcomposite
libxkbcommon
luajit
- mbedtls-apache
+ mbedtls-apache-lts
mesa
pciutils
pipewire
--
2.40.1
^ permalink raw reply related [flat|nested] 69+ messages in thread
* [bug#64332] [PATCH v4 2/6] gnu: mbedtls-apache-for-hiawatha: Use inherited source.
2023-06-28 18:33 ` [bug#63765] [PATCH v4 0/6] gnu: python-lief: Update to 0.13.2 Hilton Chain via Guix-patches via
2023-06-28 18:35 ` [bug#64333] [PATCH v4 1/6] gnu: mbedtls-apache: Rename package to mbedtls-apache-lts Hilton Chain via Guix-patches via
@ 2023-06-28 18:35 ` Hilton Chain via Guix-patches via
[not found] ` <handler.64332.B.168797732415505.ack@debbugs.gnu.org>
2023-06-28 18:35 ` [bug#64334] [PATCH v4 3/6] gnu: mbedtls-apache-lts: Update to 2.28.3 Hilton Chain via Guix-patches via
` (3 subsequent siblings)
5 siblings, 1 reply; 69+ messages in thread
From: Hilton Chain via Guix-patches via @ 2023-06-28 18:35 UTC (permalink / raw)
To: 64332; +Cc: Hilton Chain
* gnu/packages/tls.scm (mbedtls-apache-for-hiawatha): Use inherited source.
[arguments]<#:phases>: Keep "-Wformat-signedness".
---
gnu/packages/tls.scm | 25 -------------------------
1 file changed, 25 deletions(-)
diff --git a/gnu/packages/tls.scm b/gnu/packages/tls.scm
index c2011976ff..2a0c81f559 100644
--- a/gnu/packages/tls.scm
+++ b/gnu/packages/tls.scm
@@ -943,8 +943,6 @@ (define-public perl-crypt-openssl-random
(define-public mbedtls-apache-lts
(package
(name "mbedtls-apache")
- ;; XXX Check whether ‘-Wformat-signedness’ still breaks mbedtls-for-hiawatha
- ;; when updating.
(version "2.28.0")
(source
(origin
@@ -981,26 +979,6 @@ (define-public mbedtls-for-hiawatha
(hidden-package
(package
(inherit mbedtls-apache-lts)
- (name "mbedtls-apache")
- (version "2.26.0")
- (source
- (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/ARMmbed/mbedtls")
- (commit (string-append "mbedtls-" version))))
- (sha256
- (base32 "0scwpmrgvg6q7rvqkc352d2fqlsx0aylcbyibcp1f1rsn8iiif2m"))
- (file-name (git-file-name name version))
- (modules '((guix build utils)))
- (snippet
- '(begin
- ;; Can be removed with the next version.
- ;; Reduce level of format truncation warnings due to false positives.
- ;; https://github.com/ARMmbed/mbedtls/commit/2065a8d8af27c6cb1e40c9462b5933336dca7434
- (substitute* "CMakeLists.txt"
- (("Wformat-truncation=2") "Wformat-truncation"))
- #t))))
(arguments
(substitute-keyword-arguments (package-arguments mbedtls-apache-lts)
((#:phases phases)
@@ -1011,9 +989,6 @@ (define-public mbedtls-for-hiawatha
(invoke "scripts/config.pl" "set" feature))
(list "MBEDTLS_THREADING_C"
"MBEDTLS_THREADING_PTHREAD"))
- ;; XXX The above enables code that breaks with -Werror…
- (substitute* "CMakeLists.txt"
- ((" -Wformat-signedness") ""))
#t)))))))))
(define-public dehydrated
--
2.40.1
^ permalink raw reply related [flat|nested] 69+ messages in thread
* [bug#64334] [PATCH v4 3/6] gnu: mbedtls-apache-lts: Update to 2.28.3.
2023-06-28 18:33 ` [bug#63765] [PATCH v4 0/6] gnu: python-lief: Update to 0.13.2 Hilton Chain via Guix-patches via
2023-06-28 18:35 ` [bug#64333] [PATCH v4 1/6] gnu: mbedtls-apache: Rename package to mbedtls-apache-lts Hilton Chain via Guix-patches via
2023-06-28 18:35 ` [bug#64332] [PATCH v4 2/6] gnu: mbedtls-apache-for-hiawatha: Use inherited source Hilton Chain via Guix-patches via
@ 2023-06-28 18:35 ` Hilton Chain via Guix-patches via
2023-06-28 18:35 ` [bug#64335] [PATCH v4 4/6] gnu: Add mbedtls-apache, version 3.4.0 Hilton Chain via Guix-patches via
` (2 subsequent siblings)
5 siblings, 0 replies; 69+ messages in thread
From: Hilton Chain via Guix-patches via @ 2023-06-28 18:35 UTC (permalink / raw)
To: 64334; +Cc: Hilton Chain
* gnu/packages/tls.scm (mbedtls-apache-lts): Update to 2.28.3.
---
gnu/packages/tls.scm | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/gnu/packages/tls.scm b/gnu/packages/tls.scm
index 2a0c81f559..f25834c7ca 100644
--- a/gnu/packages/tls.scm
+++ b/gnu/packages/tls.scm
@@ -943,7 +943,7 @@ (define-public perl-crypt-openssl-random
(define-public mbedtls-apache-lts
(package
(name "mbedtls-apache")
- (version "2.28.0")
+ (version "2.28.3")
(source
(origin
(method git-fetch)
@@ -952,7 +952,7 @@ (define-public mbedtls-apache-lts
(commit (string-append "mbedtls-" version))))
(file-name (git-file-name name version))
(sha256
- (base32 "0s37dsi29v7146fi9k4frvx5rz2snxdm6c3rwq2fvnca2r80hfjl"))))
+ (base32 "177925jkr73x536g703vbxxamcyx9acvkp5iyb294icdn09ck5n3"))))
(build-system cmake-build-system)
(arguments
`(#:configure-flags
--
2.40.1
^ permalink raw reply related [flat|nested] 69+ messages in thread
* [bug#64335] [PATCH v4 4/6] gnu: Add mbedtls-apache, version 3.4.0.
2023-06-28 18:33 ` [bug#63765] [PATCH v4 0/6] gnu: python-lief: Update to 0.13.2 Hilton Chain via Guix-patches via
` (2 preceding siblings ...)
2023-06-28 18:35 ` [bug#64334] [PATCH v4 3/6] gnu: mbedtls-apache-lts: Update to 2.28.3 Hilton Chain via Guix-patches via
@ 2023-06-28 18:35 ` Hilton Chain via Guix-patches via
2023-06-28 18:35 ` [bug#64336] [PATCH v4 5/6] gnu: Add frozen Hilton Chain via Guix-patches via
2023-06-28 18:35 ` [bug#64337] [PATCH v4 6/6] gnu: python-lief: Update to 0.13.2 Hilton Chain via Guix-patches via
5 siblings, 0 replies; 69+ messages in thread
From: Hilton Chain via Guix-patches via @ 2023-06-28 18:35 UTC (permalink / raw)
To: 64335; +Cc: Hilton Chain
* gnu/packages/tls.scm (mbedtls-apache): New variable.
---
gnu/packages/tls.scm | 15 +++++++++++++++
1 file changed, 15 insertions(+)
diff --git a/gnu/packages/tls.scm b/gnu/packages/tls.scm
index f25834c7ca..5cc7cdd96b 100644
--- a/gnu/packages/tls.scm
+++ b/gnu/packages/tls.scm
@@ -974,6 +974,21 @@ (define-public mbedtls-apache-lts
(home-page "https://www.trustedfirmware.org/projects/mbed-tls/")
(license license:asl2.0)))
+(define-public mbedtls-apache
+ (package
+ (inherit mbedtls-apache-lts)
+ (name "mbedtls-apache")
+ (version "3.4.0")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/ARMmbed/mbedtls")
+ (commit (string-append "mbedtls-" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "1y2mwkrvmadmjylyshpp6dnw328zc6l2cajdwrhkl4nmky33i06m"))))))
+
;; The Hiawatha Web server requires some specific features to be enabled.
(define-public mbedtls-for-hiawatha
(hidden-package
--
2.40.1
^ permalink raw reply related [flat|nested] 69+ messages in thread
* [bug#64336] [PATCH v4 5/6] gnu: Add frozen.
2023-06-28 18:33 ` [bug#63765] [PATCH v4 0/6] gnu: python-lief: Update to 0.13.2 Hilton Chain via Guix-patches via
` (3 preceding siblings ...)
2023-06-28 18:35 ` [bug#64335] [PATCH v4 4/6] gnu: Add mbedtls-apache, version 3.4.0 Hilton Chain via Guix-patches via
@ 2023-06-28 18:35 ` Hilton Chain via Guix-patches via
2023-06-28 18:35 ` [bug#64337] [PATCH v4 6/6] gnu: python-lief: Update to 0.13.2 Hilton Chain via Guix-patches via
5 siblings, 0 replies; 69+ messages in thread
From: Hilton Chain via Guix-patches via @ 2023-06-28 18:35 UTC (permalink / raw)
To: 64336; +Cc: Hilton Chain
* gnu/packages/cpp.scm (frozen): New variable.
---
gnu/packages/cpp.scm | 23 +++++++++++++++++++++++
1 file changed, 23 insertions(+)
diff --git a/gnu/packages/cpp.scm b/gnu/packages/cpp.scm
index d61bcd25fd..b80939183c 100644
--- a/gnu/packages/cpp.scm
+++ b/gnu/packages/cpp.scm
@@ -567,6 +567,29 @@ (define-public fifo-map
as ordering relation.")
(license license:expat)))
+(define-public frozen
+ (let ((commit "5af40b3f9e03116aa2de4d55b53b9629e5988480")
+ (revision "8"))
+ (package
+ (name "frozen")
+ (version (git-version "1.1.1" revision commit))
+ (source (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/serge-sans-paille/frozen")
+ (commit commit)))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "02snxdfmrzcqwnkazhlagsfamr3mcg10iskpz5l8yscckzvyhzfs"))))
+ (build-system cmake-build-system)
+ (home-page "https://github.com/serge-sans-paille/frozen")
+ (synopsis "Header-only, constexpr alternative to gperf for C++14 users")
+ (description
+ "Frozen is a header-only library that provides 0 cost initialization
+for immutable containers, fixed-size containers, and various algorithms.")
+ (license license:asl2.0))))
+
(define-public json-dto
(package
(name "json-dto")
--
2.40.1
^ permalink raw reply related [flat|nested] 69+ messages in thread
* [bug#64337] [PATCH v4 6/6] gnu: python-lief: Update to 0.13.2.
2023-06-28 18:33 ` [bug#63765] [PATCH v4 0/6] gnu: python-lief: Update to 0.13.2 Hilton Chain via Guix-patches via
` (4 preceding siblings ...)
2023-06-28 18:35 ` [bug#64336] [PATCH v4 5/6] gnu: Add frozen Hilton Chain via Guix-patches via
@ 2023-06-28 18:35 ` Hilton Chain via Guix-patches via
5 siblings, 0 replies; 69+ messages in thread
From: Hilton Chain via Guix-patches via @ 2023-06-28 18:35 UTC (permalink / raw)
To: 64337; +Cc: Hilton Chain, Lars-Dominik Braun, jgart
* gnu/packages/python-xyz.scm (python-lief): Update to 0.13.2.
[snippet]: Unbundle third-party dependencies.
[build-system]: Change to cmake-build-system
[native-inputs]: Add python-minimal-wrapper, python-tomli.
Remove cmake.
[inputs]: Add frozen, mbedtls-apache, nlohmann-json, pybind11, utfcpp, spdlog.
[outputs]: Add "python" output.
[home-page]: Update homepage.
(shrinkwrap)[inputs]: Replace python-lief to its "python" output.
---
gnu/packages/python-xyz.scm | 96 +++++++++++++++++++++++++++++++------
1 file changed, 81 insertions(+), 15 deletions(-)
diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index 55531b2785..a52c640fc5 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -212,6 +212,7 @@ (define-module (gnu packages python-xyz)
#:use-module (gnu packages libusb)
#:use-module (gnu packages linux)
#:use-module (gnu packages llvm)
+ #:use-module (gnu packages logging)
#:use-module (gnu packages machine-learning)
#:use-module (gnu packages man)
#:use-module (gnu packages markup)
@@ -33167,29 +33168,94 @@ (define-public python-misskey
(define-public python-lief
(package
(name "python-lief")
- (version "0.12.3")
+ (version "0.13.2")
(source (origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/lief-project/LIEF")
(commit version)))
(file-name (git-file-name name version))
+ (modules '((guix build utils)))
+ (snippet
+ '(begin
+ ;; Configure build for Python bindings.
+ (substitute* "api/python/config-default.toml"
+ (("(ninja = )true" all m)
+ (string-append m "false"))
+ (("(parallel-jobs = )0" all m)
+ (string-append m (number->string (parallel-job-count)))))
+ ;; Unbundle third-party dependencies.
+ (for-each delete-file
+ (find-files "third-party/"
+ (string-join '("spdlog"
+ "frozen"
+ "json"
+ "mbedtls"
+ "pybind11"
+ "utfcpp")
+ "|" )))
+ ;; Same in argument #:configure-flags.
+ (substitute* "api/python/setup.py"
+ (("self\\._get_third_party_opt\\(\\)")
+ "[\"-DLIEF_EXTERNAL_SPDLOG=ON\",
+ \"-DLIEF_OPT_FROZEN_EXTERNAL=ON\",
+ \"-DLIEF_OPT_MBEDTLS_EXTERNAL=ON\",
+ \"-DLIEF_OPT_NLOHMANN_JSON_EXTERNAL=ON\",
+ \"-DLIEF_OPT_PYBIND11_EXTERNAL=ON\",
+ \"-DLIEF_OPT_UTFCPP_EXTERNAL=ON\"]"))))
(sha256
(base32
- "11i6hqmcjh56y554kqhl61698n9v66j2qk1c1g63mv2w07h2z661"))))
- (build-system python-build-system)
- (native-inputs (list cmake))
+ "0y48x358ppig5xp97ahcphfipx7cg9chldj2q5zrmn610fmi4zll"))))
+ (build-system cmake-build-system)
(arguments
- (list
- #:tests? #f ;needs network
- #:phases #~(modify-phases %standard-phases
- (replace 'build
- (lambda _
- (invoke
- "python" "setup.py" "--sdk" "build"
- (string-append
- "-j" (number->string (parallel-job-count)))))))))
- (home-page "https://github.com/lief-project/LIEF")
+ (list #:modules
+ '((guix build utils)
+ (guix build cmake-build-system)
+ ((guix build python-build-system) #:prefix python:))
+ #:imported-modules
+ (append %cmake-build-system-modules
+ '((guix build python-build-system)))
+ #:configure-flags
+ #~'("-DCMAKE_LINK_WHAT_YOU_USE=ON"
+ "-DBUILD_SHARED_LIBS=ON"
+ "-DLIEF_INSTALL_COMPILED_EXAMPLES=ON"
+ "-DLIEF_TESTS=ON"
+ ;; Unbundle third-party dependencies
+ "-DLIEF_EXTERNAL_SPDLOG=ON"
+ "-DLIEF_OPT_FROZEN_EXTERNAL=ON"
+ "-DLIEF_OPT_MBEDTLS_EXTERNAL=ON"
+ "-DLIEF_OPT_NLOHMANN_JSON_EXTERNAL=ON"
+ "-DLIEF_OPT_PYBIND11_EXTERNAL=ON"
+ "-DLIEF_OPT_UTFCPP_EXTERNAL=ON")
+ #:phases
+ ;; Phases from python-build-system, for Python bindings.
+ #~(modify-phases %standard-phases
+ (add-after 'install 'chdir
+ (lambda _
+ (chdir "../source/api/python/")))
+ (add-after 'chdir 'ensure-no-mtimes-pre-1980
+ (assoc-ref python:%standard-phases 'ensure-no-mtimes-pre-1980))
+ (add-after 'ensure-no-mtimes-pre-1980 'enable-bytecode-determinism
+ (assoc-ref python:%standard-phases 'enable-bytecode-determinism))
+ (add-after 'enable-bytecode-determinism 'ensure-no-cythonized-files
+ (assoc-ref python:%standard-phases 'ensure-no-cythonized-files))
+ (add-after 'ensure-no-cythonized-files 'python-install
+ (lambda* (#:key inputs outputs #:allow-other-keys)
+ ((assoc-ref python:%standard-phases 'install)
+ #:inputs inputs
+ #:outputs outputs
+ #:configure-flags '()
+ #:use-setuptools? #t)))
+ (add-after 'python-install 'add-install-to-pythonpath
+ (assoc-ref python:%standard-phases 'add-install-to-pythonpath))
+ (add-after 'add-install-to-pythonpath 'add-install-to-path
+ (assoc-ref python:%standard-phases 'add-install-to-path))
+ (add-after 'add-install-to-path 'python-wrap
+ (assoc-ref python:%standard-phases 'wrap)))))
+ (native-inputs (list python-minimal-wrapper python-tomli))
+ (inputs (list frozen mbedtls-apache nlohmann-json pybind11 utfcpp spdlog))
+ (outputs '("out" "python"))
+ (home-page "https://lief-project.github.io/")
(synopsis "Library to instrument executable formats")
(description
"@code{python-lief} is a cross platform library which can parse, modify
@@ -33237,7 +33303,7 @@ (define-public shrinkwrap
python-poetry-core
python-pypa-build
python-pytest))
- (inputs (list python-lief python-sh))
+ (inputs (list `(,python-lief "python") python-sh))
(home-page "https://github.com/fzakaria/shrinkwrap")
(synopsis "Emboss needed dependencies on the top level executable")
(description
--
2.40.1
^ permalink raw reply related [flat|nested] 69+ messages in thread
* bug#64336: bug#64332: Acknowledgement ([PATCH v4 2/6] gnu: mbedtls-apache-for-hiawatha: Use inherited source.)
[not found] ` <handler.64332.B.168797732415505.ack@debbugs.gnu.org>
@ 2023-06-28 18:44 ` hako via Guix-patches via
0 siblings, 0 replies; 69+ messages in thread
From: hako via Guix-patches via @ 2023-06-28 18:44 UTC (permalink / raw)
To: 64332-close, 64333-close, 64334-close, 64335-close, 64336-close,
64337-close
[-- Attachment #1: Type: text/plain, Size: 75 bytes --]
...... 😣 Forgot to add a --to=
I'll resend the patches when I get up.
[-- Attachment #2: Type: text/html, Size: 142 bytes --]
^ permalink raw reply [flat|nested] 69+ messages in thread
* [bug#64333] [PATCH v4 1/6] gnu: mbedtls-apache: Rename package to mbedtls-apache-lts.
2023-06-28 18:35 ` [bug#64333] [PATCH v4 1/6] gnu: mbedtls-apache: Rename package to mbedtls-apache-lts Hilton Chain via Guix-patches via
@ 2023-06-29 4:22 ` Liliana Marie Prikler
0 siblings, 0 replies; 69+ messages in thread
From: Liliana Marie Prikler @ 2023-06-29 4:22 UTC (permalink / raw)
To: Hilton Chain, 64333, control
merge 63765 64332 64333 64334 64335 64336 64337
thanks
^ permalink raw reply [flat|nested] 69+ messages in thread
* [bug#63765] [PATCH v5 0/6] gnu: python-lief: Update to 0.13.2.
2023-05-28 8:07 ` [bug#63765] [PATCH 0/8] gnu: python-lief: Update to 0.13.0 Hilton Chain via Guix-patches via
` (5 preceding siblings ...)
2023-06-28 18:33 ` [bug#63765] [PATCH v4 0/6] gnu: python-lief: Update to 0.13.2 Hilton Chain via Guix-patches via
@ 2023-06-30 7:43 ` Hilton Chain via Guix-patches via
2023-06-30 7:44 ` [bug#63765] [PATCH v5 1/6] gnu: mbedtls-apache: Rename package to mbedtls-apache-lts Hilton Chain via Guix-patches via
` (5 more replies)
2023-08-05 13:18 ` [bug#63765] [PATCH v6 00/10] " Hilton Chain via Guix-patches via
7 siblings, 6 replies; 69+ messages in thread
From: Hilton Chain via Guix-patches via @ 2023-06-30 7:43 UTC (permalink / raw)
To: 63765; +Cc: Hilton Chain, Lars-Dominik Braun, jgart
v4->v5:
No changes. v4 wasn't sent to the correct address, so resending as v5.
Hilton Chain (6):
gnu: mbedtls-apache: Rename package to mbedtls-apache-lts.
gnu: mbedtls-apache-for-hiawatha: Use inherited source.
gnu: mbedtls-apache-lts: Update to 2.28.3.
gnu: Add mbedtls-apache, version 3.4.0.
gnu: Add frozen.
gnu: python-lief: Update to 0.13.2.
gnu/packages/cpp.scm | 23 ++++++++
gnu/packages/emulators.scm | 2 +-
gnu/packages/game-development.scm | 2 +-
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/python-xyz.scm | 96 ++++++++++++++++++++++++++-----
gnu/packages/search.scm | 2 +-
gnu/packages/tls.scm | 50 +++++++---------
gnu/packages/video.scm | 2 +-
15 files changed, 139 insertions(+), 60 deletions(-)
base-commit: 94ac93042f09b4ba68b7b64ed1feeebd3dab1ea4
--
2.40.1
^ permalink raw reply [flat|nested] 69+ messages in thread
* [bug#63765] [PATCH v5 1/6] gnu: mbedtls-apache: Rename package to mbedtls-apache-lts.
2023-06-30 7:43 ` [bug#63765] [PATCH v5 0/6] " Hilton Chain via Guix-patches via
@ 2023-06-30 7:44 ` Hilton Chain via Guix-patches via
2023-06-30 7:44 ` [bug#63765] [PATCH v5 2/6] gnu: mbedtls-apache-for-hiawatha: Use inherited source Hilton Chain via Guix-patches via
` (4 subsequent siblings)
5 siblings, 0 replies; 69+ messages in thread
From: Hilton Chain via Guix-patches via @ 2023-06-30 7:44 UTC (permalink / raw)
To: 63765
Cc: Hilton Chain, Efraim Flashner, Leo Famulari,
Liliana Marie Prikler, Simon Tournier, Tobias Geerinckx-Rice,
宋文武
* 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)[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.
---
gnu/packages/emulators.scm | 2 +-
gnu/packages/game-development.scm | 2 +-
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, 18 insertions(+), 18 deletions(-)
diff --git a/gnu/packages/emulators.scm b/gnu/packages/emulators.scm
index be76f81ff4..52921e79a6 100644
--- a/gnu/packages/emulators.scm
+++ b/gnu/packages/emulators.scm
@@ -341,7 +341,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 aa99109cca..4131b85a20 100644
--- a/gnu/packages/game-development.scm
+++ b/gnu/packages/game-development.scm
@@ -1964,7 +1964,7 @@ (define-public godot
libxi
libxinerama
libxrandr
- mbedtls-apache
+ mbedtls-apache-lts
mesa
opusfile
pcre2
diff --git a/gnu/packages/hardware.scm b/gnu/packages/hardware.scm
index c23299d1db..d1ad38adbd 100644
--- a/gnu/packages/hardware.scm
+++ b/gnu/packages/hardware.scm
@@ -703,7 +703,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:
@@ -1069,7 +1069,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 b31bb6b11a..d442787d97 100644
--- a/gnu/packages/irc.scm
+++ b/gnu/packages/irc.scm
@@ -748,7 +748,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 2320b03595..78ec186bf2 100644
--- a/gnu/packages/julia-jll.scm
+++ b/gnu/packages/julia-jll.scm
@@ -1404,7 +1404,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 ba54175822..82891525c2 100644
--- a/gnu/packages/julia.scm
+++ b/gnu/packages/julia.scm
@@ -511,7 +511,7 @@ (define-public julia
("libunwind" ,libunwind-julia)
("libuv" ,libuv-julia)
("llvm" ,llvm-julia)
- ("mbedtls-apache" ,mbedtls-apache)
+ ("mbedtls-apache" ,mbedtls-apache-lts)
("mpfr" ,mpfr)
("openblas" ,openblas)
("openlibm" ,openlibm)
diff --git a/gnu/packages/linphone.scm b/gnu/packages/linphone.scm
index 7d87ee602c..f26c5efd3c 100644
--- a/gnu/packages/linphone.scm
+++ b/gnu/packages/linphone.scm
@@ -188,7 +188,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 ffb736f447..eb65c06a66 100644
--- a/gnu/packages/linux.scm
+++ b/gnu/packages/linux.scm
@@ -2262,7 +2262,7 @@ (define-public dislocker
(build-system cmake-build-system)
(arguments
'(#:tests? #f)) ;no test suite
- (inputs (list fuse mbedtls-apache))
+ (inputs (list fuse 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 2f118bccb2..f150c77b78 100644
--- a/gnu/packages/networking.scm
+++ b/gnu/packages/networking.scm
@@ -822,7 +822,7 @@ (define-public nng
(native-inputs
`(("ksh" ,oksh)))
(inputs
- `(("mbedtls" ,mbedtls-apache)))
+ `(("mbedtls" ,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 3e3e8e00c6..a0640799bc 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 d94b7c27f5..c2011976ff 100644
--- a/gnu/packages/tls.scm
+++ b/gnu/packages/tls.scm
@@ -940,7 +940,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
@@ -980,7 +980,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
@@ -1002,7 +1002,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 aa46da0c5e..f6895a56d1 100644
--- a/gnu/packages/video.scm
+++ b/gnu/packages/video.scm
@@ -3450,7 +3450,7 @@ (define-public obs
libxcomposite
libxkbcommon
luajit
- mbedtls-apache
+ mbedtls-apache-lts
mesa
pciutils
pipewire
--
2.40.1
^ permalink raw reply related [flat|nested] 69+ messages in thread
* [bug#63765] [PATCH v5 2/6] gnu: mbedtls-apache-for-hiawatha: Use inherited source.
2023-06-30 7:43 ` [bug#63765] [PATCH v5 0/6] " Hilton Chain via Guix-patches via
2023-06-30 7:44 ` [bug#63765] [PATCH v5 1/6] gnu: mbedtls-apache: Rename package to mbedtls-apache-lts Hilton Chain via Guix-patches via
@ 2023-06-30 7:44 ` Hilton Chain via Guix-patches via
2023-06-30 7:44 ` [bug#63765] [PATCH v5 3/6] gnu: mbedtls-apache-lts: Update to 2.28.3 Hilton Chain via Guix-patches via
` (3 subsequent siblings)
5 siblings, 0 replies; 69+ messages in thread
From: Hilton Chain via Guix-patches via @ 2023-06-30 7:44 UTC (permalink / raw)
To: 63765; +Cc: Hilton Chain
* gnu/packages/tls.scm (mbedtls-apache-for-hiawatha): Use inherited source.
[arguments]<#:phases>: Keep "-Wformat-signedness".
---
gnu/packages/tls.scm | 25 -------------------------
1 file changed, 25 deletions(-)
diff --git a/gnu/packages/tls.scm b/gnu/packages/tls.scm
index c2011976ff..2a0c81f559 100644
--- a/gnu/packages/tls.scm
+++ b/gnu/packages/tls.scm
@@ -943,8 +943,6 @@ (define-public perl-crypt-openssl-random
(define-public mbedtls-apache-lts
(package
(name "mbedtls-apache")
- ;; XXX Check whether ‘-Wformat-signedness’ still breaks mbedtls-for-hiawatha
- ;; when updating.
(version "2.28.0")
(source
(origin
@@ -981,26 +979,6 @@ (define-public mbedtls-for-hiawatha
(hidden-package
(package
(inherit mbedtls-apache-lts)
- (name "mbedtls-apache")
- (version "2.26.0")
- (source
- (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/ARMmbed/mbedtls")
- (commit (string-append "mbedtls-" version))))
- (sha256
- (base32 "0scwpmrgvg6q7rvqkc352d2fqlsx0aylcbyibcp1f1rsn8iiif2m"))
- (file-name (git-file-name name version))
- (modules '((guix build utils)))
- (snippet
- '(begin
- ;; Can be removed with the next version.
- ;; Reduce level of format truncation warnings due to false positives.
- ;; https://github.com/ARMmbed/mbedtls/commit/2065a8d8af27c6cb1e40c9462b5933336dca7434
- (substitute* "CMakeLists.txt"
- (("Wformat-truncation=2") "Wformat-truncation"))
- #t))))
(arguments
(substitute-keyword-arguments (package-arguments mbedtls-apache-lts)
((#:phases phases)
@@ -1011,9 +989,6 @@ (define-public mbedtls-for-hiawatha
(invoke "scripts/config.pl" "set" feature))
(list "MBEDTLS_THREADING_C"
"MBEDTLS_THREADING_PTHREAD"))
- ;; XXX The above enables code that breaks with -Werror…
- (substitute* "CMakeLists.txt"
- ((" -Wformat-signedness") ""))
#t)))))))))
(define-public dehydrated
--
2.40.1
^ permalink raw reply related [flat|nested] 69+ messages in thread
* [bug#63765] [PATCH v5 3/6] gnu: mbedtls-apache-lts: Update to 2.28.3.
2023-06-30 7:43 ` [bug#63765] [PATCH v5 0/6] " Hilton Chain via Guix-patches via
2023-06-30 7:44 ` [bug#63765] [PATCH v5 1/6] gnu: mbedtls-apache: Rename package to mbedtls-apache-lts Hilton Chain via Guix-patches via
2023-06-30 7:44 ` [bug#63765] [PATCH v5 2/6] gnu: mbedtls-apache-for-hiawatha: Use inherited source Hilton Chain via Guix-patches via
@ 2023-06-30 7:44 ` Hilton Chain via Guix-patches via
2023-06-30 7:44 ` [bug#63765] [PATCH v5 4/6] gnu: Add mbedtls-apache, version 3.4.0 Hilton Chain via Guix-patches via
` (2 subsequent siblings)
5 siblings, 0 replies; 69+ messages in thread
From: Hilton Chain via Guix-patches via @ 2023-06-30 7:44 UTC (permalink / raw)
To: 63765; +Cc: Hilton Chain
* gnu/packages/tls.scm (mbedtls-apache-lts): Update to 2.28.3.
---
gnu/packages/tls.scm | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/gnu/packages/tls.scm b/gnu/packages/tls.scm
index 2a0c81f559..f25834c7ca 100644
--- a/gnu/packages/tls.scm
+++ b/gnu/packages/tls.scm
@@ -943,7 +943,7 @@ (define-public perl-crypt-openssl-random
(define-public mbedtls-apache-lts
(package
(name "mbedtls-apache")
- (version "2.28.0")
+ (version "2.28.3")
(source
(origin
(method git-fetch)
@@ -952,7 +952,7 @@ (define-public mbedtls-apache-lts
(commit (string-append "mbedtls-" version))))
(file-name (git-file-name name version))
(sha256
- (base32 "0s37dsi29v7146fi9k4frvx5rz2snxdm6c3rwq2fvnca2r80hfjl"))))
+ (base32 "177925jkr73x536g703vbxxamcyx9acvkp5iyb294icdn09ck5n3"))))
(build-system cmake-build-system)
(arguments
`(#:configure-flags
--
2.40.1
^ permalink raw reply related [flat|nested] 69+ messages in thread
* [bug#63765] [PATCH v5 4/6] gnu: Add mbedtls-apache, version 3.4.0.
2023-06-30 7:43 ` [bug#63765] [PATCH v5 0/6] " Hilton Chain via Guix-patches via
` (2 preceding siblings ...)
2023-06-30 7:44 ` [bug#63765] [PATCH v5 3/6] gnu: mbedtls-apache-lts: Update to 2.28.3 Hilton Chain via Guix-patches via
@ 2023-06-30 7:44 ` Hilton Chain via Guix-patches via
2023-06-30 7:44 ` [bug#63765] [PATCH v5 5/6] gnu: Add frozen Hilton Chain via Guix-patches via
2023-06-30 7:44 ` [bug#63765] [PATCH v5 6/6] gnu: python-lief: Update to 0.13.2 Hilton Chain via Guix-patches via
5 siblings, 0 replies; 69+ messages in thread
From: Hilton Chain via Guix-patches via @ 2023-06-30 7:44 UTC (permalink / raw)
To: 63765; +Cc: Hilton Chain
* gnu/packages/tls.scm (mbedtls-apache): New variable.
---
gnu/packages/tls.scm | 15 +++++++++++++++
1 file changed, 15 insertions(+)
diff --git a/gnu/packages/tls.scm b/gnu/packages/tls.scm
index f25834c7ca..5cc7cdd96b 100644
--- a/gnu/packages/tls.scm
+++ b/gnu/packages/tls.scm
@@ -974,6 +974,21 @@ (define-public mbedtls-apache-lts
(home-page "https://www.trustedfirmware.org/projects/mbed-tls/")
(license license:asl2.0)))
+(define-public mbedtls-apache
+ (package
+ (inherit mbedtls-apache-lts)
+ (name "mbedtls-apache")
+ (version "3.4.0")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/ARMmbed/mbedtls")
+ (commit (string-append "mbedtls-" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "1y2mwkrvmadmjylyshpp6dnw328zc6l2cajdwrhkl4nmky33i06m"))))))
+
;; The Hiawatha Web server requires some specific features to be enabled.
(define-public mbedtls-for-hiawatha
(hidden-package
--
2.40.1
^ permalink raw reply related [flat|nested] 69+ messages in thread
* [bug#63765] [PATCH v5 5/6] gnu: Add frozen.
2023-06-30 7:43 ` [bug#63765] [PATCH v5 0/6] " Hilton Chain via Guix-patches via
` (3 preceding siblings ...)
2023-06-30 7:44 ` [bug#63765] [PATCH v5 4/6] gnu: Add mbedtls-apache, version 3.4.0 Hilton Chain via Guix-patches via
@ 2023-06-30 7:44 ` Hilton Chain via Guix-patches via
2023-06-30 7:44 ` [bug#63765] [PATCH v5 6/6] gnu: python-lief: Update to 0.13.2 Hilton Chain via Guix-patches via
5 siblings, 0 replies; 69+ messages in thread
From: Hilton Chain via Guix-patches via @ 2023-06-30 7:44 UTC (permalink / raw)
To: 63765; +Cc: Hilton Chain
* gnu/packages/cpp.scm (frozen): New variable.
---
gnu/packages/cpp.scm | 23 +++++++++++++++++++++++
1 file changed, 23 insertions(+)
diff --git a/gnu/packages/cpp.scm b/gnu/packages/cpp.scm
index d61bcd25fd..b80939183c 100644
--- a/gnu/packages/cpp.scm
+++ b/gnu/packages/cpp.scm
@@ -567,6 +567,29 @@ (define-public fifo-map
as ordering relation.")
(license license:expat)))
+(define-public frozen
+ (let ((commit "5af40b3f9e03116aa2de4d55b53b9629e5988480")
+ (revision "8"))
+ (package
+ (name "frozen")
+ (version (git-version "1.1.1" revision commit))
+ (source (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/serge-sans-paille/frozen")
+ (commit commit)))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "02snxdfmrzcqwnkazhlagsfamr3mcg10iskpz5l8yscckzvyhzfs"))))
+ (build-system cmake-build-system)
+ (home-page "https://github.com/serge-sans-paille/frozen")
+ (synopsis "Header-only, constexpr alternative to gperf for C++14 users")
+ (description
+ "Frozen is a header-only library that provides 0 cost initialization
+for immutable containers, fixed-size containers, and various algorithms.")
+ (license license:asl2.0))))
+
(define-public json-dto
(package
(name "json-dto")
--
2.40.1
^ permalink raw reply related [flat|nested] 69+ messages in thread
* [bug#63765] [PATCH v5 6/6] gnu: python-lief: Update to 0.13.2.
2023-06-30 7:43 ` [bug#63765] [PATCH v5 0/6] " Hilton Chain via Guix-patches via
` (4 preceding siblings ...)
2023-06-30 7:44 ` [bug#63765] [PATCH v5 5/6] gnu: Add frozen Hilton Chain via Guix-patches via
@ 2023-06-30 7:44 ` Hilton Chain via Guix-patches via
5 siblings, 0 replies; 69+ messages in thread
From: Hilton Chain via Guix-patches via @ 2023-06-30 7:44 UTC (permalink / raw)
To: 63765; +Cc: Hilton Chain, Lars-Dominik Braun, jgart
* gnu/packages/python-xyz.scm (python-lief): Update to 0.13.2.
[snippet]: Unbundle third-party dependencies.
[build-system]: Change to cmake-build-system
[native-inputs]: Add python-minimal-wrapper, python-tomli.
Remove cmake.
[inputs]: Add frozen, mbedtls-apache, nlohmann-json, pybind11, utfcpp, spdlog.
[outputs]: Add "python" output.
[home-page]: Update homepage.
(shrinkwrap)[inputs]: Replace python-lief to its "python" output.
---
gnu/packages/python-xyz.scm | 96 +++++++++++++++++++++++++++++++------
1 file changed, 81 insertions(+), 15 deletions(-)
diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index c4105c4685..dc84a8f8bc 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -212,6 +212,7 @@ (define-module (gnu packages python-xyz)
#:use-module (gnu packages libusb)
#:use-module (gnu packages linux)
#:use-module (gnu packages llvm)
+ #:use-module (gnu packages logging)
#:use-module (gnu packages machine-learning)
#:use-module (gnu packages man)
#:use-module (gnu packages markup)
@@ -33278,29 +33279,94 @@ (define-public python-misskey
(define-public python-lief
(package
(name "python-lief")
- (version "0.12.3")
+ (version "0.13.2")
(source (origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/lief-project/LIEF")
(commit version)))
(file-name (git-file-name name version))
+ (modules '((guix build utils)))
+ (snippet
+ '(begin
+ ;; Configure build for Python bindings.
+ (substitute* "api/python/config-default.toml"
+ (("(ninja = )true" all m)
+ (string-append m "false"))
+ (("(parallel-jobs = )0" all m)
+ (string-append m (number->string (parallel-job-count)))))
+ ;; Unbundle third-party dependencies.
+ (for-each delete-file
+ (find-files "third-party/"
+ (string-join '("spdlog"
+ "frozen"
+ "json"
+ "mbedtls"
+ "pybind11"
+ "utfcpp")
+ "|" )))
+ ;; Same in argument #:configure-flags.
+ (substitute* "api/python/setup.py"
+ (("self\\._get_third_party_opt\\(\\)")
+ "[\"-DLIEF_EXTERNAL_SPDLOG=ON\",
+ \"-DLIEF_OPT_FROZEN_EXTERNAL=ON\",
+ \"-DLIEF_OPT_MBEDTLS_EXTERNAL=ON\",
+ \"-DLIEF_OPT_NLOHMANN_JSON_EXTERNAL=ON\",
+ \"-DLIEF_OPT_PYBIND11_EXTERNAL=ON\",
+ \"-DLIEF_OPT_UTFCPP_EXTERNAL=ON\"]"))))
(sha256
(base32
- "11i6hqmcjh56y554kqhl61698n9v66j2qk1c1g63mv2w07h2z661"))))
- (build-system python-build-system)
- (native-inputs (list cmake))
+ "0y48x358ppig5xp97ahcphfipx7cg9chldj2q5zrmn610fmi4zll"))))
+ (build-system cmake-build-system)
(arguments
- (list
- #:tests? #f ;needs network
- #:phases #~(modify-phases %standard-phases
- (replace 'build
- (lambda _
- (invoke
- "python" "setup.py" "--sdk" "build"
- (string-append
- "-j" (number->string (parallel-job-count)))))))))
- (home-page "https://github.com/lief-project/LIEF")
+ (list #:modules
+ '((guix build utils)
+ (guix build cmake-build-system)
+ ((guix build python-build-system) #:prefix python:))
+ #:imported-modules
+ (append %cmake-build-system-modules
+ '((guix build python-build-system)))
+ #:configure-flags
+ #~'("-DCMAKE_LINK_WHAT_YOU_USE=ON"
+ "-DBUILD_SHARED_LIBS=ON"
+ "-DLIEF_INSTALL_COMPILED_EXAMPLES=ON"
+ "-DLIEF_TESTS=ON"
+ ;; Unbundle third-party dependencies
+ "-DLIEF_EXTERNAL_SPDLOG=ON"
+ "-DLIEF_OPT_FROZEN_EXTERNAL=ON"
+ "-DLIEF_OPT_MBEDTLS_EXTERNAL=ON"
+ "-DLIEF_OPT_NLOHMANN_JSON_EXTERNAL=ON"
+ "-DLIEF_OPT_PYBIND11_EXTERNAL=ON"
+ "-DLIEF_OPT_UTFCPP_EXTERNAL=ON")
+ #:phases
+ ;; Phases from python-build-system, for Python bindings.
+ #~(modify-phases %standard-phases
+ (add-after 'install 'chdir
+ (lambda _
+ (chdir "../source/api/python/")))
+ (add-after 'chdir 'ensure-no-mtimes-pre-1980
+ (assoc-ref python:%standard-phases 'ensure-no-mtimes-pre-1980))
+ (add-after 'ensure-no-mtimes-pre-1980 'enable-bytecode-determinism
+ (assoc-ref python:%standard-phases 'enable-bytecode-determinism))
+ (add-after 'enable-bytecode-determinism 'ensure-no-cythonized-files
+ (assoc-ref python:%standard-phases 'ensure-no-cythonized-files))
+ (add-after 'ensure-no-cythonized-files 'python-install
+ (lambda* (#:key inputs outputs #:allow-other-keys)
+ ((assoc-ref python:%standard-phases 'install)
+ #:inputs inputs
+ #:outputs outputs
+ #:configure-flags '()
+ #:use-setuptools? #t)))
+ (add-after 'python-install 'add-install-to-pythonpath
+ (assoc-ref python:%standard-phases 'add-install-to-pythonpath))
+ (add-after 'add-install-to-pythonpath 'add-install-to-path
+ (assoc-ref python:%standard-phases 'add-install-to-path))
+ (add-after 'add-install-to-path 'python-wrap
+ (assoc-ref python:%standard-phases 'wrap)))))
+ (native-inputs (list python-minimal-wrapper python-tomli))
+ (inputs (list frozen mbedtls-apache nlohmann-json pybind11 utfcpp spdlog))
+ (outputs '("out" "python"))
+ (home-page "https://lief-project.github.io/")
(synopsis "Library to instrument executable formats")
(description
"@code{python-lief} is a cross platform library which can parse, modify
@@ -33348,7 +33414,7 @@ (define-public shrinkwrap
python-poetry-core
python-pypa-build
python-pytest))
- (inputs (list python-lief python-sh))
+ (inputs (list `(,python-lief "python") python-sh))
(home-page "https://github.com/fzakaria/shrinkwrap")
(synopsis "Emboss needed dependencies on the top level executable")
(description
--
2.40.1
^ permalink raw reply related [flat|nested] 69+ messages in thread
* [bug#64255] [PATCH v2 0/2] gnu: utfcpp: Update to 3.2.3.
2023-06-23 15:33 ` [bug#63765] [PATCH 0/2] gnu: utfcpp: Update to 3.2.3 Hilton Chain via Guix-patches via
2023-06-23 15:35 ` [bug#64255] [PATCH 1/2] gnu: Add ftest Hilton Chain via Guix-patches via
2023-06-23 15:35 ` [bug#64255] [PATCH 2/2] gnu: utfcpp: Update to 3.2.3 Hilton Chain via Guix-patches via
@ 2023-08-03 14:05 ` Hilton Chain via Guix-patches via
2023-08-03 14:06 ` [bug#64255] [PATCH v2 1/2] gnu: Add ftest Hilton Chain via Guix-patches via
2023-08-03 14:06 ` [bug#64255] [PATCH v2 2/2] gnu: utfcpp: Update to 3.2.3 Hilton Chain via Guix-patches via
2023-08-13 4:50 ` [bug#64255] [PATCH v3 0/2] gnu: utfcpp: Update to 3.2.4 Hilton Chain via Guix-patches via
2023-08-30 12:57 ` [bug#64255] Green light Andreas Enge
4 siblings, 2 replies; 69+ messages in thread
From: Hilton Chain via Guix-patches via @ 2023-08-03 14:05 UTC (permalink / raw)
To: 64255; +Cc: Hilton Chain, Liliana Marie Prikler, 宋文武
V1 -> V2: Rebase (and see if QA can pick this up).
All affected packages reported by `guix refresh -l' builds on my system
(x86_64-linux).
Thanks
Reza Housseini (2):
gnu: Add ftest.
gnu: utfcpp: Update to 3.2.3.
gnu/packages/check.scm | 41 ++++++++++++++++++++++++++++++++++++++
gnu/packages/games.scm | 2 +-
gnu/packages/textutils.scm | 27 ++++++++++++-------------
gnu/packages/video.scm | 5 +++++
4 files changed, 60 insertions(+), 15 deletions(-)
base-commit: 23e2ff223c0511317edf236504fb474e3b5ac301
--
2.41.0
^ permalink raw reply [flat|nested] 69+ messages in thread
* [bug#64255] [PATCH v2 1/2] gnu: Add ftest.
2023-08-03 14:05 ` [bug#64255] [PATCH v2 0/2] " Hilton Chain via Guix-patches via
@ 2023-08-03 14:06 ` Hilton Chain via Guix-patches via
2023-08-03 14:06 ` [bug#64255] [PATCH v2 2/2] gnu: utfcpp: Update to 3.2.3 Hilton Chain via Guix-patches via
1 sibling, 0 replies; 69+ messages in thread
From: Hilton Chain via Guix-patches via @ 2023-08-03 14:06 UTC (permalink / raw)
To: 64255; +Cc: Hilton Chain, Reza Housseini
From: Reza Housseini <reza@housseini.me>
* gnu/packages/check.scm (ftest): New variable.
Co-authored-by: Hilton Chain <hako@ultrarare.space>
---
gnu/packages/check.scm | 41 +++++++++++++++++++++++++++++++++++++++++
1 file changed, 41 insertions(+)
diff --git a/gnu/packages/check.scm b/gnu/packages/check.scm
index 71dc9eb54b..51aa40f18d 100644
--- a/gnu/packages/check.scm
+++ b/gnu/packages/check.scm
@@ -45,6 +45,8 @@
;;; Copyright © 2023 Timo Wilken <guix@twilken.net>
;;; Copyright © 2023 Zhu Zihao <all_but_last@163.com>
;;; Copyright © 2023 Bruno Victal <mirai@makinata.eu>
+;;; Copyright © 2023 Reza Housseini <reza@housseini.me>
+;;; Copyright © 2023 Hilton Chain <hako@ultrarare.space>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -67,6 +69,7 @@ (define-module (gnu packages check)
#:use-module (gnu packages autotools)
#:use-module (gnu packages base)
#:use-module (gnu packages bash)
+ #:use-module (gnu packages cmake)
#:use-module (gnu packages compression)
#:use-module (gnu packages linux)
#:use-module (gnu packages llvm)
@@ -94,6 +97,7 @@ (define-module (gnu packages check)
#:use-module (guix gexp)
#:use-module (guix git-download)
#:use-module (guix build-system cmake)
+ #:use-module (guix build-system copy)
#:use-module (guix build-system glib-or-gtk)
#:use-module (guix build-system gnu)
#:use-module (guix build-system go)
@@ -813,6 +817,43 @@ (define-public doctest
has been designed to be fast, light and unintrusive.")
(license license:expat)))
+(define-public ftest
+ ;; There aren't any releases and it looks more like a small side project.
+ ;; It is included for completness to run tests for package utfcpp.
+ (let ((commit "c4ad4af0946b73ce1a40cbc72205d15d196c7e06")
+ (revision "0"))
+ (package
+ (name "ftest")
+ (version (git-version "0" revision commit))
+ (source (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/nemtrif/ftest")
+ (commit commit)))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "1jcd76zjhx5f2nsi80hj7gmywgpz1f7vcw8lv5yf7gx0l99dn86x"))))
+ ;; No CMakeLists.txt file provided, only one to run tests
+ (build-system copy-build-system)
+ (arguments
+ (list #:install-plan
+ #~'(("ftest.h" "include/ftest/"))
+ #:phases
+ #~(modify-phases %standard-phases
+ (add-before 'install 'check
+ (lambda _
+ (with-directory-excursion "tests"
+ (invoke "cmake" ".")
+ (invoke "make")
+ (invoke "ctest")))))))
+ (native-inputs (list cmake-minimal))
+ (home-page "https://github.com/nemtrif/ftest")
+ (synopsis "C++ testing framework")
+ (description
+ "This package provides a simple and limited unit-test framework for C++.")
+ (license license:boost1.0))))
+
(define-public python-gixy
;; The 0.1.20 release is missing some important fixes.
;; XXX: Commit 'e9008dcbd11f43ccac109b0cf2bf98a94e76b449' breaks tests
--
2.41.0
^ permalink raw reply related [flat|nested] 69+ messages in thread
* [bug#64255] [PATCH v2 2/2] gnu: utfcpp: Update to 3.2.3.
2023-08-03 14:05 ` [bug#64255] [PATCH v2 0/2] " Hilton Chain via Guix-patches via
2023-08-03 14:06 ` [bug#64255] [PATCH v2 1/2] gnu: Add ftest Hilton Chain via Guix-patches via
@ 2023-08-03 14:06 ` Hilton Chain via Guix-patches via
1 sibling, 0 replies; 69+ messages in thread
From: Hilton Chain via Guix-patches via @ 2023-08-03 14:06 UTC (permalink / raw)
To: 64255
Cc: Hilton Chain, Reza Housseini, Liliana Marie Prikler,
宋文武
From: Reza Housseini <reza@housseini.me>
* gnu/packages/textutils.scm (utfcpp): Update to 3.2.3.
[snippet]: Unbundle ftest.
[arguments]: Remove field.
[native-inputs]: Add ftest.
* gnu/packages/games.scm (warzone2100)<#:phases>: Adjust 'fix-utfcpp-include.
* gnu/packages/video.scm (mkvtoolnix)<#:phases>: Add 'fix-utfcpp-include.
Co-authored-by: Hilton Chain <hako@ultrarare.space>
---
gnu/packages/games.scm | 2 +-
gnu/packages/textutils.scm | 27 +++++++++++++--------------
gnu/packages/video.scm | 5 +++++
3 files changed, 19 insertions(+), 15 deletions(-)
diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm
index 1573d7de00..82302852f4 100644
--- a/gnu/packages/games.scm
+++ b/gnu/packages/games.scm
@@ -5573,7 +5573,7 @@ (define-public warzone2100
(lambda _
(substitute* "lib/framework/wzstring.cpp"
(("<utfcpp/source/utf8.h>")
- "<utf8.h>"))))
+ "<utf8cpp/utf8.h>"))))
(add-after 'unpack 'link-tests-with-qt
(lambda _
(substitute* "tests/Makefile.am"
diff --git a/gnu/packages/textutils.scm b/gnu/packages/textutils.scm
index 4e026fc6f9..5fbfdde284 100644
--- a/gnu/packages/textutils.scm
+++ b/gnu/packages/textutils.scm
@@ -25,6 +25,8 @@
;;; Copyright © 2021 Felix Gruber <felgru@posteo.net>
;;; Copyright © 2021 Bonface Munyoki Kilyungi <me@bonfacemunyoki.com>
;;; Copyright © 2022 Gabriel Wicki <gabriel@erlikon.ch>
+;;; Copyright © 2023 Reza Housseini <reza@housseini.me>
+;;; Copyright © 2023 Hilton Chain <hako@ultrarare.space>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -690,29 +692,26 @@ (define-public catdoc
(define-public utfcpp
(package
(name "utfcpp")
- (version "2.3.5")
+ (version "3.2.3")
(source (origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/nemtrif/utfcpp")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
+ (modules '((guix build utils)))
+ ;; Unbundle ftest
+ (snippet
+ '(begin
+ (delete-file-recursively "extern")
+ (substitute* (find-files "tests" "\\.cpp")
+ (("\"../extern/ftest/ftest.h\"")
+ "<ftest/ftest.h>"))))
(sha256
(base32
- "1gr98d826z6wa58r1s5i7rz7q2x3r31v7zj0pjjlrc7gfxwklr4s"))))
+ "00hzh39iddbc6nxg13813qd6d55g2kccwjf5dr96wykfhway9wbr"))))
(build-system cmake-build-system)
- (arguments
- `(#:out-of-source? #f
- #:phases
- (modify-phases %standard-phases
- (replace 'install ; no install target
- (lambda* (#:key outputs #:allow-other-keys)
- (let* ((out (assoc-ref outputs "out"))
- (include (string-append out "/include"))
- (doc (string-append out "/share/doc/" ,name)))
- (copy-recursively "source" include)
- (install-file "README.md" doc)
- #t))))))
+ (native-inputs (list ftest))
(home-page "https://github.com/nemtrif/utfcpp")
(synopsis "Portable C++ library for handling UTF-8")
(description "UTF8-CPP is a C++ library for handling UTF-8 encoded text
diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm
index 801c2602e4..f75a528b13 100644
--- a/gnu/packages/video.scm
+++ b/gnu/packages/video.scm
@@ -1050,6 +1050,11 @@ (define-public mkvtoolnix
"--enable-precompiled-headers=no")
#:phases
(modify-phases %standard-phases
+ (add-after 'unpack 'fix-utfcpp-include
+ (lambda _
+ (substitute* "src/common/strings/utf8.cpp"
+ (("<utf8.h>")
+ "<utf8cpp/utf8.h>"))))
(add-after 'unpack 'patch-relative-file-names
(lambda* (#:key outputs #:allow-other-keys)
(let ((out (assoc-ref outputs "out")))
--
2.41.0
^ permalink raw reply related [flat|nested] 69+ messages in thread
* [bug#63765] [PATCH v6 00/10] gnu: python-lief: Update to 0.13.2.
2023-05-28 8:07 ` [bug#63765] [PATCH 0/8] gnu: python-lief: Update to 0.13.0 Hilton Chain via Guix-patches via
` (6 preceding siblings ...)
2023-06-30 7:43 ` [bug#63765] [PATCH v5 0/6] " Hilton Chain via Guix-patches via
@ 2023-08-05 13:18 ` Hilton Chain via Guix-patches via
2023-08-05 13:18 ` [bug#63765] [PATCH v6 01/10] gnu: mbedtls-apache: Rename to mbedtls-apache-lts Hilton Chain via Guix-patches via
` (9 more replies)
7 siblings, 10 replies; 69+ messages in thread
From: Hilton Chain via Guix-patches via @ 2023-08-05 13:18 UTC (permalink / raw)
To: 63765; +Cc: Hilton Chain, Lars-Dominik Braun, jgart
(Depends on #64255 for utfcpp update.)
V5 -> V6:
- mbedtls-apache-lts@2.28.4, mbedtls-apache@3.4.1.
- Unbundle all third-party dependencies.
- Honor build system arguments when building Python bindings.
- (@ (gnu packages python-xyz) python-lief) -> (@ (gnu packages elf) lief)
V4 -> V5 (resend)
V3 -> V4:
- Split out utfcpp update to #64255.
V2 -> V3:
- python-lief@0.13.2.
- Fix build of mkvtoolnix and warzone2100 (in utfcpp update).
V1 -> V2:
- python-lief@0.13.1.
V1:
- python-lief@0.13.0
- Install C bindings to "out" and Python bindings to "python" (Previously
only installed Python bindings to "out").
- utfcpp@3.2.3.
- Rename mbedtls-apache to mbedtls-apache-lts and update it to 2.28.3.
- Add mbedtls-apache@3.4.0.
- Unbundle, except tcb-span, leaf, melkor and catch2.
Note:
- The library is built twice, once (shared) for C bindings, the other
(static) for Python bindings.
- Unable to use Python bindings when building with "-DBUILD_SHARED_LIBS=ON".
--8<---------------cut here---------------start------------->8---
ImportError: /gnu/store/...-lief-0.13.2-python/lib/python3.10/site-packages/lief/_lief.cpython-310-x86_64-linux-gnu.so: undefined symbol: _ZTIN4LIEF12BinaryStreamE
--8<---------------cut here---------------end--------------->8---
- Some warnings are visible with --verbosity=1, bug?
--8<---------------cut here---------------start------------->8---
The following derivation will be built:
/gnu/store/x5ndfim6k184agskfvkgyzb596k8y3ww-python-lief-0.13.2.drv
building /gnu/store/x5ndfim6k184agskfvkgyzb596k8y3ww-python-lief-0.13.2.drv...
49% ▕████████████████████████████████████████████████████████████████████████████████████████▏ ▏�@ build-log 6665 1568
�} may change value [-Wconversion]
479 | raw_cmd.dataoff += linkedit_offset_;
| ~~~~~~~~~~~~~~~~~~^~~~~~~~~~~~~~~~~~~
/tmp/guix-build-python-lief-0.13.2.drv-0/source/src/MachO/Builder.tcc: In instantiation of ‘LIEF::ok_error_t LIEF::MachO::Builder::build(LIEF::MachO::DataInCode&) [with T = LIEF::MachO::details::MachO64; LIEF::ok_error_t = boost::leaf::result<LIEF::ok_t>]’:
/tmp/guix-build-python-lief-0.13.2.drv-0/source/src/MachO/Builder.tcc:83:13: required from ‘LIEF::ok_error_t LIEF::MachO::Builder::build_linkedit() [with T = LIEF::MachO::details::MachO64; LIEF::ok_error_t = boost::leaf::result<LIEF::ok_t>]’
/tmp/guix-build-python-lief-0.13.2.drv-0/source/src/MachO/Builder.cpp:69:22: required from ‘LIEF::ok_error_t LIEF::MachO::Builder::build() [with T = LIEF::MachO::details::MachO64; LIEF::ok_error_t = boost::leaf::result<LIEF::ok_t>]’
/tmp/guix-build-python-lief-0.13.2.drv-0/source/src/MachO/Builder.cpp:55:33: required from here
/tmp/guix-build-python-lief-0.13.2.drv-0/source/src/MachO/Builder.tcc:763:37: warning: conversion from ‘size_t’ {aka ‘long unsigned int’} to ‘uint32_t’ {aka ‘unsigned int’} may change value [-Wconversion]
763 | raw_cmd.dataoff = linkedit_.size();
| ~~~~~~~~~~~~~~^~
32% 'python-install' ▕████████████████████████████████████████████████████▏ ▏�@ build-log 6665 183
�} may change value [-Wconversion]
479 | raw_cmd.dataoff += linkedit_offset_;
| ~~~~~~~~~~~~~~~~~~^~~~~~~~~~~~~~~~~~~
/gnu/store/nf7jr5zc4qnq1wckcgl82mnc6wchrsmz-python-lief-0.13.2
/gnu/store/j765jgsnzz19ic0q2wlhrj441bpmrbwf-python-lief-0.13.2-python
--8<---------------cut here---------------end--------------->8---
--8<---------------cut here---------------start------------->8---
building /gnu/store/8qhffw3z1x6vyhbyl8n4qfwyaq9gcmmp-julia-cfitsio-1.4.1.drv...
���Mw�ŭ�1 phasej ��t�=F\�lrs��x�re��F��0x��}�����W�7��A@@@�$�d����Ϛ���H L��;�p6=�^8 �ى�ޣ��C��>�����;��w������y~9�^�ŭ~���g+n�e[��,�M�(�8����~\w�
�@@@@�)_��-@ build-log 11136 43
phase `check' succeeded after 18.7 seconds
--8<---------------cut here---------------end--------------->8---
--8<---------------cut here---------------start------------->8---
building /gnu/store/6h9jy7bf5afghxl7w799d7ifr2y4lygk-julia-simd-3.4.2.drv...
/ 'check' phase��@ build-log 18329 1211
��┌ @ /gnu/store/flmywqlaizs7vcd8a9rbm1jafimnp3bx-julia-simd-3.4.2/share/julia/loadpath/SIMD/src/LLVM_intrinsics.jl:822 within `macro expansion`
vextractf128 $1, %ymm0, %xmm1
vaddpd %xmm1, %xmm0, %xmm0
vpermilpd $1, %xmm0, %xmm1 # xmm1 = xmm0[1,0]
vaddsd %xmm1, %xmm0, %xmm0
vxorpd %xmm1, %xmm1, %xmm1
vaddsd %xmm1, %xmm0, %xmm0
; │└└└
--8<---------------cut here---------------end--------------->8---
Updating mbedtls-apache affects many Julia packages and I haven't tried to
build them all.
Thanks
Hilton Chain (10):
gnu: mbedtls-apache: Rename to mbedtls-apache-lts.
gnu: mbedtls-apache-for-hiawatha: Use inherited source.
gnu: mbedtls-apache-lts: Update to 2.28.4.
gnu: Add mbedtls-apache, version 3.4.1.
gnu: Add frozen.
gnu: Add boost-leaf.
gnu: Add tcb-span.
gnu: Add melkor.
gnu: python-lief: Update to 0.13.2.
gnu: python-lief: Rename to lief.
gnu/local.mk | 1 +
gnu/packages/boost.scm | 33 ++++
gnu/packages/cpp.scm | 67 ++++++++
gnu/packages/elf.scm | 162 +++++++++++++++++-
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 +-
.../lief-unbundle-test-dependencies.patch | 103 +++++++++++
gnu/packages/python-xyz.scm | 35 +---
gnu/packages/search.scm | 2 +-
gnu/packages/tls.scm | 50 +++---
gnu/packages/video.scm | 2 +-
19 files changed, 403 insertions(+), 80 deletions(-)
create mode 100644 gnu/packages/patches/lief-unbundle-test-dependencies.patch
base-commit: 4739e6844cfbf815357019faf708d3c266137acc
prerequisite-patch-id: 82c68dd1a77d4105aa1c2bc868325b94fe5d1f73
prerequisite-patch-id: 1fdbe22294c9e1df602b3d3636e14c806dc29313
--
2.41.0
^ permalink raw reply [flat|nested] 69+ messages in thread
* [bug#63765] [PATCH v6 01/10] gnu: mbedtls-apache: Rename to mbedtls-apache-lts.
2023-08-05 13:18 ` [bug#63765] [PATCH v6 00/10] " Hilton Chain via Guix-patches via
@ 2023-08-05 13:18 ` Hilton Chain via Guix-patches via
2023-08-05 13:18 ` [bug#63765] [PATCH v6 02/10] gnu: mbedtls-apache-for-hiawatha: Use inherited source Hilton Chain via Guix-patches via
` (8 subsequent siblings)
9 siblings, 0 replies; 69+ messages in thread
From: Hilton Chain via Guix-patches via @ 2023-08-05 13:18 UTC (permalink / raw)
To: 63765
Cc: Hilton Chain, Efraim Flashner, Leo Famulari,
Liliana Marie Prikler, Simon Tournier, Tobias Geerinckx-Rice,
宋文武
* 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.
---
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 67950c1603..8123ec764b 100644
--- a/gnu/packages/emulators.scm
+++ b/gnu/packages/emulators.scm
@@ -341,7 +341,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 5771b7530f..dffdf18aed 100644
--- a/gnu/packages/game-development.scm
+++ b/gnu/packages/game-development.scm
@@ -1971,7 +1971,7 @@ (define-public godot-lts
libxi
libxinerama
libxrandr
- mbedtls-apache
+ mbedtls-apache-lts
mesa
opusfile
pcre2
@@ -2213,7 +2213,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 ab343d1dac..02db432810 100644
--- a/gnu/packages/hardware.scm
+++ b/gnu/packages/hardware.scm
@@ -692,7 +692,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:
@@ -1058,7 +1058,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 f966724022..407d3f4b08 100644
--- a/gnu/packages/irc.scm
+++ b/gnu/packages/irc.scm
@@ -815,7 +815,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 2320b03595..78ec186bf2 100644
--- a/gnu/packages/julia-jll.scm
+++ b/gnu/packages/julia-jll.scm
@@ -1404,7 +1404,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 ba54175822..82891525c2 100644
--- a/gnu/packages/julia.scm
+++ b/gnu/packages/julia.scm
@@ -511,7 +511,7 @@ (define-public julia
("libunwind" ,libunwind-julia)
("libuv" ,libuv-julia)
("llvm" ,llvm-julia)
- ("mbedtls-apache" ,mbedtls-apache)
+ ("mbedtls-apache" ,mbedtls-apache-lts)
("mpfr" ,mpfr)
("openblas" ,openblas)
("openlibm" ,openlibm)
diff --git a/gnu/packages/linphone.scm b/gnu/packages/linphone.scm
index 7d87ee602c..f26c5efd3c 100644
--- a/gnu/packages/linphone.scm
+++ b/gnu/packages/linphone.scm
@@ -188,7 +188,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 9c49cc0b3a..40e24c39bc 100644
--- a/gnu/packages/linux.scm
+++ b/gnu/packages/linux.scm
@@ -2309,7 +2309,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 488d015107..e1d48a82f0 100644
--- a/gnu/packages/networking.scm
+++ b/gnu/packages/networking.scm
@@ -822,7 +822,7 @@ (define-public nng
(native-inputs
`(("ksh" ,oksh)))
(inputs
- `(("mbedtls" ,mbedtls-apache)))
+ `(("mbedtls" ,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 3e3e8e00c6..a0640799bc 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 f51c47db04..a986d2e578 100644
--- a/gnu/packages/tls.scm
+++ b/gnu/packages/tls.scm
@@ -955,7 +955,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
@@ -995,7 +995,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
@@ -1017,7 +1017,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 f75a528b13..38489beea7 100644
--- a/gnu/packages/video.scm
+++ b/gnu/packages/video.scm
@@ -3505,7 +3505,7 @@ (define-public obs
libxcomposite
libxkbcommon
luajit
- mbedtls-apache
+ mbedtls-apache-lts
mesa
pciutils
pipewire
--
2.41.0
^ permalink raw reply related [flat|nested] 69+ messages in thread
* [bug#63765] [PATCH v6 02/10] gnu: mbedtls-apache-for-hiawatha: Use inherited source.
2023-08-05 13:18 ` [bug#63765] [PATCH v6 00/10] " Hilton Chain via Guix-patches via
2023-08-05 13:18 ` [bug#63765] [PATCH v6 01/10] gnu: mbedtls-apache: Rename to mbedtls-apache-lts Hilton Chain via Guix-patches via
@ 2023-08-05 13:18 ` Hilton Chain via Guix-patches via
2023-08-05 13:18 ` [bug#63765] [PATCH v6 03/10] gnu: mbedtls-apache-lts: Update to 2.28.4 Hilton Chain via Guix-patches via
` (7 subsequent siblings)
9 siblings, 0 replies; 69+ messages in thread
From: Hilton Chain via Guix-patches via @ 2023-08-05 13:18 UTC (permalink / raw)
To: 63765; +Cc: Hilton Chain
* gnu/packages/tls.scm (mbedtls-apache-for-hiawatha): Use inherited source.
[arguments]<#:phases>: Keep "-Wformat-signedness".
---
gnu/packages/tls.scm | 25 -------------------------
1 file changed, 25 deletions(-)
diff --git a/gnu/packages/tls.scm b/gnu/packages/tls.scm
index a986d2e578..5723956357 100644
--- a/gnu/packages/tls.scm
+++ b/gnu/packages/tls.scm
@@ -958,8 +958,6 @@ (define-public perl-crypt-openssl-random
(define-public mbedtls-apache-lts
(package
(name "mbedtls-apache")
- ;; XXX Check whether ‘-Wformat-signedness’ still breaks mbedtls-for-hiawatha
- ;; when updating.
(version "2.28.0")
(source
(origin
@@ -996,26 +994,6 @@ (define-public mbedtls-for-hiawatha
(hidden-package
(package
(inherit mbedtls-apache-lts)
- (name "mbedtls-apache")
- (version "2.26.0")
- (source
- (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/ARMmbed/mbedtls")
- (commit (string-append "mbedtls-" version))))
- (sha256
- (base32 "0scwpmrgvg6q7rvqkc352d2fqlsx0aylcbyibcp1f1rsn8iiif2m"))
- (file-name (git-file-name name version))
- (modules '((guix build utils)))
- (snippet
- '(begin
- ;; Can be removed with the next version.
- ;; Reduce level of format truncation warnings due to false positives.
- ;; https://github.com/ARMmbed/mbedtls/commit/2065a8d8af27c6cb1e40c9462b5933336dca7434
- (substitute* "CMakeLists.txt"
- (("Wformat-truncation=2") "Wformat-truncation"))
- #t))))
(arguments
(substitute-keyword-arguments (package-arguments mbedtls-apache-lts)
((#:phases phases)
@@ -1026,9 +1004,6 @@ (define-public mbedtls-for-hiawatha
(invoke "scripts/config.pl" "set" feature))
(list "MBEDTLS_THREADING_C"
"MBEDTLS_THREADING_PTHREAD"))
- ;; XXX The above enables code that breaks with -Werror…
- (substitute* "CMakeLists.txt"
- ((" -Wformat-signedness") ""))
#t)))))))))
(define-public dehydrated
--
2.41.0
^ permalink raw reply related [flat|nested] 69+ messages in thread
* [bug#63765] [PATCH v6 03/10] gnu: mbedtls-apache-lts: Update to 2.28.4.
2023-08-05 13:18 ` [bug#63765] [PATCH v6 00/10] " Hilton Chain via Guix-patches via
2023-08-05 13:18 ` [bug#63765] [PATCH v6 01/10] gnu: mbedtls-apache: Rename to mbedtls-apache-lts Hilton Chain via Guix-patches via
2023-08-05 13:18 ` [bug#63765] [PATCH v6 02/10] gnu: mbedtls-apache-for-hiawatha: Use inherited source Hilton Chain via Guix-patches via
@ 2023-08-05 13:18 ` Hilton Chain via Guix-patches via
2023-08-05 13:19 ` [bug#63765] [PATCH v6 04/10] gnu: Add mbedtls-apache, version 3.4.1 Hilton Chain via Guix-patches via
` (6 subsequent siblings)
9 siblings, 0 replies; 69+ messages in thread
From: Hilton Chain via Guix-patches via @ 2023-08-05 13:18 UTC (permalink / raw)
To: 63765; +Cc: Hilton Chain
* gnu/packages/tls.scm (mbedtls-apache-lts): Update to 2.28.4.
---
gnu/packages/tls.scm | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/gnu/packages/tls.scm b/gnu/packages/tls.scm
index 5723956357..7e8f2921d2 100644
--- a/gnu/packages/tls.scm
+++ b/gnu/packages/tls.scm
@@ -958,7 +958,7 @@ (define-public perl-crypt-openssl-random
(define-public mbedtls-apache-lts
(package
(name "mbedtls-apache")
- (version "2.28.0")
+ (version "2.28.4")
(source
(origin
(method git-fetch)
@@ -967,7 +967,7 @@ (define-public mbedtls-apache-lts
(commit (string-append "mbedtls-" version))))
(file-name (git-file-name name version))
(sha256
- (base32 "0s37dsi29v7146fi9k4frvx5rz2snxdm6c3rwq2fvnca2r80hfjl"))))
+ (base32 "1lcsccnkgxj1j4pl7pa6l2rvl23kzpv7cwk8hgb96jv0sf7yghpk"))))
(build-system cmake-build-system)
(arguments
`(#:configure-flags
--
2.41.0
^ permalink raw reply related [flat|nested] 69+ messages in thread
* [bug#63765] [PATCH v6 04/10] gnu: Add mbedtls-apache, version 3.4.1.
2023-08-05 13:18 ` [bug#63765] [PATCH v6 00/10] " Hilton Chain via Guix-patches via
` (2 preceding siblings ...)
2023-08-05 13:18 ` [bug#63765] [PATCH v6 03/10] gnu: mbedtls-apache-lts: Update to 2.28.4 Hilton Chain via Guix-patches via
@ 2023-08-05 13:19 ` Hilton Chain via Guix-patches via
2023-08-05 13:19 ` [bug#63765] [PATCH v6 05/10] gnu: Add frozen Hilton Chain via Guix-patches via
` (5 subsequent siblings)
9 siblings, 0 replies; 69+ messages in thread
From: Hilton Chain via Guix-patches via @ 2023-08-05 13:19 UTC (permalink / raw)
To: 63765; +Cc: Hilton Chain
* gnu/packages/tls.scm (mbedtls-apache): New variable.
---
gnu/packages/tls.scm | 15 +++++++++++++++
1 file changed, 15 insertions(+)
diff --git a/gnu/packages/tls.scm b/gnu/packages/tls.scm
index 7e8f2921d2..ac8d6c552c 100644
--- a/gnu/packages/tls.scm
+++ b/gnu/packages/tls.scm
@@ -989,6 +989,21 @@ (define-public mbedtls-apache-lts
(home-page "https://www.trustedfirmware.org/projects/mbed-tls/")
(license license:asl2.0)))
+(define-public mbedtls-apache
+ (package
+ (inherit mbedtls-apache-lts)
+ (name "mbedtls-apache")
+ (version "3.4.1")
+ (source (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/ARMmbed/mbedtls")
+ (commit (string-append "mbedtls-" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "0fzm1a02r4mkhawxdgk6rr7pv9dp94z4yrg4xd9sk0svqm2z521l"))))))
+
;; The Hiawatha Web server requires some specific features to be enabled.
(define-public mbedtls-for-hiawatha
(hidden-package
--
2.41.0
^ permalink raw reply related [flat|nested] 69+ messages in thread
* [bug#63765] [PATCH v6 05/10] gnu: Add frozen.
2023-08-05 13:18 ` [bug#63765] [PATCH v6 00/10] " Hilton Chain via Guix-patches via
` (3 preceding siblings ...)
2023-08-05 13:19 ` [bug#63765] [PATCH v6 04/10] gnu: Add mbedtls-apache, version 3.4.1 Hilton Chain via Guix-patches via
@ 2023-08-05 13:19 ` Hilton Chain via Guix-patches via
2023-08-05 13:19 ` [bug#63765] [PATCH v6 06/10] gnu: Add boost-leaf Hilton Chain via Guix-patches via
` (4 subsequent siblings)
9 siblings, 0 replies; 69+ messages in thread
From: Hilton Chain via Guix-patches via @ 2023-08-05 13:19 UTC (permalink / raw)
To: 63765; +Cc: Hilton Chain
* gnu/packages/cpp.scm (frozen): New variable.
---
gnu/packages/cpp.scm | 23 +++++++++++++++++++++++
1 file changed, 23 insertions(+)
diff --git a/gnu/packages/cpp.scm b/gnu/packages/cpp.scm
index 1a71c86c3c..5d1361173f 100644
--- a/gnu/packages/cpp.scm
+++ b/gnu/packages/cpp.scm
@@ -567,6 +567,29 @@ (define-public fifo-map
as ordering relation.")
(license license:expat)))
+(define-public frozen
+ (let ((commit "5af40b3f9e03116aa2de4d55b53b9629e5988480")
+ (revision "8"))
+ (package
+ (name "frozen")
+ (version (git-version "1.1.1" revision commit))
+ (source (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/serge-sans-paille/frozen")
+ (commit commit)))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "02snxdfmrzcqwnkazhlagsfamr3mcg10iskpz5l8yscckzvyhzfs"))))
+ (build-system cmake-build-system)
+ (home-page "https://github.com/serge-sans-paille/frozen")
+ (synopsis "Header-only, constexpr alternative to gperf for C++14")
+ (description
+ "Frozen is a header-only library that provides 0 cost initialization
+for immutable containers, fixed-size containers, and various algorithms.")
+ (license license:asl2.0))))
+
(define-public json-dto
(package
(name "json-dto")
--
2.41.0
^ permalink raw reply related [flat|nested] 69+ messages in thread
* [bug#63765] [PATCH v6 06/10] gnu: Add boost-leaf.
2023-08-05 13:18 ` [bug#63765] [PATCH v6 00/10] " Hilton Chain via Guix-patches via
` (4 preceding siblings ...)
2023-08-05 13:19 ` [bug#63765] [PATCH v6 05/10] gnu: Add frozen Hilton Chain via Guix-patches via
@ 2023-08-05 13:19 ` Hilton Chain via Guix-patches via
2023-08-05 13:19 ` [bug#63765] [PATCH v6 07/10] gnu: Add tcb-span Hilton Chain via Guix-patches via
` (3 subsequent siblings)
9 siblings, 0 replies; 69+ messages in thread
From: Hilton Chain via Guix-patches via @ 2023-08-05 13:19 UTC (permalink / raw)
To: 63765; +Cc: Hilton Chain
* gnu/packages/boost.scm (boost-leaf): New variable.
---
gnu/packages/boost.scm | 33 +++++++++++++++++++++++++++++++++
1 file changed, 33 insertions(+)
diff --git a/gnu/packages/boost.scm b/gnu/packages/boost.scm
index d2b676cc73..9b522a54fb 100644
--- a/gnu/packages/boost.scm
+++ b/gnu/packages/boost.scm
@@ -42,6 +42,7 @@ (define-module (gnu packages boost)
#:use-module (guix download)
#:use-module (guix git-download)
#:use-module (guix build-system gnu)
+ #:use-module (guix build-system meson)
#:use-module (guix build-system trivial)
#:use-module (gnu packages)
#:use-module (gnu packages compression)
@@ -363,6 +364,38 @@ (define-public boost-for-mysql
(delete "python-minimal-wrapper")))
(properties '((hidden? . #t)))))
+(define-public boost-leaf
+ (package
+ (name "boost-leaf")
+ (version "1.82.0")
+ (source (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/boostorg/leaf")
+ (commit (string-append "boost-" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "1awxidipj54rz82mk48axaajiy5na8qsglqrv9iqr50kvjil39z1"))))
+ (build-system meson-build-system)
+ (arguments
+ (list #:configure-flags
+ #~'("-Dleaf_enable_examples=false")
+ #:phases
+ #~(modify-phases %standard-phases
+ (replace 'install
+ (lambda _
+ (mkdir-p #$output)
+ (copy-recursively
+ "../source/include"
+ (string-append #$output "/include")))))))
+ (home-page "https://boostorg.github.io/leaf/")
+ (synopsis "C++11 error handling library")
+ (description
+ "@acronym{LEAF, Lightweight Error Augmentation Framework} is a lightweight
+error handling library for C++11.")
+ (license license:boost1.0)))
+
(define-public boost-sync
(let ((commit "e690de2d30e2f1649ff500c9a6f3539814994b1c")
(version "1.55")
--
2.41.0
^ permalink raw reply related [flat|nested] 69+ messages in thread
* [bug#63765] [PATCH v6 07/10] gnu: Add tcb-span.
2023-08-05 13:18 ` [bug#63765] [PATCH v6 00/10] " Hilton Chain via Guix-patches via
` (5 preceding siblings ...)
2023-08-05 13:19 ` [bug#63765] [PATCH v6 06/10] gnu: Add boost-leaf Hilton Chain via Guix-patches via
@ 2023-08-05 13:19 ` Hilton Chain via Guix-patches via
2023-08-05 13:19 ` [bug#63765] [PATCH v6 08/10] gnu: Add melkor Hilton Chain via Guix-patches via
` (2 subsequent siblings)
9 siblings, 0 replies; 69+ messages in thread
From: Hilton Chain via Guix-patches via @ 2023-08-05 13:19 UTC (permalink / raw)
To: 63765; +Cc: Hilton Chain
* gnu/packages/cpp.scm (tcb-span): New variable.
---
gnu/packages/cpp.scm | 44 ++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 44 insertions(+)
diff --git a/gnu/packages/cpp.scm b/gnu/packages/cpp.scm
index 5d1361173f..8d20e698bb 100644
--- a/gnu/packages/cpp.scm
+++ b/gnu/packages/cpp.scm
@@ -1023,6 +1023,50 @@ (define-public sobjectizer
development of concurrent and multithreaded applications in C++.")
(license license:bsd-3)))
+(define-public tcb-span
+ ;; No released versions
+ (let ((commit "836dc6a0efd9849cb194e88e4aa2387436bb079b")
+ (revision "0"))
+ (package
+ (name "tcb-span")
+ (version (git-version "0.0.0" revision commit))
+ (source (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/tcbrindle/span")
+ (commit commit)))
+ (file-name (git-file-name name version))
+ (modules '((guix build utils)))
+ (snippet
+ '(begin
+ (delete-file "test/catch.hpp")
+ (substitute* "test/CMakeLists.txt"
+ (("add_library.*" line)
+ (string-append
+ line "find_package(Catch2 REQUIRED)\n")))
+ (substitute* (find-files "test" "\\.cpp")
+ (("\"catch.hpp\"") "<catch2/catch.hpp>"))))
+ (sha256
+ (base32
+ "1v3x1mj4if8jrr7cmrcbhv8n8ygla0liqb0dic6g6ji7px2pr6jf"))))
+ (build-system cmake-build-system)
+ (arguments
+ (list #:phases
+ #~(modify-phases %standard-phases
+ (replace 'install
+ (lambda _
+ (copy-recursively
+ "../source/include"
+ (string-append #$output "/include")))))))
+ (native-inputs (list catch2))
+ (home-page "https://github.com/tcbrindle/span")
+ (synopsis "@code{std::span} implementation for older compilers")
+ (description
+ "This package provides a single-header implementation of C++20's
+@code{std::span}, conforming to the C++20 committee draft. It is compatible
+with C++11, but will use newer language features if they are available.")
+ (license license:boost1.0))))
+
(define-public tweeny
(package
(name "tweeny")
--
2.41.0
^ permalink raw reply related [flat|nested] 69+ messages in thread
* [bug#63765] [PATCH v6 08/10] gnu: Add melkor.
2023-08-05 13:18 ` [bug#63765] [PATCH v6 00/10] " Hilton Chain via Guix-patches via
` (6 preceding siblings ...)
2023-08-05 13:19 ` [bug#63765] [PATCH v6 07/10] gnu: Add tcb-span Hilton Chain via Guix-patches via
@ 2023-08-05 13:19 ` Hilton Chain via Guix-patches via
2023-08-05 13:19 ` [bug#63765] [PATCH v6 09/10] gnu: python-lief: Update to 0.13.2 Hilton Chain via Guix-patches via
2023-08-05 13:19 ` [bug#63765] [PATCH v6 10/10] gnu: python-lief: Rename to lief Hilton Chain via Guix-patches via
9 siblings, 0 replies; 69+ messages in thread
From: Hilton Chain via Guix-patches via @ 2023-08-05 13:19 UTC (permalink / raw)
To: 63765; +Cc: Hilton Chain
* gnu/packages/elf.scm (melkor): New variable.
---
gnu/packages/elf.scm | 37 +++++++++++++++++++++++++++++++++++++
1 file changed, 37 insertions(+)
diff --git a/gnu/packages/elf.scm b/gnu/packages/elf.scm
index a100038f14..3ddb6c4064 100644
--- a/gnu/packages/elf.scm
+++ b/gnu/packages/elf.scm
@@ -28,6 +28,7 @@
;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>.
(define-module (gnu packages elf)
+ #:use-module (guix gexp)
#:use-module (guix utils)
#:use-module (guix packages)
#:use-module (guix download)
@@ -340,3 +341,39 @@ (define-public libdwarf
debugging information format.")
;; See https://www.prevanders.net/dwarflicense.html:
(license (list lgpl2.1 gpl2 bsd-2))))
+
+(define-public melkor
+ (let ((commit "ac2495bef2a744e7931537e023b1129229b001c4")
+ (revision "8"))
+ (package
+ (name "melkor")
+ (version (git-version "1.0" revision commit))
+ (source (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/romainthomas/elf_fuzzer")
+ (commit commit)))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "1czg0dgvzxcsi04myjvvdcl3vcf59d5l328ydmm01lh892wdf4dy"))))
+ (build-system gnu-build-system)
+ (arguments
+ (list #:tests? #f ;No tests.
+ #:make-flags
+ #~(list (string-append "CC=" #$(cc-for-target))
+ (format #f "INSTALLPATH=~a/bin/" #$output))
+ #:phases
+ #~(modify-phases %standard-phases
+ ;; No configure script.
+ (delete 'configure)
+ (add-before 'install 'create-/bin
+ (lambda _
+ (mkdir-p (string-append #$output "/bin")))))))
+ ;; Fork of <https://github.com/IOActive/Melkor_ELF_Fuzzer>
+ (home-page "https://github.com/romainthomas/elf_fuzzer")
+ (synopsis "ELF File Format Fuzzer")
+ (description
+ "Melkor is an intuitive and easy-to-use ELF file format fuzzer for
+finding functional and security bugs in ELF parsers.")
+ (license gpl3+))))
--
2.41.0
^ permalink raw reply related [flat|nested] 69+ messages in thread
* [bug#63765] [PATCH v6 09/10] gnu: python-lief: Update to 0.13.2.
2023-08-05 13:18 ` [bug#63765] [PATCH v6 00/10] " Hilton Chain via Guix-patches via
` (7 preceding siblings ...)
2023-08-05 13:19 ` [bug#63765] [PATCH v6 08/10] gnu: Add melkor Hilton Chain via Guix-patches via
@ 2023-08-05 13:19 ` Hilton Chain via Guix-patches via
2023-08-05 13:19 ` [bug#63765] [PATCH v6 10/10] gnu: python-lief: Rename to lief Hilton Chain via Guix-patches via
9 siblings, 0 replies; 69+ messages in thread
From: Hilton Chain via Guix-patches via @ 2023-08-05 13:19 UTC (permalink / raw)
To: 63765; +Cc: Hilton Chain, Lars-Dominik Braun, jgart
* gnu/packages/patches/lief-unbundle-test-dependencies.patch: New file.
* gnu/local.mk (dist_patch_DATA): Add it.
* gnu/packages/python-xyz.scm (python-lief): Update to 0.13.2.
[snippet]: Unbundle third-party dependencies.
[build-system]: Switch to cmake-build-system
[native-inputs]: Add catch2, melkor, python-wrapper, python-tomli.
Remove cmake.
[inputs]: Add boost-leaf, frozen, mbedtls-apache, nlohmann-json, pybind11,
spdlog, tcb-span, utfcpp.
[outputs]: Add "python" output.
[home-page]: Update homepage.
(shrinkwrap)[inputs]: Replace python-lief to its "python" output.
---
gnu/local.mk | 1 +
.../lief-unbundle-test-dependencies.patch | 103 ++++++++++++++++
gnu/packages/python-xyz.scm | 112 +++++++++++++++---
3 files changed, 202 insertions(+), 14 deletions(-)
create mode 100644 gnu/packages/patches/lief-unbundle-test-dependencies.patch
diff --git a/gnu/local.mk b/gnu/local.mk
index 77707127a7..c79299a592 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1544,6 +1544,7 @@ dist_patch_DATA = \
%D%/packages/patches/libwpd-gcc-compat.patch \
%D%/packages/patches/libxslt-generated-ids.patch \
%D%/packages/patches/libxt-guix-search-paths.patch \
+ %D%/packages/patches/lief-unbundle-test-dependencies.patch \
%D%/packages/patches/lierolibre-check-unaligned-access.patch \
%D%/packages/patches/lierolibre-is-free-software.patch \
%D%/packages/patches/lierolibre-newer-libconfig.patch \
diff --git a/gnu/packages/patches/lief-unbundle-test-dependencies.patch b/gnu/packages/patches/lief-unbundle-test-dependencies.patch
new file mode 100644
index 0000000000..d86126c657
--- /dev/null
+++ b/gnu/packages/patches/lief-unbundle-test-dependencies.patch
@@ -0,0 +1,103 @@
+From 0e0f105e984eeac51147b5fd87cf95668e8fa235 Mon Sep 17 00:00:00 2001
+From: Hilton Chain <hako@ultrarare.space>
+Date: Fri, 4 Aug 2023 10:57:32 +0800
+Subject: [PATCH] Use system Catch2 and Melkor.
+
+---
+ tests/CMakeLists.txt | 47 ++++------------------------------------
+ tests/test_iterators.cpp | 2 +-
+ 2 files changed, 5 insertions(+), 44 deletions(-)
+
+diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
+index 1d34b711..cf79ab74 100644
+--- a/tests/CMakeLists.txt
++++ b/tests/CMakeLists.txt
+@@ -8,23 +8,6 @@ set(LIEF_EXAMPLES_DIRECTORY "${PROJECT_SOURCE_DIR}/examples")
+ set(LIEF_EXAMPLES_BINARY_DIR "${PROJECT_BINARY_DIR}/examples")
+
+
+-# Catch
+-# =====
+-set(CATCH_VERSION 2.13.8)
+-set(CATCH_SHA256 SHA256=532f163e4f2db66dae33f1d0a279e8d9befec8bc6cca60d7b82155f7d06bd89c)
+-set(CATCH_URL "${THIRD_PARTY_DIRECTORY}/Catch2-${CATCH_VERSION}.zip" CACHE STRING "URL to the Catch repo")
+-
+-ExternalProject_Add(catch
+- PREFIX ${CATCH_PREFIX}
+- URL ${CATCH_URL}
+- URL_HASH ${CATCH_SHA256}
+- CONFIGURE_COMMAND ""
+- BUILD_COMMAND ""
+- INSTALL_COMMAND ""
+-)
+-ExternalProject_Get_Property(catch source_dir)
+-set(CATCH_INCLUDE_DIR "${source_dir}" CACHE INTERNAL "Path to include folder for Catch")
+-
+ # Code covergage
+ # ==============
+ if(LIEF_COVERAGE)
+@@ -58,31 +41,6 @@ if(LIEF_COVERAGE)
+ endif()
+
+
+-# Fuzzing
+-# =======
+-if(UNIX AND NOT APPLE)
+- set(MELKOR_VERSION ac2495b) # From the fork: https://github.com/romainthomas/elf_fuzzer
+- set(MELKOR_SHA256 SHA256=8cccc4ca5e05e305215cc74761413746b660b76f5869a563f52cec1f23d79f2e)
+- set(MELKOR_URL "${THIRD_PARTY_DIRECTORY}/Melkor_ELF_Fuzzer-${MELKOR_VERSION}.zip" CACHE STRING "URL to the Melkor package")
+-
+- set(MELKOR_PREFIX "${CMAKE_CURRENT_BINARY_DIR}/Melkor")
+- set(MELKOR_INSTALL_DIR "${CMAKE_CURRENT_BINARY_DIR}/Melkor")
+- ExternalProject_Add(MELKOR
+- PREFIX ${MELKOR_PREFIX}
+- URL ${MELKOR_URL}
+- URL_HASH ${MELKOR_SHA256}
+- INSTALL_DIR ${MELKOR_INSTALL_DIR}
+- UPDATE_COMMAND ""
+- CONFIGURE_COMMAND ""
+- INSTALL_COMMAND ""
+- BUILD_COMMAND make clean && make
+- BUILD_IN_SOURCE ON)
+-
+- ExternalProject_get_property(MELKOR SOURCE_DIR)
+- set(MELKOR_BINARY "${SOURCE_DIR}/melkor")
+- message(STATUS "${MELKOR_BINARY}")
+-endif()
+-
+ # Tests
+ # =====
+ add_executable(test_iterators "${CMAKE_CURRENT_SOURCE_DIR}/test_iterators.cpp")
+@@ -100,10 +58,13 @@ if (LIEF_COVERAGE)
+ target_link_libraries(test_iterators gcov)
+ endif()
+
+-add_dependencies(test_iterators catch LIB_LIEF)
++find_package(Catch2 REQUIRED)
++add_dependencies(test_iterators Catch2::Catch2 LIB_LIEF)
+
+ target_link_libraries(test_iterators LIB_LIEF)
+
++find_program(MELKOR_FOUND melkor REQUIRED)
++
+ add_test(test_iterators
+ ${CMAKE_CURRENT_BINARY_DIR}/test_iterators)
+
+diff --git a/tests/test_iterators.cpp b/tests/test_iterators.cpp
+index 2d837371..df3d2ed5 100644
+--- a/tests/test_iterators.cpp
++++ b/tests/test_iterators.cpp
+@@ -14,7 +14,7 @@
+ * limitations under the License.
+ */
+ #define CATCH_CONFIG_MAIN
+-#include <catch.hpp>
++#include <catch2/catch.hpp>
+
+ #include <LIEF/iterators.hpp>
+
+
+base-commit: 2d9855fc7f9d4ce6325245f8b75c98eb7663db60
+--
+2.41.0
+
diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index b8e8097c7b..5066fcd1dd 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -167,6 +167,7 @@ (define-module (gnu packages python-xyz)
#:use-module (gnu packages base)
#:use-module (gnu packages bash)
#:use-module (gnu packages bdw-gc)
+ #:use-module (gnu packages boost)
#:use-module (gnu packages check)
#:use-module (gnu packages cmake)
#:use-module (gnu packages compression)
@@ -180,6 +181,7 @@ (define-module (gnu packages python-xyz)
#:use-module (gnu packages djvu)
#:use-module (gnu packages docker)
#:use-module (gnu packages documentation)
+ #:use-module (gnu packages elf)
#:use-module (gnu packages enchant)
#:use-module (gnu packages file)
#:use-module (gnu packages fonts)
@@ -213,6 +215,7 @@ (define-module (gnu packages python-xyz)
#:use-module (gnu packages libusb)
#:use-module (gnu packages linux)
#:use-module (gnu packages llvm)
+ #:use-module (gnu packages logging)
#:use-module (gnu packages machine-learning)
#:use-module (gnu packages man)
#:use-module (gnu packages markup)
@@ -33438,29 +33441,110 @@ (define-public python-misskey
(define-public python-lief
(package
(name "python-lief")
- (version "0.12.3")
+ (version "0.13.2")
(source (origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/lief-project/LIEF")
(commit version)))
(file-name (git-file-name name version))
+ (patches (search-patches "lief-unbundle-test-dependencies.patch"))
+ (modules '((guix build utils)))
+ (snippet
+ '(begin (delete-file-recursively "third-party")
+ (substitute* "api/python/config-default.toml"
+ (("(ninja *= ).*" _ m)
+ (string-append m "false\n")))))
(sha256
(base32
- "11i6hqmcjh56y554kqhl61698n9v66j2qk1c1g63mv2w07h2z661"))))
- (build-system python-build-system)
- (native-inputs (list cmake))
+ "0y48x358ppig5xp97ahcphfipx7cg9chldj2q5zrmn610fmi4zll"))))
+ (build-system cmake-build-system)
(arguments
(list
- #:tests? #f ;needs network
- #:phases #~(modify-phases %standard-phases
- (replace 'build
- (lambda _
- (invoke
- "python" "setup.py" "--sdk" "build"
- (string-append
- "-j" (number->string (parallel-job-count)))))))))
- (home-page "https://github.com/lief-project/LIEF")
+ #:imported-modules
+ `(,@%cmake-build-system-modules
+ (guix build python-build-system))
+ #:modules
+ '(((guix build python-build-system) #:prefix python:)
+ (guix build cmake-build-system)
+ (guix build utils))
+ #:configure-flags
+ #~'("-DBUILD_SHARED_LIBS=ON"
+ "-DLIEF_INSTALL_COMPILED_EXAMPLES=ON"
+ "-DLIEF_TESTS=ON"
+ ;; Use dependencies from Guix.
+ "-DLIEF_EXTERNAL_SPDLOG=ON"
+ "-DLIEF_OPT_EXTERNAL_LEAF=ON"
+ "-DLIEF_OPT_EXTERNAL_SPAN=ON"
+ "-DLIEF_OPT_FROZEN_EXTERNAL=ON"
+ "-DLIEF_OPT_MBEDTLS_EXTERNAL=ON"
+ "-DLIEF_OPT_NLOHMANN_JSON_EXTERNAL=ON"
+ "-DLIEF_OPT_PYBIND11_EXTERNAL=ON"
+ "-DLIEF_OPT_UTFCPP_EXTERNAL=ON")
+ #:phases
+ ;; Python bindings.
+ #~(modify-phases %standard-phases
+ (add-after 'unpack 'configure-python-build
+ (lambda* (#:key configure-flags build-type parallel-build?
+ #:allow-other-keys)
+ (with-directory-excursion "api/python"
+ (substitute* "config-default.toml"
+ ;; Honor `#:build-type'.
+ (("(type *)= .*" _ m)
+ (format #f "~a= \"~a\"~%"
+ m build-type))
+ ;; Honor `#:parallel-build?'.
+ (("(parallel-jobs *)= .*" _ m)
+ (format #f "~a= ~a~%"
+ m (if parallel-build?
+ (parallel-job-count)
+ 1))))
+ (substitute* "setup.py"
+ ;; Honor `#:configure-flags'.
+ (("(configure_cmd = .*)\n" _ m)
+ (format #f "~a + [~a]~%"
+ m (apply string-append
+ (map (lambda (flag)
+ (format #f "\"~a\"," flag))
+ (append configure-flags
+ '("-DBUILD_SHARED_LIBS=OFF"))))
+ ))))))
+ (add-after 'install 'chdir
+ (lambda _
+ (chdir "../source/api/python/")))
+ (add-after 'chdir 'ensure-no-mtimes-pre-1980
+ (assoc-ref python:%standard-phases 'ensure-no-mtimes-pre-1980))
+ (add-after 'ensure-no-mtimes-pre-1980 'enable-bytecode-determinism
+ (assoc-ref python:%standard-phases 'enable-bytecode-determinism))
+ (add-after 'enable-bytecode-determinism 'python-install
+ (lambda* (#:key inputs outputs #:allow-other-keys)
+ ((assoc-ref python:%standard-phases 'install)
+ #:inputs inputs
+ #:outputs outputs
+ #:configure-flags '()
+ #:use-setuptools? #t)))
+ (add-after 'python-install 'add-install-to-pythonpath
+ (assoc-ref python:%standard-phases 'add-install-to-pythonpath))
+ (add-after 'add-install-to-pythonpath 'add-install-to-path
+ (assoc-ref python:%standard-phases 'add-install-to-path))
+ (add-after 'add-install-to-path 'python-wrap
+ (assoc-ref python:%standard-phases 'wrap)))))
+ (native-inputs
+ (list catch2
+ melkor
+ python-wrapper
+ python-tomli))
+ (inputs
+ (list boost-leaf
+ frozen
+ mbedtls-apache
+ nlohmann-json
+ pybind11
+ spdlog
+ tcb-span
+ utfcpp))
+ (outputs '("out" "python"))
+ (home-page "https://lief-project.github.io/")
(synopsis "Library to instrument executable formats")
(description
"@code{python-lief} is a cross platform library which can parse, modify
@@ -33508,7 +33592,7 @@ (define-public shrinkwrap
python-poetry-core
python-pypa-build
python-pytest))
- (inputs (list python-lief python-sh))
+ (inputs (list `(,python-lief "python") python-sh))
(home-page "https://github.com/fzakaria/shrinkwrap")
(synopsis "Emboss needed dependencies on the top level executable")
(description
--
2.41.0
^ permalink raw reply related [flat|nested] 69+ messages in thread
* [bug#63765] [PATCH v6 10/10] gnu: python-lief: Rename to lief.
2023-08-05 13:18 ` [bug#63765] [PATCH v6 00/10] " Hilton Chain via Guix-patches via
` (8 preceding siblings ...)
2023-08-05 13:19 ` [bug#63765] [PATCH v6 09/10] gnu: python-lief: Update to 0.13.2 Hilton Chain via Guix-patches via
@ 2023-08-05 13:19 ` Hilton Chain via Guix-patches via
9 siblings, 0 replies; 69+ messages in thread
From: Hilton Chain via Guix-patches via @ 2023-08-05 13:19 UTC (permalink / raw)
To: 63765; +Cc: Hilton Chain, Lars-Dominik Braun, jgart
* gnu/packages/elf.scm(lief): Renamed from ...
* gnu/packages/python-xyz.scm (python-lief): ...this.
(shrinkwrap)[inputs]: Adjust accordingly.
---
gnu/packages/elf.scm | 125 +++++++++++++++++++++++++++++++++++-
gnu/packages/python-xyz.scm | 117 +--------------------------------
2 files changed, 125 insertions(+), 117 deletions(-)
diff --git a/gnu/packages/elf.scm b/gnu/packages/elf.scm
index 3ddb6c4064..41fd1c72f2 100644
--- a/gnu/packages/elf.scm
+++ b/gnu/packages/elf.scm
@@ -33,18 +33,27 @@ (define-module (gnu packages elf)
#:use-module (guix packages)
#:use-module (guix download)
#:use-module (guix git-download)
+ #:use-module (guix build-system cmake)
#:use-module (guix build-system gnu)
- #:use-module ((guix licenses) #:select (gpl3+ lgpl3+ lgpl2.0+ lgpl2.1 gpl2 bsd-2))
+ #:use-module ((guix licenses) #:select (gpl3+ lgpl3+ lgpl2.0+ lgpl2.1 gpl2 asl2.0 bsd-2))
#:use-module (gnu packages)
#:use-module (gnu packages autotools)
+ #:use-module (gnu packages boost)
+ #:use-module (gnu packages check)
#:use-module (gnu packages compression)
+ #:use-module (gnu packages cpp)
#:use-module (gnu packages documentation)
#:use-module (gnu packages gcc)
+ #:use-module (gnu packages logging)
#:use-module (gnu packages m4)
#:use-module (gnu packages pkg-config)
#:use-module (gnu packages python)
+ #:use-module (gnu packages python-build)
+ #:use-module (gnu packages python-xyz)
#:use-module (gnu packages sphinx)
#:use-module (gnu packages texinfo)
+ #:use-module (gnu packages textutils)
+ #:use-module (gnu packages tls)
#:use-module (gnu packages xml)
#:use-module (srfi srfi-1)
#:use-module (srfi srfi-26))
@@ -342,6 +351,120 @@ (define-public libdwarf
;; See https://www.prevanders.net/dwarflicense.html:
(license (list lgpl2.1 gpl2 bsd-2))))
+(define-public lief
+ (package
+ (name "lief")
+ (version "0.13.2")
+ (source (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/lief-project/LIEF")
+ (commit version)))
+ (file-name (git-file-name name version))
+ (patches (search-patches "lief-unbundle-test-dependencies.patch"))
+ (modules '((guix build utils)))
+ (snippet
+ '(begin (delete-file-recursively "third-party")
+ (substitute* "api/python/config-default.toml"
+ (("(ninja *= ).*" _ m)
+ (string-append m "false\n")))))
+ (sha256
+ (base32
+ "0y48x358ppig5xp97ahcphfipx7cg9chldj2q5zrmn610fmi4zll"))))
+ (build-system cmake-build-system)
+ (arguments
+ (list
+ #:imported-modules
+ `(,@%cmake-build-system-modules
+ (guix build python-build-system))
+ #:modules
+ '(((guix build python-build-system) #:prefix python:)
+ (guix build cmake-build-system)
+ (guix build utils))
+ #:configure-flags
+ #~'("-DBUILD_SHARED_LIBS=ON"
+ "-DLIEF_INSTALL_COMPILED_EXAMPLES=ON"
+ "-DLIEF_TESTS=ON"
+ ;; Use dependencies from Guix.
+ "-DLIEF_EXTERNAL_SPDLOG=ON"
+ "-DLIEF_OPT_EXTERNAL_LEAF=ON"
+ "-DLIEF_OPT_EXTERNAL_SPAN=ON"
+ "-DLIEF_OPT_FROZEN_EXTERNAL=ON"
+ "-DLIEF_OPT_MBEDTLS_EXTERNAL=ON"
+ "-DLIEF_OPT_NLOHMANN_JSON_EXTERNAL=ON"
+ "-DLIEF_OPT_PYBIND11_EXTERNAL=ON"
+ "-DLIEF_OPT_UTFCPP_EXTERNAL=ON")
+ #:phases
+ ;; Python bindings.
+ #~(modify-phases %standard-phases
+ (add-after 'unpack 'configure-python-build
+ (lambda* (#:key configure-flags build-type parallel-build?
+ #:allow-other-keys)
+ (with-directory-excursion "api/python"
+ (substitute* "config-default.toml"
+ ;; Honor `#:build-type'.
+ (("(type *)= .*" _ m)
+ (format #f "~a= \"~a\"~%"
+ m build-type))
+ ;; Honor `#:parallel-build?'.
+ (("(parallel-jobs *)= .*" _ m)
+ (format #f "~a= ~a~%"
+ m (if parallel-build?
+ (parallel-job-count)
+ 1))))
+ (substitute* "setup.py"
+ ;; Honor `#:configure-flags'.
+ (("(configure_cmd = .*)\n" _ m)
+ (format #f "~a + [~a]~%"
+ m (apply string-append
+ (map (lambda (flag)
+ (format #f "\"~a\"," flag))
+ (append configure-flags
+ '("-DBUILD_SHARED_LIBS=OFF"))))
+ ))))))
+ (add-after 'install 'chdir
+ (lambda _
+ (chdir "../source/api/python/")))
+ (add-after 'chdir 'ensure-no-mtimes-pre-1980
+ (assoc-ref python:%standard-phases 'ensure-no-mtimes-pre-1980))
+ (add-after 'ensure-no-mtimes-pre-1980 'enable-bytecode-determinism
+ (assoc-ref python:%standard-phases 'enable-bytecode-determinism))
+ (add-after 'enable-bytecode-determinism 'python-install
+ (lambda* (#:key inputs outputs #:allow-other-keys)
+ ((assoc-ref python:%standard-phases 'install)
+ #:inputs inputs
+ #:outputs outputs
+ #:configure-flags '()
+ #:use-setuptools? #t)))
+ (add-after 'python-install 'add-install-to-pythonpath
+ (assoc-ref python:%standard-phases 'add-install-to-pythonpath))
+ (add-after 'add-install-to-pythonpath 'add-install-to-path
+ (assoc-ref python:%standard-phases 'add-install-to-path))
+ (add-after 'add-install-to-path 'python-wrap
+ (assoc-ref python:%standard-phases 'wrap)))))
+ (native-inputs
+ (list catch2
+ melkor
+ python-wrapper
+ python-tomli))
+ (inputs
+ (list boost-leaf
+ frozen
+ mbedtls-apache
+ nlohmann-json
+ pybind11
+ spdlog
+ tcb-span
+ utfcpp))
+ (outputs '("out" "python"))
+ (home-page "https://lief-project.github.io/")
+ (synopsis "Library to instrument executable formats")
+ (description
+ "@acronym{LIEF, Library to Instrument Executable Formats} is a cross
+platform library which can parse, modify and abstract ELF, PE and MachO
+formats.")
+ (license asl2.0)))
+
(define-public melkor
(let ((commit "ac2495bef2a744e7931537e023b1129229b001c4")
(revision "8"))
diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index 5066fcd1dd..8aa39f679a 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -167,7 +167,6 @@ (define-module (gnu packages python-xyz)
#:use-module (gnu packages base)
#:use-module (gnu packages bash)
#:use-module (gnu packages bdw-gc)
- #:use-module (gnu packages boost)
#:use-module (gnu packages check)
#:use-module (gnu packages cmake)
#:use-module (gnu packages compression)
@@ -215,7 +214,6 @@ (define-module (gnu packages python-xyz)
#:use-module (gnu packages libusb)
#:use-module (gnu packages linux)
#:use-module (gnu packages llvm)
- #:use-module (gnu packages logging)
#:use-module (gnu packages machine-learning)
#:use-module (gnu packages man)
#:use-module (gnu packages markup)
@@ -33438,119 +33436,6 @@ (define-public python-misskey
platform using the ActivityPub protocol.")
(license license:expat)))
-(define-public python-lief
- (package
- (name "python-lief")
- (version "0.13.2")
- (source (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/lief-project/LIEF")
- (commit version)))
- (file-name (git-file-name name version))
- (patches (search-patches "lief-unbundle-test-dependencies.patch"))
- (modules '((guix build utils)))
- (snippet
- '(begin (delete-file-recursively "third-party")
- (substitute* "api/python/config-default.toml"
- (("(ninja *= ).*" _ m)
- (string-append m "false\n")))))
- (sha256
- (base32
- "0y48x358ppig5xp97ahcphfipx7cg9chldj2q5zrmn610fmi4zll"))))
- (build-system cmake-build-system)
- (arguments
- (list
- #:imported-modules
- `(,@%cmake-build-system-modules
- (guix build python-build-system))
- #:modules
- '(((guix build python-build-system) #:prefix python:)
- (guix build cmake-build-system)
- (guix build utils))
- #:configure-flags
- #~'("-DBUILD_SHARED_LIBS=ON"
- "-DLIEF_INSTALL_COMPILED_EXAMPLES=ON"
- "-DLIEF_TESTS=ON"
- ;; Use dependencies from Guix.
- "-DLIEF_EXTERNAL_SPDLOG=ON"
- "-DLIEF_OPT_EXTERNAL_LEAF=ON"
- "-DLIEF_OPT_EXTERNAL_SPAN=ON"
- "-DLIEF_OPT_FROZEN_EXTERNAL=ON"
- "-DLIEF_OPT_MBEDTLS_EXTERNAL=ON"
- "-DLIEF_OPT_NLOHMANN_JSON_EXTERNAL=ON"
- "-DLIEF_OPT_PYBIND11_EXTERNAL=ON"
- "-DLIEF_OPT_UTFCPP_EXTERNAL=ON")
- #:phases
- ;; Python bindings.
- #~(modify-phases %standard-phases
- (add-after 'unpack 'configure-python-build
- (lambda* (#:key configure-flags build-type parallel-build?
- #:allow-other-keys)
- (with-directory-excursion "api/python"
- (substitute* "config-default.toml"
- ;; Honor `#:build-type'.
- (("(type *)= .*" _ m)
- (format #f "~a= \"~a\"~%"
- m build-type))
- ;; Honor `#:parallel-build?'.
- (("(parallel-jobs *)= .*" _ m)
- (format #f "~a= ~a~%"
- m (if parallel-build?
- (parallel-job-count)
- 1))))
- (substitute* "setup.py"
- ;; Honor `#:configure-flags'.
- (("(configure_cmd = .*)\n" _ m)
- (format #f "~a + [~a]~%"
- m (apply string-append
- (map (lambda (flag)
- (format #f "\"~a\"," flag))
- (append configure-flags
- '("-DBUILD_SHARED_LIBS=OFF"))))
- ))))))
- (add-after 'install 'chdir
- (lambda _
- (chdir "../source/api/python/")))
- (add-after 'chdir 'ensure-no-mtimes-pre-1980
- (assoc-ref python:%standard-phases 'ensure-no-mtimes-pre-1980))
- (add-after 'ensure-no-mtimes-pre-1980 'enable-bytecode-determinism
- (assoc-ref python:%standard-phases 'enable-bytecode-determinism))
- (add-after 'enable-bytecode-determinism 'python-install
- (lambda* (#:key inputs outputs #:allow-other-keys)
- ((assoc-ref python:%standard-phases 'install)
- #:inputs inputs
- #:outputs outputs
- #:configure-flags '()
- #:use-setuptools? #t)))
- (add-after 'python-install 'add-install-to-pythonpath
- (assoc-ref python:%standard-phases 'add-install-to-pythonpath))
- (add-after 'add-install-to-pythonpath 'add-install-to-path
- (assoc-ref python:%standard-phases 'add-install-to-path))
- (add-after 'add-install-to-path 'python-wrap
- (assoc-ref python:%standard-phases 'wrap)))))
- (native-inputs
- (list catch2
- melkor
- python-wrapper
- python-tomli))
- (inputs
- (list boost-leaf
- frozen
- mbedtls-apache
- nlohmann-json
- pybind11
- spdlog
- tcb-span
- utfcpp))
- (outputs '("out" "python"))
- (home-page "https://lief-project.github.io/")
- (synopsis "Library to instrument executable formats")
- (description
- "@code{python-lief} is a cross platform library which can parse, modify
-and abstract ELF, PE and MachO formats.")
- (license license:asl2.0)))
-
(define-public python-eris
(package
(name "python-eris")
@@ -33592,7 +33477,7 @@ (define-public shrinkwrap
python-poetry-core
python-pypa-build
python-pytest))
- (inputs (list `(,python-lief "python") python-sh))
+ (inputs (list `(,lief "python") python-sh))
(home-page "https://github.com/fzakaria/shrinkwrap")
(synopsis "Emboss needed dependencies on the top level executable")
(description
--
2.41.0
^ permalink raw reply related [flat|nested] 69+ messages in thread
* [bug#64255] [PATCH v3 0/2] gnu: utfcpp: Update to 3.2.4.
2023-06-23 15:33 ` [bug#63765] [PATCH 0/2] gnu: utfcpp: Update to 3.2.3 Hilton Chain via Guix-patches via
` (2 preceding siblings ...)
2023-08-03 14:05 ` [bug#64255] [PATCH v2 0/2] " Hilton Chain via Guix-patches via
@ 2023-08-13 4:50 ` Hilton Chain via Guix-patches via
2023-08-13 4:51 ` [bug#64255] [PATCH v3 1/2] gnu: Add ftest Hilton Chain via Guix-patches via
2023-08-13 4:51 ` [bug#64255] [PATCH v3 2/2] gnu: utfcpp: Update to 3.2.4 Hilton Chain via Guix-patches via
2023-08-30 12:57 ` [bug#64255] Green light Andreas Enge
4 siblings, 2 replies; 69+ messages in thread
From: Hilton Chain via Guix-patches via @ 2023-08-13 4:50 UTC (permalink / raw)
To: 64255; +Cc: Hilton Chain, Liliana Marie Prikler, 宋文武
V2 -> V3: utfcpp@3.2.4.
V1 -> V2: Rebase (and see if QA can pick this up).
Reza Housseini (2):
gnu: Add ftest.
gnu: utfcpp: Update to 3.2.4.
gnu/packages/check.scm | 41 ++++++++++++++++++++++++++++++++++++++
gnu/packages/games.scm | 2 +-
gnu/packages/textutils.scm | 27 ++++++++++++-------------
gnu/packages/video.scm | 5 +++++
4 files changed, 60 insertions(+), 15 deletions(-)
base-commit: d0a2b422e06aab0cab3a10a47ef378602992577f
--
2.41.0
^ permalink raw reply [flat|nested] 69+ messages in thread
* [bug#64255] [PATCH v3 1/2] gnu: Add ftest.
2023-08-13 4:50 ` [bug#64255] [PATCH v3 0/2] gnu: utfcpp: Update to 3.2.4 Hilton Chain via Guix-patches via
@ 2023-08-13 4:51 ` Hilton Chain via Guix-patches via
2023-08-13 4:51 ` [bug#64255] [PATCH v3 2/2] gnu: utfcpp: Update to 3.2.4 Hilton Chain via Guix-patches via
1 sibling, 0 replies; 69+ messages in thread
From: Hilton Chain via Guix-patches via @ 2023-08-13 4:51 UTC (permalink / raw)
To: 64255; +Cc: Hilton Chain, Reza Housseini
From: Reza Housseini <reza@housseini.me>
* gnu/packages/check.scm (ftest): New variable.
Co-authored-by: Hilton Chain <hako@ultrarare.space>
---
gnu/packages/check.scm | 41 +++++++++++++++++++++++++++++++++++++++++
1 file changed, 41 insertions(+)
diff --git a/gnu/packages/check.scm b/gnu/packages/check.scm
index 1d70ea9fe0..a3a79ae189 100644
--- a/gnu/packages/check.scm
+++ b/gnu/packages/check.scm
@@ -45,6 +45,8 @@
;;; Copyright © 2023 Timo Wilken <guix@twilken.net>
;;; Copyright © 2023 Zhu Zihao <all_but_last@163.com>
;;; Copyright © 2023 Bruno Victal <mirai@makinata.eu>
+;;; Copyright © 2023 Reza Housseini <reza@housseini.me>
+;;; Copyright © 2023 Hilton Chain <hako@ultrarare.space>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -67,6 +69,7 @@ (define-module (gnu packages check)
#:use-module (gnu packages autotools)
#:use-module (gnu packages base)
#:use-module (gnu packages bash)
+ #:use-module (gnu packages cmake)
#:use-module (gnu packages compression)
#:use-module (gnu packages linux)
#:use-module (gnu packages llvm)
@@ -94,6 +97,7 @@ (define-module (gnu packages check)
#:use-module (guix gexp)
#:use-module (guix git-download)
#:use-module (guix build-system cmake)
+ #:use-module (guix build-system copy)
#:use-module (guix build-system glib-or-gtk)
#:use-module (guix build-system gnu)
#:use-module (guix build-system go)
@@ -813,6 +817,43 @@ (define-public doctest
has been designed to be fast, light and unintrusive.")
(license license:expat)))
+(define-public ftest
+ ;; There aren't any releases and it looks more like a small side project.
+ ;; It is included for completness to run tests for package utfcpp.
+ (let ((commit "c4ad4af0946b73ce1a40cbc72205d15d196c7e06")
+ (revision "0"))
+ (package
+ (name "ftest")
+ (version (git-version "0" revision commit))
+ (source (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/nemtrif/ftest")
+ (commit commit)))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "1jcd76zjhx5f2nsi80hj7gmywgpz1f7vcw8lv5yf7gx0l99dn86x"))))
+ ;; No CMakeLists.txt file provided, only one to run tests
+ (build-system copy-build-system)
+ (arguments
+ (list #:install-plan
+ #~'(("ftest.h" "include/ftest/"))
+ #:phases
+ #~(modify-phases %standard-phases
+ (add-before 'install 'check
+ (lambda _
+ (with-directory-excursion "tests"
+ (invoke "cmake" ".")
+ (invoke "make")
+ (invoke "ctest")))))))
+ (native-inputs (list cmake-minimal))
+ (home-page "https://github.com/nemtrif/ftest")
+ (synopsis "C++ testing framework")
+ (description
+ "This package provides a simple and limited unit-test framework for C++.")
+ (license license:boost1.0))))
+
(define-public python-gixy
;; The 0.1.20 release is missing some important fixes.
;; XXX: Commit 'e9008dcbd11f43ccac109b0cf2bf98a94e76b449' breaks tests
--
2.41.0
^ permalink raw reply related [flat|nested] 69+ messages in thread
* [bug#64255] [PATCH v3 2/2] gnu: utfcpp: Update to 3.2.4.
2023-08-13 4:50 ` [bug#64255] [PATCH v3 0/2] gnu: utfcpp: Update to 3.2.4 Hilton Chain via Guix-patches via
2023-08-13 4:51 ` [bug#64255] [PATCH v3 1/2] gnu: Add ftest Hilton Chain via Guix-patches via
@ 2023-08-13 4:51 ` Hilton Chain via Guix-patches via
1 sibling, 0 replies; 69+ messages in thread
From: Hilton Chain via Guix-patches via @ 2023-08-13 4:51 UTC (permalink / raw)
To: 64255
Cc: Hilton Chain, Reza Housseini, Liliana Marie Prikler,
宋文武
From: Reza Housseini <reza@housseini.me>
* gnu/packages/textutils.scm (utfcpp): Update to 3.2.4.
[snippet]: Unbundle ftest.
[arguments]: Remove field.
[native-inputs]: Add ftest.
* gnu/packages/games.scm (warzone2100)<#:phases>: Adjust 'fix-utfcpp-include.
* gnu/packages/video.scm (mkvtoolnix)<#:phases>: Add 'fix-utfcpp-include.
Co-authored-by: Hilton Chain <hako@ultrarare.space>
---
gnu/packages/games.scm | 2 +-
gnu/packages/textutils.scm | 27 +++++++++++++--------------
gnu/packages/video.scm | 5 +++++
3 files changed, 19 insertions(+), 15 deletions(-)
diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm
index bf5c680042..9ba5d4a964 100644
--- a/gnu/packages/games.scm
+++ b/gnu/packages/games.scm
@@ -5573,7 +5573,7 @@ (define-public warzone2100
(lambda _
(substitute* "lib/framework/wzstring.cpp"
(("<utfcpp/source/utf8.h>")
- "<utf8.h>"))))
+ "<utf8cpp/utf8.h>"))))
(add-after 'unpack 'link-tests-with-qt
(lambda _
(substitute* "tests/Makefile.am"
diff --git a/gnu/packages/textutils.scm b/gnu/packages/textutils.scm
index 4e026fc6f9..508a954254 100644
--- a/gnu/packages/textutils.scm
+++ b/gnu/packages/textutils.scm
@@ -25,6 +25,8 @@
;;; Copyright © 2021 Felix Gruber <felgru@posteo.net>
;;; Copyright © 2021 Bonface Munyoki Kilyungi <me@bonfacemunyoki.com>
;;; Copyright © 2022 Gabriel Wicki <gabriel@erlikon.ch>
+;;; Copyright © 2023 Reza Housseini <reza@housseini.me>
+;;; Copyright © 2023 Hilton Chain <hako@ultrarare.space>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -690,29 +692,26 @@ (define-public catdoc
(define-public utfcpp
(package
(name "utfcpp")
- (version "2.3.5")
+ (version "3.2.4")
(source (origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/nemtrif/utfcpp")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
+ (modules '((guix build utils)))
+ ;; Unbundle ftest
+ (snippet
+ '(begin
+ (delete-file-recursively "extern")
+ (substitute* (find-files "tests" "\\.cpp")
+ (("\"../extern/ftest/ftest.h\"")
+ "<ftest/ftest.h>"))))
(sha256
(base32
- "1gr98d826z6wa58r1s5i7rz7q2x3r31v7zj0pjjlrc7gfxwklr4s"))))
+ "0p18cbdk57ilbgcgprgqp7fgysb5i0nidczbhc5rnxkiiw4jvxgn"))))
(build-system cmake-build-system)
- (arguments
- `(#:out-of-source? #f
- #:phases
- (modify-phases %standard-phases
- (replace 'install ; no install target
- (lambda* (#:key outputs #:allow-other-keys)
- (let* ((out (assoc-ref outputs "out"))
- (include (string-append out "/include"))
- (doc (string-append out "/share/doc/" ,name)))
- (copy-recursively "source" include)
- (install-file "README.md" doc)
- #t))))))
+ (native-inputs (list ftest))
(home-page "https://github.com/nemtrif/utfcpp")
(synopsis "Portable C++ library for handling UTF-8")
(description "UTF8-CPP is a C++ library for handling UTF-8 encoded text
diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm
index 7df68e8f53..6355acfd4e 100644
--- a/gnu/packages/video.scm
+++ b/gnu/packages/video.scm
@@ -1054,6 +1054,11 @@ (define-public mkvtoolnix
"--enable-precompiled-headers=no")
#:phases
(modify-phases %standard-phases
+ (add-after 'unpack 'fix-utfcpp-include
+ (lambda _
+ (substitute* "src/common/strings/utf8.cpp"
+ (("<utf8.h>")
+ "<utf8cpp/utf8.h>"))))
(add-after 'unpack 'patch-relative-file-names
(lambda* (#:key outputs #:allow-other-keys)
(let ((out (assoc-ref outputs "out")))
--
2.41.0
^ permalink raw reply related [flat|nested] 69+ messages in thread
* [bug#64255] Green light
2023-06-23 15:33 ` [bug#63765] [PATCH 0/2] gnu: utfcpp: Update to 3.2.3 Hilton Chain via Guix-patches via
` (3 preceding siblings ...)
2023-08-13 4:50 ` [bug#64255] [PATCH v3 0/2] gnu: utfcpp: Update to 3.2.4 Hilton Chain via Guix-patches via
@ 2023-08-30 12:57 ` Andreas Enge
2023-09-01 9:00 ` bug#64255: " Hilton Chain via Guix-patches via
4 siblings, 1 reply; 69+ messages in thread
From: Andreas Enge @ 2023-08-30 12:57 UTC (permalink / raw)
To: 64255
Hello Hilton,
there is a green button from QA, I had a quick look over the first version
of the patches, and they look good to me. Since you have git commit access
now, I let you apply the patches and close the bug!
Andreas
^ permalink raw reply [flat|nested] 69+ messages in thread
* bug#64255: Green light
2023-08-30 12:57 ` [bug#64255] Green light Andreas Enge
@ 2023-09-01 9:00 ` Hilton Chain via Guix-patches via
0 siblings, 0 replies; 69+ messages in thread
From: Hilton Chain via Guix-patches via @ 2023-09-01 9:00 UTC (permalink / raw)
To: Andreas Enge; +Cc: 64255-done
Hi Andreas,
On Wed, 30 Aug 2023 20:57:37 +0800,
Andreas Enge wrote:
>
> Hello Hilton,
>
> there is a green button from QA, I had a quick look over the first version
> of the patches, and they look good to me. Since you have git commit access
> now, I let you apply the patches and close the bug!
Thank you, pushed it to master.
^ permalink raw reply [flat|nested] 69+ messages in thread
end of thread, other threads:[~2023-09-01 9:02 UTC | newest]
Thread overview: 69+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
[not found] <832fd8ce-7234-0521-55bf-a2c81f8c48d8@housseini.me>
2023-05-28 8:07 ` [bug#63765] [PATCH 0/8] gnu: python-lief: Update to 0.13.0 Hilton Chain via Guix-patches via
2023-05-28 8:11 ` [bug#63765] [PATCH 1/8] gnu: Add ftest-for-utfcpp Hilton Chain via Guix-patches via
2023-05-28 8:11 ` [bug#63765] [PATCH 2/8] gnu: utfcpp: Update to 3.2.3 Hilton Chain via Guix-patches via
2023-05-28 8:11 ` [bug#63765] [PATCH 3/8] gnu: mbedtls-apache: Rename package to mbedtls-apache-lts Hilton Chain via Guix-patches via
2023-05-28 8:11 ` [bug#63765] [PATCH 4/8] gnu: mbedtls-apache-for-hiawatha: Use inherited source Hilton Chain via Guix-patches via
2023-05-28 8:11 ` [bug#63765] [PATCH 5/8] gnu: mbedtls-apache-lts: Update to 2.28.3 Hilton Chain via Guix-patches via
2023-05-28 8:11 ` [bug#63765] [PATCH 6/8] gnu: Add mbedtls-apache, version 3.4.0 Hilton Chain via Guix-patches via
2023-05-28 8:11 ` [bug#63765] [PATCH 7/8] gnu: Add frozen Hilton Chain via Guix-patches via
2023-05-28 8:11 ` [bug#63765] [PATCH 8/8] gnu: python-lief: Update to 0.13.0 Hilton Chain via Guix-patches via
2023-05-28 12:54 ` [bug#63765] [PATCH v2 0/8] gnu: python-lief: Update to 0.13.1 Hilton Chain via Guix-patches via
2023-05-28 12:56 ` [bug#63765] [PATCH v2 1/8] gnu: Add ftest-for-utfcpp Hilton Chain via Guix-patches via
2023-05-28 12:56 ` [bug#63765] [PATCH v2 2/8] gnu: utfcpp: Update to 3.2.3 Hilton Chain via Guix-patches via
2023-05-28 12:56 ` [bug#63765] [PATCH v2 3/8] gnu: mbedtls-apache: Rename package to mbedtls-apache-lts Hilton Chain via Guix-patches via
2023-05-28 12:56 ` [bug#63765] [PATCH v2 4/8] gnu: mbedtls-apache-for-hiawatha: Use inherited source Hilton Chain via Guix-patches via
2023-05-28 12:56 ` [bug#63765] [PATCH v2 5/8] gnu: mbedtls-apache-lts: Update to 2.28.3 Hilton Chain via Guix-patches via
2023-05-28 12:56 ` [bug#63765] [PATCH v2 6/8] gnu: Add mbedtls-apache, version 3.4.0 Hilton Chain via Guix-patches via
2023-05-28 12:56 ` [bug#63765] [PATCH v2 7/8] gnu: Add frozen Hilton Chain via Guix-patches via
2023-05-28 12:56 ` [bug#63765] [PATCH v2 8/8] gnu: python-lief: Update to 0.13.1 Hilton Chain via Guix-patches via
2023-06-23 6:24 ` [bug#63765] [PATCH v3 0/8] gnu: python-lief: Update to 0.13.2 Hilton Chain via Guix-patches via
2023-06-23 6:24 ` [bug#63765] [PATCH v3 1/8] gnu: Add ftest-for-utfcpp Hilton Chain via Guix-patches via
2023-06-23 6:24 ` [bug#63765] [PATCH v3 2/8] gnu: utfcpp: Update to 3.2.3 Hilton Chain via Guix-patches via
2023-06-23 6:24 ` [bug#63765] [PATCH v3 3/8] gnu: mbedtls-apache: Rename package to mbedtls-apache-lts Hilton Chain via Guix-patches via
2023-06-26 18:59 ` Liliana Marie Prikler
2023-06-23 6:24 ` [bug#63765] [PATCH v3 4/8] gnu: mbedtls-apache-for-hiawatha: Use inherited source Hilton Chain via Guix-patches via
2023-06-23 6:24 ` [bug#63765] [PATCH v3 5/8] gnu: mbedtls-apache-lts: Update to 2.28.3 Hilton Chain via Guix-patches via
2023-06-23 6:24 ` [bug#63765] [PATCH v3 6/8] gnu: Add mbedtls-apache, version 3.4.0 Hilton Chain via Guix-patches via
2023-06-23 6:24 ` [bug#63765] [PATCH v3 7/8] gnu: Add frozen Hilton Chain via Guix-patches via
2023-06-23 6:24 ` [bug#63765] [PATCH v3 8/8] gnu: python-lief: Update to 0.13.2 Hilton Chain via Guix-patches via
2023-06-23 7:24 ` [bug#63765] ftest and utfcpp in issue 62473 reza via Guix-patches via
2023-06-23 7:39 ` Hilton Chain via Guix-patches via
[not found] ` <d4281dd0-6488-00bd-1ee0-8d92a1104c67@housseini.me>
2023-06-23 7:58 ` reza via Guix-patches via
2023-06-23 15:33 ` [bug#63765] [PATCH 0/2] gnu: utfcpp: Update to 3.2.3 Hilton Chain via Guix-patches via
2023-06-23 15:35 ` [bug#64255] [PATCH 1/2] gnu: Add ftest Hilton Chain via Guix-patches via
2023-06-23 15:35 ` [bug#64255] [PATCH 2/2] gnu: utfcpp: Update to 3.2.3 Hilton Chain via Guix-patches via
2023-08-03 14:05 ` [bug#64255] [PATCH v2 0/2] " Hilton Chain via Guix-patches via
2023-08-03 14:06 ` [bug#64255] [PATCH v2 1/2] gnu: Add ftest Hilton Chain via Guix-patches via
2023-08-03 14:06 ` [bug#64255] [PATCH v2 2/2] gnu: utfcpp: Update to 3.2.3 Hilton Chain via Guix-patches via
2023-08-13 4:50 ` [bug#64255] [PATCH v3 0/2] gnu: utfcpp: Update to 3.2.4 Hilton Chain via Guix-patches via
2023-08-13 4:51 ` [bug#64255] [PATCH v3 1/2] gnu: Add ftest Hilton Chain via Guix-patches via
2023-08-13 4:51 ` [bug#64255] [PATCH v3 2/2] gnu: utfcpp: Update to 3.2.4 Hilton Chain via Guix-patches via
2023-08-30 12:57 ` [bug#64255] Green light Andreas Enge
2023-09-01 9:00 ` bug#64255: " Hilton Chain via Guix-patches via
2023-06-28 18:33 ` [bug#63765] [PATCH v4 0/6] gnu: python-lief: Update to 0.13.2 Hilton Chain via Guix-patches via
2023-06-28 18:35 ` [bug#64333] [PATCH v4 1/6] gnu: mbedtls-apache: Rename package to mbedtls-apache-lts Hilton Chain via Guix-patches via
2023-06-29 4:22 ` Liliana Marie Prikler
2023-06-28 18:35 ` [bug#64332] [PATCH v4 2/6] gnu: mbedtls-apache-for-hiawatha: Use inherited source Hilton Chain via Guix-patches via
[not found] ` <handler.64332.B.168797732415505.ack@debbugs.gnu.org>
2023-06-28 18:44 ` bug#64336: bug#64332: Acknowledgement ([PATCH v4 2/6] gnu: mbedtls-apache-for-hiawatha: Use inherited source.) hako via Guix-patches via
2023-06-28 18:35 ` [bug#64334] [PATCH v4 3/6] gnu: mbedtls-apache-lts: Update to 2.28.3 Hilton Chain via Guix-patches via
2023-06-28 18:35 ` [bug#64335] [PATCH v4 4/6] gnu: Add mbedtls-apache, version 3.4.0 Hilton Chain via Guix-patches via
2023-06-28 18:35 ` [bug#64336] [PATCH v4 5/6] gnu: Add frozen Hilton Chain via Guix-patches via
2023-06-28 18:35 ` [bug#64337] [PATCH v4 6/6] gnu: python-lief: Update to 0.13.2 Hilton Chain via Guix-patches via
2023-06-30 7:43 ` [bug#63765] [PATCH v5 0/6] " Hilton Chain via Guix-patches via
2023-06-30 7:44 ` [bug#63765] [PATCH v5 1/6] gnu: mbedtls-apache: Rename package to mbedtls-apache-lts Hilton Chain via Guix-patches via
2023-06-30 7:44 ` [bug#63765] [PATCH v5 2/6] gnu: mbedtls-apache-for-hiawatha: Use inherited source Hilton Chain via Guix-patches via
2023-06-30 7:44 ` [bug#63765] [PATCH v5 3/6] gnu: mbedtls-apache-lts: Update to 2.28.3 Hilton Chain via Guix-patches via
2023-06-30 7:44 ` [bug#63765] [PATCH v5 4/6] gnu: Add mbedtls-apache, version 3.4.0 Hilton Chain via Guix-patches via
2023-06-30 7:44 ` [bug#63765] [PATCH v5 5/6] gnu: Add frozen Hilton Chain via Guix-patches via
2023-06-30 7:44 ` [bug#63765] [PATCH v5 6/6] gnu: python-lief: Update to 0.13.2 Hilton Chain via Guix-patches via
2023-08-05 13:18 ` [bug#63765] [PATCH v6 00/10] " Hilton Chain via Guix-patches via
2023-08-05 13:18 ` [bug#63765] [PATCH v6 01/10] gnu: mbedtls-apache: Rename to mbedtls-apache-lts Hilton Chain via Guix-patches via
2023-08-05 13:18 ` [bug#63765] [PATCH v6 02/10] gnu: mbedtls-apache-for-hiawatha: Use inherited source Hilton Chain via Guix-patches via
2023-08-05 13:18 ` [bug#63765] [PATCH v6 03/10] gnu: mbedtls-apache-lts: Update to 2.28.4 Hilton Chain via Guix-patches via
2023-08-05 13:19 ` [bug#63765] [PATCH v6 04/10] gnu: Add mbedtls-apache, version 3.4.1 Hilton Chain via Guix-patches via
2023-08-05 13:19 ` [bug#63765] [PATCH v6 05/10] gnu: Add frozen Hilton Chain via Guix-patches via
2023-08-05 13:19 ` [bug#63765] [PATCH v6 06/10] gnu: Add boost-leaf Hilton Chain via Guix-patches via
2023-08-05 13:19 ` [bug#63765] [PATCH v6 07/10] gnu: Add tcb-span Hilton Chain via Guix-patches via
2023-08-05 13:19 ` [bug#63765] [PATCH v6 08/10] gnu: Add melkor Hilton Chain via Guix-patches via
2023-08-05 13:19 ` [bug#63765] [PATCH v6 09/10] gnu: python-lief: Update to 0.13.2 Hilton Chain via Guix-patches via
2023-08-05 13:19 ` [bug#63765] [PATCH v6 10/10] gnu: python-lief: Rename to lief Hilton Chain via Guix-patches via
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/guix.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).