diff options
author | Efraim Flashner <efraim@flashner.co.il> | 2023-12-10 13:25:47 +0200 |
---|---|---|
committer | Efraim Flashner <efraim@flashner.co.il> | 2023-12-10 13:25:47 +0200 |
commit | 34eaf5714efcb847c9cba03a055a17e790c1d017 (patch) | |
tree | d9c534cac0e668052e6b3c5b11602d0773aa5068 /gnu/packages/docker.scm | |
parent | 99f7f6457485d524c560bce428fb8c3997e2b553 (diff) | |
parent | 63e06f30ce20fa846a7e2e814976fefcd9eda7d3 (diff) | |
download | guix-34eaf5714efcb847c9cba03a055a17e790c1d017.tar.gz guix-34eaf5714efcb847c9cba03a055a17e790c1d017.zip |
Merge remote-tracking branch 'origin/master' into rust-team
Change-Id: Ic45f7071abd6a02c2ccad411500e5103c8272ffb
Diffstat (limited to 'gnu/packages/docker.scm')
-rw-r--r-- | gnu/packages/docker.scm | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/gnu/packages/docker.scm b/gnu/packages/docker.scm index 3b809feb67..a69bbac168 100644 --- a/gnu/packages/docker.scm +++ b/gnu/packages/docker.scm @@ -1,6 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2016 David Thompson <davet@gnu.org> -;;; Copyright © 2018 Efraim Flashner <efraim@flashner.co.il> +;;; Copyright © 2018, 2023 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2019, 2020 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2019, 2020, 2021, 2023 Maxim Cournoyer <maxim.cournoyer@gmail.com> ;;; Copyright © 2020 Michael Rohleder <mike@rohleder.de> @@ -299,7 +299,10 @@ the required network abstractions for applications.") (inherit docker-libnetwork) (name "docker-libnetwork-cmd-proxy") (arguments - `(#:import-path "github.com/docker/libnetwork/cmd/proxy" + ;; The tests are unsupported on all architectures except x86_64-linux. + `(#:tests? ,(and (not (%current-target-system)) + (target-x86-64?)) + #:import-path "github.com/docker/libnetwork/cmd/proxy" #:unpack-path "github.com/docker/libnetwork" #:install-source? #f)) (native-inputs |