From patchwork Tue Jan 4 20:06:39 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: M X-Patchwork-Id: 544 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 1C42127BBEB; Tue, 4 Jan 2022 20:07:23 +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_INVALID, DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL,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 D5ED727BBE9 for ; Tue, 4 Jan 2022 20:07:22 +0000 (GMT) Received: from localhost ([::1]:53986 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1n4q5a-0005h3-1D for patchwork@mira.cbaines.net; Tue, 04 Jan 2022 15:07:22 -0500 Received: from eggs.gnu.org ([209.51.188.92]:39892) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1n4q5H-0005gS-Mo for guix-patches@gnu.org; Tue, 04 Jan 2022 15:07:03 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:55497) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1n4q5H-00036K-DC for guix-patches@gnu.org; Tue, 04 Jan 2022 15:07:03 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1n4q5H-00085H-9A for guix-patches@gnu.org; Tue, 04 Jan 2022 15:07:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#50072] [PATCH v4 0/4] Add upstream updater for git-fetch origins References: In-Reply-To: Resent-From: Maxime Devos Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 04 Jan 2022 20:07:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 50072 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 50072@debbugs.gnu.org Cc: Maxime Devos Received: via spool by 50072-submit@debbugs.gnu.org id=B50072.164132682131046 (code B ref 50072); Tue, 04 Jan 2022 20:07:03 +0000 Received: (at 50072) by debbugs.gnu.org; 4 Jan 2022 20:07:01 +0000 Received: from localhost ([127.0.0.1]:38805 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1n4q5E-00084a-MH for submit@debbugs.gnu.org; Tue, 04 Jan 2022 15:07:00 -0500 Received: from michel.telenet-ops.be ([195.130.137.88]:47930) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1n4q56-00083d-3a for 50072@debbugs.gnu.org; Tue, 04 Jan 2022 15:06:54 -0500 Received: from localhost.localdomain ([IPv6:2a02:1811:8c09:9d00:3c5f:2eff:feb0:ba5a]) by michel.telenet-ops.be with bizsmtp id ek6q260014UW6Th06k6q5j; Tue, 04 Jan 2022 21:06:50 +0100 From: Maxime Devos Date: Tue, 4 Jan 2022 20:06:39 +0000 Message-Id: <20220104200643.43374-1-maximedevos@telenet.be> X-Mailer: git-send-email 2.30.2 MIME-Version: 1.0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r22; t=1641326810; bh=QLxMUTuKH8tat9OEh43UPkB9+BGFE7mmNDaJyVnY8Jo=; h=From:To:Cc:Subject:Date; b=UnY1wDaVEB0uJIRmVBnCYM44a83fb/xJmCoS8ty/TkmqQvx8gcK/4TvTEnUNzk0o2 cGNqGrqenDwxUBZbm1cKHXpXnXSYtctAqn+I8oUg/dzZouIOKU5CgERstnzQN7jbRH Ihn6nlCrBBkHiteWihRqQQ4U6r1HsFopLN36i8XpeqzWnxnoU7vufAwRJtodokvscP omav7GfHlkabA6tljy71feSMzSi2ceqZqmvNkL5Cupe8Ud+XcEw/6sGvfMwAEh7ZB+ GtjVuXg35PhXu2/F6QEU7EIGTAVmwCCisZuxneZqVvSTmv/ixfj3Lu8bMm886myY/w LA4J0107tNeTA== 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" X-getmail-retrieved-from-mailbox: Patches I've found a solution to the upstream-source-compiler/git-fetch problem: returning the result of git-fetch like upstream-source-compiler/url-fetch returns the result of url-fetch. The following now works: $ ./pre-inst-env guix build --source minetest-unified-inventory --with-latest=minetest-unified-inventory Unrelated change: I let (guix git) be autoloaded, to avoid loading guile-git when not necessary. I think this patch series is ready now? Sarah Morgensen (4): guix hash: Extract file hashing procedures. import: Factorize file hashing. refresh: Support non-tarball sources. upstream: Support updating and fetching 'git-fetch' origins. Makefile.am | 1 + guix/git.scm | 14 +++++++- guix/hash.scm | 68 +++++++++++++++++++++++++++++++++++++ guix/import/cran.scm | 32 ++---------------- guix/import/elpa.scm | 29 +++------------- guix/import/git.scm | 22 +++++++----- guix/import/go.scm | 25 ++------------ guix/import/minetest.scm | 25 ++++++-------- guix/scripts/hash.scm | 22 +++--------- guix/scripts/refresh.scm | 10 +++--- guix/upstream.scm | 73 ++++++++++++++++++++++++++++++++++++---- tests/minetest.scm | 7 ++-- 12 files changed, 195 insertions(+), 133 deletions(-) create mode 100644 guix/hash.scm base-commit: 9708681f1a9f221ae6cad64625ba8309b6742653