aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLeo Famulari <leo@famulari.name>2017-06-29 18:02:50 -0400
committerLeo Famulari <leo@famulari.name>2017-06-30 02:32:53 -0400
commit6b86ad153f558864ebfd9d9cc431ba8b653508de (patch)
treec1b3682c1499f7f9f0fc57bfe9a4d485da8d896f
parent1024c8119c71ba3ec0122238e8d8254b08d29187 (diff)
downloadguix-6b86ad153f558864ebfd9d9cc431ba8b653508de.tar.gz
guix-6b86ad153f558864ebfd9d9cc431ba8b653508de.zip
gnu: libgcrypt: Integrate grafted update.
* gnu/packages/gnupg.scm (libgcrypt): Update to 1.7.8. [replacement]: Remove field. (libgcrypt-1.7.8): Remove variable. (libgcrypt-1.5)[replacement]: Remove field.
-rw-r--r--gnu/packages/gnupg.scm19
1 files changed, 2 insertions, 17 deletions
diff --git a/gnu/packages/gnupg.scm b/gnu/packages/gnupg.scm
index 8b6069ec63..8a1ea37b5a 100644
--- a/gnu/packages/gnupg.scm
+++ b/gnu/packages/gnupg.scm
@@ -82,15 +82,14 @@ Daemon and possibly more in the future.")
(define-public libgcrypt
(package
(name "libgcrypt")
- (replacement libgcrypt-1.7.8)
- (version "1.7.7")
+ (version "1.7.8")
(source (origin
(method url-fetch)
(uri (string-append "mirror://gnupg/libgcrypt/libgcrypt-"
version ".tar.bz2"))
(sha256
(base32
- "16ndaj93asw122mwjz172x2ilpm03w1yp5mqcrp3xslk0yx5xf5r"))))
+ "16f1rsv4y4w2pk1il2jbcqggsb6mrlfva5vayd205fp68zm7d0ll"))))
(build-system gnu-build-system)
(propagated-inputs
`(("libgpg-error-host" ,libgpg-error)))
@@ -116,22 +115,8 @@ generation.")
(properties '((ftp-server . "ftp.gnupg.org")
(ftp-directory . "/gcrypt/libgcrypt")))))
-(define libgcrypt-1.7.8
- (package
- (inherit libgcrypt)
- (replacement #f)
- (version "1.7.8")
- (source (origin
- (method url-fetch)
- (uri (string-append "mirror://gnupg/libgcrypt/libgcrypt-"
- version ".tar.bz2"))
- (sha256
- (base32
- "16f1rsv4y4w2pk1il2jbcqggsb6mrlfva5vayd205fp68zm7d0ll"))))))
-
(define-public libgcrypt-1.5
(package (inherit libgcrypt)
- (replacement #f)
(version "1.5.6")
(source
(origin