From 08a50480921281c42aad505682441f0674a4e081 Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Sun, 12 Jan 2025 16:31:52 +0000 Subject: [PATCH] gnu: spritely-libp2p-daemon: Enable tests, simplify. * gnu/packages/ipfs.scm (spritely-libp2p-daemon) [arguments] : Default ig go-1.21 from the go-build-system. : Use it instead of custom phase. : Remove 'fix-libp2p-asn-util-embed. [propagated-inputs]: Remove go-github-com-libp2p-go-libp2p, go-github-com-libp2p-go-libp2p-peer, go-github-com-libp2p-go-libp2p-crypto, and go-github-com-multiformats-go-multiaddr. [native-inputs]: Add go-github-com-libp2p-go-libp2p, go-github-com-multiformats-go-multiaddr, and go-github-com-stretchr-testify. Change-Id: I594aa2958092b6943ef961a2cd3df89379cbbde2 --- gnu/packages/ipfs.scm | 32 ++++++-------------------------- 1 file changed, 6 insertions(+), 26 deletions(-) diff --git a/gnu/packages/ipfs.scm b/gnu/packages/ipfs.scm index 8194dc50c2..349517e878 100644 --- a/gnu/packages/ipfs.scm +++ b/gnu/packages/ipfs.scm @@ -5,7 +5,7 @@ ;;; Copyright © 2020, 2021, 2022 Michael Rohleder ;;; Copyright © 2022 Maxime Devos ;;; Copyright © 2023, 2024 Artyom V. Poptsov -;;; Copyright © 2024 Sharlatan Hellseher +;;; Copyright © 2024-2025 Sharlatan Hellseher ;;; Copyright © 2024 Giacomo Leidi ;;; ;;; This file is part of GNU Guix. @@ -1239,33 +1239,13 @@ (define-public spritely-libp2p-daemon (build-system go-build-system) (arguments (list - #:go go-1.21 - #:import-path "gitlab.com/spritely/spritely-libp2p-daemon" - #:tests? #f + #:embed-files #~(list "sorted-network-list.bin") #:install-source? #f - #:phases - #~(modify-phases %standard-phases - ;; libp2p-asn-util uses go://embed to embed a file, but Go - ;; does *not* accept files that are symlinks. Guix sets up - ;; all dependency files as symlinks, though. To work around - ;; this, we delete the symlink and copy over the file to be - ;; embedded. - (add-after 'unpack 'fix-libp2p-asn-util-embed - (lambda _ - (let ((file-name - (string-append - "src/github.com/libp2p/go-libp2p-asn-util/" - "sorted-network-list.bin"))) - (delete-file file-name) - (copy-file - (string-append #$go-github-com-libp2p-go-libp2p-asn-util - "/" file-name) - file-name))))))) - (propagated-inputs + #:import-path "gitlab.com/spritely/spritely-libp2p-daemon")) + (native-inputs (list go-github-com-libp2p-go-libp2p - go-github-com-libp2p-go-libp2p-peer - go-github-com-libp2p-go-libp2p-crypto - go-github-com-multiformats-go-multiaddr)) + go-github-com-multiformats-go-multiaddr + go-github-com-stretchr-testify)) (home-page "https://gitlab.com/spritely/go-libp2p-daemon") (synopsis "Simple daemon to connect over libp2p") (description "This package provides a very simple daemon to interface to