diff options
| author | Marius Bakke <mbakke@fastmail.com> | 2017-03-30 22:59:53 +0200 |
|---|---|---|
| committer | Marius Bakke <mbakke@fastmail.com> | 2017-03-30 22:59:53 +0200 |
| commit | 84157bb8bf2c610584e0836047da4c710f8eaf76 (patch) | |
| tree | be5d8c7238e32802221db55a3ee83e7f6a58affb /gnu/packages/backup.scm | |
| parent | fa63939acba69e11df44073a7eb687bd2ba48349 (diff) | |
| parent | 03d0aa8b22223b67ec9bbd363c4d5800efdbaf82 (diff) | |
| download | guix-84157bb8bf2c610584e0836047da4c710f8eaf76.tar guix-84157bb8bf2c610584e0836047da4c710f8eaf76.tar.gz | |
Merge branch 'master' into core-updates
Most conflicts are from 6fd52309b8f52c9bb59fccffac53e029ce94b698.
Diffstat (limited to 'gnu/packages/backup.scm')
| -rw-r--r-- | gnu/packages/backup.scm | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/gnu/packages/backup.scm b/gnu/packages/backup.scm index bdf8884ab2..74245e5812 100644 --- a/gnu/packages/backup.scm +++ b/gnu/packages/backup.scm @@ -524,7 +524,7 @@ detection, and lossless compression.") ("python-setuptools-scm" ,python-setuptools-scm) ;; Borg 1.0.8's test suite uses 'tmpdir_factory', which was introduced in ;; pytest 2.8. - ("python-pytest" ,python-pytest-2.9.2) + ("python-pytest" ,python-pytest-3.0) ;; For generating the documentation. ("python-sphinx" ,python-sphinx) ("python-sphinx-rtd-theme" ,python-sphinx-rtd-theme))) |