diff options
author | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2022-01-17 10:07:35 -0500 |
---|---|---|
committer | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2022-01-17 11:47:09 -0500 |
commit | 276f40fdc349d2ad62582b23ea55e061b689cfc0 (patch) | |
tree | 8052d91aee78cf0d4317b41ec52134fde48fa5fb /gnu/packages/version-control.scm | |
parent | b2f6b6f6b9df6bcc24794238e7e97357470af95d (diff) | |
parent | 6ba510d76d6847065be725e958718002f3b13c7a (diff) | |
download | guix-276f40fdc349d2ad62582b23ea55e061b689cfc0.tar guix-276f40fdc349d2ad62582b23ea55e061b689cfc0.tar.gz |
Merge branch 'version-1.4.0'
With resolved conflicts in:
gnu/packages/gnome.scm
gnu/packages/openstack.scm
gnu/packages/python-xyz.scm
Diffstat (limited to 'gnu/packages/version-control.scm')
-rw-r--r-- | gnu/packages/version-control.scm | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm index 5ff1fe9901..5a78dc3a6f 100644 --- a/gnu/packages/version-control.scm +++ b/gnu/packages/version-control.scm @@ -1675,14 +1675,7 @@ visualize your public Git repositories on a web interface.") "not test_install_existing_hooks_no_overwrite" " and not test_uninstall_restores_legacy_hooks" " and not test_installed_from_venv" - " and not test_healthy_venv_creator"))))) - (add-before 'reset-gzip-timestamps 'make-gz-writable - (lambda* (#:key outputs #:allow-other-keys) - ;; Make sure .gz files are writable so that the - ;; 'reset-gzip-timestamps' phase can do its work. - (let ((out (assoc-ref outputs "out"))) - (for-each make-file-writable - (find-files out "\\.gz$")))))))) + " and not test_healthy_venv_creator")))))))) (native-inputs `(("git" ,git-minimal) ("python-covdefaults" ,python-covdefaults) |