mirror of
https://codeberg.org/guix/guix.git
synced 2025-10-02 02:15:12 +00:00
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.
This commit is contained in:
parent
9b5b1dde32
commit
db2444ad82
6 changed files with 21 additions and 13 deletions
|
@ -1153,7 +1153,7 @@ Language.")
|
||||||
("libaio" ,libaio)
|
("libaio" ,libaio)
|
||||||
("libxml2" ,libxml2)
|
("libxml2" ,libxml2)
|
||||||
("ncurses" ,ncurses)
|
("ncurses" ,ncurses)
|
||||||
("openssl" ,openssl)
|
("openssl" ,openssl-1.1)
|
||||||
("pam" ,linux-pam)
|
("pam" ,linux-pam)
|
||||||
("pcre2" ,pcre2)
|
("pcre2" ,pcre2)
|
||||||
("xz" ,xz)
|
("xz" ,xz)
|
||||||
|
|
|
@ -290,7 +290,7 @@
|
||||||
icu4c
|
icu4c
|
||||||
libuv
|
libuv
|
||||||
`(,nghttp2 "lib")
|
`(,nghttp2 "lib")
|
||||||
openssl
|
openssl-1.1
|
||||||
zlib
|
zlib
|
||||||
;; Regular build-time dependencies.
|
;; Regular build-time dependencies.
|
||||||
perl
|
perl
|
||||||
|
@ -867,7 +867,7 @@ source files.")
|
||||||
icu4c-71
|
icu4c-71
|
||||||
libuv-for-node
|
libuv-for-node
|
||||||
`(,nghttp2 "lib")
|
`(,nghttp2 "lib")
|
||||||
openssl
|
openssl-1.1
|
||||||
zlib
|
zlib
|
||||||
;; Regular build-time dependencies.
|
;; Regular build-time dependencies.
|
||||||
perl
|
perl
|
||||||
|
@ -884,7 +884,7 @@ source files.")
|
||||||
llhttp-bootstrap
|
llhttp-bootstrap
|
||||||
brotli
|
brotli
|
||||||
`(,nghttp2 "lib")
|
`(,nghttp2 "lib")
|
||||||
openssl
|
openssl-1.1
|
||||||
python-wrapper ;; for node-gyp (supports python3)
|
python-wrapper ;; for node-gyp (supports python3)
|
||||||
zlib))))
|
zlib))))
|
||||||
|
|
||||||
|
|
|
@ -608,7 +608,7 @@ message digests and key derivation functions.")
|
||||||
(add-after 'unpack 'set-no-rust
|
(add-after 'unpack 'set-no-rust
|
||||||
(lambda _
|
(lambda _
|
||||||
(setenv "CRYPTOGRAPHY_DONT_BUILD_RUST" "1"))))))
|
(setenv "CRYPTOGRAPHY_DONT_BUILD_RUST" "1"))))))
|
||||||
(inputs (list openssl))
|
(inputs (list openssl-1.1))
|
||||||
(native-inputs
|
(native-inputs
|
||||||
(list python-cryptography-vectors
|
(list python-cryptography-vectors
|
||||||
python-hypothesis
|
python-hypothesis
|
||||||
|
|
|
@ -388,7 +388,7 @@
|
||||||
gdbm
|
gdbm
|
||||||
libffi ; for ctypes
|
libffi ; for ctypes
|
||||||
sqlite ; for sqlite extension
|
sqlite ; for sqlite extension
|
||||||
openssl
|
openssl-1.1
|
||||||
readline
|
readline
|
||||||
zlib
|
zlib
|
||||||
tcl
|
tcl
|
||||||
|
@ -556,6 +556,9 @@ data types.")
|
||||||
(map cdr outputs)))))
|
(map cdr outputs)))))
|
||||||
(replace 'install-sitecustomize.py
|
(replace 'install-sitecustomize.py
|
||||||
,(customize-site version))))))
|
,(customize-site version))))))
|
||||||
|
(inputs
|
||||||
|
(modify-inputs (package-inputs python-2.7)
|
||||||
|
(replace "openssl" openssl)))
|
||||||
(native-inputs
|
(native-inputs
|
||||||
`(("tzdata" ,tzdata-for-tests)
|
`(("tzdata" ,tzdata-for-tests)
|
||||||
("unzip" ,unzip)
|
("unzip" ,unzip)
|
||||||
|
|
|
@ -138,7 +138,7 @@
|
||||||
(("/bin/sh") (which "sh")))
|
(("/bin/sh") (which "sh")))
|
||||||
#t)))))
|
#t)))))
|
||||||
(inputs
|
(inputs
|
||||||
(list readline openssl libffi gdbm))
|
(list readline openssl-1.1 libffi gdbm))
|
||||||
(propagated-inputs
|
(propagated-inputs
|
||||||
(list zlib))
|
(list zlib))
|
||||||
(native-search-paths
|
(native-search-paths
|
||||||
|
@ -216,11 +216,14 @@ a focus on simplicity and productivity.")
|
||||||
"/ruby-" version ".tar.xz"))
|
"/ruby-" version ".tar.xz"))
|
||||||
(sha256
|
(sha256
|
||||||
(base32
|
(base32
|
||||||
"1w7jpq3flnm007z5kj8kixgm8l4smb80w8ak4993a12j0irzq8lf"))))))
|
"1w7jpq3flnm007z5kj8kixgm8l4smb80w8ak4993a12j0irzq8lf"))))
|
||||||
|
(inputs
|
||||||
|
(modify-inputs (package-inputs ruby-2.7)
|
||||||
|
(replace "openssl" openssl)))))
|
||||||
|
|
||||||
(define-public ruby-3.1
|
(define-public ruby-3.1
|
||||||
(package
|
(package
|
||||||
(inherit ruby-2.7)
|
(inherit ruby-3.0)
|
||||||
(version "3.1.2")
|
(version "3.1.2")
|
||||||
(source
|
(source
|
||||||
(origin
|
(origin
|
||||||
|
|
|
@ -415,7 +415,7 @@ OpenSSL for TARGET."
|
||||||
(error "unsupported openssl target architecture")))))
|
(error "unsupported openssl target architecture")))))
|
||||||
(string-append kernel "-" arch))))
|
(string-append kernel "-" arch))))
|
||||||
|
|
||||||
(define-public openssl
|
(define-public openssl-1.1
|
||||||
(package
|
(package
|
||||||
(name "openssl")
|
(name "openssl")
|
||||||
(version "1.1.1l")
|
(version "1.1.1l")
|
||||||
|
@ -545,7 +545,7 @@ OpenSSL for TARGET."
|
||||||
|
|
||||||
(define openssl/fixed
|
(define openssl/fixed
|
||||||
(package
|
(package
|
||||||
(inherit openssl)
|
(inherit openssl-1.1)
|
||||||
(name "openssl")
|
(name "openssl")
|
||||||
(version "1.1.1q")
|
(version "1.1.1q")
|
||||||
(source (origin
|
(source (origin
|
||||||
|
@ -564,7 +564,7 @@ OpenSSL for TARGET."
|
||||||
|
|
||||||
(define-public openssl-3.0
|
(define-public openssl-3.0
|
||||||
(package
|
(package
|
||||||
(inherit openssl)
|
(inherit openssl-1.1)
|
||||||
(version "3.0.5")
|
(version "3.0.5")
|
||||||
(source (origin
|
(source (origin
|
||||||
(method url-fetch)
|
(method url-fetch)
|
||||||
|
@ -580,7 +580,7 @@ OpenSSL for TARGET."
|
||||||
(base32
|
(base32
|
||||||
"0yja085lygkdxbf4k4rckkj9r24p8dgix8avqljnbbbixydqszda"))))
|
"0yja085lygkdxbf4k4rckkj9r24p8dgix8avqljnbbbixydqszda"))))
|
||||||
(arguments
|
(arguments
|
||||||
(substitute-keyword-arguments (package-arguments openssl)
|
(substitute-keyword-arguments (package-arguments openssl-1.1)
|
||||||
((#:phases phases '%standard-phases)
|
((#:phases phases '%standard-phases)
|
||||||
#~(modify-phases #$phases
|
#~(modify-phases #$phases
|
||||||
(add-before 'configure 'configure-perl
|
(add-before 'configure 'configure-perl
|
||||||
|
@ -590,6 +590,8 @@ OpenSSL for TARGET."
|
||||||
"/bin/perl"))))))))
|
"/bin/perl"))))))))
|
||||||
(license license:asl2.0)))
|
(license license:asl2.0)))
|
||||||
|
|
||||||
|
(define-public openssl openssl-1.1)
|
||||||
|
|
||||||
(define-public bearssl
|
(define-public bearssl
|
||||||
(package
|
(package
|
||||||
(name "bearssl")
|
(name "bearssl")
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue