diff options
author | Eric Bavier <bavier@member.fsf.org> | 2018-03-06 23:33:57 -0600 |
---|---|---|
committer | Eric Bavier <bavier@member.fsf.org> | 2018-03-06 23:33:57 -0600 |
commit | 2468ca04882f27ac28a427e2445a20157b9b2802 (patch) | |
tree | 29d783a572673ec8484d78aa14d50af46c3a998e /gnu/packages | |
parent | f70666c9ce4f463d47c4d1694ed608bfadb56cd7 (diff) | |
download | guix-patches-2468ca04882f27ac28a427e2445a20157b9b2802.tar guix-patches-2468ca04882f27ac28a427e2445a20157b9b2802.tar.gz |
gnu: thefuck: Update to 3.25.
* gnu/packages/admin.scm (thefuck): Update to 3.25
[inputs]: Add python-pyte.
[native-inputs]: Remove python-setuptools.
* gnu/packages/patches/thefuck-test-environ.patch: Adjust to latest source.
Diffstat (limited to 'gnu/packages')
-rw-r--r-- | gnu/packages/admin.scm | 13 | ||||
-rw-r--r-- | gnu/packages/patches/thefuck-test-environ.patch | 20 |
2 files changed, 16 insertions, 17 deletions
diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index 78b7b64dd1..26ee4aaabe 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -2,7 +2,7 @@ ;;; Copyright © 2012, 2013, 2014, 2015, 2016, 2017, 2018 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2013 Cyril Roelandt <tipecaml@gmail.com> ;;; Copyright © 2014, 2015, 2016, 2018 Mark H Weaver <mhw@netris.org> -;;; Copyright © 2014, 2015, 2016, 2017 Eric Bavier <bavier@member.fsf.org> +;;; Copyright © 2014, 2015, 2016, 2017, 2018 Eric Bavier <bavier@member.fsf.org> ;;; Copyright © 2015, 2016 Taylan Ulrich Bayırlı/Kammer <taylanbayirli@gmail.com> ;;; Copyright © 2015 Alex Sassmannshausen <alex.sassmannshausen@gmail.com> ;;; Copyright © 2015 Eric Dvorsak <eric@dvorsak.fr> @@ -75,6 +75,7 @@ #:use-module (gnu packages python) #:use-module (gnu packages python-crypto) #:use-module (gnu packages python-web) + #:use-module (gnu packages terminals) #:use-module (gnu packages texinfo) #:use-module (gnu packages groff) #:use-module (gnu packages pciutils) @@ -1855,7 +1856,7 @@ throughput (in the same interval).") (define-public thefuck (package (name "thefuck") - (version "3.19") + (version "3.25") (source (origin (method url-fetch) (uri (string-append "https://github.com/nvbn/thefuck/archive/" @@ -1863,7 +1864,7 @@ throughput (in the same interval).") (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "191zbvkyc02h0wwd46xwj4zzg7jhlr8xv0ji6knqkgjnk0nvqq01")) + "088bn2l1376qlndbpnjya4q1x3913nj3yj3wc7s2w3bz66d23skk")) (patches (search-patches "thefuck-test-environ.patch")))) (build-system python-build-system) (arguments @@ -1881,14 +1882,12 @@ throughput (in the same interval).") `(("python-colorama" ,python-colorama) ("python-decorator" ,python-decorator) ("python-psutil" ,python-psutil) + ("python-pyte" ,python-pyte) ("python-six" ,python-six))) (native-inputs `(("python-mock" ,python-mock) ("python-pytest" ,python-pytest) - ("python-pytest-mock" ,python-pytest-mock) - ;; Requires setuptools >= 17.1 due to some features used, while our - ;; python currently only includes 12.0. TODO: Remove this input. - ("python-setuptools" ,python-setuptools))) + ("python-pytest-mock" ,python-pytest-mock))) (home-page "https://github.com/nvbn/thefuck") (synopsis "Correct mistyped console command") (description diff --git a/gnu/packages/patches/thefuck-test-environ.patch b/gnu/packages/patches/thefuck-test-environ.patch index 0c602a38c4..54194d8928 100644 --- a/gnu/packages/patches/thefuck-test-environ.patch +++ b/gnu/packages/patches/thefuck-test-environ.patch @@ -1,14 +1,14 @@ Retain environment setting of "HOME" for tests that need os.path.expanduser() to return a readable directory in the build chroot. ---- thefuck-3.15/tests/test_conf.py -+++ thefuck-3.15/tests/test_conf.py -@@ -12,7 +12,7 @@ - - @pytest.fixture - def environ(monkeypatch): -- data = {} -+ data = {"HOME": os.environ.get("HOME")} - monkeypatch.setattr('thefuck.conf.os.environ', data) - return data +--- thefuck-3.25/tests/conftest.py ++++ thefuck-3.25/tests/conftest.py +@@ -64,6 +64,7 @@ def set_shell(monkeypatch): + @pytest.fixture(autouse=True) + def os_environ(monkeypatch): +- env = {'PATH': os.environ['PATH']} ++ env = {'PATH': os.environ['PATH'], ++ 'HOME': os.environ['HOME']} + monkeypatch.setattr('os.environ', env) + return env |