From patchwork Mon Mar 21 15:14:10 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Attila Lendvai X-Patchwork-Id: 37974 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 B4ECF27BBEA; Mon, 21 Mar 2022 15:17:32 +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 3934027BBE9 for ; Mon, 21 Mar 2022 15:17:32 +0000 (GMT) Received: from localhost ([::1]:46524 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nWJml-0001RH-57 for patchwork@mira.cbaines.net; Mon, 21 Mar 2022 11:17:31 -0400 Received: from eggs.gnu.org ([209.51.188.92]:38260) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nWJmK-0001PZ-37 for guix-patches@gnu.org; Mon, 21 Mar 2022 11:17:06 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:43974) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nWJmI-00015X-Se for guix-patches@gnu.org; Mon, 21 Mar 2022 11:17:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nWJmI-0001mm-HI for guix-patches@gnu.org; Mon, 21 Mar 2022 11:17:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#54216] [PATCH v4] gnu: shepherd-for-guix: New package for use in Guix. 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, 21 Mar 2022 15:17: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.16478758126349 (code B ref 54216); Mon, 21 Mar 2022 15:17:02 +0000 Received: (at 54216) by debbugs.gnu.org; 21 Mar 2022 15:16:52 +0000 Received: from localhost ([127.0.0.1]:37871 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nWJm7-0001e4-Tl for submit@debbugs.gnu.org; Mon, 21 Mar 2022 11:16:52 -0400 Received: from mail-ej1-f47.google.com ([209.85.218.47]:41962) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nWJm5-0001Xo-Be for 54216@debbugs.gnu.org; Mon, 21 Mar 2022 11:16:50 -0400 Received: by mail-ej1-f47.google.com with SMTP id a8so30514847ejc.8 for <54216@debbugs.gnu.org>; Mon, 21 Mar 2022 08:16:49 -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=2blBOk/itWB/Ii7c/Hj/wYU868vN7WZqlClrIJaS5gY=; b=MiTz8ax2eQSsxsEFP7pjsKGm5snl9+M4kbETLKY++PjvXe39qMo2SSiEOHKw+qGIbP OmOkUN/D4YTzgPEbjGbKCm492eGhtinjK9WrpcLpVj7pDnmgx4gkPZJv/xq9QekZj86j 6rGN3PYriMgoSZvvmmMYR8un3MTqcJHge/4gYwLrngcTCaKyqIlwcWEVnCUah3GcbIid n+lRRh5YI6D3Nam4X58u5fdRQq/7ZoOhYGSryouHIk9hY/TpH5kKVoZrQzJkQx6aCN5V Ok4AhxyGeoJhJPIcAILLrmP/hzVRgpgFTyar7ZiWuGH+3Su8lxe5XOjSm9d0XkvnrQr6 CDiw== 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=2blBOk/itWB/Ii7c/Hj/wYU868vN7WZqlClrIJaS5gY=; b=fIJs7O+JcW10jH46mOJBm800lgJmfvYu4BLx07Ks8l1SI1vjliRKra/yLJc+AdTP+x caCBNalo/o0P3EzxOY1j5CpKWWj2VrUmm5DZm6yYWtOXjBZUAkp5ZJ3uvr6unY2FuZeC XnPRFJYvIqGuAhYRp8TheQhiFnjzQtHIyKPseY7Yw7lDwwQQkOn2MuydHkl4orBQ29ZH jkIlEbzX7N8VxeFvyjh1yiTdzWWL6kEGuRB3WbgBDlKThydCcQrI7pIc6ddWTseL0ZbH 0zDvbfNkfHiIK2a6MrDaNCzx0pbSt2Q058FJ1vGBZBcL+etUs1LiQufC4TdZWPEyqgFJ fDrw== X-Gm-Message-State: AOAM532VwtZG1yqnNbUhOthgk/l+vTWpKqaMYoCt9Ijpgi6BxJ/GGiwt 6xfAt6WG2TAr2itOJR+bV3OpPB70jS4= X-Google-Smtp-Source: ABdhPJwJ+BQM9BT6DRm2PBd8WsYoE1zvIsnRIxMPkn7JPGPA/8nq4VYshnZlAFMizTafVOwp7uzrZg== X-Received: by 2002:a17:906:9c90:b0:6df:9eea:cda3 with SMTP id fj16-20020a1709069c9000b006df9eeacda3mr19138195ejc.89.1647875800571; Mon, 21 Mar 2022 08:16:40 -0700 (PDT) Received: from lelap.local (catv-89-132-245-188.catv.fixed.vodafone.hu. [89.132.245.188]) by smtp.gmail.com with ESMTPSA id m20-20020a056402431400b00419315cc3e2sm2093021edc.61.2022.03.21.08.16.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 21 Mar 2022 08:16:39 -0700 (PDT) From: Attila Lendvai Date: Mon, 21 Mar 2022 16:14:10 +0100 Message-Id: <20220321151410.21398-1-attila@lendvai.name> X-Mailer: git-send-email 2.34.0 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 This also updates shepherd-for-guix to the latest commit, so that the two variants have a different version. * gnu/packages/admin.scm (shepherd-for-guix): New variable. --- v4: update to build the latest shepherd that now contains the #:resource-limits commit. gnu/packages/admin.scm | 49 +++++++++++++++++++++++++++++++++++++++ gnu/services/shepherd.scm | 2 +- 2 files changed, 50 insertions(+), 1 deletion(-) diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index c8f91aab0d..27fc33e990 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -307,6 +307,55 @@ (define-public shepherd (license license:gpl3+) (home-page "https://www.gnu.org/software/shepherd/"))) +;; This is the Shepherd package used by Guix. This package variant +;; allows us to add new features and fix bugs in Shepherd and use the +;; new features in Guix, without having to go through the 'staging' +;; branch, and without having to wait for a new release, see +;; [TODO] in the manual. +(define-public shepherd-for-guix + (let* ((version "0.8.1") + ;; If it's an unreleased commit: + (commit "3ee9a7193d73821d6f1dd76a745ed5e4bb1a78c8") + ;; Use the below form if it's a release, and also set REVISION to #f. + ;; (commit (string-append "v" version)) + (revision "1")) + (package + (inherit shepherd) + (version (if revision + (git-version version revision commit) + version)) + (source + (origin + (inherit (package-source shepherd)) + (method git-fetch) + (uri (git-reference + ;; Build from git and add Autotools inputs, to make developing + ;; Shepherd easier. It enables easier package inheritance. + (url "https://git.savannah.gnu.org/git/shepherd.git/") + (commit commit))) + (snippet #f) ; TODO delete this once parent is refactored. + (sha256 + (base32 + "07zaazw33p98n38j9hgjaipjvbh9mf0x3b5nbri5nyrxbgn0vvvb")))) + ;; TODO merge this back into the parent with a patch to staging. + (arguments + (append + (package-arguments shepherd) + '(#:phases + (modify-phases %standard-phases + (delete 'strip) ; Avoid some warnings from stripping .go files. + (add-after 'unpack 'patch-source + (lambda _ + ;; Build with -O1 to work around . + (substitute* "Makefile.am" + (("compile --target") + "compile -O1 --target")))))))) + (native-inputs + (modify-inputs (package-native-inputs shepherd) + (prepend autoconf automake gettext-minimal help2man texinfo))) + (description "A package variant for use in Guix. It helps lowering +the build time of Guix when working on Shepherd.")))) + (define-public guile2.2-shepherd (package (inherit shepherd) diff --git a/gnu/services/shepherd.scm b/gnu/services/shepherd.scm index b44dbf9d9f..991194ffe6 100644 --- a/gnu/services/shepherd.scm +++ b/gnu/services/shepherd.scm @@ -88,7 +88,7 @@ (define-record-type* shepherd-configuration make-shepherd-configuration shepherd-configuration? (shepherd shepherd-configuration-shepherd - (default shepherd)) ; file-like + (default shepherd-for-guix)) ; file-like (services shepherd-configuration-services (default '()))) ; list of