mirror of
https://git.in.rschanz.org/ryan77627/guix.git
synced 2024-12-24 05:18:07 -05:00
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.
This commit is contained in:
parent
f70666c9ce
commit
2468ca0488
2 changed files with 16 additions and 17 deletions
|
@ -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 @@ (define-module (gnu packages admin)
|
|||
#: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 @@ (define-public dstat
|
|||
(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 @@ (define-public thefuck
|
|||
(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 @@ (define-public thefuck
|
|||
`(("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
|
||||
|
|
|
@ -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
|
||||
|
|
Loading…
Reference in a new issue