diff options
| author | Leo Famulari <leo@famulari.name> | 2017-03-13 00:11:12 -0400 |
|---|---|---|
| committer | Leo Famulari <leo@famulari.name> | 2017-03-13 15:33:54 -0400 |
| commit | 7cb68a3cb3082cb6ae5435c28ae7f9278e4d1a0f (patch) | |
| tree | ae6240a4f3a278cad7e894b96fa6b84864b2720a | |
| parent | be81133a13932bc83b0697d73581a47674ef6987 (diff) | |
| download | guix-7cb68a3cb3082cb6ae5435c28ae7f9278e4d1a0f.tar.gz guix-7cb68a3cb3082cb6ae5435c28ae7f9278e4d1a0f.zip | |
gnu: Remove python-3.4.
* gnu/packages/python.scm (python-3.4): Remove variable.
* gnu/packages/patches/python-3.4-fix-tests.patch: Delete file.
* gnu/local.mk (dist_patch_DATA): Remove it.
| -rw-r--r-- | gnu/local.mk | 1 | ||||
| -rw-r--r-- | gnu/packages/patches/python-3.4-fix-tests.patch | 12 | ||||
| -rw-r--r-- | gnu/packages/python.scm | 17 |
3 files changed, 0 insertions, 30 deletions
diff --git a/gnu/local.mk b/gnu/local.mk index c51e04289b..c74418d0dc 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -853,7 +853,6 @@ dist_patch_DATA = \ %D%/packages/patches/python-2.7-source-date-epoch.patch \ %D%/packages/patches/python-3-deterministic-build-info.patch \ %D%/packages/patches/python-3-search-paths.patch \ - %D%/packages/patches/python-3.4-fix-tests.patch \ %D%/packages/patches/python-3.5-fix-tests.patch \ %D%/packages/patches/python-3.5-getentropy-on-old-kernels.patch \ %D%/packages/patches/python-dendropy-fix-tests.patch \ diff --git a/gnu/packages/patches/python-3.4-fix-tests.patch b/gnu/packages/patches/python-3.4-fix-tests.patch deleted file mode 100644 index d1f8138e79..0000000000 --- a/gnu/packages/patches/python-3.4-fix-tests.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- Lib/test/test_posixpath.py 2014-03-01 05:46:56.984311000 +0100 -+++ Lib/test/test_posixpath.py 2014-03-07 00:59:20.888311000 +0100 -@@ -319,7 +319,11 @@ - del env['HOME'] - home = pwd.getpwuid(os.getuid()).pw_dir - # $HOME can end with a trailing /, so strip it (see #17809) -- self.assertEqual(posixpath.expanduser("~"), home.rstrip("/")) -+ # The Guix builders have '/' as a home directory, so -+ # home.rstrip("/") will be an empty string and the test will -+ # fail. Let's just disable it since it does not really make -+ # sense with such a bizarre setup. -+ # self.assertEqual(posixpath.expanduser("~"), home.rstrip("/")) diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 2a7257b21d..60f0594453 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -344,23 +344,6 @@ data types.") (version-major+minor version) "/site-packages")))))))) -(define-public python-3.4 - (package (inherit python-3.5) - (version "3.4.5") - (source (origin - (method url-fetch) - (uri (string-append "https://www.python.org/ftp/python/" - version "/Python-" version ".tar.xz")) - (patches (search-patches - "python-fix-tests.patch" - "python-3.4-fix-tests.patch" - "python-3-deterministic-build-info.patch" - "python-3-search-paths.patch")) - (patch-flags '("-p0")) - (sha256 - (base32 - "12l9klp778wklxmckhghniy5hklss8r26995pyd00qbllk4b2r7f")))))) - ;; Current 3.x version. (define-public python-3 python-3.5) |