nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

gnu: opendht: Update to 1.8.1. 

* gnu/packages/crypto.scm (opendht): Update to 1.8.1.
[source]: Remove snippet that deletes argon2, which is no longer bundled.
[arguments]: Add "--with-argon2" to use system argon2.
[license]: Update to GPLv3+ following the README and source headers.
This commit is contained in:
Pierre Neidhardt 2019-01-09 21:12:44 +01:00
parent 6fe6840dab
commit 6a6e5d84da
No known key found for this signature in database
GPG Key ID: 9BDCF497A4BBCC7F
1 changed files with 8 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
gnu/packages/crypto.scm
View File

@ -11,6 +11,8 @@
;;; Copyright © 2018 Arun Isaac <arunisaac@systemreboot.net> ;;; Copyright © 2018 Arun Isaac <arunisaac@systemreboot.net>
;;; Copyright © 2018 Nicolas Goaziou <mail@nicolasgoaziou.fr> ;;; Copyright © 2018 Nicolas Goaziou <mail@nicolasgoaziou.fr>
;;; Copyright © 2018 Nicolò Balzarotti <nicolo@nixo.xyz> ;;; Copyright © 2018 Nicolò Balzarotti <nicolo@nixo.xyz>
;;; Copyright © 2018 Tim Gesthuizen <tim.gesthuizen@yahoo.de>
;;; Copyright © 2019 Pierre Neidhardt <mail@ambrevar.xyz>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -167,28 +169,16 @@ OpenBSD tool of the same name.")
(define-public opendht (define-public opendht
(package (package
(name "opendht") (name "opendht")
(version "0.6.1") (version "1.8.1")
(source (origin (source (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
(url "https://github.com/savoirfairelinux/opendht.git") (url "https://github.com/savoirfairelinux/opendht.git")
(commit version))) (commit version)))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(modules '((guix build utils)))
(snippet
'(begin
(delete-file-recursively "src/argon2")
(substitute* "src/Makefile.am"
(("./argon2/libargon2.la") "")
(("SUBDIRS = argon2") ""))
(substitute* "src/crypto.cpp"
(("argon2/argon2.h") "argon2.h"))
(substitute* "configure.ac"
(("src/argon2/Makefile") ""))
#t))
(sha256 (sha256
(base32 (base32
"1akk613f18rc8kqs0cxdm34iq7wwc9kffhgp5rng09arwlw8gw3w")))) "0vninb5mak27wigajslyvr05vq7wbrwqhbr4wzl2nmqcb20wmlq2"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(inputs (inputs
`(("gnutls" ,gnutls) `(("gnutls" ,gnutls)
@ -203,13 +193,15 @@ OpenBSD tool of the same name.")
("automake" ,automake) ("automake" ,automake)
("libtool" ,libtool))) ("libtool" ,libtool)))
(arguments (arguments
`(#:configure-flags '("--disable-tools" "--disable-python"))) `(#:configure-flags '("--disable-tools"
"--disable-python"
"--with-argon2")))
(home-page "https://github.com/savoirfairelinux/opendht/") (home-page "https://github.com/savoirfairelinux/opendht/")
(synopsis "Distributed Hash Table (DHT) library") (synopsis "Distributed Hash Table (DHT) library")
(description "OpenDHT is a Distributed Hash Table (DHT) library. It may (description "OpenDHT is a Distributed Hash Table (DHT) library. It may
be used to manage peer-to-peer network connections as needed for real time be used to manage peer-to-peer network connections as needed for real time
communication.") communication.")
(license license:gpl3))) (license license:gpl3+)))
(define-public encfs (define-public encfs
(package (package