From db2444ad824ab529fd9e850dbae42359009ac4a2 Mon Sep 17 00:00:00 2001
From: Marius Bakke <marius@gnu.org>
Date: Tue, 30 Aug 2022 18:40:03 +0200
Subject: gnu: Introduce versioned 'openssl-1.1' variable.

...and use it in packages that do not yet support 3.0.

* gnu/packages/tls.scm (openssl): Rename to ...
(openssl-1.1): ... this.
(openssl/fixed): Inherit from OPENSSL-1.1.
(openssl-3.0): Likewise.
(openssl): Turn into alias for OPENSSL-1.1.
* gnu/packages/ruby.scm (ruby-2.6)[inputs]: Change from OPENSSL to OPENSSL-1.1.
(ruby-3.0)[inputs]: Change "openssl" input to OPENSSL.
(ruby-3.1): Inherit from RUBY-3.0.
* gnu/packages/python.scm (python-2.7)[inputs]: Change from OPENSSL to
OPENSSL-1.1.
(python-3.9)[inputs]: Replace "openssl" with OPENSSL.
* gnu/packages/python-crypto.scm (python-cryptography)[inputs]: Change from
OPENSSL to OPENSSL-1.1.
* gnu/packages/databases.scm (mariadb)[inputs]: Likewise.
* gnu/packages/node.scm (node)[native-inputs, inputs]: Likewise.
(node-lts)[native-inputs]: Likewise.
---
 gnu/packages/databases.scm     |  2 +-
 gnu/packages/node.scm          |  6 +++---
 gnu/packages/python-crypto.scm |  2 +-
 gnu/packages/python.scm        |  5 ++++-
 gnu/packages/ruby.scm          |  9 ++++++---
 gnu/packages/tls.scm           | 10 ++++++----
 6 files changed, 21 insertions(+), 13 deletions(-)

(limited to 'gnu/packages')

diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm
index 209ad0f278..7edf0fed2d 100644
--- a/gnu/packages/databases.scm
+++ b/gnu/packages/databases.scm
@@ -1153,7 +1153,7 @@ Language.")
        ("libaio" ,libaio)
        ("libxml2" ,libxml2)
        ("ncurses" ,ncurses)
-       ("openssl" ,openssl)
+       ("openssl" ,openssl-1.1)
        ("pam" ,linux-pam)
        ("pcre2" ,pcre2)
        ("xz" ,xz)
diff --git a/gnu/packages/node.scm b/gnu/packages/node.scm
index 2839348554..4e9daa522d 100644
--- a/gnu/packages/node.scm
+++ b/gnu/packages/node.scm
@@ -290,7 +290,7 @@
            icu4c
            libuv
            `(,nghttp2 "lib")
-           openssl
+           openssl-1.1
            zlib
            ;; Regular build-time dependencies.
            perl
@@ -867,7 +867,7 @@ source files.")
            icu4c-71
            libuv-for-node
            `(,nghttp2 "lib")
-           openssl
+           openssl-1.1
            zlib
            ;; Regular build-time dependencies.
            perl
@@ -884,7 +884,7 @@ source files.")
            llhttp-bootstrap
            brotli
            `(,nghttp2 "lib")
-           openssl
+           openssl-1.1
            python-wrapper ;; for node-gyp (supports python3)
            zlib))))
 
diff --git a/gnu/packages/python-crypto.scm b/gnu/packages/python-crypto.scm
index 5e78417042..dc9079cd41 100644
--- a/gnu/packages/python-crypto.scm
+++ b/gnu/packages/python-crypto.scm
@@ -608,7 +608,7 @@ message digests and key derivation functions.")
                (add-after 'unpack 'set-no-rust
                  (lambda _
                    (setenv "CRYPTOGRAPHY_DONT_BUILD_RUST" "1"))))))
-    (inputs (list openssl))
+    (inputs (list openssl-1.1))
     (native-inputs
      (list python-cryptography-vectors
            python-hypothesis
diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index 23407e4e84..6b571f6d12 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -388,7 +388,7 @@
            gdbm
            libffi ; for ctypes
            sqlite ; for sqlite extension
-           openssl
+           openssl-1.1
            readline
            zlib
            tcl
@@ -556,6 +556,9 @@ data types.")
                            (map cdr outputs)))))
            (replace 'install-sitecustomize.py
              ,(customize-site version))))))
+    (inputs
+     (modify-inputs (package-inputs python-2.7)
+       (replace "openssl" openssl)))
     (native-inputs
      `(("tzdata" ,tzdata-for-tests)
        ("unzip" ,unzip)
diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm
index d2c2a931a1..a2cafbf1f1 100644
--- a/gnu/packages/ruby.scm
+++ b/gnu/packages/ruby.scm
@@ -138,7 +138,7 @@
                (("/bin/sh") (which "sh")))
              #t)))))
     (inputs
-     (list readline openssl libffi gdbm))
+     (list readline openssl-1.1 libffi gdbm))
     (propagated-inputs
      (list zlib))
     (native-search-paths
@@ -216,11 +216,14 @@ a focus on simplicity and productivity.")
                            "/ruby-" version ".tar.xz"))
        (sha256
         (base32
-         "1w7jpq3flnm007z5kj8kixgm8l4smb80w8ak4993a12j0irzq8lf"))))))
+         "1w7jpq3flnm007z5kj8kixgm8l4smb80w8ak4993a12j0irzq8lf"))))
+    (inputs
+     (modify-inputs (package-inputs ruby-2.7)
+       (replace "openssl" openssl)))))
 
 (define-public ruby-3.1
   (package
-    (inherit ruby-2.7)
+    (inherit ruby-3.0)
     (version "3.1.2")
     (source
      (origin
diff --git a/gnu/packages/tls.scm b/gnu/packages/tls.scm
index 4ee75ace3d..7f61bd790b 100644
--- a/gnu/packages/tls.scm
+++ b/gnu/packages/tls.scm
@@ -415,7 +415,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.1l")
@@ -545,7 +545,7 @@ OpenSSL for TARGET."
 
 (define openssl/fixed
   (package
-    (inherit openssl)
+    (inherit openssl-1.1)
     (name "openssl")
     (version "1.1.1q")
     (source (origin
@@ -564,7 +564,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)
@@ -580,7 +580,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
@@ -590,6 +590,8 @@ OpenSSL for TARGET."
                                            "/bin/perl"))))))))
     (license license:asl2.0)))
 
+(define-public openssl openssl-1.1)
+
 (define-public bearssl
   (package
     (name "bearssl")
-- 
cgit v1.2.3