Message ID | 7d9c1d64af2c747e68a9d78b955e1411bee99f90.1690641116.git.attila@lendvai.name |
---|---|
State | New |
Headers | show |
Series | [bug#61750] gnu: shepherd: Build Shepherd from git. | expand |
Ludo, any hope that this gets merged? i'm trying to debug something in shepherd (the SYSTEM call in shepherd misbehaves, but only when pulled on my server, not in a `guix system vm`). it will once again require me to use a custom shepherd, and pull/rebuild/reconfigure a gazillion times. as for this patch: the only issue i know is that it cannot be cross compiled 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. -- • attila lendvai • PGP: 963F 5D5F 45C7 DFCD 0A39 -- “He who flatters a man is his enemy. He who tells him of his faults is his maker.” — Confucius (551–479 BC)
Hi Attila,
Attila Lendvai <attila@lendvai.name> skribis:
> Ludo, any hope that this gets merged?
Apologies. I’m not convinced about the patch, mainly because I’ve been
using Shepherd as a channel for testing, which I think makes fine
details about the ‘shepherd’ package in Guix less interesting.
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 ‘guix system describe’ tells you
precisely which Shepherd commit you’re using.
WDYT?
Thanks,
Ludo’.
> Apologies. I’m not convinced about the patch, mainly because I’ve been > using Shepherd as a channel for testing, which I think makes fine > details about the ‘shepherd’ package in Guix less interesting. > > 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 ‘guix system describe’ tells you > precisely which Shepherd commit you’re using. > > 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 would work. please confirm my assumption: 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 points 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` tests, only when i pull stuff to my server (slow!). i have zero info on what goes 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, especially around its fork+exec-command calls. this is how i used to hack shepherd, when i need to test it in its real environment: i have a guix system test that i have extracted from the guix test suite. it defines an OPERATING-SYSTEM object that is run using `guix system vm`: https://github.com/attila-lendvai/guix-crypto/blob/main/tests/swarm-tests.scm a custom shepherd package is defined for this OS object by modifying its SHEPHERD-ROOT-SERVICE-TYPE. my custom shepherd package inherits from the shepherd package from guix, and replaces its source to point to my own shepherd checkout. for this to work, my local guix contains the patch to compile shepherd from git. this worked fine, but something broke my setup recently. it was that some heavy 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 recompiled locally, which is pohibitively slow (it's added to the edit-compile-run cycle). a tangential: i think these new dependencies are only needed for the CLI tools 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 from it 3) i give up on getting this merged, and try to keep a completely standalone shepherd package in sync with what's in guix. i also give up on adding detailed 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 waste 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 option 3) to achieve my goals.
> but after having read the README once again, i'm still not sure how this would work. please confirm my assumption: > > 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 points 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=~/workspace/guix/shepherd/.guix/modules:$GUILE_LOAD_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 all the changes in my shepherd checkout compiled in, and with a bearable turnaround time. note that this was not suggested in the README. i'll keep an eye on updating the docs to help others getting into shepherd hacking. thanks for your patience and help Ludo!
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 <https://issues.guix.gnu.org/58631>. - (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)