[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
01/15: gnu: OpenSSL: Remove replacement package.
From: |
guix-commits |
Subject: |
01/15: gnu: OpenSSL: Remove replacement package. |
Date: |
Thu, 26 Mar 2020 17:40:25 -0400 (EDT) |
mbakke pushed a commit to branch core-updates
in repository guix.
commit ad8254c23a86c3ca4ca32bc68fc8d76954aa80fd
Author: Marius Bakke <address@hidden>
AuthorDate: Thu Mar 26 21:37:02 2020 +0100
gnu: OpenSSL: Remove replacement package.
* gnu/packages/tls.scm (openssl): Update to 1.1.1e.
[replacement]: Remove.
(openssl-1.1.1e): Remove variable.
---
gnu/packages/tls.scm | 23 ++---------------------
1 file changed, 2 insertions(+), 21 deletions(-)
diff --git a/gnu/packages/tls.scm b/gnu/packages/tls.scm
index 45ee67f..f631022 100644
--- a/gnu/packages/tls.scm
+++ b/gnu/packages/tls.scm
@@ -280,8 +280,7 @@ required structures.")
(define-public openssl
(package
(name "openssl")
- (version "1.1.1d")
- (replacement openssl-1.1.1e)
+ (version "1.1.1e")
(source (origin
(method url-fetch)
(uri (list (string-append
"https://www.openssl.org/source/openssl-"
@@ -293,7 +292,7 @@ required structures.")
"/openssl-" version ".tar.gz")))
(sha256
(base32
- "1whinyw402z3b9xlb3qaxv4b9sk4w1bgh9k0y8df1z4x3yy92fhy"))
+ "1gnwlri1dphr5wdzmg9vlhkh6aq2yqgpfkpmffzwjlfb26n62kv9"))
(patches (search-patches "openssl-1.1-c-rehash-in.patch"))))
(build-system gnu-build-system)
(outputs '("out"
@@ -403,24 +402,6 @@ required structures.")
(license license:openssl)
(home-page "https://www.openssl.org/")))
-(define openssl-1.1.1e
- (package
- (inherit openssl)
- (version "1.1.1e")
- (source (origin
- (method url-fetch)
- (uri (list (string-append
"https://www.openssl.org/source/openssl-"
- version ".tar.gz")
- (string-append "ftp://ftp.openssl.org/source/"
- "openssl-" version ".tar.gz")
- (string-append "ftp://ftp.openssl.org/source/old/"
- (string-trim-right version
char-set:letter)
- "/openssl-" version ".tar.gz")))
- (patches (search-patches "openssl-1.1-c-rehash-in.patch"))
- (sha256
- (base32
- "1gnwlri1dphr5wdzmg9vlhkh6aq2yqgpfkpmffzwjlfb26n62kv9"))))))
-
(define-public openssl-1.0
(package
(inherit openssl)
- branch core-updates updated (3a1c364 -> b12acff), guix-commits, 2020/03/26
- 01/15: gnu: OpenSSL: Remove replacement package.,
guix-commits <=
- 02/15: gnu: ghostscript: Update to 9.52., guix-commits, 2020/03/26
- 05/15: gnu: bison: Update to 3.5.3., guix-commits, 2020/03/26
- 03/15: gnu: GLib: Update to 2.62.6., guix-commits, 2020/03/26
- 09/15: gnu: python-xmlschema: Update to 1.1.2., guix-commits, 2020/03/26
- 04/15: gnu: perl: Update to 5.30.2., guix-commits, 2020/03/26
- 07/15: gnu: xcb-proto: Update to 1.14., guix-commits, 2020/03/26
- 08/15: gnu: libxcb: Update to 1.14., guix-commits, 2020/03/26
- 10/15: gnu: python-fonttools: Update to 4.6.0., guix-commits, 2020/03/26
- 12/15: gnu: libgsf: Update to 1.14.47., guix-commits, 2020/03/26
- 14/15: gnu: ImageMagick: Build reproducibly., guix-commits, 2020/03/26