From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp12.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms5.migadu.com with LMTPS id 8GfXL8z6MWNeEgAAbAwnHQ (envelope-from ) for ; Mon, 26 Sep 2022 21:17:32 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp12.migadu.com with LMTPS id CNzDL8z6MWO9EQAAauVa8A (envelope-from ) for ; Mon, 26 Sep 2022 21:17:32 +0200 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 81D85AA8 for ; Mon, 26 Sep 2022 21:17:32 +0200 (CEST) Received: from localhost ([::1]:35452 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1octba-0005Cm-JB for larch@yhetil.org; Mon, 26 Sep 2022 15:17:29 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:50798) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1octZG-0004Eg-N8 for guix-patches@gnu.org; Mon, 26 Sep 2022 15:15:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:52704) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1octZG-0000Gf-DO for guix-patches@gnu.org; Mon, 26 Sep 2022 15:15:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1octZG-0004wT-82 for guix-patches@gnu.org; Mon, 26 Sep 2022 15:15:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#54216] [PATCH v5] gnu: shepherd: Build Shepherd 0.9.2 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: Mon, 26 Sep 2022 19:15:02 +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.166421965518920 (code B ref 54216); Mon, 26 Sep 2022 19:15:02 +0000 Received: (at 54216) by debbugs.gnu.org; 26 Sep 2022 19:14:15 +0000 Received: from localhost ([127.0.0.1]:51782 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1octYU-0004v5-UN for submit@debbugs.gnu.org; Mon, 26 Sep 2022 15:14:15 -0400 Received: from mail-ed1-f45.google.com ([209.85.208.45]:34304) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1octYQ-0004uq-I3 for 54216@debbugs.gnu.org; Mon, 26 Sep 2022 15:14:13 -0400 Received: by mail-ed1-f45.google.com with SMTP id z2so10407501edi.1 for <54216@debbugs.gnu.org>; Mon, 26 Sep 2022 12:14:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:sender:from:to:cc:subject:date; bh=8tLwkWCjxs7FbMYw4CCnxt6sVIAOr7+b1DZ6wILIo4Q=; b=orMoH+LP9nZEEbyig6zsj1NKAdDLSm3om5AFgMEWThcWXAjvizpRHtDqJynqWaVLNJ q1Iwltyd6LZ/x3v5QZUnNS3I4feROodPEdkd61cMGIuTsJXGb029UHVnDCDbbde5MexM GoDy61c4rK9wkBrbV+apHTL65U29bMAqm5ZcosH2jN83DUeGR8E2It+RL9zgsYNGV/13 hrM53juboWHMHBC1ICA2S3wnebephaAd6OE5ede97kmDUveEx6QMSWuoT233A86210DF Qs7lfuDGbVzktT6m325n5SmqW9E6C3+65aOqfXCiT/Db0LfghtliejzNBr17OZifqX0E LFcg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:sender:x-gm-message-state:from:to:cc:subject:date; bh=8tLwkWCjxs7FbMYw4CCnxt6sVIAOr7+b1DZ6wILIo4Q=; b=cVdy6Vi7YquMOtH5kMRWak7t5XZGxsvl0du1pbnHARyPjFOqnyB/VCNp7YejFJp5Hv w9aIWVvfrpbGtKwJdhWj+x30SaI6YgXmMQtV73j9ojHQgO/jtrJQjAMCNZN5UnorMa2F 0LqxORUPRsNXH9heNuKiOrIqdp0agqSKa8DO4RjbEcNmhNqARPZTV2hHdGFBeX1ycHAu 6qtvO8UoJljGXUBCY3sUBmamUPjcA3Qmw1fvwKe0DvigmCzBBFv1UJjbx0D90Yu8Kcbf RrQwvVtFN6ceSHM6Havn1F8p5Mc7L2y0Y0ChtTf8hG8rbiSUG6T74y5ZhL7lmAlNm+JS ug7g== X-Gm-Message-State: ACrzQf0b0AKpfPjbYPmGtlbMwFn4eAc6CQSSemtVOw7p7tzKAg1JvaNA LG8mb5FauhEFUAsWGTDW+R0JYB4HpH4= X-Google-Smtp-Source: AMsMyM6nmPy2ipoH0X8ryMSRtek77ROoJxqWN9ckzFN1Clk3YhS4nX4vtPEmjTUhksFdlSBL5+roig== X-Received: by 2002:aa7:d58e:0:b0:457:4ba0:60ed with SMTP id r14-20020aa7d58e000000b004574ba060edmr6421298edq.54.1664219644683; Mon, 26 Sep 2022 12:14:04 -0700 (PDT) Received: from lelap.lan (catv-86-101-126-246.catv.fixed.vodafone.hu. [86.101.126.246]) by smtp.gmail.com with ESMTPSA id g5-20020a056402320500b00456ddead51asm6550233eda.16.2022.09.26.12.14.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 26 Sep 2022 12:14:03 -0700 (PDT) From: Attila Lendvai Date: Mon, 26 Sep 2022 21:11:56 +0200 Message-Id: <20220926191155.3978-1-attila@lendvai.name> X-Mailer: git-send-email 2.35.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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-To: larch@yhetil.org X-Migadu-Country: US ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1664219852; 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=8tLwkWCjxs7FbMYw4CCnxt6sVIAOr7+b1DZ6wILIo4Q=; b=icc0RUc22c17o/tbs6ZFuStSGZBhkMz5AgKpwrWuWwH3QjpqnSyncjXql9r5Bykkbh/zOw 4tUIo2yAenUXzZULt2Apb87A+l1pkZxxw+PktOwehjcUFdOVyvQ9/YSHK0TnTvp/dBcmel uwKzmGAHgE9FZmkb+IaV5LJH+qThx6EYuHQeRtqA/tV1O/HT4I8G3j0hJaxQc3SCjJQTTc g2bP0XOoFxwyyR0wAo+FscWH0+jh+6/YFhRu9FMrisDSFVs7XYOJ+TAX5I1ql19mTHvEmZ PbW3B9bbwiY6WROhWa9Fla/Ygquv5dMO9vnr6Yu8lFUVfzNZPXGpk4i8+9T3/A== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1664219852; a=rsa-sha256; cv=none; b=WxL6ZP0p7fMdwvqbLSLxSkKjnU57ph+kO5h37WvrsrdaJ4Q6z5gkejKsp7LY1kj7GPWt2U bovfWccHxYkJWKv9GujdqQeK6YnPF4aplXNhBizj9gxVm/lgQUcuNHfA6G8tulkbr/qBdj yrqZq1qhrSHSu3n7pPQEouaST1apGwn2Vi/OIFio9HJi01DNdiyJtDo8gkmEoed40f1OOJ S4luBIA1n6NsE2MIjS0+Y9woWreG4nkBYVNG8bD4hRM5Dc1xqTZwa86wchOyhf3aBS3gxC q17K82hmUCtM1hGT0oai79yiwnFp+bfiSoFHEcdlF90+HjrxzDOsdRcrweNEWQ== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20210112 header.b=orMoH+LP; dmarc=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: 2.85 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20210112 header.b=orMoH+LP; dmarc=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: 81D85AA8 X-Spam-Score: 2.85 X-Migadu-Scanner: scn0.migadu.com X-TUID: rzVkldI1J0R1 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. --- since v4: rebased on master, avoid reindenting to shorten the diff, avoid adding a (name "shepherd") field. gnu/packages/admin.scm | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index 5fb621e027..1a1378d64e 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -327,12 +327,13 @@ (define-public shepherd-0.9 (inherit shepherd) (version "0.9.2") (source (origin - (method url-fetch) - (uri (string-append "mirror://gnu/shepherd/shepherd-" - version ".tar.gz")) + (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 "shepherd" version)) (sha256 - (base32 - "0mcby3ygh3bpns44rb1vnk8bz2km4nlw092nrcgkm3nkqfmbp4p1")) + (base32 "1b16qc7zmm1cz45gspcbng4djz9jy8db4awfw63b2hvf9b396mv2")) (modules '((guix build utils))) (snippet ;; Avoid continuation barriers so (@ (fibers) sleep) can be @@ -349,6 +350,7 @@ (define-public shepherd-0.9 #: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 @@ -363,8 +365,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 -- 2.35.1