From patchwork Tue Mar 1 08:59:13 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Attila Lendvai X-Patchwork-Id: 37563 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 5C8E427BBEA; Tue, 1 Mar 2022 09:25:07 +0000 (GMT) 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_H5,RCVD_IN_MSPIKE_WL, 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 C63F127BBE9 for ; Tue, 1 Mar 2022 09:25:06 +0000 (GMT) Received: from localhost ([::1]:38910 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nOykh-0003rr-V2 for patchwork@mira.cbaines.net; Tue, 01 Mar 2022 04:25:03 -0500 Received: from eggs.gnu.org ([209.51.188.92]:59958) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nOyMV-0007sy-6n for guix-patches@gnu.org; Tue, 01 Mar 2022 04:00:07 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:41498) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nOyMU-0004hM-To for guix-patches@gnu.org; Tue, 01 Mar 2022 04:00:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nOyMU-0001NS-SX for guix-patches@gnu.org; Tue, 01 Mar 2022 04:00:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#54207] [PATCH] gnu: shepherd: Convert to build from git instead of a release. Resent-From: Attila Lendvai Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 01 Mar 2022 09:00:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 54207 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 54207@debbugs.gnu.org Cc: Attila Lendvai X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.16461251955255 (code B ref -1); Tue, 01 Mar 2022 09:00:02 +0000 Received: (at submit) by debbugs.gnu.org; 1 Mar 2022 08:59:55 +0000 Received: from localhost ([127.0.0.1]:35395 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nOyMM-0001Mh-Tf for submit@debbugs.gnu.org; Tue, 01 Mar 2022 03:59:55 -0500 Received: from lists.gnu.org ([209.51.188.17]:55996) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nOyML-0001Ma-Vd for submit@debbugs.gnu.org; Tue, 01 Mar 2022 03:59:54 -0500 Received: from eggs.gnu.org ([209.51.188.92]:59936) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nOyMK-0007mY-8L for guix-patches@gnu.org; Tue, 01 Mar 2022 03:59:52 -0500 Received: from [2a00:1450:4864:20::62e] (port=40709 helo=mail-ej1-x62e.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nOyMI-0004g8-Eq for guix-patches@gnu.org; Tue, 01 Mar 2022 03:59:51 -0500 Received: by mail-ej1-x62e.google.com with SMTP id p15so30046492ejc.7 for ; Tue, 01 Mar 2022 00:59:50 -0800 (PST) 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=JjN36fnqUE4WsIp2XHHmHOJ9Ld3SjFv+NsKz38Ax9QQ=; b=cu9/9uwXGEcZOEpZZb+GAaDshsmbYFl7UG6J1GO0XiT4BBvj8Z84kT8lcDG/5lnO/K eJYOjmH4d1E1an8H7fT41+K3JefEagfGAHn7cOvjxkTc3XqJopU0WksziIXYS34rTItw vNAIodKJCBTV/fRiIBCcxXQSGIW3NQheYqlodTs0iY6Zs11Y0OMBTG73kdWLJUKckfHG 6RuM732DSKcOCEOQQz+iV2L4PyGhebJHecPFrfHMGjQpx8mWqmLVyArJhy6FgKLEJjdS Y3eV2C+3AFNguZNDeg1ORKKu3Dlug6MmD4OhId+J7XVQxEkLH0YLM+FtdoUGCS935M6n NfYg== 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=JjN36fnqUE4WsIp2XHHmHOJ9Ld3SjFv+NsKz38Ax9QQ=; b=VMw34FbqYbBFf5XY6m5TZz16fr4wAvra9vUGbXQf1VRfTPuWFCYprx5Y/kq4SbDOOi Co/2eJan/vqEaS2X5dJsLuedOC1nJowOPAPIjefocF6jtEU9/LMRGOftpQvPWDpxroBo b+7QuXGLylJ9riA+lkX7LwkXX4XvRvA3l5ImSlc0HD50kW+bKnDfrwTlqM6KUeHYMMeR KWMvXGrg0EB/8Ltzgw1rW22bSX6aLM2QiA5NsulAYfswXksF5PJ5h2ebEeKiJhR4UfhH iWnd7Nf+cRnA3OeiDtugds7vHohyrEaihgSLkspfxXI8V6EuVEBSuV5Py9dtraFUOEAx gkuQ== X-Gm-Message-State: AOAM532HLHl4f6Z5c8WNcZBin6b7WGic2mHW434Nxw2jMrgrqtwsqpUY Q/LWf2FED0cpgJfejmUZWincYWkxMP4= X-Google-Smtp-Source: ABdhPJxaA1XthLtWdbFU1+ttR2vwWjRqUpdsBt6kTiQjWY4b/GcQS/cs2E4UNBP9Oj5xj7N6i4Vt8w== X-Received: by 2002:a17:906:d931:b0:6ce:70bb:3847 with SMTP id rn17-20020a170906d93100b006ce70bb3847mr18162772ejb.65.1646125188838; Tue, 01 Mar 2022 00:59:48 -0800 (PST) Received: from lelap.local (catv-89-132-245-188.catv.fixed.vodafone.hu. [89.132.245.188]) by smtp.gmail.com with ESMTPSA id d6-20020a056402144600b00412a7d10c20sm6800616edx.60.2022.03.01.00.59.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 01 Mar 2022 00:59:48 -0800 (PST) From: Attila Lendvai Date: Tue, 1 Mar 2022 09:59:13 +0100 Message-Id: <20220301085912.31958-1-attila@lendvai.name> X-Mailer: git-send-email 2.34.0 MIME-Version: 1.0 X-Host-Lookup-Failed: Reverse DNS lookup failed for 2a00:1450:4864:20::62e (failed) Received-SPF: pass client-ip=2a00:1450:4864:20::62e; envelope-from=attila.lendvai@gmail.com; helo=mail-ej1-x62e.google.com X-Spam_score_int: 0 X-Spam_score: -0.1 X-Spam_bar: / X-Spam_report: (-0.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.249, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.249, PDS_HP_HELO_NORDNS=0.659, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=no autolearn_force=no X-Spam_action: no action 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 This increases the flexibility to inherit from this package, and use a non-yet-released version of Shepherd in a Guix build while working on Shepherd. --- gnu/packages/admin.scm | 37 ++++++++++++++++++++++--------------- 1 file changed, 22 insertions(+), 15 deletions(-) diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index c8f91aab0d..59a37c5ace 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -270,26 +270,33 @@ (define-public shepherd (package (name "shepherd") (version "0.8.1") - (source (origin - (method url-fetch) - (uri (string-append "mirror://gnu/shepherd/shepherd-" - version ".tar.gz")) - (sha256 - (base32 - "0x9zr0x3xvk4qkb6jnda451d5iyrl06cz1bjzjsm0lxvjj3fabyk")) - (modules '((guix build utils))) - (snippet - '(begin - ;; Build with -O1 to work around . - (substitute* "Makefile.in" - (("compile --target") - "compile -O1 --target")))))) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://git.savannah.gnu.org/git/shepherd.git/") + (commit (string-append "v" version)))) + (sha256 + (base32 + "109ha9rk4ycqcmx9cddlbym92c3fvbwp12q9p42h8sg8vr367w5j")) + (modules '((guix build utils))) + (snippet + '(begin + ;; Build with -O1 to work around . + (substitute* "Makefile.am" + (("compile --target") + "compile -O1 --target")))))) (build-system gnu-build-system) (arguments '(#:configure-flags '("--localstatedir=/var") #:make-flags '("GUILE_AUTO_COMPILE=0"))) (native-inputs - (list pkg-config + (list autoconf + automake + gettext-minimal + help2man + pkg-config + texinfo ;; This is the Guile we use as a cross-compiler... guile-3.0)) (inputs