From patchwork Sat Jul 29 14:31:57 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Attila Lendvai X-Patchwork-Id: 52356 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 D166E27BBE9; Sat, 29 Jul 2023 15:54:50 +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=-2.7 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, 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 6FC8727BBE2 for ; Sat, 29 Jul 2023 15:54:48 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qPl28-0001hP-Ob; Sat, 29 Jul 2023 10:35:04 -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 1qPl26-0001gc-ON for guix-patches@gnu.org; Sat, 29 Jul 2023 10:35:03 -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 1qPl25-0000Ft-WF for guix-patches@gnu.org; Sat, 29 Jul 2023 10:35:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qPl25-0001gA-O7 for guix-patches@gnu.org; Sat, 29 Jul 2023 10:35:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#61750] [PATCH] gnu: shepherd: Build Shepherd from git. References: <20230224140243.15315-1-attila@lendvai.name> In-Reply-To: <20230224140243.15315-1-attila@lendvai.name> Resent-From: Attila Lendvai Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 29 Jul 2023 14:35:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 61750 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 61750@debbugs.gnu.org Cc: Attila Lendvai Received: via spool by 61750-submit@debbugs.gnu.org id=B61750.16906412976441 (code B ref 61750); Sat, 29 Jul 2023 14:35:01 +0000 Received: (at 61750) by debbugs.gnu.org; 29 Jul 2023 14:34:57 +0000 Received: from localhost ([127.0.0.1]:48638 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qPl20-0001fo-Q5 for submit@debbugs.gnu.org; Sat, 29 Jul 2023 10:34:57 -0400 Received: from mail-ej1-x633.google.com ([2a00:1450:4864:20::633]:45495) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qPl1y-0001fa-Jz for 61750@debbugs.gnu.org; Sat, 29 Jul 2023 10:34:55 -0400 Received: by mail-ej1-x633.google.com with SMTP id a640c23a62f3a-99bf3f59905so210670666b.3 for <61750@debbugs.gnu.org>; Sat, 29 Jul 2023 07:34:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1690641289; x=1691246089; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=4rPyRadwfULB0gkLUpeXH3fkpUv8qA2E2hjhTjUDVnk=; b=GkOT5ichvwf8V/4r6Rm+AwJvj100Jz8ngaStjFIINPlUdlS5NVlwKOi3gkRXh7pJ2Z RQ5zABlTfpexRupPs3y/FtsbGIvgn+Q/zQLKco3iP1U938NKrp6S0k1Wi+SMFW7PPg93 r2OTG6uttNH/m869sx8yLALVMWHIxEAHD9JQuHNq+3eshw5nrj8DQP6O8kgxV9UuU7o7 AsU+UPYVBm0vBSbjN5TwqK81ER6DL4RvnS9OMiET9kkW/zfB0ueA6JWcrFsCX8YmIIso 5vZd1NCAv3B1D07m2rN8F+S+uT1xyyrDgqhZahmtrALrW5FzPvIt3xfP0c61p/0yJ1d/ jkPQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1690641289; x=1691246089; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=4rPyRadwfULB0gkLUpeXH3fkpUv8qA2E2hjhTjUDVnk=; b=P5RneFZDfeRyRI5T9uKqqNnBnjBZi6Icsge1PLJpYuw/zBkxtU7/lCDGrzt3N6aBLb nmyAgZnFXENpbQh7cXLyfVtb7V3X0EtIDKFBbGv+IRT1kiawEZ1Ao65lMeGjgBrwdOXx 2U4ZANiuBQBbpb08IklwqzKHC/ngv5GMZ0oY/ClPXiGqnhpwiZqUktE/CiuhxD65sgqA OGz1soqDz+b5mDxOvnZVgZpTYIrjnms15+i2+TNzy6WK3lyMDUlceEbXGq6WZUMb1Vy2 N9fhXRbt10LklIoT7yekKEHhZRy9ZU06qMvdVV4rriVqgAMZaZWz+VzwSS49BucG5hRU qyQA== X-Gm-Message-State: ABy/qLYBVCR5aIp1O8dBujesZ8K6mi410RNZeUnY/FccuPhzER17Hm5/ KaunGef1O6xGd1UUWI7TtWAK4toXSaA= X-Google-Smtp-Source: APBJJlEPlSKOvp1QADKu65Ck1eWjeNbx8T7/TloEyqp9o13XcDU3DIw+oXdVcXeQ9Eei6szZbYF8uQ== X-Received: by 2002:a17:906:1d05:b0:997:e79c:99dc with SMTP id n5-20020a1709061d0500b00997e79c99dcmr2616286ejh.74.1690641288511; Sat, 29 Jul 2023 07:34:48 -0700 (PDT) Received: from lelap.lan (catv-80-98-247-145.catv.fixed.vodafone.hu. [80.98.247.145]) by smtp.gmail.com with ESMTPSA id jj27-20020a170907985b00b00992b1c93279sm3315736ejc.110.2023.07.29.07.34.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 29 Jul 2023 07:34:47 -0700 (PDT) From: Attila Lendvai X-Google-Original-From: Attila Lendvai Date: Sat, 29 Jul 2023 16:31:57 +0200 Message-Id: <7d9c1d64af2c747e68a9d78b955e1411bee99f90.1690641116.git.attila@lendvai.name> X-Mailer: git-send-email 2.40.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-bounces+patchwork=mira.cbaines.net@gnu.org 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 speeding up the edit-compile-test cycle. * gnu/packages/admin.scm (shepherd-0.10): Source points to the git repo; adjust native-inputs accordingly. Also delete the strip build phase. --- i've been running with this commit ever since i first submitted it, but now it is causing quite a lot of local rebuilds, making it that much more trouble. please consider merging it if it makes senes. note that it was not extensively tested by me WRT cross-compilation, or non x86_64 platforms. gnu/packages/admin.scm | 38 +++++++++++++++++++++++--------------- 1 file changed, 23 insertions(+), 15 deletions(-) base-commit: c7e45139faa27b60f2c7d0a4bc140f9793d97d47 prerequisite-patch-id: 5586be8a480bef6910bc7557e9491c5100f56a0e prerequisite-patch-id: 0030a0ed3944c6bbbdefc9401325f095b92cc700 prerequisite-patch-id: 9f2204275da87bd4918b7c5f6d77643926e02afa prerequisite-patch-id: 83a83f44b77fffb685e845ddc3ead64b711f4155 prerequisite-patch-id: 9a430e4316112cf97a40d220425dd8a5409a9e73 prerequisite-patch-id: 4b80e182f3cd3d48686f1faa15d9a3db3f354777 prerequisite-patch-id: 5b18a9e12c8eea82f8dc63dabc8c560588981a80 prerequisite-patch-id: f0ca061e8beb99c6305f38cef019cb8d66802ba7 prerequisite-patch-id: fd60adfe24e43be484f96e5403c3428ba3ef5fde prerequisite-patch-id: 81af80e2d0821ffb9410c7c331a8ba3c4cb73aff prerequisite-patch-id: 206663d5f2b364cf2c1598d382f8b34daedf0ba4 prerequisite-patch-id: cb5793fb638c7c086a1dbba94c115a51973f0cce diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index ec32041055..77975654c9 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -337,12 +337,13 @@ (define-public shepherd-0.9 (inherit shepherd-0.8) (version "0.9.3") (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 - "0qy2yq13xhf05an5ilz7grighdxicx56211yaarqq5qigiiybc32")))) + (base32 "1pvdpx2mfki8wvhcac54p8fn5idqszicww60ikswszz2cv5d0s11")))) (arguments (list #:configure-flags #~'("--localstatedir=/var") #:make-flags #~'("GUILE_AUTO_COMPILE=0") @@ -362,24 +363,31 @@ (define-public shepherd-0.9 (this-package-input "guile-fibers") "/lib/guile/3.0/site-ccache")))))) #~%standard-phases))) - - ;; Note: Use 'guile-3.0-latest' to address the continuation-related memory - ;; leak reported at . - (native-inputs (list pkg-config guile-3.0-latest - guile-fibers-1.1)) ;for cross-compilation - (inputs (list guile-3.0-latest guile-fibers-1.1)))) + (native-inputs + (list autoconf + automake + gettext-minimal + guile-3.0 + guile-fibers-1.1 ; for cross-compilation + help2man + pkg-config + texinfo)) + (inputs (list guile-3.0 + guile-fibers-1.1)))) (define-public shepherd-0.10 (package (inherit shepherd-0.9) (version "0.10.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 - "0v9ld9gbqdp5ya380fbkdsxa0iqr90gi6yk004ccz3n792nq6wlj")))) + "1kvfv4rkgs5jq2wir72m29idgk3n2i44qji9rq1hmmc8vkgqxh26")))) (native-inputs (modify-inputs (package-native-inputs shepherd-0.9) (replace "guile-fibers" guile-fibers-1.3))) (inputs (modify-inputs (package-inputs shepherd-0.9)