From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp12.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id wJv6IfnQIGK/AQAAgWs5BA (envelope-from ) for ; Thu, 03 Mar 2022 15:30:17 +0100 Received: from aspmx1.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp12.migadu.com with LMTPS id GHyEHvnQIGKLDQAAauVa8A (envelope-from ) for ; Thu, 03 Mar 2022 15:30:17 +0100 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 1A8103D0D0 for ; Thu, 3 Mar 2022 15:30:17 +0100 (CET) Received: from localhost ([::1]:47480 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nPmT9-0000m8-KX for larch@yhetil.org; Thu, 03 Mar 2022 09:30:15 -0500 Received: from eggs.gnu.org ([209.51.188.92]:59404) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nPmSy-0000lm-U4 for guix-patches@gnu.org; Thu, 03 Mar 2022 09:30:04 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:48063) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nPmSx-0001ni-LW for guix-patches@gnu.org; Thu, 03 Mar 2022 09:30:03 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nPmSx-0007fR-Gc for guix-patches@gnu.org; Thu, 03 Mar 2022 09:30:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#54216] [PATCH staging] gnu: shepherd: Build it from git, and clean up shepherd-for-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: Thu, 03 Mar 2022 14:30:03 +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.164631779629434 (code B ref 54216); Thu, 03 Mar 2022 14:30:03 +0000 Received: (at 54216) by debbugs.gnu.org; 3 Mar 2022 14:29:56 +0000 Received: from localhost ([127.0.0.1]:41960 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nPmSq-0007ef-A3 for submit@debbugs.gnu.org; Thu, 03 Mar 2022 09:29:56 -0500 Received: from mail-ej1-f50.google.com ([209.85.218.50]:38408) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nPmSo-0007eT-G8 for 54216@debbugs.gnu.org; Thu, 03 Mar 2022 09:29:55 -0500 Received: by mail-ej1-f50.google.com with SMTP id r13so11073518ejd.5 for <54216@debbugs.gnu.org>; Thu, 03 Mar 2022 06:29:54 -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=SKouk2NeITzvyMLMqUltyfSZ8hykeb3Ml1ToudiOYs4=; b=P2wTE3YH6F0jdbD4rB3MBm7dF8U4hJ6JgZLacdLTp3a5JENto/RzLd+cV5NwZZ9nMF GSoXtb3ogw1dsxLQKtYVhbpIiz/bXC9W0EFElYU8q7vVb6jC43iXNz1MD1nynoyGxOSu LVAEAkKW6PsXt1WUMgdlBKLEDDYeaut2sebOqRqV65HHrNR+tYNGekG4LUWFpnQbWSzc 3gLFIt3S1F1Tkqj/3boXWQ5XhTuZ8OQqktR4kzHfIEnO4fTJgvyTV2SoinGdk++F9s6E VK2XJqTcJ/l5Yr6CpE4Il3YL4/XUCnc0Hn7itOsvn83N5l98Ax2hZkcwWHieQZtCvCBM 7Yzw== 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=SKouk2NeITzvyMLMqUltyfSZ8hykeb3Ml1ToudiOYs4=; b=szINkQwqwszSdN04Dx/jexafFgFLacFwWrIoh4LUBTIkP5V1Ff+dBZrqAhy9U0zy79 Lenqbaaa7Ey3xkmtFhQAag7a3dgN2NAxzhtiD4qJ+XJ8VdQYxssT56JLR3ojwvbNLPsy l/7ufB8S4kdjcqjqluoohkT2YM8RWYtkaMWpxieLc9BsFcbrHShdKp0sovJbiv33lcLD ZVR655K4zq+t9DjyDmQntDVXrfzmsRUmMzcb7xsIBPyBHVxxJrtpNAuNRYaEhutJGysw IiTGfXnwfh0lrbTP9bVmk9MEB1vedRlT7tSbGioYA41eeEUTql6+i3t8QgacT24kIgAV J53Q== X-Gm-Message-State: AOAM530n5AwUT45ZNWtC54v7h9/0a8kIirhcFSTHldeKqFkaNHE1FRwg 9Fe3I2mr19ju0rqDO/kyu8GhYEgnjKs= X-Google-Smtp-Source: ABdhPJy0zhXwJarHNPzvPmTe53MqrXRVCl1Jchbr1lpnzoPtqUm2fnor/x/u0NzY2TRcbIccevZI7Q== X-Received: by 2002:a17:906:8299:b0:6cf:3847:284b with SMTP id h25-20020a170906829900b006cf3847284bmr27242620ejx.682.1646317788378; Thu, 03 Mar 2022 06:29: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 n19-20020a1709067b5300b006ce36e2f6fdsm759214ejo.159.2022.03.03.06.29.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 03 Mar 2022 06:29:47 -0800 (PST) From: Attila Lendvai Date: Thu, 3 Mar 2022 15:28:39 +0100 Message-Id: <20220303142838.9991-1-attila@lendvai.name> X-Mailer: git-send-email 2.34.0 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-Country: US ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1646317817; 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=SKouk2NeITzvyMLMqUltyfSZ8hykeb3Ml1ToudiOYs4=; b=iaHvsZGsxvkqYHVIKgfnvancWha1nlH0ESSdcmKY3hZDVslUbV2FDhAnrabG8s2xIOOkEZ bo+BYEtBTelF+PvvWMpuBSbK3X0JEgxfST/cZMwDMhm8XPn4Ry4RSP6TrmCDwSKW/o6gRY h2XTChRyK9rq98jIcJjRkp18qYj0kIKrJjH8W7HZGpic2lrfjumgYp59QAbU7E5Pbqa0O0 frP+IHC9C50AgyJNAQK74DjWZONp3aBHOXpvBcFZ8ZWgQiJ4KLU11y2z4HVzSa9Ra7mH3S Drf1pWQk+2z2r+TpWK8VbbWZMGLQIJ+b0DJ9+745hfCHwcE4b4gvO0uogSW9tA== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1646317817; a=rsa-sha256; cv=none; b=pkO4eFxMsfebxdBNawYEmWAgTbMZ38yHk0TRzsDR/+TpsIC6gDHixpfYO0Ua/3q6lBPlaV 3i2xQ2FPpaEcIHsCo5FGWJxaoMnKNaTYshcnqcV4DOxA3qPVIp5kpAdlAa/en+wLa4xS3k M2YfCw/OJpP/tlqq+j3/utiYrbgQDtuZtYNm4+rkU9pBXt0p6Adci0oNRWyrTyBVPh+Sdp SqMEWvtGoOseNZW0PS+h1Ctu1eDurjySVVm8QiHoEc4INxH+LJoBkWqgoyZ19OGj6vghxz /z+mMAoAdqnmCsUiMrrN3rfPBIQRmT2qvIH+Et+gzS8E+3u3kEv2oIZbEUEYPQ== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20210112 header.b=P2wTE3YH; 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.33 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20210112 header.b=P2wTE3YH; 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: 1A8103D0D0 X-Spam-Score: 2.33 X-Migadu-Scanner: scn0.migadu.com X-TUID: Rx5MVfE0pVDU This cleanup is in a seprate patch because this one must go through staging. --- as promised, this is the cleanup patch for staging. gnu/packages/admin.scm | 70 +++++++++++++++++------------------------- 1 file changed, 28 insertions(+), 42 deletions(-) diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index dbceaca5e5..bcfef124d7 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -270,26 +270,31 @@ (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)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1hgkbl3fyzwi5vw63kbkswnf3viyfl52c5dzkx7vbkr4sj5ysz1g")) + (modules '((guix build utils))))) (build-system gnu-build-system) (arguments '(#:configure-flags '("--localstatedir=/var") - #:make-flags '("GUILE_AUTO_COMPILE=0"))) + #:make-flags '("GUILE_AUTO_COMPILE=0") + #:phases + (modify-phases %standard-phases + ;; TODO delete this once Guile is updated to v3.0.8+ + (add-after 'unpack 'patch-source + (lambda _ + ;; Build with -O1 to work around . + (substitute* "Makefile.am" + (("compile --target") + "compile -O1 --target"))))))) (native-inputs - (list pkg-config + (list autoconf automake gettext-minimal help2man texinfo pkg-config ;; This is the Guile we use as a cross-compiler... guile-3.0)) (inputs @@ -314,45 +319,26 @@ (define-public shepherd ;; [TODO] in the manual. (define-public shepherd-for-guix (let* ((version "0.8.1") - ;; If it's an unreleased commit: + ;; A commit string, or #f if it's a release. (commit "7c380590164ea8ee40de46059d07e08a48963577") - ;; Use the below form if it's a release, and also set REVISION to #f. - ;; (commit (string-append "v" version)) - (revision "1")) + (revision "1") ; Only relevant when COMMIT is specified. + (git-ref (or commit (string-append "v" version)))) (package (inherit shepherd) - (version (if revision + (version (if commit (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. + (commit git-ref))) (sha256 - (base32 - "1hgkbl3fyzwi5vw63kbkswnf3viyfl52c5dzkx7vbkr4sj5ysz1g")))) - ;; TODO merge this back into the parent with a patch to staging. - (arguments - (append - (package-arguments shepherd) - '(#:phases - (modify-phases %standard-phases - (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 + (base32 "1hgkbl3fyzwi5vw63kbkswnf3viyfl52c5dzkx7vbkr4sj5ysz1g")))) + (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 -- 2.34.0