From patchwork Sun May 1 14:31:17 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Attila Lendvai X-Patchwork-Id: 39040 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 2C82A27BBEA; Sun, 1 May 2022 15:33:12 +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 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 B4FFC27BBE9 for ; Sun, 1 May 2022 15:33:11 +0100 (BST) Received: from localhost ([::1]:48992 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nlAdK-00043C-S4 for patchwork@mira.cbaines.net; Sun, 01 May 2022 10:33:10 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:41820) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nlAdC-000427-8T for guix-patches@gnu.org; Sun, 01 May 2022 10:33:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:39981) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nlAdB-0006jJ-Vs for guix-patches@gnu.org; Sun, 01 May 2022 10:33:01 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nlAdB-0001sF-MA for guix-patches@gnu.org; Sun, 01 May 2022 10:33:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#54216] [PATCH v4] gnu: shepherd: Build Shepherd 0.9.0 from git. References: <20220301182848.26694-1-attila@lendvai.name> In-Reply-To: <20220301182848.26694-1-attila@lendvai.name> Resent-From: Attila Lendvai Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 01 May 2022 14:33:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 54216 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 54216@debbugs.gnu.org Cc: Attila Lendvai Received: via spool by 54216-submit@debbugs.gnu.org id=B54216.16514155487150 (code B ref 54216); Sun, 01 May 2022 14:33:01 +0000 Received: (at 54216) by debbugs.gnu.org; 1 May 2022 14:32:28 +0000 Received: from localhost ([127.0.0.1]:33874 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nlAce-0001rG-7v for submit@debbugs.gnu.org; Sun, 01 May 2022 10:32:28 -0400 Received: from mail-ed1-f43.google.com ([209.85.208.43]:44906) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nlAcc-0001r4-BE for 54216@debbugs.gnu.org; Sun, 01 May 2022 10:32:27 -0400 Received: by mail-ed1-f43.google.com with SMTP id t5so3436917edw.11 for <54216@debbugs.gnu.org>; Sun, 01 May 2022 07:32:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=sender:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=/RoA1OaRArpP+QK2zS2aGtGk96Il7e00fjvBcA58KyA=; b=d1WxAbs8SRXkbc1GzCYaNpErz56MM08rrwyhLu0zf+5RfpdsKo9GLyQ5u5y9nPqJQj SfOli/QZj6m01b0XLoVEF9J097ablR3eC8tFFIv4Ed5xmWPXmzLnhT1HrA4zHvTx5doa 4y3AtoHA89Bcb7Vadr/cyC4pqJVh9gKxoWwHrhJh9ih1ZB86ZeVGegMb1WBNEDjvL3By LY67wqr5eLa+b37SJ49UodrtamdYwBFfKjJy3lZ1OE2GWq7nNKq8R5LfsqZRm2hhgPi5 Cn44vtge1ejR+haDVyExZ0kp6u/n+AHDyzNt22HpnRtYkozHsCxWBrorPBHKHd5KJCRB A3Mg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :mime-version:content-transfer-encoding; bh=/RoA1OaRArpP+QK2zS2aGtGk96Il7e00fjvBcA58KyA=; b=8PC2O4c3Kd9IOVzklyTql4Nz0bYZ/LOCM5mcbsbwbzwJJp9/CRn+eI35/wNHdJTO26 mF3qCKm7RlQX3dE0ENNMSLcuUJtplVJBRlziWYxAAKQt7ZThyhXRB9qSRvlX+1tHJOh6 RJZry6UTx1DJsMuyD42BQJVGHBn0pRMh/eS1MAlPKI1cLjhUQ/MWX492R2XuGaMaVt91 YgX7Hy9inD7ebJneWN8jnelgfMye3NjaebGL3CsEIPjnpPudePttDW8OzyBBRTb/DedK X4KQowquBm3dAqL5J03gIOapWLGmLd0iTfYReZX5NcDMo9RDZGGpNr9Huo1zD/y1ADLV Fclw== X-Gm-Message-State: AOAM533ZbS9kT9SPIxzNPdfuGRwuEndLVIXMx0n/eAQdKW/9Na+FabIt tEchL5S0jBYPut9YWJKhaqwEnvmMcrA= X-Google-Smtp-Source: ABdhPJxczz4/PKUa7CQfWaJCkY3vaSdgIopoUhYJbLLQ+PsAKkY9AAow5+BY4nN6i783lw35bv/JsQ== X-Received: by 2002:a05:6402:158a:b0:426:9efd:57a with SMTP id c10-20020a056402158a00b004269efd057amr9051302edv.85.1651415540272; Sun, 01 May 2022 07:32:20 -0700 (PDT) Received: from localhost.localdomain ([2a02:ab88:7509:f780:ed82:a496:f55:e07b]) by smtp.gmail.com with ESMTPSA id hg1-20020a1709072cc100b006f3ef214e72sm2610942ejc.216.2022.05.01.07.32.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 01 May 2022 07:32:19 -0700 (PDT) From: Attila Lendvai Date: Sun, 1 May 2022 16:31:17 +0200 Message-Id: <20220501143116.7027-1-attila@lendvai.name> X-Mailer: git-send-email 2.35.1 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" X-getmail-retrieved-from-mailbox: Patches The rationale for this is that it makes it simpler to start VM's with a Shepherd that is compiled from a local checkout. This facilitates hacking on Shepherd itself, and testing it in the Guix init environment, by greatly reducing the edit-compile-test cycle. * gnu/packages/admin.scm (shepherd-0.9): Source points to the git repo; adjust native-inputs accordingly. Also delete the strip build phase. --- gnu/packages/admin.scm | 24 +++++++++++++++--------- 1 file changed, 15 insertions(+), 9 deletions(-) diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index 94636faf8b..fd7df3f09f 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -314,19 +314,23 @@ (define-public shepherd shepherd-0.8) (define-public shepherd-0.9 (package (inherit shepherd) + (name "shepherd") ; Only for git-file-name below; not ideal. (version "0.9.0") - (source (origin - (method url-fetch) - (uri (string-append "mirror://gnu/shepherd/shepherd-" - version ".tar.gz")) - (sha256 - (base32 - "1rdwhrcibs2ly4hjwwb5kmzb133ccjmrfvb0a70cqkv9jy1pg061")))) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://git.savannah.gnu.org/git/shepherd.git/") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1caxw0549jfadnvjbh0jlawg6k535mb5mc226darcfihvjy3crma")))) (arguments (list #:configure-flags #~'("--localstatedir=/var") #:make-flags #~'("GUILE_AUTO_COMPILE=0") #:phases (if (%current-target-system) #~(modify-phases %standard-phases + (delete 'strip) ; Warns when stripping .go files. (add-before 'configure 'set-fibers-directory (lambda _ ;; When cross-compiling, refer to the target @@ -341,8 +345,10 @@ (define-public shepherd-0.9 (this-package-input "guile-fibers") "/lib/guile/3.0/site-ccache")))))) #~%standard-phases))) - (native-inputs (list pkg-config guile-3.0 - guile-fibers-1.1)) ;for cross-compilation + (native-inputs + (list autoconf automake gettext-minimal help2man texinfo pkg-config + guile-fibers-1.1 ; for cross-compilation + guile-3.0)) (inputs (list guile-3.0 guile-fibers-1.1)))) (define-public guile2.2-shepherd