From patchwork Thu Mar 7 12:18:38 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sharlatan Hellseher X-Patchwork-Id: 61458 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 2CF1327BBE9; Thu, 7 Mar 2024 12:21:21 +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 autolearn=ham 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 2561F27BBE2 for ; Thu, 7 Mar 2024 12:21:20 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1riCjv-0004K3-S3; Thu, 07 Mar 2024 07:20:47 -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 1riCjh-00049J-FE for guix-patches@gnu.org; Thu, 07 Mar 2024 07:20:34 -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 1riCjh-00021t-1x for guix-patches@gnu.org; Thu, 07 Mar 2024 07:20:33 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1riCkC-0007I3-EQ for guix-patches@gnu.org; Thu, 07 Mar 2024 07:21:04 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#69608] [PATCH 7/7] gnu: kubo: Unbundle more packages. Resent-From: Sharlatan Hellseher Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 07 Mar 2024 12:21:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 69608 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 69608@debbugs.gnu.org Cc: Sharlatan Hellseher Received: via spool by 69608-submit@debbugs.gnu.org id=B69608.170981403227907 (code B ref 69608); Thu, 07 Mar 2024 12:21:04 +0000 Received: (at 69608) by debbugs.gnu.org; 7 Mar 2024 12:20:32 +0000 Received: from localhost ([127.0.0.1]:52753 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1riCjg-0007Fy-0V for submit@debbugs.gnu.org; Thu, 07 Mar 2024 07:20:32 -0500 Received: from mail-qk1-f178.google.com ([209.85.222.178]:43096) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1riCjc-0007Ea-Dr for 69608@debbugs.gnu.org; Thu, 07 Mar 2024 07:20:28 -0500 Received: by mail-qk1-f178.google.com with SMTP id af79cd13be357-78833eb8fe5so153812285a.0 for <69608@debbugs.gnu.org>; Thu, 07 Mar 2024 04:19:56 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1709813931; x=1710418731; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=sb55pAzMVkOlr0fAV1jB7fbo/Zn+6MpIs8VtdIrcyUg=; b=UKkcfpga/Hc48BylPdsb5cAEcMmjEs1KxKSw1bLLCgTEKogNIZ9uRoqFI0eL5yyqzJ WxStR/i5IQQqovwCTqqqlhzfU/NxcekvrrGW7K/1AYTbHwBKAKh+bKAZIyk2pCNCxoqK JRWJEaf7MsHwlAkV6IAU01VYfhaqPfwMEhyJh+BC9bhKQa7ikRhljMyT6P57etFV+fFL iqIbFPMeNeYdJI+pUzDC9ZSAKN40o5mwqlDI5tE49j/yvJiww6O/W+NW+aDDOSme9fJw lfyzJH3HBtpmoXLobdI9EMLvQH12mlPEzBXQGtALiTFI8qjxFXrGiJZz8YZlh/iVTjhy sdhg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1709813931; x=1710418731; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=sb55pAzMVkOlr0fAV1jB7fbo/Zn+6MpIs8VtdIrcyUg=; b=nCuSMD7rfR0IBMZFOVVX/7hYdoJpD8fftpJKrErAaAJTif0eFHWMK/oq18DDFJNt15 1bGDKqNZx1lSrKbj8yWkHf/sy4KxPf9n5aodYW3FqS8Smjgyaa4vNW3Ckw5zDNOuc5A1 LiKNL8Th4KpUuzy7Y12tHt9wKMkMdpz91L5Gl8j/62k7WRoCX6R++D7y7E9TT307ZB0u fyRzq26iZYE/Xpz0t6OvlIq+LjBOHl/uKoV1TT1nt14GjZyXaJ3WIgle7j1nvANy7QWM qbkDAX32xMVkBpDjSLl1t+afeg26VBJ0mLLpHf/2+tFJnkLP5h2T+endTtPjnx2zBiUy eL0Q== X-Gm-Message-State: AOJu0YyEglK7juN/MANkvEzo2YyunuZyrrc98xpZNeRx8SdgJlCfaWBq tuksmLDr/TkVxiEjWdc31Wv/3eB9JkV3sYu1lRLUjPY5xI60qpv0OlFnZFz9hGA8pQ== X-Google-Smtp-Source: AGHT+IG7woE9JWmAqyqj43g4I/pt8r3A/5eEXtBdQO2PrvNw/Y5H0HY5pWpyuyaJbvhzT52hKAC7hw== X-Received: by 2002:a05:620a:40c6:b0:787:f140:9a1d with SMTP id g6-20020a05620a40c600b00787f1409a1dmr1536188qko.21.1709813931558; Thu, 07 Mar 2024 04:18:51 -0800 (PST) Received: from localhost.localdomain (cpc100856-bagu15-2-0-cust368.1-3.cable.virginm.net. [82.25.93.113]) by smtp.gmail.com with ESMTPSA id r8-20020a0ccc08000000b0068f6e1c3582sm8489007qvk.146.2024.03.07.04.18.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 07 Mar 2024 04:18:51 -0800 (PST) From: Sharlatan Hellseher Date: Thu, 7 Mar 2024 12:18:38 +0000 Message-ID: <2e89095c79519b44e0bec91c6d61454bc19817e0.1709812934.git.sharlatanus@gmail.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 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 * gnu/packages/ipfs.scm (kubo) [snippet]: Remove more available vendor packages. [inputs]: Add go-github-com-benbjohnson-clock and go-github-com-blang-semver-v4. Remove go-github-com-cheggaaa-pb-v3, fail over to vendor package explicitly as v3 is not required. Change-Id: I8317ea656120b034a98d180278b928f0744f5fbb --- gnu/packages/ipfs.scm | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/gnu/packages/ipfs.scm b/gnu/packages/ipfs.scm index bad65f04a0..0a1065535b 100644 --- a/gnu/packages/ipfs.scm +++ b/gnu/packages/ipfs.scm @@ -241,10 +241,13 @@ (define-public kubo (snippet '(for-each delete-file-recursively ;; TODO: unbundle the rest as well '("vendor/github.com/alecthomas" - ;; "vendor/github.com/blang" + "vendor/github.com/benbjohnson/clock" + "vendor/github.com/beorn7/perks" + "vendor/github.com/blang" "vendor/github.com/cespare" - ;; TODO: Go files not found - ;; "vendor/github.com/cheggaaa" + ;; TODO: kubo depends on v1.0.29 which is way too + ;; hard to back port. + ; "vendor/github.com/cheggaaa/pb" "vendor/github.com/davecgh" "vendor/github.com/dustin" "vendor/github.com/flynn" @@ -261,8 +264,6 @@ (define-public kubo ;; "vendor/github.com/ipld" "vendor/github.com/jackpal" "vendor/github.com/klauspost" - ;; TODO: Go files not found - ;; "vendor/github.com/lucas-clemente" "vendor/github.com/mattn" "vendor/github.com/mgutz" "vendor/github.com/minio" @@ -306,11 +307,10 @@ (define-public kubo #~(string-append #$output "/bin/ipfs")) "commands" "completion" "bash"))))))))) (inputs (list go-github-com-alecthomas-units - ;; TODO: needs to be updated first - ;; go-github-com-blang-semver + go-github-com-benbjohnson-clock + go-github-com-blang-semver-v4 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