diff options
| author | Efraim Flashner <efraim@flashner.co.il> | 2022-06-01 12:31:09 +0300 |
|---|---|---|
| committer | Efraim Flashner <efraim@flashner.co.il> | 2022-06-01 12:42:04 +0300 |
| commit | 64c043e63a4be97f59fd1906c47973a74eedda67 (patch) | |
| tree | 37b15dfb4830e4f874edca87b521b6e9cdc3c81b /gnu/packages/diffoscope.scm | |
| parent | b1f763de54dc2b8e240d0f01f7948ce76f67243e (diff) | |
| parent | 75af73e1b7ac58770122d8831faa3a8158638bb0 (diff) | |
Merge remote-tracking branch 'origin/master' into staging
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 bd091fedfc..16e3b2a481 100644 --- a/gnu/packages/diffoscope.scm +++ b/gnu/packages/diffoscope.scm @@ -74,7 +74,7 @@ (define-public diffoscope (package (name "diffoscope") - (version "213") + (version "214") (source (origin (method git-fetch) @@ -83,7 +83,7 @@ (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "075zrraj7pibwgi731pa506pkq5i06mpilqa03w3dd548b1jc9py")) + (base32 "05vzvs8yn963wzxmnqifj0zsa9scxcq3iqrq9msm0vqznb1xgp7q")) (patches (search-patches "diffoscope-fix-llvm-test.patch")))) (build-system python-build-system) @@ -111,13 +111,6 @@ (string-append "['" (which "stat") "',")) (("\\['getfacl',") (string-append "['" (which "getfacl") "',"))))) - (add-after 'unpack 'xb-tool-external-tool - ;; Fixed upstream, remove this phase when updating to - ;; diffoscope 213 - (lambda _ - (substitute* "diffoscope/external_tools.py" - ((".debian.: .libxmlb-dev.") - "\"debian\": \"libxmlb-dev\", \"guix\": \"libxmlb\"")))) (add-after 'build 'build-man-page (lambda* (#:key (make-flags '()) #:allow-other-keys) (apply invoke "make" "-C" "doc" make-flags))) |