diff options
| author | Marius Bakke <mbakke@fastmail.com> | 2020-04-23 13:33:09 +0200 |
|---|---|---|
| committer | Marius Bakke <mbakke@fastmail.com> | 2020-04-23 13:33:09 +0200 |
| commit | 030f6f489fe9544f35ebaf95135acd1dd67ce63f (patch) | |
| tree | f1d5d1f1b68de81daec6f05d032a0410a475d960 /gnu/packages/admin.scm | |
| parent | 95c14929a7fbd3c55c5e8756953c2f257625e2b7 (diff) | |
| parent | 938df0de739aa13c2fb483f440ec1db281a52aaa (diff) | |
| download | guix-030f6f489fe9544f35ebaf95135acd1dd67ce63f.tar.gz | |
Merge branch 'master' into core-updates
Conflicts: etc/news.scm gnu/local.mk gnu/packages/bootloaders.scm gnu/packages/linphone.scm gnu/packages/linux.scm gnu/packages/tls.scm gnu/system.scm
Diffstat (limited to 'gnu/packages/admin.scm')
| -rw-r--r-- | gnu/packages/admin.scm | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index 7105a09dd1..567c7cfb94 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -201,7 +201,7 @@ and provides a \"top-like\" mode (monitoring).") (define-public shepherd (package (name "shepherd") - (version "0.7.0") + (version "0.8.0") (source (origin (method url-fetch) (uri (string-append "mirror://gnu/shepherd/shepherd-" @@ -209,7 +209,7 @@ and provides a \"top-like\" mode (monitoring).") (patches (search-patches "shepherd-hurd.patch")) (sha256 (base32 - "07j3vd0y8zab2nwbrwj0ahrfif1ldm5sjssn7m3dw4s307fsrfzx")))) + "02lbc8z5gd8v8wfi4yh1zww8mk03w0zcwnmk4l4p3vpjlvlb63ll")))) (build-system gnu-build-system) (arguments '(#:configure-flags '("--localstatedir=/var"))) @@ -247,6 +247,16 @@ interface and is based on GNU Guile.") (define-public guile3.0-shepherd (deprecated-package "guile3.0-shepherd" shepherd)) +(define-public guile2.0-shepherd + (package + (inherit shepherd) + (name "guile2.0-shepherd") + (native-inputs + `(("pkg-config" ,pkg-config) + ("guile" ,guile-2.0))) + (inputs + `(("guile" ,guile-2.0))))) + (define-public cloud-utils (package (name "cloud-utils") |