diff options
| author | fanquake <fanquake@gmail.com> | 2022-06-30 11:20:29 +0100 |
|---|---|---|
| committer | fanquake <fanquake@gmail.com> | 2022-06-30 11:21:06 +0100 |
| commit | 103c0d9f7e084c94ba7d83a44e784ab0b4a6d8e4 (patch) | |
| tree | 37bcff17ee06fda6294dc113fb28e6d77f820251 /contrib | |
| parent | 5bc10b39abbcb77638161902ccd1225139bc7cc0 (diff) | |
| download | bitcoin-103c0d9f7e084c94ba7d83a44e784ab0b4a6d8e4.tar.xz | |
guix: use elfesteem 2eb1e5384ff7a220fd1afacd4a0170acff54fe56
Our patch has been merged upstream, see
https://github.com/LRGH/elfesteem/pull/3
Diffstat (limited to 'contrib')
| -rw-r--r-- | contrib/guix/manifest.scm | 5 | ||||
| -rw-r--r-- | contrib/guix/patches/elfsteem-value-error-python-39.patch | 13 |
2 files changed, 2 insertions, 16 deletions
diff --git a/contrib/guix/manifest.scm b/contrib/guix/manifest.scm index df51d659e8..b05a13fd0f 100644 --- a/contrib/guix/manifest.scm +++ b/contrib/guix/manifest.scm @@ -253,7 +253,7 @@ thus should be able to compile on most platforms where these exist.") (license license:gpl3+))) ; license is with openssl exception (define-public python-elfesteem - (let ((commit "87bbd79ab7e361004c98cc8601d4e5f029fd8bd5")) + (let ((commit "2eb1e5384ff7a220fd1afacd4a0170acff54fe56")) (package (name "python-elfesteem") (version (git-version "0.1" "1" commit)) @@ -266,8 +266,7 @@ thus should be able to compile on most platforms where these exist.") (file-name (git-file-name name commit)) (sha256 (base32 - "1nyvjisvyxyxnd0023xjf5846xd03lwawp5pfzr8vrky7wwm5maz")) - (patches (search-our-patches "elfsteem-value-error-python-39.patch")))) + "07x6p8clh11z8s1n2kdxrqwqm2almgc5qpkcr9ckb6y5ivjdr5r6")))) (build-system python-build-system) ;; There are no tests, but attempting to run python setup.py test leads to ;; PYTHONPATH problems, just disable the test diff --git a/contrib/guix/patches/elfsteem-value-error-python-39.patch b/contrib/guix/patches/elfsteem-value-error-python-39.patch deleted file mode 100644 index 21e1228afd..0000000000 --- a/contrib/guix/patches/elfsteem-value-error-python-39.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/examples/otool.py b/examples/otool.py -index 2b8efc0..d797b2e 100755 ---- a/examples/otool.py -+++ b/examples/otool.py -@@ -342,7 +342,7 @@ if __name__ == '__main__': - try: - e = macho_init.MACHO(raw, - parseSymbols = False) -- except ValueError, err: -+ except ValueError as err: - print("%s:" %file) - print(" %s" % err) - continue |