diff options
| author | Marius Bakke <marius@gnu.org> | 2022-08-30 18:40:03 +0200 |
|---|---|---|
| committer | Marius Bakke <marius@gnu.org> | 2022-08-30 18:42:26 +0200 |
| commit | db2444ad824ab529fd9e850dbae42359009ac4a2 (patch) | |
| tree | 92e294d827d2fc4239594f65873fb7d2485d5915 /gnu/packages/ruby.scm | |
| parent | 9b5b1dde32b9526cd39b51978209ba3e61b6c785 (diff) | |
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.
Diffstat (limited to 'gnu/packages/ruby.scm')
| -rw-r--r-- | gnu/packages/ruby.scm | 9 |
1 files changed, 6 insertions, 3 deletions
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 |