cat src/org/euandre/papo.scm >> src/org/euandre/packages.scm

4 files changed, 107 insertions, 145 deletions

diff --git a/Makefile b/Makefile
index 9bef852..af4d841 100644
--- a/Makefile
+++ b/Makefile
@@ -21,7 +21,6 @@ test-config-files = \
 derived-assets = \
 	queue.scm.sentinel             \
 	packages.scm.sentinel          \
-	papo.scm.sentinel              \
 	local.scm.sentinel             \
 	internet.scm.sentinel          \
 	maintainer.key.sentinel        \
@@ -32,7 +31,6 @@ side-assets = \
 	queue.scm-*                    \
 	dynamic.scm                    \
 	packages.scm                   \
-	papo.scm                       \
 	local.scm                      \
 	internet.scm                   \
 
@@ -43,13 +41,11 @@ all: maintainer.key.sentinel
 
 queue.scm.sentinel:    src/org/euandre/queue.scm
 packages.scm.sentinel: src/org/euandre/queue.scm src/org/euandre/packages.scm
-papo.scm.sentinel:     src/org/euandre/queue.scm src/org/euandre/packages.scm \
-		src/org/euandre/papo.scm
 local.scm.sentinel:    src/org/euandre/queue.scm tests/local/system.scm
 internet.scm.sentinel: src/org/euandre/queue.scm src/org/euandre/packages.scm \
 		tests/internet/system.scm
 
-queue.scm.sentinel packages.scm.sentinel papo.scm.sentinel: Makefile
+queue.scm.sentinel packages.scm.sentinel: Makefile
 	rm -f `basename $@ .sentinel`*
 	guix build -c$N -v3 -Lsrc -r`basename $@ .sentinel` -Kf src/org/euandre/`basename $@ .sentinel`
 	touch $@
diff --git a/src/org/euandre/packages.scm b/src/org/euandre/packages.scm
index c3b2dc5..cc27bfc 100644
--- a/src/org/euandre/packages.scm
+++ b/src/org/euandre/packages.scm
@@ -131,6 +131,23 @@
              cicd-configuration-run-in-container?
              cicd-configuration-container-name
 
+            <papod-configuration>
+             papod-configuration
+        make-papod-configuration
+             papod-configuration?
+             papod-configuration-name
+             papod-configuration-package
+             papod-configuration-user
+             papod-configuration-group
+             papod-configuration-log-file
+             papod-configuration-data-directory
+             papod-configuration-run-directory
+             papod-configuration-run-in-container?
+             papod-configuration-container-name
+             papod-configuration-options
+             papod-configuration-listen-socket
+             papod-configuration-upstream-socket
+
              fmt
              str
              service-type-for))
@@ -297,25 +314,34 @@
     (propagated-inputs
       (format-inputs (list eut adoc eslaides)))))
 
+(define-public (mkwbsite pkg)
+  (package
+    (inherit pkg)
+    (native-inputs
+      (append
+       (format-inputs     (list mkwb mktorrent-latest))
+       (normalize-inputs '(gnupg jq rsync po4a gettext ghostscript moreutils))))
+    (arguments
+      (substitute-keyword-arguments (package-arguments pkg)
+        ((#:phases phases)
+         #~(modify-phases #$phases
+             (add-before 'build 'sethome-ghostscript
+               (lambda _
+                 (setenv "HOME" (getcwd))))))))))
+
 (define-public euandre.org
-  (let ((pkg (pkg
-              "euandre.org"
-              "6e493d66649925fccaa351f65ee6cac2dedf264f"
-              "05isnj2mmwg6k1qd94r3yaycy556f5d7br3f2vdmriqazrgj0grg")))
-    (package
-      (inherit pkg)
-      (native-inputs
-        (append
-         (format-inputs     (list mkwb mktorrent-latest))
-         (normalize-inputs '(gnupg jq rsync po4a gettext ghostscript moreutils))))
-      (arguments
-        (substitute-keyword-arguments (package-arguments pkg)
-          ((#:phases phases)
-           #~(modify-phases #$phases
-               (add-before 'build 'sethome-ghostscript
-                 (lambda _
-                   (setenv "HOME" (getcwd)))))))))))
+  (mkwbsite
+   (pkg
+    "euandre.org"
+    "6e493d66649925fccaa351f65ee6cac2dedf264f"
+    "05isnj2mmwg6k1qd94r3yaycy556f5d7br3f2vdmriqazrgj0grg")))
 
+(define-public papo.im
+  (mkwbsite
+   (pkg
+    "papo.im"
+    "fa07fa576e07b4cc6b7c9123bd3a6c91e6afc609"
+    "084w89v15nmr45nv9av8pz7iq99aw3ggaxr0gzqfjbskb3wvvkml")))
 
 
 (define-public (format-inputs l)
@@ -495,6 +521,24 @@
    "2171a9ce7d03c75e20754536c603cad401919dfa"
    "10459is48i21iry3kamdl7cr88smw172bw7s0s8k30n9b4sm6f0q"))
 
+(define-public chat.papo.im
+  (package
+    (inherit
+      (pkg
+       "chat.papo.im"
+       "f9c959b2d8e36460395a425a51d480fac635c5ec"
+       "0h2y0kdfzpsgi64zi7brnj1p0dqz0fx4ksvy57wakr7pvv6rpf64"))
+    (native-inputs
+      (normalize-inputs '(node)))))
+
+(define-public papod
+  (gopkg
+   "papod"
+   (format-inputs
+    (list stm pds golite q:sqlitex scrypt q:scryptkdf fiinha cracha))
+   "ecd7797abb3b43226532b0bace7ba9f1e5ac277d"
+   "1570gn5rqx8h84jf3qb0qxdb08449ig26vsyj6ccp3m4h8z0vcfn"))
+
 
 
 (define-public (user-accounts users)
@@ -1170,6 +1214,44 @@ The default configuration should provide sane values for all of these."
     (description (fmt "The CI agent service that backs a Git server."))))
 
 
+(define-record-type* <papod-configuration>
+  papod-configuration
+  make-papod-configuration
+  papod-configuration?
+  (name              papod-configuration-name
+                     (default "papod"))
+  (package           papod-configuration-package
+                     (default papod))
+  (user              papod-configuration-user
+                     (default "papod"))
+  (group             papod-configuration-group
+                     (default "papod"))
+  (log-file          papod-configuration-log-file
+                     (default "/var/log/papod/papod.log"))
+  (data-directory    papod-configuration-data-directory
+                     (default "/var/lib/papod"))
+  (run-directory     papod-configuration-run-directory
+                     (default "/var/run/papod"))
+  (run-in-container? papod-configuration-run-in-container?
+                     (default #t))
+  (container-name    papod-configuration-container-name
+                     (default "papod-container"))
+  (options           papod-configuration-options
+                     (default '()))
+  (listen-socket     papod-configuration-listen-socket
+                     (default "/var/run/papod/papod.socket"))
+  (upstream-socket   papod-configuration-upstream-socket
+                     (default #f)))
+
+
+#;
+(define-public papod-service-type
+  (pkg:service-type-for 'papod
+                        <papod-configuration>
+                        (papod-configuration)
+                        '()))
+
+
 
 (list
  mktorrent-latest
@@ -1201,4 +1283,8 @@ The default configuration should provide sane values for all of these."
  gistatic
  urubu
  fiinha
- cracha)
+ cracha
+
+      papo.im
+ chat.papo.im
+ papod)
diff --git a/src/org/euandre/papo.scm b/src/org/euandre/papo.scm
deleted file mode 100644
index 3af0635..0000000
--- a/src/org/euandre/papo.scm
+++ /dev/null
@@ -1,119 +0,0 @@
-(define-module (org euandre papo)
-  #:use-module ((org euandre packages) #:prefix pkg:)
-  #:use-module ((org euandre queue) #:prefix q:)
-  #:use-module (guix gexp)
-  #:use-module (guix packages)
-  #:use-module (guix records)
-  #:use-module (guix utils)
-  #:export (<papod-configuration>
-             papod-configuration
-        make-papod-configuration
-             papod-configuration?
-             papod-configuration-name
-             papod-configuration-package
-             papod-configuration-user
-             papod-configuration-group
-             papod-configuration-log-file
-             papod-configuration-data-directory
-             papod-configuration-run-directory
-             papod-configuration-run-in-container?
-             papod-configuration-container-name
-             papod-configuration-options
-             papod-configuration-listen-socket
-             papod-configuration-upstream-socket))
-
-
-
-(define-public papo.im
-  (let ((pkg (pkg:pkg
-              "papo.im"
-              "fa07fa576e07b4cc6b7c9123bd3a6c91e6afc609"
-              "084w89v15nmr45nv9av8pz7iq99aw3ggaxr0gzqfjbskb3wvvkml")))
-    (package
-      (inherit pkg)
-      (native-inputs
-        (append
-         (pkg:format-inputs (list pkg:mkwb pkg:mktorrent-latest))
-         (pkg:normalize-inputs '(gnupg jq rsync po4a gettext ghostscript moreutils))))
-      (arguments
-        (substitute-keyword-arguments (package-arguments pkg)
-          ((#:phases phases)
-           #~(modify-phases #$phases
-               (add-before 'build 'sethome-ghostscript
-               (lambda _
-                 (setenv "HOME" (getcwd)))))))))))
-
-(define-public chat.papo.im
-  (package
-    (inherit
-      (pkg:pkg
-       "chat.papo.im"
-       "f9c959b2d8e36460395a425a51d480fac635c5ec"
-       "0h2y0kdfzpsgi64zi7brnj1p0dqz0fx4ksvy57wakr7pvv6rpf64"))
-    (native-inputs
-      (pkg:normalize-inputs '(node)))))
-
-(define-public papod
-  (pkg:gopkg
-   "papod"
-   (pkg:format-inputs
-    (list
-     pkg:gotext
-     pkg:uuid
-     pkg:gobang
-     pkg:pds
-     pkg:stm
-     pkg:golite q:sqlitex
-     pkg:scrypt q:scryptkdf
-     pkg:fiinha
-     pkg:cracha
-     pkg:eut))
-   "3f307fefed00d61e28b31a089774f210c90c18db"
-   "16dzrg5hh5fiqn2rpfki44w6k1fpb6q2gqisndbk858mxapvf0bj"))
-
-
-
-(define-record-type* <papod-configuration>
-  papod-configuration
-  make-papod-configuration
-  papod-configuration?
-  (name              papod-configuration-name
-                     (default "papod"))
-  (package           papod-configuration-package
-                     (default papod))
-  (user              papod-configuration-user
-                     (default "papod"))
-  (group             papod-configuration-group
-                     (default "papod"))
-  (log-file          papod-configuration-log-file
-                     (default "/var/log/papod/papod.log"))
-  (data-directory    papod-configuration-data-directory
-                     (default "/var/lib/papod"))
-  (run-directory     papod-configuration-run-directory
-                     (default "/var/run/papod"))
-  (run-in-container? papod-configuration-run-in-container?
-                     (default #t))
-  (container-name    papod-configuration-container-name
-                     (default "papod-container"))
-  (options           papod-configuration-options
-                     (default '()))
-  (listen-socket     papod-configuration-listen-socket
-                     (default "/var/run/papod/papod.socket"))
-  (upstream-socket   papod-configuration-upstream-socket
-                     (default #f)))
-
-
-
-#;
-(define-public papod-service-type
-  (pkg:service-type-for 'papod
-                        <papod-configuration>
-                        (papod-configuration)
-                        '()))
-
-
-
-(list
-      papo.im
- chat.papo.im
- papod)
diff --git a/tests/internet/system.scm b/tests/internet/system.scm
index af75541..f640e52 100644
--- a/tests/internet/system.scm
+++ b/tests/internet/system.scm
@@ -1,7 +1,6 @@
 (use-modules
   ((org euandre queue) #:prefix q:)
   ((org euandre packages) #:prefix pkg:)
-  ((org euandre papo) #:prefix papo:)
   (gnu))
 (use-package-modules)
 (use-service-modules
@@ -22,8 +21,8 @@
 
 (define-public papod-service-type
   (pkg:service-type-for 'papod
-                        papo:<papod-configuration>
-                        (papo:papod-configuration)
+                        pkg:<papod-configuration>
+                        (pkg:papod-configuration)
                         '()))