From patchwork Tue Jul 18 13:14:59 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Janneke Nieuwenhuizen X-Patchwork-Id: 51785 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 9C91627BBE9; Tue, 18 Jul 2023 14:16:30 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-3.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,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 700A127BBE2 for ; Tue, 18 Jul 2023 14:16:29 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qLkYw-00032f-Qe; Tue, 18 Jul 2023 09:16:22 -0400 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 1qLkYf-0002zG-1D for guix-patches@gnu.org; Tue, 18 Jul 2023 09:16:06 -0400 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 1qLkYe-0006lz-L2 for guix-patches@gnu.org; Tue, 18 Jul 2023 09:16:04 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qLkYe-0003xQ-Gk for guix-patches@gnu.org; Tue, 18 Jul 2023 09:16:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#64708] [PATCH 3/8] gnu: commencement: Add git-fetch-from-tarball utility. Resent-From: Janneke Nieuwenhuizen Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 18 Jul 2023 13:16:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 64708 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 64708@debbugs.gnu.org Cc: Ludovic =?utf-8?q?Court=C3=A8s?= Received: via spool by 64708-submit@debbugs.gnu.org id=B64708.168968612215097 (code B ref 64708); Tue, 18 Jul 2023 13:16:04 +0000 Received: (at 64708) by debbugs.gnu.org; 18 Jul 2023 13:15:22 +0000 Received: from localhost ([127.0.0.1]:52149 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qLkXy-0003vL-8x for submit@debbugs.gnu.org; Tue, 18 Jul 2023 09:15:22 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:41028) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qLkXv-0003u5-Kz for 64708@debbugs.gnu.org; Tue, 18 Jul 2023 09:15:19 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qLkXm-0006Xb-6B; Tue, 18 Jul 2023 09:15:10 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:References:In-Reply-To:Date:Subject:To: From; bh=JjdNExDEZ3C55h7l7tyVDVkrfVctwSD28oL54tPCS4M=; b=rPu3Bl1Uv/2siYHL23DT 5ezjK1YAtY0PddQ7uHSopVz4RnBC5PR5jjm6Zk/f7YxwE2sYOA9N65d7H7qWjpbs7qLx1dJE0QGpM d1KCekV7HONKNGJ/NL2uv6g1Clwo6CkfR/WowZe/tmn+DOO7hieWUkfmVIJvjkH+dB8v/AUFcjhGC 0IqLjr2Voo8KFPh56zUAxKBxkEGQHhK4Mx7WwMEQ5/qECBKfefRI7cFFprqtKJ2OtYjyaomSfMwxm WuDy0VS7BZJzvTs3Kwr/hrWZEdH6ibosF6wCytWjaOdhMH5WnGBvKHGCukCmOnJ2sb6UfpW2h4i4A Q8YEIrYbmW98rA==; Received: from 2a02-a462-da03-1-aeb0-2f5e-e96a-dccb.fixed6.kpn.net ([2a02:a462:da03:1:aeb0:2f5e:e96a:dccb] helo=drakenpad.fritz.box) by fencepost.gnu.org with esmtpa (Exim 4.90_1) (envelope-from ) id 1qLkXl-0004rp-PI; Tue, 18 Jul 2023 09:15:09 -0400 From: Janneke Nieuwenhuizen Date: Tue, 18 Jul 2023 15:14:59 +0200 Message-Id: <161bab138845fe307ec92b8fea181e00ece86e58.1689685375.git.janneke@gnu.org> X-Mailer: git-send-email 2.40.1 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 From: Ludovic Courtès * gnu/packages/commencement.scm (git-fetch-from-tarball): New procedure. --- gnu/packages/commencement.scm | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm index d0603e62c8..1d69c2a80f 100644 --- a/gnu/packages/commencement.scm +++ b/gnu/packages/commencement.scm @@ -57,7 +57,10 @@ (define-module (gnu packages commencement) #:use-module (gnu packages xml) #:use-module (guix gexp) #:use-module (guix packages) + #:use-module ((guix store) #:select (%store-monad)) + #:use-module (guix monads) #:use-module (guix download) + #:use-module ((guix git-download) #:select (git-reference git-file-name)) #:use-module (guix build-system gnu) #:use-module (guix build-system trivial) #:use-module ((guix licenses) #:prefix license:) @@ -90,6 +93,34 @@ (define-module (gnu packages commencement) ;;; ;;; Code: +(define* (git-fetch-from-tarball tarball) + (lambda* (url hash-algo hash + #:optional name + #:key (system (%current-system)) + (guile %bootstrap-guile)) + (mlet %store-monad ((guile (package->derivation guile system))) + (gexp->derivation + (or name "git-checkout") + (with-imported-modules '((guix build utils)) + #~(begin + (use-modules (guix build utils) + (ice-9 ftw) + (ice-9 match)) + (setenv "PATH" + #+(file-append %bootstrap-coreutils&co "/bin")) + (invoke (string-append #+tar "/bin/tar") + "xf" #$tarball) + (match (scandir ".") + (("." ".." directory) + (copy-recursively directory #$output))))) + #:recursive? #t + #:hash-algo hash-algo + #:hash hash + #:system system + #:guile-for-build guile + #:graft? #f + #:local-build? #t)))) + (define bootar (package (name "bootar")