diff options
author | Marius Bakke <marius@gnu.org> | 2022-08-30 18:58:57 +0200 |
---|---|---|
committer | Marius Bakke <marius@gnu.org> | 2022-08-30 18:58:57 +0200 |
commit | 827b4117daa7a7f5cdd84e0211c3acb778e9246b (patch) | |
tree | 6ca042081f2e98c599bb3121af025ca35bdc0431 /gnu/packages/linux.scm | |
parent | 1cf37370937665f21b4fb01daeffbf90c671611e (diff) | |
parent | db2444ad824ab529fd9e850dbae42359009ac4a2 (diff) | |
download | guix-827b4117daa7a7f5cdd84e0211c3acb778e9246b.tar.gz guix-827b4117daa7a7f5cdd84e0211c3acb778e9246b.zip |
Merge branch 'master' into staging
Diffstat (limited to 'gnu/packages/linux.scm')
-rw-r--r-- | gnu/packages/linux.scm | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index d19d6b754f..f7dd4a9430 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -7683,9 +7683,9 @@ Text-based output formats: CSV, XML, Netfilter's LOG, Netfilter's conntrack ;; Disable the test suite on armhf-linux, as there are too many ;; failures to keep track of (see for example: ;; https://github.com/proot-me/proot/issues/286). - `(#:tests? ,(not (string-prefix? "armhf" - (or (%current-target-system) - (%current-system)))) + `(#:tests? ,(not (or (%current-target-system) + (string-prefix? "armhf" + (or (%current-system))))) #:make-flags '("-C" "src") #:phases (modify-phases %standard-phases (add-after 'unpack 'patch-sources |