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/python.scm | |
| parent | 9b5b1dde32b9526cd39b51978209ba3e61b6c785 (diff) | |
| download | guix-db2444ad824ab529fd9e850dbae42359009ac4a2.tar.gz | |
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/python.scm')
| -rw-r--r-- | gnu/packages/python.scm | 5 |
1 files changed, 4 insertions, 1 deletions
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) |