From debbugs-submit-bounces@debbugs.gnu.org Fri Feb 24 09:06:33 2023 Received: (at submit) by debbugs.gnu.org; 24 Feb 2023 14:06:33 +0000 Received: from localhost ([127.0.0.1]:36379 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pVYiX-0006zO-5H for submit@debbugs.gnu.org; Fri, 24 Feb 2023 09:06:33 -0500 Received: from lists.gnu.org ([209.51.188.17]:45134) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pVYiV-0006zG-Lu for submit@debbugs.gnu.org; Fri, 24 Feb 2023 09:06:32 -0500 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 1pVYiU-0000SV-HC for guix-patches@gnu.org; Fri, 24 Feb 2023 09:06:30 -0500 Received: from mail-ed1-x52c.google.com ([2a00:1450:4864:20::52c]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pVYiS-0000ix-BI for guix-patches@gnu.org; Fri, 24 Feb 2023 09:06:30 -0500 Received: by mail-ed1-x52c.google.com with SMTP id cq23so54927079edb.1 for ; Fri, 24 Feb 2023 06:06:27 -0800 (PST) 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:message-id:reply-to; bh=lNv4PeQUBX2s86eTmG2NspXuE6EL0JLweCbfhhOpeGM=; b=XSI9qKEKE84GE5dDCFKWxbNtWAs0dFvxBlhDXy+P12mzx3DaHvVV2WwEFesEQIN8n7 kUhFtT4og9JvgQjqcIJZy69oR6IXghneXGg30uzwlCfKa4DW83toNlKQ/2GdvXj8Kx14 hUBgINKGR4/1QCXjXCUBceC5xYf9TSHyNVO3fUs7YE5oAb8VCjouJ+ZjheALRYc5CMkA TPMqPnpEW9KTsND1Y9wQD9BtXSjdrmT82npz427Y3OsQxQIzTjqNJdr1KY58fHEO7NEm btPwC/Bmhcdf3tC5gK/JgpZngpsCyJylPLAw3hTO/rffZAu195NkGuTt5iTJrqVgZtUd qTmQ== 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 :message-id:reply-to; bh=lNv4PeQUBX2s86eTmG2NspXuE6EL0JLweCbfhhOpeGM=; b=Au/gE87WOGWIUWfBNXvT0YlbsvYmWlXUEOokhDfBuLgtAFYipflctU+2P4cJldimVR S9urCwiB6fvbfO32J0uXqwRC9YNHyHUjB+I/xYamdh8jUSUy48NshugIwYlDbFNx45Ng GeMVTxmALg6+8mHP3HvtrXKXWC+FvdmEzRRbLuVpa+jQ+MeRq05KFGiCrzYzFFEjLYBs REwahJD7sWwMh1wPx0r41FzeBFyVHfW5AOKhAzKCyB2VaGJxHxYEo8LsMkh2KSLXBuaD ScUIZcYr8++GDwIwHZ2lzS5mMVo/2kFge6/RmNwQuNGnbotU0PCeXowqPYW0e9ivsziR 7IXg== X-Gm-Message-State: AO0yUKUMhzi7y+FYP3JpoqtG2RXBcTuxFLluhKj3WAZbfBIVO68J+KJg xypEZLn0LVDvovR/UWfe6xkXSUWT4Fs= X-Google-Smtp-Source: AK7set+UyFBEAAtYNs2SMpKBUZqs5UywK8EIaYwfOsqwZLcz4gNGSmzXZC7qQHkjlvb5hQN5V4XbjQ== X-Received: by 2002:a17:907:60d4:b0:8e1:cc38:6e78 with SMTP id hv20-20020a17090760d400b008e1cc386e78mr16765249ejc.39.1677247585658; Fri, 24 Feb 2023 06:06:25 -0800 (PST) Received: from lelap.lan (catv-80-98-247-145.catv.fixed.vodafone.hu. [80.98.247.145]) by smtp.gmail.com with ESMTPSA id de30-20020a1709069bde00b008d57e796dcbsm6166398ejc.25.2023.02.24.06.06.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 24 Feb 2023 06:06:25 -0800 (PST) From: Attila Lendvai To: guix-patches@gnu.org Subject: [PATCH 1/2] gnu: shepherd: Build Shepherd from git. Date: Fri, 24 Feb 2023 15:02:43 +0100 Message-Id: <20230224140243.15315-1-attila@lendvai.name> X-Mailer: git-send-email 2.38.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=2a00:1450:4864:20::52c; envelope-from=attila.lendvai@gmail.com; helo=mail-ed1-x52c.google.com X-Spam_score_int: -14 X-Spam_score: -1.5 X-Spam_bar: - X-Spam_report: (-1.5 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.25, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.25, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-Spam-Score: -1.1 (-) X-Debbugs-Envelope-To: submit Cc: Attila Lendvai X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.1 (--) 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.9): Source points to the git repo; adjust native-inputs accordingly. Also delete the strip build phase. --- the first commit works, except when cross-compiling: help2man wants to run the foreign binary, and fails. the second commit is a WIP attempt to get the compiled man pages from the native package when cross compiling. it's not ready, but i got stuck at needing to gunzip the man pages, and where to put them to convince the makefile to not execute help2man, etc. my suggestion is to simply get rid of the not-very-useful auto generated man page to fix cross-compilation. if that's not desirable, then the second commit needs to be polished, or implemented some other way. gnu/packages/admin.scm | 28 +++++++++++++++++----------- 1 file changed, 17 insertions(+), 11 deletions(-) diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index d4cc8ca6ca..91f98bf48e 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -335,12 +335,13 @@ (define-public shepherd-0.9 (inherit shepherd) (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") @@ -360,12 +361,17 @@ (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 guile2.2-shepherd (package -- 2.38.1 From debbugs-submit-bounces@debbugs.gnu.org Fri Feb 24 09:08:10 2023 Received: (at 61750) by debbugs.gnu.org; 24 Feb 2023 14:08:10 +0000 Received: from localhost ([127.0.0.1]:36384 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pVYk5-00072C-SF for submit@debbugs.gnu.org; Fri, 24 Feb 2023 09:08:10 -0500 Received: from mail-ed1-f49.google.com ([209.85.208.49]:37739) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pVYk3-00071l-M4 for 61750@debbugs.gnu.org; Fri, 24 Feb 2023 09:08:08 -0500 Received: by mail-ed1-f49.google.com with SMTP id d30so13992850eda.4 for <61750@debbugs.gnu.org>; Fri, 24 Feb 2023 06:08:07 -0800 (PST) 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:message-id:reply-to; bh=jQo/wNFHulOYlFFgPFqyciUNMTAGHCvwEzLYNMAhuHo=; b=DtYFMS0wQh8Q6ceff5jJZYWSkFiUGKngb0idy2B0pSj/YifJpUyRPQb+lJVVMLaSRU VAebY0fKxhb7F6LnYHZjl0Z7MTepQYKjbKWWM5lKUZNpG4aRml44UYq0HSBYMcYS/fxC jn6blIaMDDkaVtjPS4YarOnsYD78ufnEuOMkp+JtwkzzFugdam/AuCs5viO6Xsfaryxh txww21RjC+D2n6zsQtXesttsa9uGTOWqldf0kGJo8otRUpE8d8XxUuffDcsqcCLfOsB9 jlsNxhinwUVWis8KVGgrXUQ1QqEMGi8T4r8MYWYFnPzN04L7Xjl4qND3ZjW1BlMPqDgY 5peQ== 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 :message-id:reply-to; bh=jQo/wNFHulOYlFFgPFqyciUNMTAGHCvwEzLYNMAhuHo=; b=Cy2+UvAdXDUXP0+QVZ18B8dgZu7xF8t3aV+W3EnpfnHhQvarWOOCvpxjcJvAzFq1BX gOcgxnS41isAkHcjzA3MU0uyYcZAKLhC+z5vHpZPLf5gtpt+nYxVE5DyX8L+d231uACm Ny9f7Y5rZ7TyZ7lnuWfnlCuopHEa0BNKplCsQr5nZh2AHmC38xl8AYqdHXis00LkjchG OFw9Hz6roKobKVerZngYpQCLAtBvBPdjC1uIo6/KZ1m2Yyj2eb9bygx959XLdKLx1TbO W7bMQUjd7ffbww9csgaB3rSaKUOYMlDvqbjDzIGxp9PaOOZYh2qz4qY2czj28HoFEc2V 82+Q== X-Gm-Message-State: AO0yUKUcJvvq2XXYpBM7JYtWQIhk3qJgXZOEqLJhn+covAIjrsSnoiBx xziJ2Aa+xYOCpqChQR+dblmG8T1Cj3U= X-Google-Smtp-Source: AK7set8w0BwjeFTHuPLSPXhOcIMcctLZP92JTQh2W9dFj+zU75TPm+ajdZQ8rScX5NUw9T0ZgD8vkA== X-Received: by 2002:a17:906:1557:b0:8de:a8c:403c with SMTP id c23-20020a170906155700b008de0a8c403cmr14485535ejd.58.1677247681485; Fri, 24 Feb 2023 06:08:01 -0800 (PST) Received: from lelap.lan (catv-80-98-247-145.catv.fixed.vodafone.hu. [80.98.247.145]) by smtp.gmail.com with ESMTPSA id m11-20020a50930b000000b004a27046b7a7sm7260905eda.73.2023.02.24.06.08.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 24 Feb 2023 06:08:01 -0800 (PST) From: Attila Lendvai To: 61750@debbugs.gnu.org Subject: [PATCH 2/2] WIP failing attempt to get the man page while cross-compiling Date: Fri, 24 Feb 2023 15:07:42 +0100 Message-Id: <20230224140740.16494-2-attila@lendvai.name> X-Mailer: git-send-email 2.38.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.2 (/) X-Debbugs-Envelope-To: 61750 Cc: Attila Lendvai X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.8 (/) --- gnu/packages/admin.scm | 48 +++++++++++++++++++++++++++++++++--------- 1 file changed, 38 insertions(+), 10 deletions(-) diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index 91f98bf48e..6e5082e612 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -343,7 +343,7 @@ (define-public shepherd-0.9 (sha256 (base32 "1pvdpx2mfki8wvhcac54p8fn5idqszicww60ikswszz2cv5d0s11")))) (arguments - (list #:configure-flags #~'("--localstatedir=/var") + (list #:configure-flags #~'("HELP2MAN=true --localstatedir=/var") #:make-flags #~'("GUILE_AUTO_COMPILE=0") #:phases (if (%current-target-system) #~(modify-phases %standard-phases @@ -359,17 +359,45 @@ (define-public shepherd-0.9 (("%FIBERS_OBJECT_DIRECTORY%") #$(file-append (this-package-input "guile-fibers") - "/lib/guile/3.0/site-ccache")))))) + "/lib/guile/3.0/site-ccache"))))) + (add-after 'configure 'copy-man-pages + (lambda* (#:key outputs native-inputs #:allow-other-keys) + ;; Cannot run help2man when cross-compiling, + ;; so let's copy the man pages from the native + ;; build. + (let ((gzip (search-input-file native-inputs + "bin/gzip"))) + ;; TODO + (pk #$(file-append + (this-package-input this-package) + "/man/shepherd.1.gz")) + (invoke gzip "--decompress" "--stdout" + #$(file-append + (this-package-input this-package) + "/man/shepherd.1.gz") + ">doc/shepherd.1")) + #;(copy-file #$(file-append + (this-package-input this-package) + "/man/shepherd.1") + (string-append + (assoc-ref outputs "out") + "/man/shepherd.1")) + #f))) #~%standard-phases))) (native-inputs - (list autoconf - automake - gettext-minimal - guile-3.0 - guile-fibers-1.1 ; for cross-compilation - help2man - pkg-config - texinfo)) + (cons* autoconf + automake + gettext-minimal + guile-3.0 + guile-fibers-1.1 ; for cross-compilation + help2man + pkg-config + texinfo + ;; for the help2man man page when cross-compiling + (if (%current-target-system) + (list gzip + this-package) + '()))) (inputs (list guile-3.0 guile-fibers-1.1)))) -- 2.38.1 From debbugs-submit-bounces@debbugs.gnu.org Sat Jul 29 10:34:57 2023 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 To: 61750@debbugs.gnu.org Subject: [PATCH] gnu: shepherd: Build Shepherd from git. 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 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 61750 Cc: Attila Lendvai X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) 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(-) 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) 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 -- 2.40.1 From debbugs-submit-bounces@debbugs.gnu.org Tue Oct 31 13:04:48 2023 Received: (at 61750) by debbugs.gnu.org; 31 Oct 2023 17:04:48 +0000 Received: from localhost ([127.0.0.1]:49068 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qxsAa-0004fe-2D for submit@debbugs.gnu.org; Tue, 31 Oct 2023 13:04:48 -0400 Received: from mail-4022.proton.ch ([185.70.40.22]:46973) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qxsAX-0004fP-5T for 61750@debbugs.gnu.org; Tue, 31 Oct 2023 13:04:47 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=lendvai.name; s=protonmail3; t=1698771843; x=1699031043; bh=47truDIY1Lrs0DjK+4fSHu+v2u3/IeYHvmzOtc1ZJbo=; h=Date:To:From:Cc:Subject:Message-ID:In-Reply-To:References: Feedback-ID:From:To:Cc:Date:Subject:Reply-To:Feedback-ID: Message-ID:BIMI-Selector; b=Kk1xvmQzozbndDTZJfiNE1l/CW1yyw+s5mOv6cjy66JBHmzDngcArd+WlJAAtMopi 43J/P/oQNjBmzzdzCZQbxsHa8xGDYlxIdhXLNVW4dFcHS1a4MJ/dN1ROunDKZT0Pcr YNjCP8Mkmo41D7UEQsn+28SRAtL2i4HY7OAvvqakb+HrRMUGrP26V4MR/weEohZojS cum9BEaHl0QonyRLTOVEkThTmbk4fzXlbLNB/vWrbUstOpGqdZfJLDWsK1rwXU5eIP P5aFIfq04epuWU/D3194SsvHMeP5EdO9Q9eBC8+oO214Mc1O/pWfmYCyPob+fKi+gx 9tEhvsarS9QGA== Date: Tue, 31 Oct 2023 17:03:57 +0000 To: =?utf-8?Q?Ludovic_Court=C3=A8s?= From: Attila Lendvai Subject: Re: [PATCH] gnu: shepherd: Build Shepherd from git. Message-ID: <1Lbh6LTUAZI1rid93lHYEmdZBeToprn9DZBarBpj5-WQnOYRdJ7oaUAoAumjFsr8cOmX8XOTci4g_jcbTGEtYKe6qTf-Nk8lFK7D-0NYpzs=@lendvai.name> In-Reply-To: <7d9c1d64af2c747e68a9d78b955e1411bee99f90.1690641116.git.attila@lendvai.name> References: <7d9c1d64af2c747e68a9d78b955e1411bee99f90.1690641116.git.attila@lendvai.name> Feedback-ID: 28384833:user:proton MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 61750 Cc: 61750@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Ludo, any hope that this gets merged? i'm trying to debug something in shepherd (the SYSTEM call in shepherd misb= ehaves, but only when pulled on my server, not in a `guix system vm`). it w= ill once again require me to use a custom shepherd, and pull/rebuild/reconf= igure a gazillion times. as for this patch: the only issue i know is that it cannot be cross compile= d because of the help2man call. if you ask me, i would just get rid of that= altogether. it's just added complexity for little gain. -- =E2=80=A2 attila lendvai =E2=80=A2 PGP: 963F 5D5F 45C7 DFCD 0A39 -- =E2=80=9CHe who flatters a man is his enemy. He who tells him of his faults= is his maker.=E2=80=9D =09=E2=80=94 Confucius (551=E2=80=93479 BC) From debbugs-submit-bounces@debbugs.gnu.org Sun Nov 05 09:47:52 2023 Received: (at 61750) by debbugs.gnu.org; 5 Nov 2023 14:47:52 +0000 Received: from localhost ([127.0.0.1]:36406 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qzePo-00054b-8W for submit@debbugs.gnu.org; Sun, 05 Nov 2023 09:47:52 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:38342) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qzePl-00054O-H6 for 61750@debbugs.gnu.org; Sun, 05 Nov 2023 09:47:50 -0500 Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qzeP5-0004Fq-2n; Sun, 05 Nov 2023 09:47:07 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:Date:References:In-Reply-To:Subject:To: From; bh=4DHsakj+a2JJb0no0Pch3+NUiN82RxOXSEeGHn3kEvQ=; b=nuKmev0p4wIxCh79cuAp VtMkfv8pd1EKuUBUvv4f2SK6yXUDwUZzisrKfMrewjSlM8Brac1N5KUg1OR31WbKYCe1ihO0L7JPL qbQpMdeF1uBbVFpXgqAjTXxCtgGxegAaBr/JFmtMt1ovgqkUmP/7VBXYHTHQ72odjTu6HkYtOnu22 8jMltivmo1gnndD8PzeJCCbLi8uc1VeGrdAy0VeRP5Mx3cu8Tztk4LH70phiYR2S7f36Mik4LQEHX Ho5VCPAbICaAUyPWilQ84ueJqCPsc0Z58oyQfsrG+x9QUibOg1HG2YSDI7qnYmWGmxiKDTrW2x5AA k2l0SyfFCFOykA==; From: =?utf-8?Q?Ludovic_Court=C3=A8s?= To: Attila Lendvai Subject: Re: [bug#61750] [PATCH] gnu: shepherd: Build Shepherd from git. In-Reply-To: <1Lbh6LTUAZI1rid93lHYEmdZBeToprn9DZBarBpj5-WQnOYRdJ7oaUAoAumjFsr8cOmX8XOTci4g_jcbTGEtYKe6qTf-Nk8lFK7D-0NYpzs=@lendvai.name> (Attila Lendvai's message of "Tue, 31 Oct 2023 17:03:57 +0000") References: <7d9c1d64af2c747e68a9d78b955e1411bee99f90.1690641116.git.attila@lendvai.name> <1Lbh6LTUAZI1rid93lHYEmdZBeToprn9DZBarBpj5-WQnOYRdJ7oaUAoAumjFsr8cOmX8XOTci4g_jcbTGEtYKe6qTf-Nk8lFK7D-0NYpzs=@lendvai.name> Date: Sun, 05 Nov 2023 15:47:03 +0100 Message-ID: <87o7g81cm0.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 61750 Cc: 61750@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) Hi Attila, Attila Lendvai skribis: > Ludo, any hope that this gets merged? Apologies. I=E2=80=99m not convinced about the patch, mainly because I=E2= =80=99ve been using Shepherd as a channel for testing, which I think makes fine details about the =E2=80=98shepherd=E2=80=99 package in Guix less interesti= ng. For info on how to do that, see: https://git.savannah.gnu.org/cgit/shepherd.git/tree/README The added bonus when doing this is that =E2=80=98guix system describe=E2=80= =99 tells you precisely which Shepherd commit you=E2=80=99re using. WDYT? Thanks, Ludo=E2=80=99. From debbugs-submit-bounces@debbugs.gnu.org Mon Nov 13 04:40:05 2023 Received: (at 61750) by debbugs.gnu.org; 13 Nov 2023 09:40:05 +0000 Received: from localhost ([127.0.0.1]:57520 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r2TQK-0004N8-VB for submit@debbugs.gnu.org; Mon, 13 Nov 2023 04:40:05 -0500 Received: from mail-4018.proton.ch ([185.70.40.18]:34239) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r2TQE-0004MU-MC for 61750@debbugs.gnu.org; Mon, 13 Nov 2023 04:40:03 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=lendvai.name; s=protonmail3; t=1699868350; x=1700127550; bh=XrbwcBP8g4LsmiAQvHVOpjqU9ZOId/vpUet01ptP4zI=; h=Date:To:From:Cc:Subject:Message-ID:In-Reply-To:References: Feedback-ID:From:To:Cc:Date:Subject:Reply-To:Feedback-ID: Message-ID:BIMI-Selector; b=YUXHSNC1NKQMHF7s9T1SzyUwPohPSTG3HlDula3QO0BjUg3KuQDNAQmgTyBTRh+ZS cordaiFfpDUmba6T7C0NZ3MW1jxeclFEmn+qOugnSWX6IL7HlfeBBbNGE46e9EHuwh EgZreWQ5VR6uoZkivPX8fxN8+LSDs2gESkqImY+iV0CRjdePkkl2ActypWTkUr6GrM ofkZJ1jZy/q5YufJpghrDnY0trOBzlgnYMaIf2D8CryJOxAAY+KL+8XthSG2hV0kcd yvEEqh0+UTVjdBVROHCUs5EOzLxddNk3Dw7IUe6J7w8A3maMNdMNihvgYHqX31V7TS ckoITa57wcaoA== Date: Mon, 13 Nov 2023 09:38:52 +0000 To: =?utf-8?Q?Ludovic_Court=C3=A8s?= From: Attila Lendvai Subject: Re: [bug#61750] [PATCH] gnu: shepherd: Build Shepherd from git. Message-ID: In-Reply-To: <87o7g81cm0.fsf@gnu.org> References: <7d9c1d64af2c747e68a9d78b955e1411bee99f90.1690641116.git.attila@lendvai.name> <1Lbh6LTUAZI1rid93lHYEmdZBeToprn9DZBarBpj5-WQnOYRdJ7oaUAoAumjFsr8cOmX8XOTci4g_jcbTGEtYKe6qTf-Nk8lFK7D-0NYpzs=@lendvai.name> <87o7g81cm0.fsf@gnu.org> Feedback-ID: 28384833:user:proton MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 61750 Cc: 61750@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) > Apologies. I=E2=80=99m not convinced about the patch, mainly because I= =E2=80=99ve been > using Shepherd as a channel for testing, which I think makes fine > details about the =E2=80=98shepherd=E2=80=99 package in Guix less interes= ting. >=20 > For info on how to do that, see: >=20 > https://git.savannah.gnu.org/cgit/shepherd.git/tree/README >=20 > The added bonus when doing this is that =E2=80=98guix system describe= =E2=80=99 tells you > precisely which Shepherd commit you=E2=80=99re using. >=20 > WDYT? ouch, we've been here before, sorry for my loss of memory! but after having read the README once again, i'm still not sure how this wo= uld work. please confirm my assumption: if i add shepherd as a channel, then i unavoidably need to issue a `guix pu= ll` (slow!) before i can test any shepherd changes, even if the channel poi= nts to a local checkout. also, i need to record any pending changes that i = want to test into a git commit. this is my objective: - be able to edit files in a shepherd checkout - issue a command that runs a vm with my shepherd changes included - keep this cycle reasonably fast to avoid frustration my ultimate objective: fix a shepherd-action bug that doesn't manifest in my `guix system vm` test= s, only when i pull stuff to my server (slow!). i have zero info on what go= es wrong besides a non-zero return code from tar that my action invokes. to= gain more info i'm planning to add extensive logging to shepherd, especial= ly around its fork+exec-command calls. this is how i used to hack shepherd, when i need to test it in its real env= ironment: i have a guix system test that i have extracted from the guix test suite. i= t defines an OPERATING-SYSTEM object that is run using `guix system vm`: https://github.com/attila-lendvai/guix-crypto/blob/main/tests/swarm-tests.s= cm a custom shepherd package is defined for this OS object by modifying its SH= EPHERD-ROOT-SERVICE-TYPE. my custom shepherd package inherits from the shepherd package from guix, an= d replaces its source to point to my own shepherd checkout. for this to wor= k, my local guix contains the patch to compile shepherd from git. this worked fine, but something broke my setup recently. it was that some h= eavy packages started to depend on shepherd, which means that if i include = my patch to compile shepherd from git, then all those packages need to be r= ecompiled locally, which is pohibitively slow (it's added to the edit-compi= le-run cycle). a tangential: i think these new dependencies are only needed for the CLI to= ols provided by the shepherd package. splitting shepherd into two packages = (CLI tools and service) would also resolve this problem of mine. possible solutions: 1) i learn some better way to hack on shepherd 2) shepherd in guix is compiled from git, so that i can easily inherit fro= m it 3) i give up on getting this merged, and try to keep a completely standalo= ne shepherd package in sync with what's in guix. i also give up on adding d= etailed instructions to the docs on how to hack on shepherd (https://issues= .guix.gnu.org/54199). i'd appreciate some guidance on how to proceed from here. i don't want to w= aste anyone's time further with this. if this change is not welcome in guix= proper, then reject the patch and i'll try to find another way (probably o= ption 3) to achieve my goals. --=20 =E2=80=A2 attila lendvai =E2=80=A2 PGP: 963F 5D5F 45C7 DFCD 0A39 -- =E2=80=9CThink what you do when you run in debt; you give to another power = over your liberty.=E2=80=9D =09=E2=80=94 Benjamin Franklin (1706=E2=80=931790), 'The Way to Wealth' (17= 58) From debbugs-submit-bounces@debbugs.gnu.org Fri Nov 17 10:27:02 2023 Received: (at 61750) by debbugs.gnu.org; 17 Nov 2023 15:27:02 +0000 Received: from localhost ([127.0.0.1]:46995 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r40kI-0003kQ-K0 for submit@debbugs.gnu.org; Fri, 17 Nov 2023 10:27:02 -0500 Received: from mail-4323.proton.ch ([185.70.43.23]:16043) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r40kE-0003ju-VR for 61750@debbugs.gnu.org; Fri, 17 Nov 2023 10:27:01 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=lendvai.name; s=protonmail3; t=1700234810; x=1700494010; bh=izFSPzdcmpJLFOmAiOCccCIXIKhqyIefwpd6/iTdbMU=; h=Date:To:From:Cc:Subject:Message-ID:In-Reply-To:References: Feedback-ID:From:To:Cc:Date:Subject:Reply-To:Feedback-ID: Message-ID:BIMI-Selector; b=FiIG12YN9XtC9kbmpkQpmvSTqpAPC3rA71tZnc2znuV2M5ZxZPH3wIXSzTSNcIR5b GjD35IhmsiWpxtwrI0oXcvZDtNw7lmJucgLzp2IBLkfofkRn1E6lYQV1iDLeRlgu8j IzqF0v1wLvXeh4zcHXwas4GT0wZIRmgxppiZOuJCHYwoZQleCjoFsB8iQxeIBvJX2c 6tMDFYFfbzCEsAGTVdRrlf9BJqdH7WbLFpwtMS2VVgq5oAM0YMk0Oy6cMuAbJs3GgU 1YoxPqiq2nV8soU674KT821BPNOQHAl0JSkBTV43J+3CN3MwBgLtYlRr6kzI0VERLg MdUM7HEXYy/Gw== Date: Fri, 17 Nov 2023 15:26:32 +0000 To: =?utf-8?Q?Ludovic_Court=C3=A8s?= From: Attila Lendvai Subject: Re: [bug#61750] [PATCH] gnu: shepherd: Build Shepherd from git. Message-ID: In-Reply-To: References: <7d9c1d64af2c747e68a9d78b955e1411bee99f90.1690641116.git.attila@lendvai.name> <1Lbh6LTUAZI1rid93lHYEmdZBeToprn9DZBarBpj5-WQnOYRdJ7oaUAoAumjFsr8cOmX8XOTci4g_jcbTGEtYKe6qTf-Nk8lFK7D-0NYpzs=@lendvai.name> <87o7g81cm0.fsf@gnu.org> Feedback-ID: 28384833:user:proton MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 61750 Cc: 61750@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) > but after having read the README once again, i'm still not sure how this = would work. please confirm my assumption: >=20 > if i add shepherd as a channel, then i unavoidably need to issue a `guix = pull` (slow!) before i can test any shepherd changes, even if the channel p= oints to a local checkout. also, i need to record any pending changes that = i want to test into a git commit. FTR, i've made progress, and i think i'm back to my original routine. what i was missing is adding this to my guix .envrc: export GUILE_LOAD_PATH=3D~/workspace/guix/shepherd/.guix/modules:$GUILE_LOA= D_PATH this then enables the following: (define *parent-shepherd-package* (@ (shepherd-package) shepherd)) with this shepherd package i can once again start a `guix system vm` with a= ll the changes in my shepherd checkout compiled in, and with a bearable tur= naround time. note that this was not suggested in the README. i'll keep an eye on updatin= g the docs to help others getting into shepherd hacking. thanks for your patience and help Ludo! --=20 =E2=80=A2 attila lendvai =E2=80=A2 PGP: 963F 5D5F 45C7 DFCD 0A39 -- =E2=80=9CWhen a wise man points at the moon the imbecile examines the finge= r.=E2=80=9D =09=E2=80=94 Confucius (551=E2=80=93479 BC)