diff options
| author | Jakub Kądziołka <kuba@kadziolka.net> | 2020-06-22 02:56:22 +0200 |
|---|---|---|
| committer | Jakub Kądziołka <kuba@kadziolka.net> | 2020-06-22 02:56:22 +0200 |
| commit | 43bc7855113bd725d464dd9eaa1e54e78edfaab1 (patch) | |
| tree | 2655f85e9946ececdb4fb052c2f3e31375c41e0f /gnu/packages/diffoscope.scm | |
| parent | 0c4e39c0b025fb23a2e5df46434fc96112bb6d6c (diff) | |
| parent | f8a28b6c6d4fe7642b7df35e8518e3c0174ede74 (diff) | |
| download | guix-43bc7855113bd725d464dd9eaa1e54e78edfaab1.tar.gz | |
Merge branch 'master' into core-updates
Diffstat (limited to 'gnu/packages/diffoscope.scm')
| -rw-r--r-- | gnu/packages/diffoscope.scm | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/gnu/packages/diffoscope.scm b/gnu/packages/diffoscope.scm index f6f402b315..f5387f8501 100644 --- a/gnu/packages/diffoscope.scm +++ b/gnu/packages/diffoscope.scm @@ -72,7 +72,7 @@ (define-public diffoscope (package (name "diffoscope") - (version "146") + (version "148") (source (origin (method git-fetch) (uri (git-reference @@ -81,7 +81,7 @@ (file-name (git-file-name name version)) (sha256 (base32 - "07kd3vshf4wlm0mv3mp6ljbxjq80mcg52w5ks6si1gnpzfbfz07p")))) + "0siv5z8iqgkzl51dmv69ifqids6hqmiir00yyl1aaqbginrwyhyv")))) (build-system python-build-system) (arguments `(#:phases (modify-phases %standard-phases @@ -92,12 +92,6 @@ (lambda _ (substitute* "setup.py" (("'python-magic',") "")))) - ;; Patch in support for known tools - (add-after 'unpack 'add-known-tools - (lambda _ - (substitute* "diffoscope/external_tools.py" - (("'debian': 'openssl'") - "'debian': 'openssl', 'guix': 'openssl'")))) ;; This test is broken because our `file` package has a ;; bug in berkeley-db file type detection. (add-after 'unpack 'remove-berkeley-test |