From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp10.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id oL2mHvOo1GEmWQEAgWs5BA (envelope-from ) for ; Tue, 04 Jan 2022 21:07:15 +0100 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp10.migadu.com with LMTPS id eAZCF/Oo1GFZEAAAG6o9tA (envelope-from ) for ; Tue, 04 Jan 2022 21:07:15 +0100 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 0B87B38DAD for ; Tue, 4 Jan 2022 21:07:15 +0100 (CET) Received: from localhost ([::1]:53986 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1n4q5S-0005h3-5m for larch@yhetil.org; Tue, 04 Jan 2022 15:07:14 -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 Content-Transfer-Encoding: 8bit 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+larch=yhetil.org@gnu.org Sender: "Guix-patches" X-Migadu-Flow: FLOW_IN X-Migadu-Country: US ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1641326835; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=QLxMUTuKH8tat9OEh43UPkB9+BGFE7mmNDaJyVnY8Jo=; b=uEBtPrAmPdMq6tZ15JVi6yG9g98kogap0JUKD+XsFe4SJbqmU87pzkwOiTJMyh63nvdlEU rvvA2wyWzowRYQXEY+Dhv+e/7iu1IoSeZHlFaWaGmd1KiS6HuFSiiIuRvf+LJqZFWixv83 K+/kCXrOQOcTaBhES0J6jYM+I9jqSt+ckUg0Uu8NEi6heZf+8NH7+wgstvUKM2WGmwHqZW LzdxPhB/TNPhGGY1GI6X0ywjQMoD24r/yPX54QOaBUTO/rfAwJRpElg0KsJ/j0+yIhji2S bdUSVVe2zKJ/8Knrtt0I1bltIU6NYm9bGu824cRzUuXoM7m9ITXpOPpabiC4SA== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1641326835; a=rsa-sha256; cv=none; b=Ujh1xkh8M7uwdcKFBPCrDwy9WRnSzz4gm6xOWC9sO7kSKgvhVxMNAszvgZJ4vRsvPWbYWF ztp/Ts2HoVtWy7lUP7nMItx3qUxkWycvBlTCTP35WVsamRKesr/OuwThexC7ds69el8m+O 6JjYGAefZ6EgUD2hTqzylsd1iAyKPJybBsAK5rdVSl0UnnEgCKMTxltQeEOCsS1f0Jot+K SMg5vfXANoQHiHefKr3y13gWQvnIwx+kVXrzvtaEj5SHgbEjTFrhsf/FBfBQVzvCkwy5u7 4untYi1icw6zsnnte4q4y/dB6pw4vFUha3f17RASvrMPYKI0gWiDtMvbLUHi+A== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=telenet.be header.s=r22 header.b=UnY1wDaV; dmarc=fail reason="SPF not aligned (relaxed)" header.from=telenet.be (policy=none); spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" X-Migadu-Spam-Score: -0.59 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=telenet.be header.s=r22 header.b=UnY1wDaV; dmarc=fail reason="SPF not aligned (relaxed)" header.from=telenet.be (policy=none); spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" X-Migadu-Queue-Id: 0B87B38DAD X-Spam-Score: -0.59 X-Migadu-Scanner: scn1.migadu.com X-TUID: xK80oQxtgJYq 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 -- 2.30.2