guixsd-config

commit 6e2829d166b6e99b291284f6129376b2257b1b4c
parent b9392807cb2a5a29f9b39be6569787d1d3843cf2
Author: Vineet Kumar <git@vineetk.net>
Date:   Sun,  1 Mar 2026 15:55:48 -0500

update guix and nonguix channels

Diffstat:
M
epistemia/channels.scm
 | 
4
++--
M
epistemia/packages/zfs.scm
 | 
10
+---------
M
epistemia/systems/demiurge.scm
 | 
2
+-
M
epistemia/systems/install-iso.scm
 | 
2
+-
M
epistemia/systems/saklas.scm
 | 
2
+-

5 files changed, 6 insertions(+), 14 deletions(-)
diff --git a/epistemia/channels.scm b/epistemia/channels.scm
@@ -11,7 +11,7 @@
         (url "https://codeberg.org/nonguix/nonguix-mirror")
         (branch "master")
         (commit
-         "48a8706d44040cc7014f36873dbd834c048aadd3")
+         "da4e72efef62d48dbc2eb089c36972ff55fe6acd")
         (introduction
          (make-channel-introduction
           "897c1a470da759236cc11798f4e0a5f7d4d59fbc"
@@ -22,7 +22,7 @@
         (url "https://codeberg.org/guix/guix")
         (branch "master")
         (commit
-         "5429b9a1f9756d78564e905bcc9721bf9bd73976")
+         "556fed9c76bd3b902656abf5ec92af2f4d9497e6")
         (introduction
          (make-channel-introduction
           "9edb3f66fd807b096b48283debdcddccfea34bad"
diff --git a/epistemia/packages/zfs.scm b/epistemia/packages/zfs.scm
@@ -10,14 +10,6 @@
   (package
     (inherit zfs)
     (name "zfs-linux")
-    (version "2.4.0") ;; not packaged in upstream guix yet
-    (source
-     (origin
-       (method url-fetch)
-       (uri (string-append "https://github.com/openzfs/zfs/releases/download/zfs-"
-                           version "/zfs-" version ".tar.gz"))
-       (sha256
-        (base32 "1vn9fnpi279vb5y3pdplshq6qy2hixg7vr73q1a5bnbi1bg17pvv"))))
     (arguments
      (substitute-keyword-arguments (package-arguments zfs)
-       ((#:linux _ #f) linux-6.17)))))
+       ((#:linux _ #f) linux-6.18)))))
diff --git a/epistemia/systems/demiurge.scm b/epistemia/systems/demiurge.scm
@@ -57,7 +57,7 @@
                  (supplementary-groups '("wheel" "audio" "video" "input" "seat" "tty" "cgroup"))) ;; TODO remove docker
 	       %base-user-accounts))
 
-  (kernel linux-6.17)
+  (kernel linux-6.18)
   (kernel-arguments (list "net.ifnames=0" "modprobe.blacklist=snd_hda_intel"))
   (kernel-loadable-modules (list (list zfs-linux "module")))
 
diff --git a/epistemia/systems/install-iso.scm b/epistemia/systems/install-iso.scm
@@ -9,7 +9,7 @@
 (define zfs-installation-os
   (operating-system
     (inherit installation-os)
-    (kernel linux-6.17)
+    (kernel linux-6.18)
     (kernel-loadable-modules (list (list zfs-linux "module")))
     (packages (append (list zfs-linux)
                       (operating-system-packages installation-os)))))
diff --git a/epistemia/systems/saklas.scm b/epistemia/systems/saklas.scm
@@ -216,7 +216,7 @@ table inet filter {
 		   (name "vmail"))
 		 %base-groups))
 
-  (kernel linux-6.17)
+  (kernel linux-6.18)
   (kernel-arguments (list "net.ifnames=0"))
   (kernel-loadable-modules (list (list zfs-linux "module")))