summary refs log tree commit diff
path: root/gnu
diff options
context:
space:
mode:
authorMarius Bakke <mbakke@fastmail.com>2017-02-21 15:59:10 +0100
committerMarius Bakke <mbakke@fastmail.com>2017-02-21 16:07:30 +0100
commit025519fa955cd554dd9c868b996b1dc6ba54f4a7 (patch)
tree6fd3fa6de64713f99b0ef5b31d0df460a79eaf55 /gnu
parent2178b580cbb7d7c4648d4fb26edb4d2412aecf96 (diff)
downloadguix-025519fa955cd554dd9c868b996b1dc6ba54f4a7.tar.gz
gnu: diffoscope: Update to 77.
* gnu/packages/package-management.scm (diffoscope): Update to 77.
[arguments]: Remove obsolete colordiff substitution. Adjust 'xxd' substitution
to source path renames. Fix test failure by making it required.
Diffstat (limited to 'gnu')
-rw-r--r--gnu/packages/package-management.scm11
1 files changed, 3 insertions, 8 deletions
diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm
index 8291740998..388368e2d3 100644
--- a/gnu/packages/package-management.scm
+++ b/gnu/packages/package-management.scm
@@ -445,13 +445,13 @@ transactions from C or Python.")
 (define-public diffoscope
   (package
     (name "diffoscope")
-    (version "63")
+    (version "77")
     (source (origin
               (method url-fetch)
               (uri (pypi-uri name version))
               (sha256
                (base32
-                "12q5d2nszql1g4jf2ss863v0wpvvhrkaivqzhy6af9m9zwvw0p0k"))))
+                "0wrb6pl88611frxj19kq3vikhbld40fy1ncrskb1iayxsmbfcbn9"))))
     (build-system python-build-system)
     (arguments
      `(#:phases (modify-phases %standard-phases
@@ -464,12 +464,7 @@ transactions from C or Python.")
                         (("'python-magic',") ""))))
                   (add-after 'unpack 'embed-tool-references
                     (lambda* (#:key inputs #:allow-other-keys)
-                      (substitute* "diffoscope/difference.py"
-                        (("@tool_required\\('colordiff'\\)") "")
-                        (("\\[\"colordiff\"")
-                         (string-append "[\"" (which "colordiff") "\"")))
-                      (substitute* "diffoscope/comparators/utils.py"
-                        (("@tool_required\\('xxd'\\)") "")
+                      (substitute* "diffoscope/comparators/utils/compare.py"
                         (("\\['xxd',")
                          (string-append "['" (which "xxd") "',")))
                       (substitute* "diffoscope/comparators/elf.py"