aboutsummaryrefslogtreecommitdiff
path: root/gnu/packages/patches
diff options
context:
space:
mode:
authorEric Bavier <bavier@member.fsf.org>2018-03-06 23:33:57 -0600
committerEric Bavier <bavier@member.fsf.org>2018-03-06 23:33:57 -0600
commit2468ca04882f27ac28a427e2445a20157b9b2802 (patch)
tree29d783a572673ec8484d78aa14d50af46c3a998e /gnu/packages/patches
parentf70666c9ce4f463d47c4d1694ed608bfadb56cd7 (diff)
downloadguix-2468ca04882f27ac28a427e2445a20157b9b2802.tar.gz
guix-2468ca04882f27ac28a427e2445a20157b9b2802.zip
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/patches')
-rw-r--r--gnu/packages/patches/thefuck-test-environ.patch20
1 files changed, 10 insertions, 10 deletions
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