From 840ef02a1c0b6104b246b6d769b5b1101cf2c0d8 Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Fri, 13 Dec 2024 00:32:49 +0000 Subject: [PATCH] gnu: go-github-com-mdlayher-netlink: Simplify package. * gnu/packages/golang-web.scm (go-github-com-mdlayher-netlink) [source]: Remove submodule with integration tests to break cycle. [arguments]: Move test skipping logic here. : Remove 'disable-failing-tests. Change-Id: I66e32ce985ea5162da8c7d0705207ea1d5323685 --- gnu/packages/golang-web.scm | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/gnu/packages/golang-web.scm b/gnu/packages/golang-web.scm index e9f1e448631688cb0b66f43951ae8a1dd05c189c..413463dec4f8a75f00cc1c809f0762ff6df64d66 100644 --- a/gnu/packages/golang-web.scm +++ b/gnu/packages/golang-web.scm @@ -3782,21 +3782,20 @@ via REST APIs.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "1pxd0qn73jr9n64gkp2kd8q8x7xgssm3v8a68vkh88al55g8jkma")))) + (base32 "1pxd0qn73jr9n64gkp2kd8q8x7xgssm3v8a68vkh88al55g8jkma")) + (modules '((guix build utils))) + (snippet + #~(begin + ;; Cycles with go-github-com-jsimonetti-rtnetlink. + (delete-file-recursively "internal/integration"))))) (build-system go-build-system) (arguments (list #:import-path "github.com/mdlayher/netlink" - #:phases - #~(modify-phases %standard-phases - (add-after 'unpack 'disable-failing-tests - (lambda* (#:key tests? import-path #:allow-other-keys) - (with-directory-excursion (string-append "src/" import-path) - (substitute* (find-files "." "_test\\.go$") - ;; failed to start command "ip": exec: "ip": executable file - ;; not found in $PATH - (("TestIntegrationConnSetBuffersSyscallConn") - "OffTestIntegrationConnSetBuffersSyscallConn")))))))) + #:test-flags + ;; Test fails to start command "ip": exec: "ip": executable file not + ;; found in $PATH + #~(list "-skip" "TestIntegrationConnSetBuffersSyscallConn"))) (propagated-inputs (list go-github-com-google-go-cmp go-github-com-josharian-native