Skip to content

Commit 0aa014d

Browse files
committed
Merge bitcoin#28859: guix: update signapple (drop macho & altgraph)
f718a74 guix: remove python-macholib (fanquake) d3cbff1 guix: update signapple (fanquake) Pull request description: Update to the latest signapple, which includes achow101/signapple#13. Drop python-macholib and python-altgraph. ACKs for top commit: Sjors: ACK f718a74 Tree-SHA512: 199b2108f2f063b6b0fb5354ac79a30b46e848c923ebe7d02f7d7d3f08749817a1f6b4c14d21658fd2f2d68f8be1698e1999edf7e2366b1cae3bf2709a665e30
2 parents 1084621 + f718a74 commit 0aa014d

File tree

1 file changed

+3
-53
lines changed

1 file changed

+3
-53
lines changed

contrib/guix/manifest.scm

Lines changed: 3 additions & 53 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919
((gnu packages python) #:select (python-minimal))
2020
((gnu packages python-build) #:select (python-tomli))
2121
((gnu packages python-crypto) #:select (python-asn1crypto))
22-
((gnu packages python-xyz) #:select (python-altgraph))
2322
((gnu packages tls) #:select (openssl))
2423
((gnu packages version-control) #:select (git-minimal))
2524
(guix build-system cmake)
@@ -373,56 +372,8 @@ certificates or paths. Supports various options, including: validation at a
373372
specific moment in time, whitelisting and revocation checks.")
374373
(license license:expat))))
375374

376-
(define-public python-macholib
377-
(package
378-
(name "python-macholib")
379-
(version "1.14")
380-
(source
381-
(origin
382-
(method git-fetch)
383-
(uri (git-reference
384-
(url "https://github.com/ronaldoussoren/macholib")
385-
(commit (string-append "v" version))))
386-
(file-name (git-file-name name version))
387-
(sha256
388-
(base32
389-
"0aislnnfsza9wl4f0vp45ivzlc0pzhp9d4r08700slrypn5flg42"))))
390-
(build-system python-build-system)
391-
(propagated-inputs
392-
`(("python-altgraph" ,python-altgraph)))
393-
(arguments
394-
'(#:phases
395-
(modify-phases %standard-phases
396-
(add-after 'unpack 'disable-broken-tests
397-
(lambda _
398-
;; This test is broken as there is no keyboard interrupt.
399-
(substitute* "macholib_tests/test_command_line.py"
400-
(("^(.*)class TestCmdLine" line indent)
401-
(string-append indent
402-
"@unittest.skip(\"Disabled by Guix\")\n"
403-
line)))
404-
(substitute* "macholib_tests/test_dyld.py"
405-
(("^(.*)def test_\\S+_find" line indent)
406-
(string-append indent
407-
"@unittest.skip(\"Disabled by Guix\")\n"
408-
line))
409-
(("^(.*)def testBasic" line indent)
410-
(string-append indent
411-
"@unittest.skip(\"Disabled by Guix\")\n"
412-
line))
413-
)
414-
#t)))))
415-
(home-page "https://github.com/ronaldoussoren/macholib")
416-
(synopsis "Python library for analyzing and editing Mach-O headers")
417-
(description "macholib is a Macho-O header analyzer and editor. It's
418-
typically used as a dependency analysis tool, and also to rewrite dylib
419-
references in Mach-O headers to be @executable_path relative. Though this tool
420-
targets a platform specific file format, it is pure python code that is platform
421-
and endian independent.")
422-
(license license:expat)))
423-
424375
(define-public python-signapple
425-
(let ((commit "7a96b4171a360abf0f0f56e499f8f9ed2116280d"))
376+
(let ((commit "62155712e7417aba07565c9780a80e452823ae6a"))
426377
(package
427378
(name "python-signapple")
428379
(version (git-version "0.1" "1" commit))
@@ -435,14 +386,13 @@ and endian independent.")
435386
(file-name (git-file-name name commit))
436387
(sha256
437388
(base32
438-
"0aa4k180jnpal15yhncnm3g3z9gzmi7qb25q5l0kaj444a1p2pm4"))))
389+
"1nm6rm4h4m7kbq729si4cm8rzild62mk4ni8xr5zja7l33fhv3gb"))))
439390
(build-system python-build-system)
440391
(propagated-inputs
441392
`(("python-asn1crypto" ,python-asn1crypto)
442393
("python-oscrypto" ,python-oscrypto)
443394
("python-certvalidator" ,python-certvalidator)
444-
("python-elfesteem" ,python-elfesteem)
445-
("python-macholib" ,python-macholib)))
395+
("python-elfesteem" ,python-elfesteem)))
446396
;; There are no tests, but attempting to run python setup.py test leads to
447397
;; problems, just disable the test
448398
(arguments '(#:tests? #f))

0 commit comments

Comments
 (0)