diff options
| author | Marius Bakke <mbakke@fastmail.com> | 2018-03-08 21:21:05 +0100 |
|---|---|---|
| committer | Marius Bakke <mbakke@fastmail.com> | 2018-03-08 21:21:05 +0100 |
| commit | d8fa1890c705ca566a56b69a4880a10dc7cf0098 (patch) | |
| tree | c3f220949e5364d981a4895477249ad46852eea0 /gnu/packages/patches | |
| parent | 5de561a79634e0814ea22f1cfece9a09efa120be (diff) | |
| parent | fee7f8a94ec64943109ba9c37f75c28749fb18bd (diff) | |
Merge branch 'master' into staging
Diffstat (limited to 'gnu/packages/patches')
| -rw-r--r-- | gnu/packages/patches/glibc-allow-kernel-2.6.32.patch | 7 | ||||
| -rw-r--r-- | gnu/packages/patches/thefuck-test-environ.patch | 20 |
2 files changed, 17 insertions, 10 deletions
diff --git a/gnu/packages/patches/glibc-allow-kernel-2.6.32.patch b/gnu/packages/patches/glibc-allow-kernel-2.6.32.patch index ce18b874c4..c03807323f 100644 --- a/gnu/packages/patches/glibc-allow-kernel-2.6.32.patch +++ b/gnu/packages/patches/glibc-allow-kernel-2.6.32.patch @@ -1,3 +1,10 @@ +This patch allows libc to be used with the heavily-patched kernel found +on CentOS 6, which identifies itself as 2.6.32. + +See <https://lists.gnu.org/archive/html/guix-devel/2018-02/msg00392.html>. + +Patch taken from Nixpkgs. + diff --git a/sysdeps/unix/sysv/linux/configure b/sysdeps/unix/sysv/linux/configure index cace758c01..38fe7fe0b0 100644 --- a/sysdeps/unix/sysv/linux/configure 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 |