diff mbox series

[bug#66718,v3,1/6] gnu: mbedtls-for-hiawatha: Use inherited source.

Message ID cd9c7d4ebb80c07e9618e0599d82da050739cd13.1706445676.git.hako@ultrarare.space
State New
Headers
Series gnu: Add mbedtls, version 3.5.2. |

Commit Message

Hilton Chain Jan. 28, 2024, 1:12 p.m. UTC 
  * gnu/packages/tls.scm (mbedtls-for-hiawatha): Use inherited source.
[arguments]<#:phases>: Keep "-Wformat-signedness".

Change-Id: I562ae6533b518a853b9b59f8fb69c0135364277f
---
 gnu/packages/tls.scm | 25 -------------------------
 1 file changed, 25 deletions(-)
diff mbox series

Patch

diff --git a/gnu/packages/tls.scm b/gnu/packages/tls.scm
index 6ba2effa5d..4fbb35cc58 100644
--- a/gnu/packages/tls.scm
+++ b/gnu/packages/tls.scm
@@ -978,8 +978,6 @@  (define-public perl-crypt-openssl-random
 (define-public mbedtls-apache
   (package
     (name "mbedtls-apache")
-    ;; XXX Check whether ‘-Wformat-signedness’ still breaks mbedtls-for-hiawatha
-    ;; when updating.
     (version "2.28.5")
     (source
      (origin
@@ -1016,26 +1014,6 @@  (define-public mbedtls-for-hiawatha
   (hidden-package
    (package
      (inherit mbedtls-apache)
-     (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)
         ((#:phases phases)
@@ -1046,9 +1024,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