diff options
| author | Liliana Marie Prikler <liliana.prikler@gmail.com> | 2024-03-30 09:47:43 +0100 |
|---|---|---|
| committer | Liliana Marie Prikler <liliana.prikler@gmail.com> | 2024-03-30 09:47:43 +0100 |
| commit | a915a57d91c54e926b625f98833dead8263607b0 (patch) | |
| tree | 24b4b9070055733acad9b2c0bdfcda2fa5affbd4 /gnu/packages/package-management.scm | |
| parent | 4b23fd7adbddc1bc18b209912c0f3ef369da2f24 (diff) | |
| parent | 704e09f1626303625e1e4eea552bff3a05303e89 (diff) | |
| download | guix-a915a57d91c54e926b625f98833dead8263607b0.tar.gz | |
Merge branch 'gnome-team'
Diffstat (limited to 'gnu/packages/package-management.scm')
| -rw-r--r-- | gnu/packages/package-management.scm | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm index b6e920da1c..a0ede07d54 100644 --- a/gnu/packages/package-management.scm +++ b/gnu/packages/package-management.scm @@ -1386,6 +1386,8 @@ tools_locations = { ;; https://github.com/conan-io/conan/issues/13577). "and not test_other_client_can_link_autotools " "and not test_autotools_lib_template " + ;; Sometimes fail: https://github.com/conan-io/conan/issues/15936 + "and not test_basic_parallel_install " (if (not (string-prefix? "x86_64" system)) ;; These tests either assume the machine is ;; x86_64, or require a cross-compiler to target |