Merge branch 'devel' into 'main'

playing with qemu-minimal-upstream and guest-agent

See merge request glicid-public/guix-glicid!61

glicid/packages/admin.scm

@@ -17,6 +17,21 @@
 )
 
 
+(define-public shadow
+  (package
+    (inherit gnu:shadow)
+    (name "shadow")
+    (version "4.11.1")
+    (source (origin
+      (method url-fetch)
+      (uri (list
+        (string-append "https://github.com/shadow-maint/shadow/releases/download/v" version "/shadow-" version ".tar.xz")
+      ))
+      (sha256 (base32 "15bwf2krh4crj4w2frkzw9pkxiwbq7h56m8wk8w5zbmjb3797w21"))
+    ))
+  )
+)
+
 (define-public sudo
   (let* ((sudo-minimal gnu:sudo))
     (package

glicid/packages/containers.scm

@@ -20,7 +20,7 @@
   )
 )
 
-(define-public podman
+(define-public podman-4.1.0
   (package
     (inherit gnu:podman)
     (name "podman")

glicid/packages/virtualization.scm

@@ -11,28 +11,50 @@
 
 
 (define-public qemu-7.0-upstream
- (package
+  (package
     (inherit qemu)
     (name "qemu-upstream")
     (version "7.0.0")
-
+    (source (origin
-    (source
+      (method url-fetch)
-     (origin
+      (uri (string-append "https://download.qemu.org/qemu-" version ".tar.xz"))
-       (method url-fetch)
+      (sha256 (base32 "0fgq8szlc75ymgpxpkj47njqqiw65nxsl2wbg4188whzjp3pbczn"))
-       (uri (string-append "https://download.qemu.org/qemu-"
+      (patches (search-patches
-                           version ".tar.xz"))
+        "qemu-build-info-manual.patch"
-       (sha256
+        "qemu-fix-agent-paths.patch"
-	(base32
+      ))
-         "0fgq8szlc75ymgpxpkj47njqqiw65nxsl2wbg4188whzjp3pbczn"))
+      (modules '((guix build utils)))
-       (patches (search-patches "qemu-build-info-manual.patch"
+      (snippet
-                                "qemu-fix-agent-paths.patch"))
-       (modules '((guix build utils)))
-       (snippet
         '(begin
            ;; Delete the bundled meson copy.
-           (delete-file-recursively "meson")))))
+           (delete-file-recursively "meson")
-
+        )
+      )
+    ))
+  )
+)
 
+(define-public qemu-minimal-7.0-upstream
+  (package
+    (inherit qemu-minimal)
+    (name "qemu-minimal-upstream")
+    (version "7.0.0")
+    (source (origin
+      (method url-fetch)
+      (uri (string-append "https://download.qemu.org/qemu-" version ".tar.xz"))
+      (sha256 (base32 "0fgq8szlc75ymgpxpkj47njqqiw65nxsl2wbg4188whzjp3pbczn"))
+      (patches (search-patches
+        "qemu-build-info-manual.patch"
+        "qemu-fix-agent-paths.patch"
+      ))
+      (modules '((guix build utils)))
+      (snippet
+        '(begin
+           ;; Delete the bundled meson copy.
+           (delete-file-recursively "meson")
+        )
+      )
+    ))
   )
 )
 
@@ -40,6 +62,9 @@
 
 (define qemu-latest (latest-version local-qemu qemu))
 
+(define local-qemu-minimal qemu-minimal-7.0-upstream)
+
+(define qemu-minimal-latest (latest-version local-qemu-minimal qemu-minimal))
 
 (define-public qemu-with-rbd
   (package
@@ -60,7 +85,7 @@
 
 (define-public qemu-minimal-with-rbd
   (package
-    (inherit qemu-minimal) 
+    (inherit qemu-minimal-latest) 
     (name "qemu-minimal-with-rbd")
     (arguments
       (substitute-keyword-arguments `(