diff options
author | Efraim Flashner <efraim@flashner.co.il> | 2021-03-24 15:28:33 +0200 |
---|---|---|
committer | Efraim Flashner <efraim@flashner.co.il> | 2021-03-24 20:50:44 +0200 |
commit | 2aab587f842908a886e3bd08b028885dddd650e0 (patch) | |
tree | 87c0723a9ae2c69ab6920d90b6e87ad8510492fe /gnu/packages/diffoscope.scm | |
parent | 5664bcdcb0e4c10dfe48dd5e4730fc3c746a21e2 (diff) | |
parent | 65c46e79e0495fe4d32f6f2725d7233fff10fd70 (diff) | |
download | guix-2aab587f842908a886e3bd08b028885dddd650e0.tar.gz guix-2aab587f842908a886e3bd08b028885dddd650e0.zip |
Merge remote-tracking branch 'origin/master' into core-updates
Diffstat (limited to 'gnu/packages/diffoscope.scm')
-rw-r--r-- | gnu/packages/diffoscope.scm | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/gnu/packages/diffoscope.scm b/gnu/packages/diffoscope.scm index a2490330e0..20ba92709a 100644 --- a/gnu/packages/diffoscope.scm +++ b/gnu/packages/diffoscope.scm @@ -72,7 +72,7 @@ (define-public diffoscope (package (name "diffoscope") - (version "168") + (version "170") (source (origin (method git-fetch) (uri (git-reference @@ -81,7 +81,7 @@ (file-name (git-file-name name version)) (sha256 (base32 - "18rs4jfx50d7vkaqcc46r7pccgizp0is56267sq13vbfvz758dhh")))) + "0s1z4yc5d10ns4x28d2lm8py30r7sq4764q6b8yxcwxwfrjibmb0")))) (build-system python-build-system) (arguments `(#:phases (modify-phases %standard-phases @@ -121,13 +121,6 @@ ;; This requires /sbin to be in $PATH. (delete-file "tests/test_tools.py") #t)) - (add-before 'check 'skip-dex-test-with-missing-procyon - (lambda _ - ;; This test actually requires procyon decompiler - (substitute* "tests/comparators/test_dex.py" - (("skip_unless_tools_exist.\"enjarify\", \"zipinfo\", \"javap\"") - "skip_unless_tools_exist(\"enjarify\", \"zipinfo\", \"javap\", \"procyon\"")) - #t)) (add-after 'install 'install-man-page (lambda* (#:key outputs #:allow-other-keys) (let* ((out (assoc-ref outputs "out")) |