From f0e9fda6beaf3c44993b2cc7264fa05ad887b0a8 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Fri, 7 Apr 2017 22:03:56 -0400 Subject: gnu: certbot, python-acme: Update to 0.13.0. * gnu/packages/tls.scm (certbot, python-acme, python2-acme): Update to 0.13.0. [arguments]: Add 'patch-dependency' phase. --- gnu/packages/tls.scm | 27 +++++++++++++++++++++++---- 1 file changed, 23 insertions(+), 4 deletions(-) (limited to 'gnu/packages/tls.scm') diff --git a/gnu/packages/tls.scm b/gnu/packages/tls.scm index 5f06140e72..ac5e406c7f 100644 --- a/gnu/packages/tls.scm +++ b/gnu/packages/tls.scm @@ -469,18 +469,29 @@ security, and applying best practice development processes.") (package (name "python-acme") ;; Remember to update the hash of certbot when updating python-acme. - (version "0.12.0") + (version "0.13.0") (source (origin (method url-fetch) (uri (pypi-uri "acme" version)) (sha256 (base32 - "1pzv8fcfwdqzvvpyhgjz412is0b98yj9495k8sidzzqgbdmvlp50")))) + "05cqadwzgfcianw3v0qxwja65dxnzw429f7dk8w0mnh21pib72bl")))) (build-system python-build-system) + + ;; TODO factorize the 'docs' phase and share arguments between python-acme + ;; and certbot. (arguments `(#:phases (modify-phases %standard-phases - (add-after 'install 'docs + (add-after 'unpack 'patch-dependency + ;; This module is part of the Python standard library, so we don't + ;; need to use an external package. + ;; https://github.com/certbot/certbot/pull/2249 + (lambda _ + (substitute* "setup.py" + (("'argparse',") "")) + #t)) + (add-after 'build 'docs (lambda* (#:key outputs #:allow-other-keys) (let* ((out (assoc-ref outputs "out")) (man (string-append out "/share/man/man1")) @@ -526,12 +537,20 @@ security, and applying best practice development processes.") (uri (pypi-uri name version)) (sha256 (base32 - "1dw86gb8lyap5ckjawmli1hxgbchw2g62g1lqfvxyqjv0df94waa")))) + "1wq0khcf4ixda71cgfd9rkqqzx6j8hp8ha0cssvjzjnsgrsdffpn")))) (build-system python-build-system) (arguments `(#:python ,python-2 #:phases (modify-phases %standard-phases + (add-after 'unpack 'patch-dependency + ;; This module is part of the Python standard library, so we don't + ;; need to use an external package. + ;; https://github.com/certbot/certbot/pull/2249 + (lambda _ + (substitute* "setup.py" + (("'argparse',") "")) + #t)) (add-after 'build 'docs (lambda* (#:key outputs #:allow-other-keys) (let* ((out (assoc-ref outputs "out")) -- cgit v1.2.3 From f26d6e4e9c5efbe060697f54456cfc9144350114 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Sat, 8 Apr 2017 12:45:16 -0400 Subject: gnu: certbot: Share python-acme's arguments. * gnu/packages/tls.scm (certbot)[arguments]: Use substitute-keyword-arguments to inherit from python-acme. --- gnu/packages/tls.scm | 39 +++++++++++++++------------------------ 1 file changed, 15 insertions(+), 24 deletions(-) (limited to 'gnu/packages/tls.scm') diff --git a/gnu/packages/tls.scm b/gnu/packages/tls.scm index ac5e406c7f..08cc6075b6 100644 --- a/gnu/packages/tls.scm +++ b/gnu/packages/tls.scm @@ -478,8 +478,6 @@ security, and applying best practice development processes.") "05cqadwzgfcianw3v0qxwja65dxnzw429f7dk8w0mnh21pib72bl")))) (build-system python-build-system) - ;; TODO factorize the 'docs' phase and share arguments between python-acme - ;; and certbot. (arguments `(#:phases (modify-phases %standard-phases @@ -541,28 +539,21 @@ security, and applying best practice development processes.") (build-system python-build-system) (arguments `(#:python ,python-2 - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'patch-dependency - ;; This module is part of the Python standard library, so we don't - ;; need to use an external package. - ;; https://github.com/certbot/certbot/pull/2249 - (lambda _ - (substitute* "setup.py" - (("'argparse',") "")) - #t)) - (add-after 'build 'docs - (lambda* (#:key outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (man1 (string-append out "/share/man/man1")) - (man7 (string-append out "/share/man/man7")) - (info (string-append out "/info"))) - (and - (zero? (system* "make" "-C" "docs" "man" "info")) - (install-file "docs/_build/texinfo/Certbot.info" info) - (install-file "docs/_build/man/certbot.1" man1) - (install-file "docs/_build/man/certbot.7" man7) - #t))))))) + ,@(substitute-keyword-arguments (package-arguments python-acme) + ((#:phases phases) + `(modify-phases ,phases + (replace 'docs + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (man1 (string-append out "/share/man/man1")) + (man7 (string-append out "/share/man/man7")) + (info (string-append out "/info"))) + (and + (zero? (system* "make" "-C" "docs" "man" "info")) + (install-file "docs/_build/texinfo/Certbot.info" info) + (install-file "docs/_build/man/certbot.1" man1) + (install-file "docs/_build/man/certbot.7" man7) + #t))))))))) ;; TODO: Add optional inputs for testing. (native-inputs `(("python2-nose" ,python2-nose) -- cgit v1.2.3 From 69121e95cd5568238a0f207dfab708501ec4a753 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Tue, 11 Apr 2017 13:09:03 -0400 Subject: gnu: libressl: Update to 2.5.3. * gnu/packages/tls.scm (libressl): Update to 2.5.3. --- gnu/packages/tls.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/tls.scm') diff --git a/gnu/packages/tls.scm b/gnu/packages/tls.scm index 08cc6075b6..95c56803a4 100644 --- a/gnu/packages/tls.scm +++ b/gnu/packages/tls.scm @@ -431,7 +431,7 @@ required structures.") (define-public libressl (package (name "libressl") - (version "2.5.2") + (version "2.5.3") (source (origin (method url-fetch) @@ -440,7 +440,7 @@ required structures.") version ".tar.gz")) (sha256 (base32 - "10hw434azw0gvfkmfm46r85r7my1c6592rg9jsna914jh1q7vyhg")))) + "0c4awq45cl757fv7f7f75i5i0ibc6v7ns13n7xvfak7chv2lrqql")))) (build-system gnu-build-system) (native-search-paths ;; FIXME: These two variables must designate a single file or directory -- cgit v1.2.3 From 1fc8476d36e21711f0bd46dea753329d97d915c0 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 10 Apr 2017 00:26:45 +0200 Subject: gnu: certbot, python-acme: Build documentation in separate phase. * gnu/packages/tls.scm (python-acme)[arguments]<:phases>: Add 'build-documentation' phase. Rename 'docs' phase to 'install-documentation'. (certbot)[arguments]<:phases>: Adjust accordingly. --- gnu/packages/tls.scm | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) (limited to 'gnu/packages/tls.scm') diff --git a/gnu/packages/tls.scm b/gnu/packages/tls.scm index 95c56803a4..faa4fcce86 100644 --- a/gnu/packages/tls.scm +++ b/gnu/packages/tls.scm @@ -489,15 +489,17 @@ security, and applying best practice development processes.") (substitute* "setup.py" (("'argparse',") "")) #t)) - (add-after 'build 'docs + (add-after 'build 'build-documentation + (lambda _ + (zero? (system* "make" "-C" "docs" "man" "info")))) + (add-after 'install 'install-documentation (lambda* (#:key outputs #:allow-other-keys) (let* ((out (assoc-ref outputs "out")) (man (string-append out "/share/man/man1")) (info (string-append out "/info"))) - (and (zero? (system* "make" "-C" "docs" "man" "info")) - (install-file "docs/_build/texinfo/acme-python.info" info) - (install-file "docs/_build/man/acme-python.1" man) - #t))))))) + (install-file "docs/_build/texinfo/acme-python.info" info) + (install-file "docs/_build/man/acme-python.1" man) + #t)))))) ;; TODO: Add optional inputs for testing. (native-inputs `(("python-mock" ,python-mock) @@ -542,18 +544,16 @@ security, and applying best practice development processes.") ,@(substitute-keyword-arguments (package-arguments python-acme) ((#:phases phases) `(modify-phases ,phases - (replace 'docs + (replace 'install-documentation (lambda* (#:key outputs #:allow-other-keys) (let* ((out (assoc-ref outputs "out")) (man1 (string-append out "/share/man/man1")) (man7 (string-append out "/share/man/man7")) (info (string-append out "/info"))) - (and - (zero? (system* "make" "-C" "docs" "man" "info")) - (install-file "docs/_build/texinfo/Certbot.info" info) - (install-file "docs/_build/man/certbot.1" man1) - (install-file "docs/_build/man/certbot.7" man7) - #t))))))))) + (install-file "docs/_build/texinfo/Certbot.info" info) + (install-file "docs/_build/man/certbot.1" man1) + (install-file "docs/_build/man/certbot.7" man7) + #t)))))))) ;; TODO: Add optional inputs for testing. (native-inputs `(("python2-nose" ,python2-nose) -- cgit v1.2.3 From 57fe07dbc009a2f619ed80a2c559b71015f37c63 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Fri, 3 Feb 2017 15:05:44 +0100 Subject: gnu: python-acme: Remove unused dependencies. Removed in python-acme@0.10.0 and 0.4.1, respectively: https://github.com/certbot/certbot/commit/edbb3a73c6085219bef0cbf008bd1c82088bfcf6 https://github.com/certbot/certbot/commit/df383ee6e408f3be4bc3beb59aa33abc8e90f268 * gnu/packages/tls.scm (python-acme, python2-acme)[propagated-inputs]: Remove python-ndg-httpsclient and python-werkzeug. --- gnu/packages/tls.scm | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'gnu/packages/tls.scm') diff --git a/gnu/packages/tls.scm b/gnu/packages/tls.scm index faa4fcce86..483cfca22d 100644 --- a/gnu/packages/tls.scm +++ b/gnu/packages/tls.scm @@ -509,9 +509,7 @@ security, and applying best practice development processes.") ("python-sphinx-rtd-theme" ,python-sphinx-rtd-theme) ("texinfo" ,texinfo))) (propagated-inputs - `(("python-ndg-httpsclient" ,python-ndg-httpsclient) - ("python-werkzeug" ,python-werkzeug) - ("python-six" ,python-six) + `(("python-six" ,python-six) ("python-requests" ,python-requests) ("python-pytz" ,python-pytz) ("python-pyrfc3339" ,python-pyrfc3339) -- cgit v1.2.3 From 012863081d44a916b8d0403701f364c5aa141117 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Fri, 3 Feb 2017 15:06:41 +0100 Subject: gnu: certbot: Remove unused dependency. This dependency was removed in certbot@0.10.0: https://github.com/certbot/certbot/commit/d54cb76432a2eff43cc9cc3c1cc4d9136eac2221 * gnu/packages/tls.scm (certbot)[propagated-inputs]: Remove python2-pythondialog. --- gnu/packages/tls.scm | 1 - 1 file changed, 1 deletion(-) (limited to 'gnu/packages/tls.scm') diff --git a/gnu/packages/tls.scm b/gnu/packages/tls.scm index 483cfca22d..1c99a3ad75 100644 --- a/gnu/packages/tls.scm +++ b/gnu/packages/tls.scm @@ -565,7 +565,6 @@ security, and applying best practice development processes.") (propagated-inputs `(("python2-acme" ,python2-acme) ("python2-zope-interface" ,python2-zope-interface) - ("python2-pythondialog" ,python2-pythondialog) ("python2-pyrfc3339" ,python2-pyrfc3339) ("python2-pyopenssl" ,python2-pyopenssl) ("python2-configobj" ,python2-configobj) -- cgit v1.2.3