Use genenetwork package variants from this channel. HEAD main

4 files changed, 80 insertions, 3 deletions

diff --git a/genenetwork-development.scm b/genenetwork-development.scm
index b886aec..8e4e1e8 100644
--- a/genenetwork-development.scm
+++ b/genenetwork-development.scm
@@ -21,7 +21,7 @@
 ;;; <https://www.gnu.org/licenses/>.
 
 (use-modules (gnu)
-             ((gn packages genenetwork) #:select (genenetwork2 genenetwork3 gn-auth))
+             ((gn-machines genenetwork) #:select (genenetwork2 genenetwork3 gn-auth))
              (gn services databases)
              ((gn packages guile) #:select (gn-guile))
              (gnu build linux-container)
diff --git a/genenetwork/services/genenetwork.scm b/genenetwork/services/genenetwork.scm
index 9ba6213..cb73791 100644
--- a/genenetwork/services/genenetwork.scm
+++ b/genenetwork/services/genenetwork.scm
@@ -20,7 +20,7 @@
 ;;; <https://www.gnu.org/licenses/>.
 
 (define-module (genenetwork services genenetwork)
-  #:use-module ((gn packages genenetwork) #:select (genenetwork2 genenetwork3 gn-auth gn-uploader))
+  #:use-module ((gn-machines genenetwork) #:select (genenetwork2 genenetwork3 gn-auth gn-uploader))
   #:use-module ((gn packages guile) #:select (gn-guile))
   #:use-module (gnu build linux-container)
   #:use-module ((gnu packages web) #:select (nginx))
diff --git a/guix/README.md b/guix/README.md
deleted file mode 100644
index 8181fbe..0000000
--- a/guix/README.md
+++ /dev/null
@@ -1 +0,0 @@
-At the moment, this is just a dummy directory to allow this repository to be a Guix channel.
diff --git a/guix/gn-machines/genenetwork.scm b/guix/gn-machines/genenetwork.scm
new file mode 100644
index 0000000..f67b3c0
--- /dev/null
+++ b/guix/gn-machines/genenetwork.scm
@@ -0,0 +1,78 @@
+(define-module (gn-machines genenetwork)
+  #:use-module ((gn packages genenetwork)
+                #:select (genenetwork2 genenetwork3 gn-auth gn-uploader)
+                #:prefix gn:)
+  #:use-module (guix git-download)
+  #:use-module (guix packages))
+
+(define-public genenetwork2
+  (let ((commit "e2f9e829bffcbffc5934e6b11685e5631fd7a001")
+        (revision "4"))
+    (package
+      (inherit gn:genenetwork2)
+      (name "genenetwork2")
+      (version (git-version (package-version gn:genenetwork2) revision commit))
+      (source (origin
+                (method git-fetch)
+                (uri (git-reference
+                       (url "https://github.com/genenetwork/genenetwork2.git")
+                       (commit commit)))
+                (file-name (string-append name "-" version))
+                (sha256
+                 (base32
+                  "13bcq0ya9sjpf3lx2gdzwsm0ya3y0l4qq48198bqinjbh6avqq1f")))))))
+
+(define-public genenetwork3
+  (let ((commit "019282e64fb401f7a6823f3c8914d1d6e5ad0233")
+        (revision "5"))
+    (package
+      (inherit gn:genenetwork3)
+      (name "genenetwork3")
+      (version (git-version (package-version gn:genenetwork3) revision commit))
+      (source
+       (origin
+         (method git-fetch)
+         (uri (git-reference
+               (url "https://github.com/genenetwork/genenetwork3.git")
+               (commit commit)))
+         (file-name (git-file-name name version))
+         (sha256
+          (base32
+           "1rr2y4i93kpc998a123d32yaakqmqiv5b7n4xva01j6jfqjsgw9s")))))))
+
+(define-public gn-auth
+  (let ((commit "9839e5bf35bd7be158b35fa98a734f7a3473688d")
+        (revision "1"))
+    (package
+      (inherit gn:gn-auth)
+      (name "gn-auth")
+      (version (git-version (package-version gn:gn-auth) revision commit))
+      (source
+       (origin
+         (method git-fetch)
+         (uri (git-reference
+               (url "https://git.genenetwork.org/gn-auth")
+               (commit commit)))
+         (file-name (git-file-name name version))
+         (hash
+          (content-hash
+           (base32
+            "1lsi7z8hvpdqgcsx3zc5ip701xka9s75c7r4pjlby2ryjc0gw83d"))))))))
+
+(define-public gn-uploader
+  (let ((commit "c4494da2e81780bbeeac8936d1fe1aede01cf73c")
+        (revision "0"))
+    (package
+      (inherit gn:gn-uploader)
+      (name "gn-uploader")
+      (version (git-version (package-version gn:gn-uploader) revision commit))
+      (source (origin
+                (method git-fetch)
+                (uri (git-reference
+                       (url "https://git.genenetwork.org/gn-uploader")
+                       (commit commit)))
+                (file-name (git-file-name name version))
+                (hash
+                 (content-hash
+                  (base32
+                   "0fhhpvxaj0anh21pqabikv5wmd1cj3nx2j1bcd9ld8q3ykmm8a9s"))))))))