chore: reorganize structure

diff --git a/infiniteadaptability/bitcoin.scm b/infiniteadaptability/packages/bitcoin.scm
similarity index 98%
rename from infiniteadaptability/bitcoin.scm
rename to infiniteadaptability/packages/bitcoin.scm
index 1d0990e3c936bcf63050fd030045562a58319692..16ef8d5a80cdc0a08371aa13f27000a8ec9945e4 100644 (file)
--- a/infiniteadaptability/bitcoin.scm
+++ b/infiniteadaptability/packages/bitcoin.scm
@@ -1,4 +1,4 @@
-(define-module (infiniteadaptability bitcoin)
+(define-module (infiniteadaptability packages bitcoin)
   #:use-module (guix build-system pyproject)
   #:use-module (guix build-system python)
   #:use-module (guix download)

diff --git a/infiniteadaptability/events.scm b/infiniteadaptability/packages/events.scm
similarity index 67%
rename from infiniteadaptability/events.scm
rename to infiniteadaptability/packages/events.scm
index f9593e4adb1b0b842e938d3b3cb0eed52aa42d3e..1ae755e04e58147b9da00377b1d03e7520b20cd4 100644 (file)
--- a/infiniteadaptability/events.scm
+++ b/infiniteadaptability/packages/events.scm
@@ -1,4 +1,4 @@
-(define-module (infiniteadaptability events)
+(define-module (infiniteadaptability packages events)
   #:use-module (gnu packages autotools)
   #:use-module (gnu packages gcc)
   #:use-module (gnu packages sqlite)
@@ -17,18 +17,19 @@
                    (string-append version "-"
                                   (number->string revision) "."
                                   (string-take commit 7))))
-      (source (origin
-                (method git-fetch)
-                (uri (git-reference
-                      (url "https://git.infiniteadaptability.org/events.git")
-                      (commit commit)))
-                (sha256
-                 (base32
-                  "0dd4man2r5flwzpqq76fyv3kwvk9sbf7hwxfb813drbsan230g5a"))
-                (file-name (string-append "events-" version "-checkout"))))
+      (source
+       (origin
+         (method git-fetch)
+         (uri (git-reference
+               (url "https://git.infiniteadaptability.org/events.git")
+               (commit commit)))
+         (sha256
+          (base32 "0dd4man2r5flwzpqq76fyv3kwvk9sbf7hwxfb813drbsan230g5a"))
+         (file-name (string-append "events-" version "-checkout"))))
       (build-system gnu-build-system)
       (arguments
-       (list #:tests? #f))
+       (list
+        #:tests? #f))
       (native-inputs `(("autoconf" ,autoconf)
                        ("automake" ,automake)))
       (home-page "https://git.infiniteadaptability.org/events")

diff --git a/infiniteadaptability/git-extra.scm b/infiniteadaptability/packages/git-extra.scm
similarity index 76%
rename from infiniteadaptability/git-extra.scm
rename to infiniteadaptability/packages/git-extra.scm
index 3374405cf428d55ca90818f484a81e604682a1a7..e06ada57d2796704522cef6452a90984a076d22d 100644 (file)
--- a/infiniteadaptability/git-extra.scm
+++ b/infiniteadaptability/packages/git-extra.scm
@@ -1,4 +1,4 @@
-(define-module (infiniteadaptability git-extra)
+(define-module (infiniteadaptability packages git-extra)
   #:use-module (guix git-download)
   #:use-module (guix build-system gnu)
   #:use-module (guix gexp)
@@ -20,16 +20,15 @@
                    (string-append version "-"
                                   (number->string revision) "."
                                   (string-take commit 7))))
-      (source (origin
-                (method git-fetch)
-                (uri (git-reference
-                      (url
-                       "https://git.infiniteadaptability.org/git-extra.git")
-                      (commit commit)))
-                (sha256
-                 (base32
-                  "10ysy0zmlxl1wxgb07gkjw4b16vc6ikqzlizqicia43af7kyr34g"))
-                (file-name (string-append "git-extra-" version "-checkout"))))
+      (source
+       (origin
+         (method git-fetch)
+         (uri (git-reference
+               (url "https://git.infiniteadaptability.org/git-extra.git")
+               (commit commit)))
+         (sha256
+          (base32 "10ysy0zmlxl1wxgb07gkjw4b16vc6ikqzlizqicia43af7kyr34g"))
+         (file-name (string-append "git-extra-" version "-checkout"))))
       (build-system gnu-build-system)
       (arguments
        '(#:phases (modify-phases %standard-phases

diff --git a/infiniteadaptability/mirror-all.scm b/infiniteadaptability/packages/mirror-all.scm
similarity index 88%
rename from infiniteadaptability/mirror-all.scm
rename to infiniteadaptability/packages/mirror-all.scm
index e94827e6f9fffe50cbdbb195df960189fe846dc3..bd9129307b63d183b2e1cee74471f891da5a86f9 100644 (file)
--- a/infiniteadaptability/mirror-all.scm
+++ b/infiniteadaptability/packages/mirror-all.scm
@@ -1,4 +1,4 @@
-(define-module (infiniteadaptability mirror-all)
+(define-module (infiniteadaptability packages mirror-all)
   #:use-module (guix git-download)
   #:use-module (guix build-system gnu)
   #:use-module (guix licenses)
@@ -39,10 +39,11 @@
                         (let ((out (assoc-ref outputs "out")))
                           (wrap-program (string-append out "/bin/mirror-all")
                             `("PATH" ":" prefix
-                              (,(string-append (assoc-ref inputs "git") "/bin")
-                               ,(string-append (assoc-ref inputs "coreutils") "/bin")
-                               ,(string-append (assoc-ref inputs "openssh") "/bin"))))
-                         #t))))
+                              (,(string-append (assoc-ref inputs "git") "/bin") ,
+                               (string-append (assoc-ref inputs "coreutils")
+                                              "/bin")
+                               ,(string-append (assoc-ref inputs "openssh")
+                                               "/bin")))) #t))))
          #:make-flags (list (string-append "PREFIX=" %output))))
       (native-inputs `(("debianutils" ,debianutils)))
       (inputs `(("bash" ,bash)

diff --git a/infiniteadaptability/packages/nitter.scm b/infiniteadaptability/packages/nitter.scm
new file mode 100644 (file)
index 0000000..f946339
--- /dev/null
+++ b/infiniteadaptability/packages/nitter.scm
@@ -0,0 +1,24 @@
+(define-module (infiniteadaptability packages nitter)
+  #:use-module (gnu)
+  #:export (nitter))
+
+(define nitter
+  (let ((version "1.0.0")
+        (commit "e40c61a6ae76431c570951cc4925f38523b00a82")
+        (revision 0))
+    (package
+      (name "nitter")
+      (version (if (zero? revision) version
+                   (string-append version "-"
+                                  (number->string revision) "."
+                                  (string-take commit 7))))
+      (source
+       (origin
+         (method git-fetch)
+         (uri (git-reference
+               (url "https://github.com/zedeus/nitter")
+               (commit commit)))
+         (sha256
+          (base32 "10ysy0zmlxl1wxgb07gkjw4b16vc6ikqzlizqicia43af7kyr34g"))
+         (file-name (string-append "nitter-" version "-checkout"))))
+      (build-system )))

diff --git a/infiniteadaptability/totp.scm b/infiniteadaptability/packages/totp.scm
similarity index 67%
rename from infiniteadaptability/totp.scm
rename to infiniteadaptability/packages/totp.scm
index 064ed4d428b75d4e4bb4f0bd2993d6a1b8c35032..210101cb342ccb9250458824953323b9a89c020f 100644 (file)
--- a/infiniteadaptability/totp.scm
+++ b/infiniteadaptability/packages/totp.scm
@@ -1,4 +1,4 @@
-(define-module (infiniteadaptability totp)
+(define-module (infiniteadaptability packages totp)
   #:use-module (gnu packages autotools)
   #:use-module (gnu packages tls)
   #:use-module (guix git-download)
@@ -17,15 +17,15 @@
                    (string-append version "-"
                                   (number->string revision) "."
                                   (string-take commit 7))))
-      (source (origin
-                (method git-fetch)
-                (uri (git-reference
-                      (url "https://git.infiniteadaptability.org/totp.git")
-                      (commit commit)))
-                (sha256
-                 (base32
-                  "1p73lrgddl67jnyndk2fjx5i0p3zwcbj1nl99dkd2d1xprlgaa32"))
-                (file-name (string-append "totp-" version "-checkout"))))
+      (source
+       (origin
+         (method git-fetch)
+         (uri (git-reference
+               (url "https://git.infiniteadaptability.org/totp.git")
+               (commit commit)))
+         (sha256
+          (base32 "1p73lrgddl67jnyndk2fjx5i0p3zwcbj1nl99dkd2d1xprlgaa32"))
+         (file-name (string-append "totp-" version "-checkout"))))
       (native-inputs (list autoconf automake))
       (inputs (list openssl))
       (build-system gnu-build-system)

diff --git a/infiniteadaptability/workouts.scm b/infiniteadaptability/packages/workouts.scm
similarity index 68%
rename from infiniteadaptability/workouts.scm
rename to infiniteadaptability/packages/workouts.scm
index 4429cb3d7b643bac1468b8c39c7bc1621ed2c4c2..606bd576d126d744014fdfb6b8442d35363b1c49 100644 (file)
--- a/infiniteadaptability/workouts.scm
+++ b/infiniteadaptability/packages/workouts.scm
@@ -1,4 +1,4 @@
-(define-module (infiniteadaptability workouts)
+(define-module (infiniteadaptability packages workouts)
   #:use-module (gnu packages autotools)
   #:use-module (gnu packages gcc)
   #:use-module (gnu packages sqlite)
@@ -17,18 +17,19 @@
                    (string-append version "-"
                                   (number->string revision) "."
                                   (string-take commit 7))))
-      (source (origin
-                (method git-fetch)
-                (uri (git-reference
-                      (url "https://git.infiniteadaptability.org/workouts.git")
-                      (commit commit)))
-                (sha256
-                 (base32
-                  "1mr4cghc55lzcfphxyk26w8laj3gardsn2j02bj06qdc4kzf2jv7"))
-                (file-name (string-append "workouts-" version "-checkout"))))
+      (source
+       (origin
+         (method git-fetch)
+         (uri (git-reference
+               (url "https://git.infiniteadaptability.org/workouts.git")
+               (commit commit)))
+         (sha256
+          (base32 "1mr4cghc55lzcfphxyk26w8laj3gardsn2j02bj06qdc4kzf2jv7"))
+         (file-name (string-append "workouts-" version "-checkout"))))
       (build-system gnu-build-system)
       (arguments
-       (list #:parallel-tests? #f))
+       (list
+        #:parallel-tests? #f))
       (native-inputs `(("autoconf" ,autoconf)
                        ("automake" ,automake)))
       (inputs `(("sqlite" ,sqlite)))

diff --git a/infiniteadaptability/services/nitter.scm b/infiniteadaptability/services/nitter.scm
new file mode 100644 (file)
index 0000000..df2a585
--- /dev/null
+++ b/infiniteadaptability/services/nitter.scm
@@ -0,0 +1,30 @@
+(define-module (infiniteadaptability services nitter)
+  #:use-module (gnu)
+  #:use-module (gnu services)
+  #:use-module (infiniteadaptability packages nitter)
+  #:export (nitter-configuration nitter-service-type))
+
+(define-record-type* <nitter-configuration> nitter-configuration
+                     make-nitter-configuration
+  nitter-configuration?
+
+  (nitter nitter-configuration-nitter ;file-like
+          (default nitter)))
+
+(define (nitter-service config)
+  "Return a <nitter-service> for nitter with CONFIG."
+  (list (shepherd-service (documentation "nitter service")
+                          (provision '(nitter))
+                          (requirement '(networking))
+                          (start #~(fork+exec-command (string-append #$nitter-configuration-nitter
+                                                                     config)
+                                                      "/bin/nitter"
+                                                      #:log-file (string-append
+                                                                  "/var/log/nitter.log"))))))
+
+(define nitter-service-type
+  (service-type (name 'nitter)
+                (default-value (nitter-configuration))
+                (description "Nitter service")
+                (extensions (list (service-extension
+                                   shepherd-root-service-type nitter-service)))))