From c3704ecaa537f96dfca2f820c3af5357a6208ce6 Mon Sep 17 00:00:00 2001 From: Vagrant Cascadian Date: Wed, 16 Oct 2019 18:18:00 -0700 Subject: gnu: diffoscope: Update to 126. * gnu/packages/diffoscope (diffoscope): Update to 126. [arguments]: Remove add-known-tools phase, merged upstream. --- gnu/packages/diffoscope.scm | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-) (limited to 'gnu/packages/diffoscope.scm') diff --git a/gnu/packages/diffoscope.scm b/gnu/packages/diffoscope.scm index 15d5a5787e..23acf0aeb8 100644 --- a/gnu/packages/diffoscope.scm +++ b/gnu/packages/diffoscope.scm @@ -67,7 +67,7 @@ (define-module (gnu packages diffoscope) #:use-module (ice-9 match)) (define-public diffoscope - (let ((version "125")) + (let ((version "126")) (package (name "diffoscope") (version version) @@ -79,7 +79,7 @@ (define-public diffoscope (file-name (git-file-name name version)) (sha256 (base32 - "02kwisp9j63w27hhcwpdhg66dgxzz61q4fcyfz8z4hwlz6r0gyqy")))) + "0lmn2116g5l05nns8qd2kwsnnd144zrqhs53fsr88inzf0mkqwhj")))) (build-system python-build-system) (arguments `(#:phases (modify-phases %standard-phases @@ -90,18 +90,6 @@ (define-public diffoscope (lambda _ (substitute* "setup.py" (("'python-magic',") "")))) - ;; Patch in support for known tools - (add-after 'unpack 'add-known-tools - (lambda _ - (substitute* "diffoscope/external_tools.py" - (("'arch': 'enjarify'},") - "'arch': 'enjarify', 'guix': 'enjarify'},")) - (substitute* "diffoscope/external_tools.py" - (("'arch': 'python-jsbeautifier'},") - "'arch': 'python-jsbeautifier', 'guix': 'python-jsbeautifier'},")) - (substitute* "diffoscope/external_tools.py" - (("'arch': 'wabt'},") - "'arch': 'wabt', 'guix': 'wabt'},")))) ;; This test is broken because our `file` package has a ;; bug in berkeley-db file type detection. (add-after 'unpack 'remove-berkeley-test -- cgit v1.2.3 From d332fd860f89ed426a2b05eaa8f7a76ff6aab58f Mon Sep 17 00:00:00 2001 From: Vagrant Cascadian Date: Mon, 28 Oct 2019 13:33:43 -0700 Subject: gnu: diffoscope: Update to 129. * gnu/packages/diffoscope (diffoscope): Update to 129. --- gnu/packages/diffoscope.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/diffoscope.scm') diff --git a/gnu/packages/diffoscope.scm b/gnu/packages/diffoscope.scm index 23acf0aeb8..47dd36b919 100644 --- a/gnu/packages/diffoscope.scm +++ b/gnu/packages/diffoscope.scm @@ -67,7 +67,7 @@ (define-module (gnu packages diffoscope) #:use-module (ice-9 match)) (define-public diffoscope - (let ((version "126")) + (let ((version "129")) (package (name "diffoscope") (version version) @@ -79,7 +79,7 @@ (define-public diffoscope (file-name (git-file-name name version)) (sha256 (base32 - "0lmn2116g5l05nns8qd2kwsnnd144zrqhs53fsr88inzf0mkqwhj")))) + "1r8hq93gga9n4jv4fyf1divc9cwvvjadkzl47lazzrfy3nn1qjwr")))) (build-system python-build-system) (arguments `(#:phases (modify-phases %standard-phases -- cgit v1.2.3 From 36f5f23c1af640782aa47dbfed6352e3d4c957ff Mon Sep 17 00:00:00 2001 From: Vagrant Cascadian Date: Tue, 29 Oct 2019 00:04:26 -0700 Subject: gnu: diffoscope: Add additional native-inputs for tests. * gnu/packages/diffoscope (diffoscope)[native-inputs]: Add python-pypdf2 and python-progressbar33. --- gnu/packages/diffoscope.scm | 2 ++ 1 file changed, 2 insertions(+) (limited to 'gnu/packages/diffoscope.scm') diff --git a/gnu/packages/diffoscope.scm b/gnu/packages/diffoscope.scm index 47dd36b919..cfa98f63f2 100644 --- a/gnu/packages/diffoscope.scm +++ b/gnu/packages/diffoscope.scm @@ -153,6 +153,8 @@ (define-public diffoscope (native-inputs `(("python-pytest" ,python-pytest) ("python-chardet" ,python-chardet) ("python-binwalk" ,python-binwalk) + ("python-pypdf2" ,python-pypdf2) + ("python-progressbar33" ,python-progressbar33) ;; test suite skips tests when tool is missing ,@(match (%current-system) ;; ghc is only available on x86 currently. -- cgit v1.2.3