summary refs log tree commit diff
path: root/gnu/packages/tls.scm
diff options
context:
space:
mode:
authorMarius Bakke <marius@gnu.org>2022-08-30 20:18:55 +0200
committerMarius Bakke <marius@gnu.org>2022-08-30 20:18:55 +0200
commit59c136ef611b7a00683af1d1bb406dbd1af1a2bd (patch)
tree1ab434580130c7fd11b8ef5c22a91087b8401559 /gnu/packages/tls.scm
parenta6f42953626df657041fddfc36a207b06c38f944 (diff)
parentd62fc2cc837b095ff1a633ae2639513ea3253596 (diff)
downloadguix-59c136ef611b7a00683af1d1bb406dbd1af1a2bd.tar.gz
Merge branch 'staging' into core-updates
Diffstat (limited to 'gnu/packages/tls.scm')
-rw-r--r--gnu/packages/tls.scm8
1 files changed, 5 insertions, 3 deletions
diff --git a/gnu/packages/tls.scm b/gnu/packages/tls.scm
index e2842cfa08..5ae7cb0f2c 100644
--- a/gnu/packages/tls.scm
+++ b/gnu/packages/tls.scm
@@ -381,7 +381,7 @@ OpenSSL for TARGET."
                (error "unsupported openssl target architecture")))))
         (string-append kernel "-" arch))))
 
-(define-public openssl
+(define-public openssl-1.1
   (package
     (name "openssl")
     (version "1.1.1q")
@@ -515,7 +515,7 @@ OpenSSL for TARGET."
 
 (define-public openssl-3.0
   (package
-    (inherit openssl)
+    (inherit openssl-1.1)
     (version "3.0.5")
     (source (origin
               (method url-fetch)
@@ -531,7 +531,7 @@ OpenSSL for TARGET."
                (base32
                 "0yja085lygkdxbf4k4rckkj9r24p8dgix8avqljnbbbixydqszda"))))
     (arguments
-     (substitute-keyword-arguments (package-arguments openssl)
+     (substitute-keyword-arguments (package-arguments openssl-1.1)
        ((#:phases phases '%standard-phases)
         #~(modify-phases #$phases
             (add-before 'configure 'configure-perl
@@ -541,6 +541,8 @@ OpenSSL for TARGET."
                                            "/bin/perl"))))))))
     (license license:asl2.0)))
 
+(define-public openssl openssl-1.1)
+
 (define-public bearssl
   (package
     (name "bearssl")