From e1a94fe09cb81d0757b8c35356d3e5ad15f6f9f8 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 22 Jan 2020 12:12:06 +0200 Subject: gnu: pass-rotate: Don't use unstable tarball. * gnu/packages/password-utils.scm (pass-rotate)[source]: Download using git-fetch. Reflow section. --- gnu/packages/password-utils.scm | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) (limited to 'gnu/packages/password-utils.scm') diff --git a/gnu/packages/password-utils.scm b/gnu/packages/password-utils.scm index e896e3db2d..3e6212f38b 100644 --- a/gnu/packages/password-utils.scm +++ b/gnu/packages/password-utils.scm @@ -1,6 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2015 Steve Sprang -;;; Copyright © 2015, 2016, 2017, 2018, 2019 Efraim Flashner +;;; Copyright © 2015, 2016, 2017, 2018, 2019, 2020 Efraim Flashner ;;; Copyright © 2015 Aljosha Papsch ;;; Copyright © 2016 Christopher Allan Webber ;;; Copyright © 2016 Jessica Tallon @@ -962,14 +962,15 @@ to use a different password manager.") (name "pass-rotate") (version "0.1") (source - (origin - (method url-fetch) - (uri (string-append "https://github.com/SirCmpwn/pass-rotate/archive/" - version ".tar.gz")) - (sha256 - (base32 - "1svm5nj8bczv2dg8lh2zqqhbsrljqsw9680r03qwgl9vlci90210")) - (file-name (string-append name "-" version ".tar.gz")))) + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/SirCmpwn/pass-rotate") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1m067vvdlc85csbpkp8aw4s3ags7q8s3jszrr32kmj9qhk5c254f")))) (build-system python-build-system) (inputs `(("python-beautifulsoup4" ,python-beautifulsoup4) -- cgit v1.2.3 From 659204ff2c15b2b8d6c0bb04c0d36bfcb5f18226 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 22 Jan 2020 12:14:02 +0200 Subject: gnu: pass-rotate: Update upstream location. * gnu/packages/password-utils.scm (pass-rotate)[source]: Update to new source uri. [home-page]: Update to new home-page. --- gnu/packages/password-utils.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/password-utils.scm') diff --git a/gnu/packages/password-utils.scm b/gnu/packages/password-utils.scm index 3e6212f38b..98d7effd3c 100644 --- a/gnu/packages/password-utils.scm +++ b/gnu/packages/password-utils.scm @@ -965,7 +965,7 @@ to use a different password manager.") (origin (method git-fetch) (uri (git-reference - (url "https://github.com/SirCmpwn/pass-rotate") + (url "https://github.com/ddevault/pass-rotate") (commit version))) (file-name (git-file-name name version)) (sha256 @@ -977,7 +977,7 @@ to use a different password manager.") ("python-docopt" ,python-docopt) ("python-html5lib" ,python-html5lib) ("python-requests" ,python-requests))) - (home-page "https://github.com/SirCmpwn/pass-rotate") + (home-page "https://github.com/ddevault/pass-rotate") (synopsis "Rotate password on online services") (description "pass-rotate is a command line utility and python library for rotating passwords on various web services. It makes it easier to rotate your -- cgit v1.2.3 From df58cc9c568b4f18af3a4eb8e19f501e2c8ba81c Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 22 Jan 2020 12:18:05 +0200 Subject: gnu: pass-git-helper: Don't use unstable tarball. * gnu/packages/password-utils.scm (pass-git-helper)[source]: Download using git-fetch. --- gnu/packages/password-utils.scm | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'gnu/packages/password-utils.scm') diff --git a/gnu/packages/password-utils.scm b/gnu/packages/password-utils.scm index 98d7effd3c..3931e8a693 100644 --- a/gnu/packages/password-utils.scm +++ b/gnu/packages/password-utils.scm @@ -752,12 +752,14 @@ winner of the 2015 Password Hashing Competition.") (version "0.3.1") (source (origin - (method url-fetch) - (uri (string-append "https://github.com/languitar/pass-git-helper/archive/release-" - version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/languitar/pass-git-helper") + (commit (string-append "release-" version)))) + (file-name (git-file-name name version)) (sha256 (base32 - "0lz5ncy44pz7z1j2nnyildx8sq33zi3xvg5nkwg25n11nasqh2xn")))) + "0vyzmfzyr6ghaglr09px2q6k38zyv1hw25j14z7if7nncj1i4i5d")))) (build-system python-build-system) (arguments `(#:phases -- cgit v1.2.3 From b70f9ad1654bb2e363257ff2365d56cce9f6f2e0 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 22 Jan 2020 12:28:48 +0200 Subject: gnu: pass-git-helper: Update to 1.1.0. * gnu/packages/password-utils.scm (pass-git-helper): Update to 1.1.0. [arguments]: Update 'patch-pass-path phase. Add 'pre-check phase. [native-inputs]: Add python-pytest, python-pytest-mock. --- gnu/packages/password-utils.scm | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) (limited to 'gnu/packages/password-utils.scm') diff --git a/gnu/packages/password-utils.scm b/gnu/packages/password-utils.scm index 3931e8a693..989d27a2e0 100644 --- a/gnu/packages/password-utils.scm +++ b/gnu/packages/password-utils.scm @@ -749,17 +749,17 @@ winner of the 2015 Password Hashing Competition.") (define-public pass-git-helper (package (name "pass-git-helper") - (version "0.3.1") + (version "1.1.0") (source (origin (method git-fetch) (uri (git-reference (url "https://github.com/languitar/pass-git-helper") - (commit (string-append "release-" version)))) + (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 (base32 - "0vyzmfzyr6ghaglr09px2q6k38zyv1hw25j14z7if7nncj1i4i5d")))) + "18nvwlp0w4aqj268wly60rnjzqw2d8jl0hbs6bkwp3hpzzz5g6yd")))) (build-system python-build-system) (arguments `(#:phases @@ -768,12 +768,19 @@ winner of the 2015 Password Hashing Competition.") (lambda* (#:key inputs #:allow-other-keys) (let* ((password-store (assoc-ref inputs "password-store")) (pass (string-append password-store "/bin/pass"))) - (substitute* "pass-git-helper" + (substitute* "passgithelper.py" (("'pass'") (string-append "'" pass "'"))) - #t)))))) + #t))) + (add-before 'check 'pre-check + (lambda _ + (setenv "HOME" (getcwd)) + #t))))) (inputs `(("python-pyxdg" ,python-pyxdg) ("password-store" ,password-store))) + (native-inputs + `(("python-pytest" ,python-pytest) + ("python-pytest-mock" ,python-pytest-mock))) (home-page "https://github.com/languitar/pass-git-helper") (synopsis "Git credential helper interfacing with pass") (description "pass-git-helper is a git credential helper which allows to -- cgit v1.2.3 From 54bcc27fb5fb1ecc9dca85380cb16913b3349d55 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 22 Jan 2020 12:39:18 +0200 Subject: gnu: pass-git-helper: Run test suite. * gnu/packages/password-utils.scm (pass-git-helper)[arguments]: Adjust custom 'patch-pass-path phase. Use custom 'check phase. --- gnu/packages/password-utils.scm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'gnu/packages/password-utils.scm') diff --git a/gnu/packages/password-utils.scm b/gnu/packages/password-utils.scm index 989d27a2e0..2716997049 100644 --- a/gnu/packages/password-utils.scm +++ b/gnu/packages/password-utils.scm @@ -768,13 +768,14 @@ winner of the 2015 Password Hashing Competition.") (lambda* (#:key inputs #:allow-other-keys) (let* ((password-store (assoc-ref inputs "password-store")) (pass (string-append password-store "/bin/pass"))) - (substitute* "passgithelper.py" + (substitute* '("passgithelper.py" + "test_passgithelper.py") (("'pass'") (string-append "'" pass "'"))) #t))) - (add-before 'check 'pre-check + (replace 'check (lambda _ (setenv "HOME" (getcwd)) - #t))))) + (invoke "pytest")))))) (inputs `(("python-pyxdg" ,python-pyxdg) ("password-store" ,password-store))) -- cgit v1.2.3 From c600cf2a72fef7994f85a1e5c3f986a79a5024cc Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 22 Jan 2020 12:45:39 +0200 Subject: gnu: argon2: Don't use unstable tarball. * gnu/packages/password-utils.scm (argon2)[source]: Download using git-fetch. --- gnu/packages/password-utils.scm | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'gnu/packages/password-utils.scm') diff --git a/gnu/packages/password-utils.scm b/gnu/packages/password-utils.scm index 2716997049..af09f7b462 100644 --- a/gnu/packages/password-utils.scm +++ b/gnu/packages/password-utils.scm @@ -706,14 +706,14 @@ using password-store through rofi interface: (version "20171227") (source (origin - (method url-fetch) - (uri - (string-append "https://github.com/P-H-C/phc-winner-argon2/archive/" - version ".tar.gz")) - (file-name (string-append name "-" version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/P-H-C/phc-winner-argon2") + (commit version))) + (file-name (git-file-name name version)) (sha256 (base32 - "1n6w5y3va7lrcym7cxr0nikapldqm80wxjdns584bvplq5r03spa")))) + "1rzayv4ydxwb5fqyr1y8nz0wsb9r45mwl1wrq8hmikjrlqhhjn6f")))) (build-system gnu-build-system) (arguments `(#:test-target "test" -- cgit v1.2.3 From fe109349d0cfb8d6c2cc8509ed6c4da86da0ca26 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 22 Jan 2020 13:04:47 +0200 Subject: gnu: argon2: Update to 20190702. * gnu/packages/password-utils.scm (argon2): Update to 20190702. [arguments]: Adjust make-flags. Remove 'patch-Makefile phase. --- gnu/packages/password-utils.scm | 29 ++++++++--------------------- 1 file changed, 8 insertions(+), 21 deletions(-) (limited to 'gnu/packages/password-utils.scm') diff --git a/gnu/packages/password-utils.scm b/gnu/packages/password-utils.scm index af09f7b462..eed0989452 100644 --- a/gnu/packages/password-utils.scm +++ b/gnu/packages/password-utils.scm @@ -703,7 +703,7 @@ using password-store through rofi interface: (define-public argon2 (package (name "argon2") - (version "20171227") + (version "20190702") (source (origin (method git-fetch) @@ -713,31 +713,18 @@ using password-store through rofi interface: (file-name (git-file-name name version)) (sha256 (base32 - "1rzayv4ydxwb5fqyr1y8nz0wsb9r45mwl1wrq8hmikjrlqhhjn6f")))) + "01rwanr4wmr9vm6c712x411wig543q195z2icn388z892a93lc7p")))) (build-system gnu-build-system) (arguments `(#:test-target "test" - #:make-flags '("CC=gcc" - "OPTTEST=1") ;disable CPU optimization + #:make-flags (list "CC=gcc" + (string-append "PREFIX=" (assoc-ref %outputs "out")) + "LIBRARY_REL=lib" + (string-append "ARGON2_VERSION=" ,version) + "OPTTEST=1") ; disable CPU optimization #:phases (modify-phases %standard-phases - (add-after 'unpack 'patch-Makefile - (lambda* (#:key outputs #:allow-other-keys) - (let ((out (assoc-ref outputs "out"))) - (substitute* "Makefile" - (("PREFIX = /usr") (string-append "PREFIX = " out))) - (substitute* "libargon2.pc" - (("prefix=/usr") (string-append "prefix=" out)) - (("@HOST_MULTIARCH@") "") - (("@UPSTREAM_VER@") ,version)) - #t))) - (delete 'configure) - (add-after 'install 'install-argon2.pc - (lambda* (#:key outputs #:allow-other-keys) - (let ((out (assoc-ref outputs "out"))) - (install-file "libargon2.pc" - (string-append out "/lib/pkgconfig")) - #t)))))) + (delete 'configure)))) ; No configure script. (home-page "https://www.argon2.com/") (synopsis "Password hashing library") (description "Argon2 provides a key derivation function that was declared -- cgit v1.2.3