...

diff --git a/infiniteadaptability/packages/nitter.scm b/infiniteadaptability/packages/nitter.scm
index d937e0621f7a19fd315c2734d570f0d7ca4563a5..49a4066e3838e260f5686fb44b1cbbdd758c97c4 100644 (file)
--- a/infiniteadaptability/packages/nitter.scm
+++ b/infiniteadaptability/packages/nitter.scm
@@ -3,7 +3,9 @@
   #:use-module (gnu packages certs)
   #:use-module (gnu packages nim)
   #:use-module (gnu packages tls)
+  #:use-module (gnu packages version-control)
   #:use-module (guix build-system gnu)
+  #:use-module (guix download)
   #:use-module (guix gexp)
   #:use-module (guix git-download)
   #:use-module ((guix licenses)
@@ -15,21 +17,100 @@
 
 (define %cachedir
   "./cache-home/.nimble/pkgcache")
-;githubcom_cheatfateasynctools_#0e6bdc3ed5bae8c7cc9
-;githubcom_dom96httpbeast_0.3.0
-;githubcom_dom96httpbeast_0.4.1
-;githubcom_euantoranodotenvnim_2.0.0
-;githubcom_euantoranodotenvnim_2.0.2
-;githubcom_iffyasynctools_#pr_fix_for_latest
-;githubcom_onionhammersha1
-;githubcom_timotheecourasynctools_#pr_fix_compilation
-;githubcom_treeformws
-;githubcom_treeformws_0.5.0
+
+(define nim-packages
+  (origin
+    (method url-fetch)
+    (file-name "nim-official-packages")
+    (uri
+     "https://raw.githubusercontent.com/nim-lang/packages/master/packages.json")
+    (sha256 (base32 "1cvf9fdhrgypsq4b713d61wvx35dj8wqzm80f448asmr3y4sanis"))))
+
+(define ws-0.5.0
+  (origin
+    (method git-fetch)
+    (file-name "ws_0_5_0-checkout")
+    (uri (git-reference (url "https://github.com/treeform/ws")
+                        (commit "0.5.0")))
+    (sha256 (base32 "0j8z9jlvzb1h60v7rryvh2wx6vg99lra6i62whf3fknc53l641fz"))))
+
+(define ws
+  (origin
+    (method git-fetch)
+    (file-name "ws-checkout")
+    (uri (git-reference (url "https://github.com/treeform/ws")
+                        (commit "5ac521b72d7d4860fb394e5e1f9f08cf480e9822")))
+    (sha256 (base32 "0qv9knjdvhigmmarsyivpkaawyb0yjip2rycdnasqjsgf31pa26a"))))
+
+(define asynctools_pr_fix_compilation
+  (origin
+    (method git-fetch)
+    (file-name "asynctools_pr_fix_compilation-checkout")
+    (uri (git-reference (url "https://github.com/timotheecour/asynctools")
+                        (commit "b365f94ad134b1cbc031a64e4ecd3bebacd4ed15")))
+    (sha256 (base32 "0n54hkknxm5hdx68jc2syyxzs4nbz2hh5rwxa34chk12kbp326s2"))))
+
+(define sha1
+  (origin
+    (method git-fetch)
+    (file-name "sha1-checkout")
+    (uri (git-reference (url "https://github.com/onionhammer/sha1")
+                        (commit "92ccc5800bb0ac4865b275a2ce3c1544e98b48bc")))
+    (sha256 (base32 "00zvvd8ssy22srg74xzapknmgmi82v534npjdrk5805shswfhqdm"))))
+
+(define asynctools_pr_fix
+  (origin
+    (method git-fetch)
+    (file-name "asynctools_pr_fix-checkout")
+    (uri (git-reference (url "https://github.com/iffy/asynctools")
+                        (commit "17dbf4cd2fda1e59b32383fe1d817b3af01cd4ce")))
+    (sha256 (base32 "0wnikgrpir5iy8mp32y33ld07z0mwfdmbvh6k69hc0knz96hpfjv"))))
+
+(define dotenv_2_0_2
+  (origin
+    (method git-fetch)
+    (file-name "dotenv_2_0_2-checkout")
+    (uri (git-reference (url "https://github.com/euantorano/dotenv.nim")
+                        (commit "2.0.2")))
+    (sha256 (base32 "0dk0ixgpxmaz2kf12a3fvzdaknn38qnwgdhp7yag0m5fbhhz2kjc"))))
+
+(define dotenv_2_0_0
+  (origin
+    (method git-fetch)
+    (file-name "dotenv_2_0_0-checkout")
+    (uri (git-reference (url "https://github.com/euantorano/dotenv.nim")
+                        (commit "2.0.0")))
+    (sha256 (base32 "066r1zkragh2rrmw8gfy1849lldcqs4ccblmg1zkl35j2ajc3rc4"))))
+
+(define httpbeast_0_4_1
+  (origin
+    (method git-fetch)
+    (file-name "httpbeast_0_4_1-checkout")
+    (uri (git-reference (url "https://github.com/dom96/httpbeast")
+                        (commit "v0.4.1")))
+    (sha256 (base32 "1x12ypfj341gjg3rh7zjq1wns8rngfyky6gqgb92lyhlvs7h4xzj"))))
+
+(define httpbeast_0_3_0
+  (origin
+    (method git-fetch)
+    (file-name "httpbeast_0_3_0-checkout")
+    (uri (git-reference (url "https://github.com/dom96/httpbeast")
+                        (commit "v0.3.0")))
+    (sha256 (base32 "0v6qhyhavs5z1klsnkkxbp7s7pipmqh5flnbvqdjnciyd0rim7j2"))))
+
+(define asynctools
+  (origin
+    (method git-fetch)
+    (file-name "asynctools-checkout")
+    (uri (git-reference (url "https://github.com/cheatfate/asynctools")
+                        (commit "0e6bdc3ed5bae8c7cc9")))
+    (sha256 (base32 "111dzyvqlg1r1jngcz3d9px8kfbxpcdi8phs26bxkmbxzjkwrmmv"))))
+
 (define jester
   (origin
     (method git-fetch)
     (file-name "jester-checkout")
-    (uri (git-reference (url "https://github.com/dom96/jester.git")
+    (uri (git-reference (url "https://github.com/dom96/jester")
                         (commit "baca3f")))
     (sha256 (base32 "0i8rxsbp5yd9dasis650vqppika43mzfsls4fc7cz8k5j8xpd6zc"))))
 
@@ -158,6 +239,10 @@
               (lambda _
                 (setenv "HOME" "./cache-home")
                 (mkdir-p #$%cachedir)
+                (copy-recursively #$(this-package-input
+                                     "nim-official-packages")
+                 "./cache-home/.nimble/packages_official.json"
+                 #:keep-permissions? #f)
                 (copy-recursively #$(this-package-input "jester-checkout")
                                   (string-append #$%cachedir
                                    "/githubcom_dom96jester_#baca3f")
@@ -206,6 +291,52 @@
                                   (string-append #$%cachedir
                                    "/githubcom_treeformjsony_#1de1f08")
                                   #:keep-permissions? #f)
+                (copy-recursively #$(this-package-input "ws-checkout")
+                                  (string-append #$%cachedir
+                                                 "/githubcom_treeformws")
+                                  #:keep-permissions? #f)
+                (copy-recursively #$(this-package-input "ws_0_5_0-checkout")
+                                  (string-append #$%cachedir
+                                   "/githubcom_treeformws_0.5.0")
+                                  #:keep-permissions? #f)
+                (copy-recursively #$(this-package-input
+                                     "asynctools_pr_fix_compilation-checkout")
+                                  (string-append #$%cachedir
+                                   "/githubcom_timotheecourasynctools_#pr_fix_compilation")
+                                  #:keep-permissions? #f)
+                (copy-recursively #$(this-package-input "sha1-checkout")
+                                  (string-append #$%cachedir
+                                                 "/githubcom_onionhammersha1")
+                                  #:keep-permissions? #f)
+                (copy-recursively #$(this-package-input
+                                     "asynctools_pr_fix-checkout")
+                                  (string-append #$%cachedir
+                                   "/githubcom_iffyasynctools_#pr_fix_for_latest")
+                                  #:keep-permissions? #f)
+                (copy-recursively #$(this-package-input
+                                     "dotenv_2_0_0-checkout")
+                                  (string-append #$%cachedir
+                                   "/githubcom_euantoranodotenv_2.0.0")
+                                  #:keep-permissions? #f)
+                (copy-recursively #$(this-package-input
+                                     "dotenv_2_0_2-checkout")
+                                  (string-append #$%cachedir
+                                   "/githubcom_euantoranodotenv_2.0.2")
+                                  #:keep-permissions? #f)
+                (copy-recursively #$(this-package-input
+                                     "httpbeast_0_3_0-checkout")
+                                  (string-append #$%cachedir
+                                   "/githubcom_dom96httpbeast_0.3.0")
+                                  #:keep-permissions? #f)
+                (copy-recursively #$(this-package-input
+                                     "httpbeast_0_4_1-checkout")
+                                  (string-append #$%cachedir
+                                   "/githubcom_dom96httpbeast_0.4.1")
+                                  #:keep-permissions? #f)
+                (copy-recursively #$(this-package-input "asynctools-checkout")
+                                  (string-append #$%cachedir
+                                   "/githubcom_cheatfateasynctools_#0e6bdc3ed5bae8c7cc9")
+                                  #:keep-permissions? #f)
                 (copy-recursively #$(this-package-input "oauth-checkout")
                                   (string-append #$%cachedir
                                    "/githubcom_CORDEAoauth_#b8c163b")
@@ -216,8 +347,10 @@
                        (nimble (string-append nim "/bin/nimble")))
                   (setenv "HOME" "./cache-home")
                   (mkdir-p "./cache-home")
+                  ;; (invoke nimble "--nimbleDir:./cache-home/.nimble" "--offline" "setup" "--verbose")
                   (invoke nimble
                           "build"
+                          "--nimbleDir:./cache-home/.nimble"
                           "--offline"
                           "-d:danger"
                           "--mm:refc"
@@ -237,8 +370,20 @@
                     flatty
                     jsony
                     oauth
+                    ws-0.5.0
+                    ws
+                    asynctools_pr_fix_compilation
+                    sha1
+                    asynctools_pr_fix
+                    dotenv_2_0_2
+                    dotenv_2_0_0
+                    httpbeast_0_4_1
+                    httpbeast_0_3_0
+                    asynctools
                     nss-certs
-                    nim))
+                    nim
+                    nim-packages
+                    git))
       (home-page "https://github.com/zedeus/nitter")
       (synopsis
        "A free and open source alternative Twitter front-end focused on privacy and performance.")