1 files changed, 17 insertions(+), 15 deletions(-)

M guixrus/packages/riddim.scm

@@ 92,27 92,34 @@
              (let* ((out (assoc-ref outputs "out"))
                     (outdir (string-append out "/share/lua/5.2"))
                     (outfile (string-append outdir "/verse.lua")))
+               (substitute* "squishy"
+                 (("libs/encodings.lua\"") "libs/encodings.lua\"\nModule \"util.sha1\" \"util/sha1.lua\""))
+               (substitute* "component.lua"
+                 (("util.hashes\".sha1") "util.sha1\".sha1"))
              (invoke "squish"
                (string-append "--prosody=" (assoc-ref inputs "prosody-source")))
              (mkdir-p outdir)
              (call-with-output-file outfile
                (lambda (port)
                  (format port
-                   "package.path = '~a/share/lua/5.2/?.lua;~a/share/lua/5.2/?.lua;~a/share/lua/5.2/?.lua;' .. package.path;~@
-                    package.cpath = '~a/lib/lua/5.2/?.so;~a/lib/lua/5.2/?.so;~a/lib/lua/5.2/?.so;' .. package.cpath;\n"
+                   "package.path = '~a/share/lua/5.2/?.lua;~a/share/lua/5.2/?.lua;~a/share/lua/5.2/?.lua;~a/share/lua/5.2/bit/?.lua;' .. package.path;~@
+                    package.cpath = '~a/lib/lua/5.2/?.so;~a/lib/lua/5.2/?.so;~a/lib/lua/5.2/?.so;~a/lib/lua/5.2/bit/?.so;' .. package.cpath;\n"
                    (assoc-ref inputs "lua-socket")
                    (assoc-ref inputs "lua-expat")
                    (assoc-ref inputs "lua-sec")
+                   (assoc-ref inputs "lua-bitop")
                    (assoc-ref inputs "lua-socket")
                    (assoc-ref inputs "lua-expat")
-                   (assoc-ref inputs "lua-sec"))
+                   (assoc-ref inputs "lua-sec")
+                   (assoc-ref inputs "lua-bitop"))
                  (call-with-input-file "verse.lua" (lambda (inport)
                    (dump-port inport port))))))))
          (delete 'install))))
     (inputs
      `(("lua-socket" ,lua5.2-socket)
        ("lua-expat" ,lua5.2-expat)
-       ("lua-sec" ,lua5.2-sec)))
+       ("lua-sec" ,lua5.2-sec)
+       ("lua-bitop" ,lua5.2-bitop)))
     (native-inputs
      `(("squish" ,squish)
        ("lua" ,lua-5.2)


@@ 127,7 134,7 @@
 (define-public riddim
   (package
     (name "riddim")
-    (version "1c2b8d10ceed")
+    (version "3420808b8d3f")
     (source
       (origin
         (method hg-fetch)


@@ 136,7 143,7 @@
           (changeset version)))
         (sha256
           (base32
-            "0yyajkfn4q7ak31xv7rfm0wxlp4xmck0l4jviblzymj7zgdqgvzx"))))
+            "0ddhlliwzdlxprigak70ck97hcrb39l84lrz8japsn41gsgfnvam"))))
     (build-system copy-build-system)
     (arguments
      `(#:install-plan '(("riddim.lua" "bin/riddim"))


@@ 154,14 161,9 @@
                  (("\"youtube\",") "\"youtube\", \"servercontact\"")))
              (invoke "squish" "--executable")
              (chmod "riddim.lua" #o755))))))
-    (inputs
-     `(("lua" ,lua-5.2)))
-    (native-inputs
-     `(("squish" ,squish)
-       ("lua-verse" ,lua-verse)))
-    (synopsis
-      "")
-    (description
-      "")
+    (inputs (list lua-5.2 lua-verse))
+    (native-inputs (list squish))
+    (synopsis "")
+    (description "")
     (home-page "https://code.matthewwild.co.uk/riddim")
     (license license:expat)))