[builder][server][proxy] make Hydrilla Guix package functional

1 files changed, 21 insertions, 21 deletions

diff --git a/guix.scm b/guix.scm
index 38a673d..d4f2dc2 100644
--- a/guix.scm
+++ b/guix.scm
@@ -123,7 +123,7 @@ network stream packet formats, etc.")
        (modify-inputs (package-propagated-inputs base)
          (replace "python-requests" python-requests-for-mitmproxy))))))
 
-(define-public python-flask-for-mitmproxy
+(define-public python-flask-for-haketilo
   (let ((base python-flask))
     (package
       (inherit base)
@@ -171,7 +171,7 @@ network stream packet formats, etc.")
                (("isinstance\\(x, HTTPFlow\\)")
                 "issubclass(type(x), HTTPFlow)"))))
          (replace 'check
-           (lambda* (#:key tests? inputs outputs #:allow-other-keys)
+           (lambda* (#:key tests? #:allow-other-keys)
              (when tests?
                (setenv "HOME" "/tmp")
                (invoke "pytest" "--timeout" "60")))))))
@@ -180,7 +180,7 @@ network stream packet formats, etc.")
            python-blinker
            python-brotli
            python-cryptography-next
-           python-flask-for-mitmproxy
+           python-flask-for-haketilo
            python-h11
            python-h2
            python-hyperframe
@@ -261,17 +261,14 @@ SSL/TLS-protected protocols.")
 static types.")
     (license license:asl2.0)))
 
-;; WARNING! Haketilo package is not ready for building yet. The definition below
-;; is only useful for setting up a development environment with
-;; `guix shell -D -f guix.scm`. The package will be updated to build properly
-;; somewhere in the future.
-(define-public haketilo
+(define-public hydrilla
   (package
-    (name "haketilo")
-    (version "git")
-    (source (local-file %source-dir
-                        #:recursive? #t
-                        #:select? (git-predicate %source-dir)))
+    (name "hydrilla")
+    ;; Change the following to the version for which you have generated a
+    ;; tarball under dist/.
+    (version "3.0b0")
+    (source (local-file
+             (string-append %source-dir "/dist/hydrilla-" version ".tar.gz")))
     (build-system python-build-system)
     (arguments
      `(#:phases
@@ -281,13 +278,16 @@ static types.")
              (when tests?
                (invoke "pytest")))))))
     (propagated-inputs
-      (list mitmproxy
-            reuse
-            python-beautifulsoup4
-            python-html5lib
-            python-immutables-for-haketilo
-            python-jsonschema
-            python-gnupg))
+     (list mitmproxy
+           python-beautifulsoup4
+           python-click
+           python-flask-for-haketilo
+           python-gnupg
+           python-html5lib
+           python-immutables-for-haketilo
+           python-itsdangerous
+           python-jsonschema
+           reuse))
     (native-inputs
       (list python-setuptools-scm
             python-babel
@@ -303,4 +303,4 @@ combines the functionalities of content blocker and user script manager. It can
 be used with its script repository, Hydrilla.")
     (license (list license:agpl3+ license:gpl3+ license:cc0))))
 
-haketilo
+hydrilla