Hi Simon, thanks for your response > Is it related to the message [1] you are answering? > > 1: <https://yhetil.org/guix/CNKL38E5T0RV.1VYM8R2V0O1QM@guix-framework/> > > If no, please start a new thread when it is a new topic. :-)
It took me a couple of minutes to understand what you're talking about. Indeed,
instead of copy-pasting the <help-guix@gnu.org> address I clicked "Reply" on
some random email from Guix mailing list and changed the subject. For years
I've been certain that messages are categorized into threads by their subject.
Now, as you wrote this, I assume there must be some thread meta-data that is
invisibly sent by our user agents when we use "Reply" or "Reply all".
Who would have thought? In the past, when I saw email software nicely present
thread emails as a tree of responses, I was thinking "wow, this program must be
using some really successful heuristic for determining what is the response to
what". Lol
Doing as you requested. Although this is suboptimal as well since now
the topic is split between 2 threads :/
> Why do you pack ’hydrilla-dist-tarball’ instead of just ’hydrilla’.
>
> Guix should take care of everything; not necessary when packing a
> Python bundle as you are doing.
It's ok, `hydrilla-dist-tarball` refers to a package that is built in
the package in the normal Guix way. The name just indicates that
tarball generated under `./dist/` is used instead of the project file
tree. If you're curious, I explain the crazy details in my previous
email response to "(".
It sometimes happens that to keep my message concise I write what seems
to be the most important and attach links to other stuff that the
reader can look at to understand everything. Here that "stuff" was the
project repo which contains hydrilla.scm with both package definitions.
And most of the time I learn that I failed to be clear enough and that
people don't have time to read my links. Well, I'm sorry for the
confusion. Although I'm starting to lose hope that I will learn to
communicate with ppl online without so many misunderstandings :/
The hydrilla.scm that I was loading with `-L .` is now attached. Is
there anything wrong in it?
Best,
Wojtek
-- (sig_start)
website: https://koszko.org/koszko.html
PGP: https://koszko.org/key.gpg
fingerprint: E972 7060 E3C5 637C 8A4F 4B42 4BC5 221C 5A79 FD1A
Meet Kraków saints! #4: blessed Bronisław Markiewicz
Poznaj świętych krakowskich! #4: błogosławiony Bronisław Markiewicz
https://pl.wikipedia.org/wiki/Bronisław_Markiewicz
-- (sig_end)
;; SPDX-License-Identifier: CC0-1.0
;; Copyright (C) 2022 Wojtek Kosior <kos...@koszko.org>
;;
;; Available under the terms of Creative Commons Zero v1.0 Universal.
(define-module (hydrilla))
(use-modules
(ice-9 rdelim)
(ice-9 regex))
(define %source-dir (dirname (current-filename)))
;; The PKG-INFO file is generated when running `python3 -m build -s` or similar.
;; It is also automatically included in the generated tarballs.
(define %hydrilla-version
(if (access? "src/hydrilla.egg-info/PKG-INFO" R_OK)
(let* ((port (open-input-file "src/hydrilla.egg-info/PKG-INFO"))
(process-line
(lambda (self-ref)
(let ((match-result
(string-match "^Version: (.*)" (read-line port))))
(if match-result (match:substring match-result 1)
(self-ref self-ref))))))
(process-line process-line))
"unknown"))
(use-modules
(guix packages)
(guix download)
(guix git-download)
(guix build-system python)
(guix gexp)
((guix licenses) #:prefix license:)
(gnu packages python-build)
(gnu packages python-xyz)
(gnu packages python-crypto)
(gnu packages compression)
(gnu packages python-compression)
(gnu packages xdisorg)
(gnu packages serialization)
(gnu packages protobuf)
(gnu packages python-web)
(gnu packages check)
(gnu packages sphinx)
(gnu packages python-check)
(gnu packages license)
(gnu packages gnupg))
(define-public python-kaitaistruct
(package
(name "python-kaitaistruct")
(version "0.10")
(source
(origin
(method url-fetch)
(uri (pypi-uri "kaitaistruct" version))
(sha256
(base32 "0ap5ka51gnc2mc4s1kqqsi6nb6zqv8wsrg17ryxazmkkj7idwi50"))))
(build-system python-build-system)
(home-page "https://kaitai.io";)
(native-inputs (list python-wheel))
(synopsis
"Declarative parser generator for binary data: runtime library for Python")
(description
"Kaitai Struct is a declarative language used for describing various binary
data structures, laid out in files or in memory - i.e. binary file formats,
network stream packet formats, etc.")
(license license:expat)))
(define-public python-parver
(package
(name "python-parver")
(version "0.3.1")
(source
(origin
(method url-fetch)
(uri (pypi-uri "parver" version))
(sha256
(base32 "1lyzqp8bz0n2kzabzl7k7g7cn90rlnrxjzva2p62gsfc7djy00n9"))))
(build-system python-build-system)
(arguments
`(#:phases
(modify-phases %standard-phases
(add-after 'unpack 'relax-requirements
(lambda _
(substitute* "setup.py"
(("arpeggio[^']*") "arpeggio"))))
(replace 'check
(lambda* (#:key tests? #:allow-other-keys)
(when tests?
(invoke "pytest")))))))
(propagated-inputs (list python-arpeggio python-attrs python-six))
(native-inputs
(list python-hypothesis
python-pretend
python-pytest))
(home-page "https://github.com/RazerM/parver";)
(synopsis "Parse and manipulate version numbers")
(description "Parver facilitates parsing and manipulation of
@url{https://www.python.org/dev/peps/pep-0440/,PEP 440} version numbers.")
(license license:expat)))
(define-public python-pyopenssl-for-haketilo
(let ((base python-pyopenssl))
(package
(inherit base)
(version "22.0.0")
(source
(origin
(inherit (package-source base))
(uri (pypi-uri "pyOpenSSL" version))
(sha256
(base32
"1gzihw09sqi71lwx97c69hab7w4rbnl6hhfrl6za3i5a4la1n2v6"))))
(propagated-inputs
(modify-inputs (package-propagated-inputs base)
(replace "python-cryptography" python-cryptography-next))))))
(define-public python-urllib3-for-haketilo
(let ((base python-urllib3))
(package
(inherit base)
(propagated-inputs
(modify-inputs (package-propagated-inputs base)
(replace "python-cryptography" python-cryptography-next)
(replace "python-pyopenssl" python-pyopenssl-for-haketilo))))))
(define-public python-requests-for-haketilo
(let ((base python-requests))
(package
(inherit base)
(propagated-inputs
(modify-inputs (package-propagated-inputs base)
(replace "python-urllib3" python-urllib3-for-haketilo))))))
(define-public python-werkzeug-for-haketilo
(let ((base python-werkzeug))
(package
(inherit base)
(propagated-inputs
(modify-inputs (package-propagated-inputs base)
(replace "python-requests" python-requests-for-haketilo))))))
(define-public python-flask-for-haketilo
(let ((base python-flask))
(package
(inherit base)
(propagated-inputs
(modify-inputs (package-propagated-inputs base)
(replace "python-werkzeug" python-werkzeug-for-haketilo))))))
(define-public mitmproxy
(package
(name "mitmproxy")
(version "8.1.1")
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/mitmproxy/mitmproxy";)
(commit (string-append "v" version))))
(sha256
(base32 "0kpzk8ci02vyjg9nqnpnadmgyaxxrpdydgfnm2xmxf1s4rzdcvwx"))
(snippet
'(begin
;; The player contains some minified JS. It would be possible to find
;; player sources elsewhere on the internet but there's no point in
;; doing do since we're not building the docs anyway.
(delete-file "docs/src/assets/asciinema-player.js")
#t))))
(build-system python-build-system)
(arguments
`(#:phases
(modify-phases %standard-phases
(add-after 'unpack 'relax-requirements
(lambda _
(substitute* "setup.py"
(("kaitaistruct>=0\\.7[^\"]*") "kaitaistruct")
;; The ">=2.8" req was there because older ldap3 lacked a crucial
;; ">=0.4.8" req for its dep, pyasn. It's not an issue for Guix
;; which ships with pyasn 4.8 anyway.
(("ldap3>=2\\.8[^\"]*") "ldap3")
(("protobuf>=3\\.14,<5") "protobuf")
(("sortedcontainers>=2\\.3[^\"]*") "sortedcontainers")
(("wsproto>=1\\.0[^\"]*") "wsproto")
(("pytest-timeout[^\"]*<2[^\"]*") "pytest-timeout")
(("pytest-asyncio[^\"]*<0.14[^\"]*") "pytest-asyncio"))
(substitute* "test/mitmproxy/proxy/layers/http/test_http.py"
(("isinstance\\(x, HTTPFlow\\)")
"issubclass(type(x), HTTPFlow)"))))
(replace 'check
(lambda* (#:key tests? #:allow-other-keys)
(when tests?
(setenv "HOME" "/tmp")
(invoke "pytest" "--timeout" "60")))))))
(propagated-inputs
(list python-asgiref
python-blinker
python-brotli
python-cryptography-next
python-flask-for-haketilo
python-h11
python-h2
python-hyperframe
python-kaitaistruct
python-ldap3
python-msgpack
python-passlib
python-protobuf
python-pyopenssl-for-haketilo
python-pyparsing
python-pyperclip
python-ruamel.yaml
python-sortedcontainers
python-tornado-6
python-urwid
python-wsproto
python-publicsuffix2
python-zstandard))
(native-inputs
(list python-parver
python-pytest
python-pytest-asyncio
python-pytest-timeout))
(home-page "https://mitmproxy.org/";)
(synopsis "A free interactive HTTPS proxy")
(description
"An interactive TLS-capable intercepting HTTP proxy for penetration testers
and software developers. It can be used to intercept, inspect, modify and
replay web traffic such as HTTP/1, HTTP/2, WebSockets, or any other
SSL/TLS-protected protocols.")
(license license:expat)))
(define-public python-immutables-for-haketilo
(let ((base python-immutables))
(package
(inherit base)
(version "0.19")
(source
(origin
;; Old version tarballs seem to be getting deleted from PyPI each time
;; a new version comes out.
(method git-fetch)
(uri (git-reference
(url "https://github.com/MagicStack/immutables";)
(commit (string-append "v" version))))
(sha256
(base32
"1awjylp4pl0jknwgnabg7kkj8f8883fkf99spsdrw1pj1acajvy9"))))
(arguments
`(#:phases
(modify-phases %standard-phases
(add-after 'unpack 'fix-expected-mypy-types
(lambda _
(substitute* "tests/test-data/check-immu.test"
(("builtins.str") "builtins.str*"))))
(replace 'check
(lambda* (#:key tests? #:allow-other-keys)
(when tests?
(invoke "pytest")))))))
(native-inputs
(list python-pytest python-mypy)))))
(define-public python-types-requests
(package
(name "python-types-requests")
(version "2.26.0")
(source (origin
(method url-fetch)
(uri (pypi-uri "types-requests" version))
(sha256
(base32
"10sq8jarr642vhw53k6zbf3hn2b8xfyrckwfngml4fj19g1whpnz"))))
(build-system python-build-system)
(home-page "https://github.com/python/typeshed";)
(synopsis "Typing stubs for requests")
(description
"This package provides a collection of library stubs for Python, with
static types.")
(license license:asl2.0)))
;; Use this variant when building from a downloaded release tarball.
(define-public hydrilla
(package
(name "hydrilla")
(version %hydrilla-version)
(source (local-file %source-dir #:recursive? #t))
(build-system python-build-system)
(arguments
`(#:phases
(modify-phases %standard-phases
(replace 'check
(lambda* (#:key tests? #:allow-other-keys)
(when tests?
(invoke "pytest")))))))
(propagated-inputs
(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
python-pytest
python-pypa-build
python-mypy
python-types-requests))
(home-page "https://hydrillabugs.koszko.org/projects/haketilo/wiki";)
(synopsis "Block JavaScript and add custom logic to web pages")
(description "Haketilo HTTP proxy facilitates viewing of websites while
having their original JavaScript replaced by user-provided scripts. Haketilo
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))))
;; Use this variant when building from a tarball generated under dist/. This
;; can be used to build from a git checkout after running `python3 -m build -s`
;; or similar.
(define-public hydrilla-dist-tarball
(let ((base hydrilla)
(filename (string-append "hydrilla-" %hydrilla-version ".tar.gz")))
(package
(inherit base)
(source (local-file
(string-append %source-dir "/dist/" filename))))))
pgpMrqOMFhWmv.pgp
Description: OpenPGP digital signature
