diff options
| author | Efraim Flashner <efraim@flashner.co.il> | 2017-10-26 12:45:11 +0300 |
|---|---|---|
| committer | Efraim Flashner <efraim@flashner.co.il> | 2017-10-26 12:45:11 +0300 |
| commit | eda8a841ac7457ffe05c4a4248d6dff074b72326 (patch) | |
| tree | e39ae185dc350d278d1f498460ac50b96956686f /gnu/local.mk | |
| parent | b7883b111d92746ff3bedb6f4bb4c1578068fc59 (diff) | |
| parent | 49c620e0685a0bbe40ff69159a9ca562ba02ca7f (diff) | |
| download | guix-eda8a841ac7457ffe05c4a4248d6dff074b72326.tar.gz | |
Merge remote-tracking branch 'origin/python-updates' into core-updates
Diffstat (limited to 'gnu/local.mk')
| -rw-r--r-- | gnu/local.mk | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/gnu/local.mk b/gnu/local.mk index 8f5cf46ee0..329a71f214 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -958,14 +958,13 @@ dist_patch_DATA = \ %D%/packages/patches/pygpgme-disable-problematic-tests.patch \ %D%/packages/patches/pyqt-configure.patch \ %D%/packages/patches/python-2-deterministic-build-info.patch \ - %D%/packages/patches/python-2.7-getentropy-on-old-kernels.patch \ + %D%/packages/patches/python-2.7-adjust-tests.patch \ %D%/packages/patches/python-2.7-search-paths.patch \ %D%/packages/patches/python-2.7-site-prefixes.patch \ %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.5-fix-tests.patch \ - %D%/packages/patches/python-3.5-getentropy-on-old-kernels.patch \ + %D%/packages/patches/python-3-fix-tests.patch \ %D%/packages/patches/python-dendropy-fix-tests.patch \ %D%/packages/patches/python-fix-tests.patch \ %D%/packages/patches/python-genshi-add-support-for-python-3.4-AST.patch \ @@ -990,7 +989,8 @@ dist_patch_DATA = \ %D%/packages/patches/python2-pygobject-2-gi-info-type-error-domain.patch \ %D%/packages/patches/python-pygpgme-fix-pinentry-tests.patch \ %D%/packages/patches/python2-subprocess32-disable-input-test.patch \ - %D%/packages/patches/python2-unittest2-remove-argparse.patch \ + %D%/packages/patches/python-unittest2-python3-compat.patch \ + %D%/packages/patches/python-unittest2-remove-argparse.patch \ %D%/packages/patches/qt4-ldflags.patch \ %D%/packages/patches/qtscript-disable-tests.patch \ %D%/packages/patches/quagga-reproducible-build.patch \ |