mirror of
https://github.com/bitcoin/bitcoin.git
synced 2026-09-11 21:20:39 +02:00
Merge bitcoin/bitcoin#28859: guix: update signapple (drop macho & altgraph)
f718a74b12guix: remove python-macholib (fanquake)d3cbff16c2guix: update signapple (fanquake) Pull request description: Update to the latest signapple, which includes https://github.com/achow101/signapple/pull/13. Drop python-macholib and python-altgraph. ACKs for top commit: Sjors: ACKf718a74b12Tree-SHA512: 199b2108f2f063b6b0fb5354ac79a30b46e848c923ebe7d02f7d7d3f08749817a1f6b4c14d21658fd2f2d68f8be1698e1999edf7e2366b1cae3bf2709a665e30
This commit is contained in:
@@ -19,7 +19,6 @@
|
|||||||
((gnu packages python) #:select (python-minimal))
|
((gnu packages python) #:select (python-minimal))
|
||||||
((gnu packages python-build) #:select (python-tomli))
|
((gnu packages python-build) #:select (python-tomli))
|
||||||
((gnu packages python-crypto) #:select (python-asn1crypto))
|
((gnu packages python-crypto) #:select (python-asn1crypto))
|
||||||
((gnu packages python-xyz) #:select (python-altgraph))
|
|
||||||
((gnu packages tls) #:select (openssl))
|
((gnu packages tls) #:select (openssl))
|
||||||
((gnu packages version-control) #:select (git-minimal))
|
((gnu packages version-control) #:select (git-minimal))
|
||||||
(guix build-system cmake)
|
(guix build-system cmake)
|
||||||
@@ -373,56 +372,8 @@ certificates or paths. Supports various options, including: validation at a
|
|||||||
specific moment in time, whitelisting and revocation checks.")
|
specific moment in time, whitelisting and revocation checks.")
|
||||||
(license license:expat))))
|
(license license:expat))))
|
||||||
|
|
||||||
(define-public python-macholib
|
|
||||||
(package
|
|
||||||
(name "python-macholib")
|
|
||||||
(version "1.14")
|
|
||||||
(source
|
|
||||||
(origin
|
|
||||||
(method git-fetch)
|
|
||||||
(uri (git-reference
|
|
||||||
(url "https://github.com/ronaldoussoren/macholib")
|
|
||||||
(commit (string-append "v" version))))
|
|
||||||
(file-name (git-file-name name version))
|
|
||||||
(sha256
|
|
||||||
(base32
|
|
||||||
"0aislnnfsza9wl4f0vp45ivzlc0pzhp9d4r08700slrypn5flg42"))))
|
|
||||||
(build-system python-build-system)
|
|
||||||
(propagated-inputs
|
|
||||||
`(("python-altgraph" ,python-altgraph)))
|
|
||||||
(arguments
|
|
||||||
'(#:phases
|
|
||||||
(modify-phases %standard-phases
|
|
||||||
(add-after 'unpack 'disable-broken-tests
|
|
||||||
(lambda _
|
|
||||||
;; This test is broken as there is no keyboard interrupt.
|
|
||||||
(substitute* "macholib_tests/test_command_line.py"
|
|
||||||
(("^(.*)class TestCmdLine" line indent)
|
|
||||||
(string-append indent
|
|
||||||
"@unittest.skip(\"Disabled by Guix\")\n"
|
|
||||||
line)))
|
|
||||||
(substitute* "macholib_tests/test_dyld.py"
|
|
||||||
(("^(.*)def test_\\S+_find" line indent)
|
|
||||||
(string-append indent
|
|
||||||
"@unittest.skip(\"Disabled by Guix\")\n"
|
|
||||||
line))
|
|
||||||
(("^(.*)def testBasic" line indent)
|
|
||||||
(string-append indent
|
|
||||||
"@unittest.skip(\"Disabled by Guix\")\n"
|
|
||||||
line))
|
|
||||||
)
|
|
||||||
#t)))))
|
|
||||||
(home-page "https://github.com/ronaldoussoren/macholib")
|
|
||||||
(synopsis "Python library for analyzing and editing Mach-O headers")
|
|
||||||
(description "macholib is a Macho-O header analyzer and editor. It's
|
|
||||||
typically used as a dependency analysis tool, and also to rewrite dylib
|
|
||||||
references in Mach-O headers to be @executable_path relative. Though this tool
|
|
||||||
targets a platform specific file format, it is pure python code that is platform
|
|
||||||
and endian independent.")
|
|
||||||
(license license:expat)))
|
|
||||||
|
|
||||||
(define-public python-signapple
|
(define-public python-signapple
|
||||||
(let ((commit "7a96b4171a360abf0f0f56e499f8f9ed2116280d"))
|
(let ((commit "62155712e7417aba07565c9780a80e452823ae6a"))
|
||||||
(package
|
(package
|
||||||
(name "python-signapple")
|
(name "python-signapple")
|
||||||
(version (git-version "0.1" "1" commit))
|
(version (git-version "0.1" "1" commit))
|
||||||
@@ -435,14 +386,13 @@ and endian independent.")
|
|||||||
(file-name (git-file-name name commit))
|
(file-name (git-file-name name commit))
|
||||||
(sha256
|
(sha256
|
||||||
(base32
|
(base32
|
||||||
"0aa4k180jnpal15yhncnm3g3z9gzmi7qb25q5l0kaj444a1p2pm4"))))
|
"1nm6rm4h4m7kbq729si4cm8rzild62mk4ni8xr5zja7l33fhv3gb"))))
|
||||||
(build-system python-build-system)
|
(build-system python-build-system)
|
||||||
(propagated-inputs
|
(propagated-inputs
|
||||||
`(("python-asn1crypto" ,python-asn1crypto)
|
`(("python-asn1crypto" ,python-asn1crypto)
|
||||||
("python-oscrypto" ,python-oscrypto)
|
("python-oscrypto" ,python-oscrypto)
|
||||||
("python-certvalidator" ,python-certvalidator)
|
("python-certvalidator" ,python-certvalidator)
|
||||||
("python-elfesteem" ,python-elfesteem)
|
("python-elfesteem" ,python-elfesteem)))
|
||||||
("python-macholib" ,python-macholib)))
|
|
||||||
;; There are no tests, but attempting to run python setup.py test leads to
|
;; There are no tests, but attempting to run python setup.py test leads to
|
||||||
;; problems, just disable the test
|
;; problems, just disable the test
|
||||||
(arguments '(#:tests? #f))
|
(arguments '(#:tests? #f))
|
||||||
|
|||||||
Reference in New Issue
Block a user