...

diff --git a/infiniteadaptability/packages/nitter.scm b/infiniteadaptability/packages/nitter.scm
index 4bce92f3710ac0240d6e4ca02ed28e31a3941223..d937e0621f7a19fd315c2734d570f0d7ca4563a5 100644 (file)
--- a/infiniteadaptability/packages/nitter.scm
+++ b/infiniteadaptability/packages/nitter.scm
@@ -6,140 +6,127 @@
   #:use-module (guix build-system gnu)
   #:use-module (guix gexp)
   #:use-module (guix git-download)
-  #:use-module ((guix licenses) #:prefix license:)
+  #:use-module ((guix licenses)
+                #:prefix license:)
   #:use-module (guix packages)
   #:use-module ((guix search-paths)
                 #:select ($SSL_CERT_DIR $SSL_CERT_FILE))
   #:export (nitter))
 
+(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 jester
   (origin
     (method git-fetch)
     (file-name "jester-checkout")
-    (uri
-     (git-reference
-      (url "https://github.com/dom96/jester.git")
-      (commit "baca3f")))
+    (uri (git-reference (url "https://github.com/dom96/jester.git")
+                        (commit "baca3f")))
     (sha256 (base32 "0i8rxsbp5yd9dasis650vqppika43mzfsls4fc7cz8k5j8xpd6zc"))))
 
 (define karax
   (origin
     (method git-fetch)
     (file-name "karax-checkout")
-    (uri
-     (git-reference
-      (url "https://github.com/karaxnim/karax")
-      (commit "5cf360c")))
+    (uri (git-reference (url "https://github.com/karaxnim/karax")
+                        (commit "5cf360c")))
     (sha256 (base32 "1fh0jcjlw0vfqmr5dmhk436g569qvcpml9f981x28wmvm1511z2c"))))
 
 (define sass
   (origin
     (method git-fetch)
     (file-name "sass-checkout")
-    (uri
-     (git-reference
-      (url "https://github.com/dom96/sass")
-      (commit "7dfdd03")))
+    (uri (git-reference (url "https://github.com/dom96/sass")
+                        (commit "7dfdd03")))
     (sha256 (base32 "19d78787k97l5cis81800hxa9qjr0yzjshlzdp727gh6pn8kc8fj"))))
 
 (define nimcrypto
   (origin
     (method git-fetch)
     (file-name "nimcrypto-checkout")
-    (uri
-     (git-reference
-      (url "https://github.com/cheatfate/nimcrypto")
-      (commit "a079df9")))
+    (uri (git-reference (url "https://github.com/cheatfate/nimcrypto")
+                        (commit "a079df9")))
     (sha256 (base32 "1dmdmgb6b9m5f8dyxk781nnd61dsk3hdxqks7idk9ncnpj9fng65"))))
 
 (define markdown
   (origin
     (method git-fetch)
     (file-name "markdown-checkout")
-    (uri
-     (git-reference
-      (url "https://github.com/soasme/nim-markdown")
-      (commit "158efe3")))
+    (uri (git-reference (url "https://github.com/soasme/nim-markdown")
+                        (commit "158efe3")))
     (sha256 (base32 "1701q0i8yd9rrjraf5fzgcvilwnwgw3wyzzfwpr2drmn3x9pd8fj"))))
 
 (define packedjson
   (origin
     (method git-fetch)
     (file-name "packedjson-checkout")
-    (uri
-     (git-reference
-      (url "https://github.com/Araq/packedjson")
-      (commit "9e6fbb6")))
+    (uri (git-reference (url "https://github.com/Araq/packedjson")
+                        (commit "9e6fbb6")))
     (sha256 (base32 "09yxshkfpacgl6x8f77snjcwz37r519vh7rrnqrnh5npvgk3h24j"))))
 
 (define supersnappy
   (origin
     (method git-fetch)
     (file-name "supersnappy-checkout")
-    (uri
-     (git-reference
-      (url "https://github.com/guzba/supersnappy")
-      (commit "6c94198")))
+    (uri (git-reference (url "https://github.com/guzba/supersnappy")
+                        (commit "6c94198")))
     (sha256 (base32 "0gxy7ijm4d2i4dkb64wwq51gns0i2d3d3rrd9cra7fyiahaph4xi"))))
 
 (define redpool
   (origin
     (method git-fetch)
     (file-name "redpool-checkout")
-    (uri
-     (git-reference
-      (url "https://github.com/zedeus/redpool")
-      (commit "8b7c1db")))
+    (uri (git-reference (url "https://github.com/zedeus/redpool")
+                        (commit "8b7c1db")))
     (sha256 (base32 "10xh5fhwnahnq1nf6j69vvnbi55kixa0ari630gr6cdx80arvbs6"))))
 
 (define nimredis
   (origin
     (method git-fetch)
     (file-name "nimredis-checkout")
-    (uri
-     (git-reference
-      (url "https://github.com/zedeus/redis")
-      (commit "d0a0e6f")))
+    (uri (git-reference (url "https://github.com/zedeus/redis")
+                        (commit "d0a0e6f")))
     (sha256 (base32 "166kzflb3wgwvqnv9flyynp8b35xby617lxmk0yas8i4m6vjl00f"))))
 
 (define zippy
   (origin
     (method git-fetch)
     (file-name "zippy-checkout")
-    (uri
-     (git-reference
-      (url "https://github.com/guzba/zippy")
-      (commit "ca5989a")))
+    (uri (git-reference (url "https://github.com/guzba/zippy")
+                        (commit "ca5989a")))
     (sha256 (base32 "0rk31ispck48ilvzs0lxpp7z6y238a7d7dh7lmlfwi5i7hx13la6"))))
 
 (define flatty
   (origin
     (method git-fetch)
     (file-name "flatty-checkout")
-    (uri
-     (git-reference
-      (url "https://github.com/treeform/flatty")
-      (commit "e668085")))
+    (uri (git-reference (url "https://github.com/treeform/flatty")
+                        (commit "e668085")))
     (sha256 (base32 "0886lk20rg1pq56jsz1jjd8vrdz46lgdaxvp97az06mcawhbabbz"))))
 
 (define jsony
   (origin
     (method git-fetch)
     (file-name "jsony-checkout")
-    (uri
-     (git-reference
-      (url "https://github.com/treeform/jsony")
-      (commit "1de1f08")))
+    (uri (git-reference (url "https://github.com/treeform/jsony")
+                        (commit "1de1f08")))
     (sha256 (base32 "0rj205cs3v6g80h8ys9flbdq4wyd1csmkwdxv0lz21972zcsrcfh"))))
 
 (define oauth
   (origin
     (method git-fetch)
     (file-name "oauth-checkout")
-    (uri
-     (git-reference
-      (url "https://github.com/CORDEA/oauth")
-      (commit "b8c163b")))
+    (uri (git-reference (url "https://github.com/CORDEA/oauth")
+                        (commit "b8c163b")))
     (sha256 (base32 "0k5slyzjngbdr6g0b0dykhqmaf8r8n2klbkg2gpid4ckm8hg62v5"))))
 
 (define nitter
@@ -167,44 +154,91 @@
         #:phases
         #~(modify-phases %standard-phases
             (delete 'configure)
-               (add-after 'unpack 'copy-deps:www
-               (lambda _
-                 (copy-recursively #$(this-package-input "jester-checkout") "dist/jester"
-                                   #:keep-permissions? #f)
-                 (copy-recursively #$(this-package-input "karax-checkout") "dist/karax"
-                                   #:keep-permissions? #f)
-                 (copy-recursively #$(this-package-input "sass-checkout") "dist/sass"
-                                   #:keep-permissions? #f)
-                 (copy-recursively #$(this-package-input "nimcrypto-checkout") "dist/nimcrypto"
-                                   #:keep-permissions? #f)
-                (copy-recursively #$(this-package-input "markdown-checkout") "dist/markdown"
-                                   #:keep-permissions? #f)
-                (copy-recursively #$(this-package-input "packedjson-checkout") "dist/packedjson"
-                                   #:keep-permissions? #f)
-                (copy-recursively #$(this-package-input "supersnappy-checkout") "dist/supersnappy"
-                                   #:keep-permissions? #f)
-                (copy-recursively #$(this-package-input "redpool-checkout") "dist/redpool"
-                                   #:keep-permissions? #f)
-                (copy-recursively #$(this-package-input "nimredis-checkout") "dist/nimredis"
-                                   #:keep-permissions? #f)
-                (copy-recursively #$(this-package-input "zippy-checkout") "dist/zippy"
-                                   #:keep-permissions? #f)
-                (copy-recursively #$(this-package-input "flatty-checkout") "dist/flatty"
-                                   #:keep-permissions? #f)
-                (copy-recursively #$(this-package-input "jsony-checkout") "dist/jsony"
-                                   #:keep-permissions? #f)
-                (copy-recursively #$(this-package-input "oauth-checkout") "dist/oauth"
-                                   #:keep-permissions? #f)))
+            (add-after 'unpack 'copy-deps:www
+              (lambda _
+                (setenv "HOME" "./cache-home")
+                (mkdir-p #$%cachedir)
+                (copy-recursively #$(this-package-input "jester-checkout")
+                                  (string-append #$%cachedir
+                                   "/githubcom_dom96jester_#baca3f")
+                                  #:keep-permissions? #f)
+                (copy-recursively #$(this-package-input "karax-checkout")
+                                  (string-append #$%cachedir
+                                   "/githubcom_karaxnimkarax_#5cf360c")
+                                  #:keep-permissions? #f)
+                (copy-recursively #$(this-package-input "sass-checkout")
+                                  (string-append #$%cachedir
+                                   "/githubcom_dom96sass_#7dfdd03")
+                                  #:keep-permissions? #f)
+                (copy-recursively #$(this-package-input "nimcrypto-checkout")
+                                  (string-append #$%cachedir
+                                   "/githubcom_cheatfatenimcrypto_#a079df9")
+                                  #:keep-permissions? #f)
+                (copy-recursively #$(this-package-input "markdown-checkout")
+                                  (string-append #$%cachedir
+                                   "/githubcom_soasmenimmarkdown_#158efe3")
+                                  #:keep-permissions? #f)
+                (copy-recursively #$(this-package-input "packedjson-checkout")
+                                  (string-append #$%cachedir
+                                   "/githubcom_Araqpackedjson_#9e6fbb6")
+                                  #:keep-permissions? #f)
+                (copy-recursively #$(this-package-input "supersnappy-checkout")
+                                  (string-append #$%cachedir
+                                   "/githubcom_guzbasupersnappy_#6c94198")
+                                  #:keep-permissions? #f)
+                (copy-recursively #$(this-package-input "redpool-checkout")
+                                  (string-append #$%cachedir
+                                   "/githubcom_zedeusredpool_#8b7c1db")
+                                  #:keep-permissions? #f)
+                (copy-recursively #$(this-package-input "nimredis-checkout")
+                                  (string-append #$%cachedir
+                                   "/githubcom_zedeusredis_#d0a0e6f")
+                                  #:keep-permissions? #f)
+                (copy-recursively #$(this-package-input "zippy-checkout")
+                                  (string-append #$%cachedir
+                                   "/githubcom_guzbazippy_#ca5989a")
+                                  #:keep-permissions? #f)
+                (copy-recursively #$(this-package-input "flatty-checkout")
+                                  (string-append #$%cachedir
+                                   "/githubcom_treeformflatty_#e668085")
+                                  #:keep-permissions? #f)
+                (copy-recursively #$(this-package-input "jsony-checkout")
+                                  (string-append #$%cachedir
+                                   "/githubcom_treeformjsony_#1de1f08")
+                                  #:keep-permissions? #f)
+                (copy-recursively #$(this-package-input "oauth-checkout")
+                                  (string-append #$%cachedir
+                                   "/githubcom_CORDEAoauth_#b8c163b")
+                                  #:keep-permissions? #f)))
             (replace 'build
               (lambda* (#:key inputs #:allow-other-keys)
                 (let* ((nim (assoc-ref inputs "nim"))
                        (nimble (string-append nim "/bin/nimble")))
                   (setenv "HOME" "./cache-home")
                   (mkdir-p "./cache-home")
-                  (invoke nimble "build" "--offline" "-d:danger" "--mm:refc" "--verbose")
+                  (invoke nimble
+                          "build"
+                          "--offline"
+                          "-d:danger"
+                          "--mm:refc"
+                          "--verbose")
                   (invoke nimble "scss")
                   (invoke nimble "md")))))))
-      (inputs (list jester karax sass nimcrypto markdown packedjson supersnappy redpool nimredis zippy flatty jsony oauth nss-certs nim))
+      (inputs (list jester
+                    karax
+                    sass
+                    nimcrypto
+                    markdown
+                    packedjson
+                    supersnappy
+                    redpool
+                    nimredis
+                    zippy
+                    flatty
+                    jsony
+                    oauth
+                    nss-certs
+                    nim))
       (home-page "https://github.com/zedeus/nitter")
       (synopsis
        "A free and open source alternative Twitter front-end focused on privacy and performance.")