diff options
| author | Mark H Weaver <mhw@netris.org> | 2017-08-06 00:23:20 -0400 |
|---|---|---|
| committer | Mark H Weaver <mhw@netris.org> | 2017-08-06 00:23:20 -0400 |
| commit | f167595ba1a4e0e419adc17de6af275bedf32822 (patch) | |
| tree | 6a582fbda8ad9d72962359add99e5ae219dd030d /gnu/packages/package-management.scm | |
| parent | e3df6938acc2ba2d2f7333d911b8bdc3697f0f75 (diff) | |
| parent | 01a61d7040b1794f36547b107abce6e967d59f21 (diff) | |
| download | gnu-guix-f167595ba1a4e0e419adc17de6af275bedf32822.tar gnu-guix-f167595ba1a4e0e419adc17de6af275bedf32822.tar.gz | |
Merge branch 'master' into core-updates
Diffstat (limited to 'gnu/packages/package-management.scm')
| -rw-r--r-- | gnu/packages/package-management.scm | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm index 506d1f94e7..3c1a4d9567 100644 --- a/gnu/packages/package-management.scm +++ b/gnu/packages/package-management.scm @@ -523,7 +523,7 @@ transactions from C or Python.") ;; Below are modules used for tests. ("python-pytest" ,python-pytest) ("python-chardet" ,python-chardet))) - (home-page "http://diffoscope.org/") + (home-page "https://diffoscope.org/") (synopsis "Compare files, archives, and directories in depth") (description "Diffoscope tries to get to the bottom of what makes files or directories @@ -661,7 +661,12 @@ This package provides Conda as a library.") (license bsd-3))) (define-public python2-conda - (package-with-python2 python-conda)) + (let ((base (package-with-python2 + (strip-python2-variant python-conda)))) + (package (inherit base) + (native-inputs + `(("python2-enum34" ,python2-enum34) + ,@(package-native-inputs base)))))) (define-public conda (package (inherit python-conda) |