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

gnu: argon2: Update to 20171227. 

* gnu/packages/password-utils.scm (argon2): Update to 20171227.
[arguments]: Add OPTTEST=1 to #:make-flags to prevent "-march=native".  Remove
custom install phase.  Add 'patch-Makefile' phase.
[license]: Add ASL2.0.
This commit is contained in:
Marius Bakke 2018-02-18 19:29:06 +01:00
parent 102fc5bc29
commit c06bf6a3e2
No known key found for this signature in database
GPG Key ID: A2A06DF2A33A54FA
1 changed files with 15 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
gnu/packages/password-utils.scm
View File

@ -15,6 +15,7 @@
;;; Copyright © 2017 Nicolas Goaziou <mail@nicolasgoaziou.fr> ;;; Copyright © 2017 Nicolas Goaziou <mail@nicolasgoaziou.fr>
;;; Copyright © 2017 Manolis Fragkiskos Ragkousis <manolis837@gmail.com> ;;; Copyright © 2017 Manolis Fragkiskos Ragkousis <manolis837@gmail.com>
;;; Copyright © 2017 Rutger Helling <rhelling@mykolab.com> ;;; Copyright © 2017 Rutger Helling <rhelling@mykolab.com>
;;; Copyright © 2018 Marius Bakke <mbakke@fastmail.com>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -410,7 +411,7 @@ through the pass command.")
(define-public argon2 (define-public argon2
(package (package
(name "argon2") (name "argon2")
(version "20161029") (version "20171227")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
@ -420,27 +421,28 @@ through the pass command.")
(file-name (string-append name "-" version ".tar.gz")) (file-name (string-append name "-" version ".tar.gz"))
(sha256 (sha256
(base32 (base32
"1rymikbysasdadm325jx69i0q19d9srqkny69jwmhswlidr4j07y")))) "1n6w5y3va7lrcym7cxr0nikapldqm80wxjdns584bvplq5r03spa"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:test-target "test" `(#:test-target "test"
#:make-flags '("CC=gcc") #:make-flags '("CC=gcc"
"OPTTEST=1") ;disable CPU optimization
#:phases #:phases
(modify-phases %standard-phases (modify-phases %standard-phases
(delete 'configure) (add-after 'unpack 'patch-Makefile
(replace 'install (lambda* (#:key outputs #:allow-other-keys)
(lambda _ (let ((out (assoc-ref outputs "out")))
(let ((out (assoc-ref %outputs "out"))) (substitute* "Makefile"
(install-file "argon2" (string-append out "/bin")) (("PREFIX = /usr") (string-append "PREFIX = " out)))
(install-file "libargon2.a" (string-append out "/lib")) #t)))
(install-file "libargon2.so" (string-append out "/lib")) (delete 'configure))))
(copy-recursively "include"
(string-append out "/include"))))))))
(home-page "https://www.argon2.com/") (home-page "https://www.argon2.com/")
(synopsis "Password hashing library") (synopsis "Password hashing library")
(description "Argon2 provides a key derivation function that was declared (description "Argon2 provides a key derivation function that was declared
winner of the 2015 Password Hashing Competition.") winner of the 2015 Password Hashing Competition.")
(license license:cc0))) ;; Argon2 is dual licensed under CC0 and ASL 2.0. Some of the source
;; files are CC0 only; see README.md and LICENSE for details.
(license (list license:cc0 license:asl2.0))))
(define-public python-bcrypt (define-public python-bcrypt
(package (package