Subject: [bug#61483] [PATCH 0/5] Some basic Home Shepherd Services

From: Jannneke Nieuwenhuizen <[email-masked]>
Date: Thu, 16 Mar 2023 16:21:27 +0100

Jan Nieuwenhuizen writes:

> Ludovic Courtès writes:
>
>> Janneke Nieuwenhuizen <[email-masked]> skribis:
>>
>>> From: "Janneke Nieuwenhuizen" <[email-masked]>
>>>
>>> * gnu/home/services/media.scm: New file.
>>> * gnu/local.mk (GNU_SYSTEM_MODULES): Add it.
>>> * doc/guix.texi (Media Home Services): Document it in new subsection.
>>
>> Please also add the new file to ‘po/guix/POTFILES.in’ so descriptions
>> can be translated.  Otherwise LGTM!
>
> Great, done.
>
>> In the meantime I realized I don’t have to push it on your behalf, so
>> I’ll let you take care of it—sorry for the confusion!
>
> Thanks, pushed to master as
>
>     70056b1b2beebbc9f8ea2c34eacc57f379368ab3

Well, it seems I added a dependency to the shepherd, module (shepherd
support), for things like

    %user-runtime-dir

I locally applied the attached patch to add Shepherd as an input (not
sure if that would be OK), but now `make update-guix-package' fails:

--8<---------------cut here---------------start------------->8---
$ make update-guix-package
git rev-parse HEAD
bd086f1718123a4d180aa6f2178828a83025ab35
./pre-inst-env "/gnu/store/f4w31qrim35yfnppacfmig491x1nwi3x-profile/bin/guile"			\
   ./build-aux/update-guix-package.scm	\
   "`git rev-parse HEAD`"
error: Failed to find the origin git remote.
make: *** [Makefile:7178: update-guix-package] Error 1
--8<---------------cut here---------------end--------------->8---

Not sure what to do, possibly best to revert the home services patches
again until we have (consensus on a) fix.

Greetings,
Janneke

>From bd086f1718123a4d180aa6f2178828a83025ab35 Mon Sep 17 00:00:00 2001
From: "Jan (janneke) Nieuwenhuizen" <[email-masked]>
Date: Thu, 16 Mar 2023 16:08:01 +0100
Subject: [PATCH] gnu: guix: Add shepherd as input dependency.

The home services depend on (shepherd support).

* gnu/packages/package-management.scm (guix)[inputs]: Add shepherd-0.9.
---
 gnu/packages/package-management.scm | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm
index d27c8a91ef..8a05955d1a 100644
--- a/gnu/packages/package-management.scm
+++ b/gnu/packages/package-management.scm
@@ -12,7 +12,7 @@
 ;;; Copyright © 2019-2023 Efraim Flashner <[email-masked]>
 ;;; Copyright © 2019 Jonathan Brielmaier <[email-masked]>
 ;;; Copyright © 2020 Mathieu Othacehe <[email-masked]>
-;;; Copyright © 2020 Jan (janneke) Nieuwenhuizen <[email-masked]>
+;;; Copyright © 2020, 2023 Jan (janneke) Nieuwenhuizen <[email-masked]>
 ;;; Copyright © 2020 Giacomo Leidi <[email-masked]>
 ;;; Copyright © 2020 Jesse Gibbons <[email-masked]>
 ;;; Copyright © 2020 Martin Becze <[email-masked]>
@@ -41,6 +41,7 @@ (define-module (gnu packages package-management)
   #:use-module (gnu artwork)
   #:use-module (gnu packages)
   #:use-module (gnu packages acl)
+  #:use-module (gnu packages admin)
   #:use-module (gnu packages attr)
   #:use-module (gnu packages avahi)
   #:use-module (gnu packages autotools)
@@ -462,7 +463,8 @@ (define code
          ("disarchive" ,disarchive)               ;for 'guix perform-download'
          ("guile-lzma" ,guile-lzma)               ;for Disarchive
 
-         ("glibc-utf8-locales" ,glibc-utf8-locales)))
+         ("glibc-utf8-locales" ,glibc-utf8-locales)
+         ("shepherd" ,shepherd-0.9)))
       (propagated-inputs
        `(("guile-gnutls" ,guile-gnutls)
          ;; Avahi requires "glib" which doesn't cross-compile yet.
-- 
2.39.1

-- 
Janneke Nieuwenhuizen <[email-masked]>  | GNU LilyPond https://LilyPond.org
Freelance IT https://www.JoyOfSource.com | Avatar® https://AvatarAcademy.com