about summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--.guix-channel24
-rw-r--r--.guix/modules/gn-libs.scm2
2 files changed, 21 insertions, 5 deletions
diff --git a/.guix-channel b/.guix-channel
index e1e0e64..2c37401 100644
--- a/.guix-channel
+++ b/.guix-channel
@@ -3,6 +3,13 @@
  (directory ".guix/modules")
  (dependencies
   (channel
+   (name gn-machines)
+   (url "https://git.genenetwork.org/gn-machines")
+   (branch "main"))
+  ;; Until https://issues.guix.gnu.org/68797 is resolved, we need to
+  ;; explicitly list guix-bioinformatics, guix-forge, guix-past and
+  ;; guix-rust-past-crates—the dependencies of the gn-machines channel—here.
+  (channel
    (name guix)
    (url "https://codeberg.org/guix/guix")
    (branch "master")
@@ -14,15 +21,24 @@
      (signer
       "BBB0 2DDF 2CEA F6A8 0D1D  E643 A2A0 6DF2 A33A 54FA"))))
   (channel
+   (name guix-forge)
+   (url "https://git.systemreboot.net/guix-forge/")
+   (branch "main")
+   (commit "e43fd9a4d73654d3876e2c698af7da89f3408f89")
+   (introduction
+    (channel-introduction
+     (version 0)
+     (commit "0432e37b20dd678a02efee21adf0b9525a670310")
+     (signer
+      "7F73 0343 F2F0 9F3C 77BF  79D3 2E25 EE8B 6180 2BB3"))))
+  (channel
    (name guix-bioinformatics)
    (url "https://git.genenetwork.org/guix-bioinformatics")
-   (branch "master"))
-  ;; FIXME: guix-bioinformatics depends on guix-past. So, there
-  ;; should be no reason to explicitly depend on guix-past. But, the
-  ;; channel does not build otherwise. This is probably a guix bug.
+   (commit "903465c85c9b2ae28480b236c3364da873ca8f51"))
   (channel
    (name guix-past)
    (url "https://codeberg.org/guix-science/guix-past")
+   (branch "master")
    (introduction
     (channel-introduction
      (version 0)
diff --git a/.guix/modules/gn-libs.scm b/.guix/modules/gn-libs.scm
index 78b362b..8fa03db 100644
--- a/.guix/modules/gn-libs.scm
+++ b/.guix/modules/gn-libs.scm
@@ -1,5 +1,5 @@
 (define-module (gn-libs)
-  #:use-module ((gn packages genenetwork) #:select (gn-libs) #:prefix gn:)
+  #:use-module ((gn-machines genenetwork) #:select (gn-libs) #:prefix gn:)
   #:use-module ((gnu packages check) #:select (python-pylint))
   #:use-module ((gnu packages python-check) #:select (python-mypy))
   #:use-module (guix gexp)