From patchwork Fri Dec 1 19:08:47 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Artyom V. Poptsov" X-Patchwork-Id: 57177 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 049DC27BBE9; Fri, 1 Dec 2023 19:10:17 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 2592127BBE2 for ; Fri, 1 Dec 2023 19:10:14 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1r98te-0003Q7-Sp; Fri, 01 Dec 2023 14:09:54 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1r98td-0003Pg-CZ for guix-patches@gnu.org; Fri, 01 Dec 2023 14:09:53 -0500 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1r98td-0001wd-4d for guix-patches@gnu.org; Fri, 01 Dec 2023 14:09:53 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1r98tl-0006uZ-US for guix-patches@gnu.org; Fri, 01 Dec 2023 14:10:01 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#67570] [PATCH] gnu: kubo: Fix build. Resent-From: "Artyom V. Poptsov" Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 01 Dec 2023 19:10:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 67570 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 67570@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.170145776026506 (code B ref -1); Fri, 01 Dec 2023 19:10:01 +0000 Received: (at submit) by debbugs.gnu.org; 1 Dec 2023 19:09:20 +0000 Received: from localhost ([127.0.0.1]:56078 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r98t5-0006tR-OT for submit@debbugs.gnu.org; Fri, 01 Dec 2023 14:09:20 -0500 Received: from lists.gnu.org ([2001:470:142::17]:54950) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r98t2-0006tC-1O for submit@debbugs.gnu.org; Fri, 01 Dec 2023 14:09:18 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1r98sn-0003Im-Ma for guix-patches@gnu.org; Fri, 01 Dec 2023 14:09:01 -0500 Received: from mail-lf1-x12e.google.com ([2a00:1450:4864:20::12e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1r98sk-0001oP-RF for guix-patches@gnu.org; Fri, 01 Dec 2023 14:09:01 -0500 Received: by mail-lf1-x12e.google.com with SMTP id 2adb3069b0e04-50be03cc8a3so597567e87.1 for ; Fri, 01 Dec 2023 11:08:58 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1701457736; x=1702062536; darn=gnu.org; h=mime-version:user-agent:message-id:date:subject:to:from:from:to:cc :subject:date:message-id:reply-to; bh=Y9Czx+BmPkzf8AvdYsU/+FtvMBUbhqm/OI/bf6PZWco=; b=QhH1OSiBRexhsiN0fRi8y4bWyKEF+XSseU8qNSG4voupLFINpgO6X4Ugs/fxdg8i80 DeaTdwLTVjVYcCNAM0lKVWZjFkdoAVpERAmb0cGneLpfk6VcaiO8LnJpjzJkujf7BNwP sr6fXkRKONSn3kNud/XxWBevss/7hTLO5nByT4IouOu6w2inioIfzEKVmbrBRVF8DSkH IdWT3qlYLNMHmHOWQXxqiXT4BQLZi7Mi6gCpbn3hP/SMxK2Xz2kAMkgXN0uaUBImDoIl lKzAFae15NyaugLzmesn6Z9S69ZmR59S6SVQR5iwgiyCidN4duEEjQ1/YYdIpOhKD8+L C9TA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1701457736; x=1702062536; h=mime-version:user-agent:message-id:date:subject:to:from :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=Y9Czx+BmPkzf8AvdYsU/+FtvMBUbhqm/OI/bf6PZWco=; b=TCjnQNQ4iWfjxh55ph0TfOhRTaCKSXIX9/XuieQ/F9203UhPHe6BJ3gS187CHfMW45 S4RFgaheAx1klusZoP5m3D3BaPQYfeqalTZEhDcir2gP4/a5YP5AoKCR1+MBNoVfI1Y1 w3zwEOQFWnK4mBX5DhYJiUxUnKzG5LiURwQ+bbTQrcYHJN0TQUV9n55hZ5e9B0dj6elU 755hMzNN+bp0ssTV+0RkwfAu6QbkK/ZQRTgpIEoeQW3t2iJw5fJXyRiPe9RurAnurvBB 8cznbx4okDe8T9xFYFL5bLAXldRh8HI/7vItjmLQ5bHvNPiaWLF6Mf4BOI64a9sHXxXt Si2g== X-Gm-Message-State: AOJu0YypFHla+d8shb3Ew++afAZCiFefk0bXettkugvFdbHYwNiwi51g A0HitUPzPrbEFcID7X+yFOhgxb1SAqM= X-Google-Smtp-Source: AGHT+IE83Mnq55BmCRdBdcFctf6rfJWiKbzVfwZV5wVgnFmrz51EpFBEFJ/sX7ZdXbngIqUu1yfIgA== X-Received: by 2002:a05:6512:32b9:b0:50b:bd80:9589 with SMTP id q25-20020a05651232b900b0050bbd809589mr1132223lfe.30.1701457736353; Fri, 01 Dec 2023 11:08:56 -0800 (PST) Received: from elephant ([5.166.207.17]) by smtp.gmail.com with ESMTPSA id l30-20020ac24a9e000000b0050915816a16sm498043lfp.145.2023.12.01.11.08.55 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 01 Dec 2023 11:08:55 -0800 (PST) From: "Artyom V. Poptsov" Date: Fri, 01 Dec 2023 22:08:47 +0300 Message-ID: <878r6deo5c.fsf@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::12e; envelope-from=poptsov.artyom@gmail.com; helo=mail-lf1-x12e.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches Hello, this patch series fixes Kubo build. - avp From b59bf490b31798ef88220ddb54a285e14c82f00d Mon Sep 17 00:00:00 2001 Message-ID: In-Reply-To: <745aa270dcfd400d34eb39f7e719985c34d79788.1701457354.git.poptsov.artyom@gmail.com> References: <745aa270dcfd400d34eb39f7e719985c34d79788.1701457354.git.poptsov.artyom@gmail.com> From: "Artyom V. Poptsov" Date: Fri, 1 Dec 2023 22:02:11 +0300 Subject: [PATCH 2/2] gnu: kubo: Fix the package style. * gnu/packages/ipfs.scm (kubo): Fix the package style. Change-Id: Ifbb4fca12c7e52b9f07fb3c430e0dc61848fd101 --- gnu/packages/ipfs.scm | 166 +++++++++++++++++++++--------------------- 1 file changed, 82 insertions(+), 84 deletions(-) diff --git a/gnu/packages/ipfs.scm b/gnu/packages/ipfs.scm index 30d579ed3f..5b467f1c8a 100644 --- a/gnu/packages/ipfs.scm +++ b/gnu/packages/ipfs.scm @@ -226,9 +226,8 @@ (define-public kubo (source (origin (method url-fetch/tarbomb) - (uri (string-append - "https://dist.ipfs.io/kubo/v" version - "/kubo-source.tar.gz")) + (uri (string-append "https://dist.ipfs.io/kubo/v" version + "/kubo-source.tar.gz")) (sha256 (base32 "0ss5k8xnzn9qk977dni5ja89yygcysdw7r3mdk67cac2dpa9hhqs")) (file-name (string-append name "-" version "-source")) @@ -285,89 +284,88 @@ (define-public kubo (list #:unpack-path "github.com/ipfs/kubo" #:import-path "github.com/ipfs/kubo/cmd/ipfs" - #:phases - #~(modify-phases %standard-phases - ;; https://github.com/ipfs/kubo/blob/master/docs/command-completion.md - (add-after 'install 'install-bashcompletion - (lambda _ - (let ((completiondir (string-append #$output - "/etc/bash_completion.d"))) - (mkdir-p completiondir) - (with-output-to-file (string-append completiondir "/ipfs") - (lambda _ - (invoke #$(if (%current-target-system) - "ipfs" - #~(string-append #$output "/bin/ipfs")) - "commands" "completion" "bash"))))))))) - (inputs - (let ((p (package-input-rewriting - `((,go-golang-org-x-sys . ,go-golang-org-x-sys-0.8)) - #:deep? #true))) - (cons go-golang-org-x-sys-0.8 - (map p - (list go-github-com-alecthomas-units - ;; TODO: needs to be updated first - ;; go-github-com-blang-semver - go-github-com-cespare-xxhash - go-github-com-cheekybits-genny - go-github-com-cheggaaa-pb-v3 - go-github-com-davecgh-go-spew - go-github-com-dustin-go-humanize - go-github-com-flynn-noise - go-github-com-francoispqt-gojay - go-github-com-fsnotify-fsnotify - go-github-com-gogo-protobuf - go-github-com-google-uuid - go-github-com-golang-groupcache-lru - go-github-com-golang-snappy - go-github-com-gorilla-websocket - go-github-com-jackpal-go-nat-pmp - go-github-com-klauspost-compress - go-github-com-klauspost-cpuid - go-github-com-lucas-clemente-quic-go - go-github-com-mattn-go-colorable - go-github-com-mattn-go-isatty - go-github-com-mattn-go-runewidth - go-github-com-mgutz-ansi - go-github-com-minio-blake2b-simd - go-github-com-minio-sha256-simd - go-github-com-mitchellh-go-homedir - go-github-com-mr-tron-base58 - go-github-com-opentracing-opentracing-go - go-github-com-pkg-errors - go-github-com-pmezard-go-difflib - go-github-com-prometheus-client-golang - go-github-com-prometheus-client-model - go-github-com-prometheus-common - go-github-com-prometheus-procfs - go-github-com-spaolacci-murmur3 - go-github-com-stretchr-testify - go-github-com-syndtr-goleveldb - go-gopkg-in-yaml-v2 - go-gopkg-in-yaml-v3 - go-go-uber-org-atomic - go-go-uber-org-multierr - go-go-uber-org-zap - go-golang-org-x-crypto - go-golang-org-x-lint - go-golang-org-x-mod - go-golang-org-x-net - go-golang-org-x-oauth2 - go-golang-org-x-sync - go-golang-org-x-term - go-golang-org-x-tools - go-golang-org-x-xerrors - go-golang-org-x-exp - go-golang-org-x-text - go-lukechampine-com-blake3))))) - (native-inputs - (append (if (%current-target-system) - (list this-package) - '()) - (list python-minimal-wrapper zsh))) + #:phases #~(modify-phases %standard-phases + ;; https://github.com/ipfs/kubo/blob/master/docs/command-completion.md + (add-after 'install 'install-bashcompletion + (lambda _ + (let ((completiondir (string-append #$output + "/etc/bash_completion.d"))) + (mkdir-p completiondir) + (with-output-to-file (string-append completiondir + "/ipfs") + (lambda _ + (invoke #$(if (%current-target-system) "ipfs" + #~(string-append #$output + "/bin/ipfs")) + "commands" "completion" "bash"))))))))) + (inputs (let ((p (package-input-rewriting `((,go-golang-org-x-sys unquote + go-golang-org-x-sys-0.8)) + #:deep? #t))) + (cons go-golang-org-x-sys-0.8 + (map p + (list go-github-com-alecthomas-units + ;; TODO: needs to be updated first + ;; go-github-com-blang-semver + go-github-com-cespare-xxhash + go-github-com-cheekybits-genny + go-github-com-cheggaaa-pb-v3 + go-github-com-davecgh-go-spew + go-github-com-dustin-go-humanize + go-github-com-flynn-noise + go-github-com-francoispqt-gojay + go-github-com-fsnotify-fsnotify + go-github-com-gogo-protobuf + go-github-com-google-uuid + go-github-com-golang-groupcache-lru + go-github-com-golang-snappy + go-github-com-gorilla-websocket + go-github-com-jackpal-go-nat-pmp + go-github-com-klauspost-compress + go-github-com-klauspost-cpuid + go-github-com-lucas-clemente-quic-go + go-github-com-mattn-go-colorable + go-github-com-mattn-go-isatty + go-github-com-mattn-go-runewidth + go-github-com-mgutz-ansi + go-github-com-minio-blake2b-simd + go-github-com-minio-sha256-simd + go-github-com-mitchellh-go-homedir + go-github-com-mr-tron-base58 + go-github-com-opentracing-opentracing-go + go-github-com-pkg-errors + go-github-com-pmezard-go-difflib + go-github-com-prometheus-client-golang + go-github-com-prometheus-client-model + go-github-com-prometheus-common + go-github-com-prometheus-procfs + go-github-com-spaolacci-murmur3 + go-github-com-stretchr-testify + go-github-com-syndtr-goleveldb + go-gopkg-in-yaml-v2 + go-gopkg-in-yaml-v3 + go-go-uber-org-atomic + go-go-uber-org-multierr + go-go-uber-org-zap + go-golang-org-x-crypto + go-golang-org-x-lint + go-golang-org-x-mod + go-golang-org-x-net + go-golang-org-x-oauth2 + go-golang-org-x-sync + go-golang-org-x-term + go-golang-org-x-tools + go-golang-org-x-xerrors + go-golang-org-x-exp + go-golang-org-x-text + go-lukechampine-com-blake3))))) + (native-inputs (append (if (%current-target-system) + (list this-package) + '()) + (list python-minimal-wrapper zsh))) (home-page "https://ipfs.io") (synopsis "Go implementation of IPFS, a peer-to-peer hypermedia protocol") - (description "IPFS is a global, versioned, peer-to-peer file system. It + (description + "IPFS is a global, versioned, peer-to-peer file system. It combines good ideas from Git, BitTorrent, Kademlia, SFS, and the Web. It is like a single bittorrent swarm, exchanging git objects. IPFS provides an interface as simple as the HTTP web, but with permanence built in. You can -- 2.41.0