From 271736117e3f09b616a2dbd5d74c9595926c9297 Mon Sep 17 00:00:00 2001
From: Vagrant Cascadian <vagrant@reproducible-builds.org>
Date: Sat, 4 Jun 2022 15:54:46 -0700
Subject: gnu: diffoscope: Update to 215.

* gnu/packages/diffoscope.scm (diffoscope): Update to 215.
  [arguments]: Drop 'install-extract-vmlinux phase.
  [inputs]: Remove python.
---
 gnu/packages/diffoscope.scm | 18 ++----------------
 1 file changed, 2 insertions(+), 16 deletions(-)

(limited to 'gnu/packages')

diff --git a/gnu/packages/diffoscope.scm b/gnu/packages/diffoscope.scm
index 1f0c905563..1cb0a7ad76 100644
--- a/gnu/packages/diffoscope.scm
+++ b/gnu/packages/diffoscope.scm
@@ -53,7 +53,6 @@
   #:use-module (gnu packages pascal)
   #:use-module (gnu packages patchutils)
   #:use-module (gnu packages pdf)
-  #:use-module (gnu packages python)
   #:use-module (gnu packages python-web)
   #:use-module (gnu packages python-xyz)
   #:use-module (gnu packages sqlite)
@@ -75,7 +74,7 @@
 (define-public diffoscope
   (package
     (name "diffoscope")
-    (version "214")
+    (version "215")
     (source
      (origin
        (method git-fetch)
@@ -84,7 +83,7 @@
              (commit version)))
        (file-name (git-file-name name version))
        (sha256
-        (base32 "05vzvs8yn963wzxmnqifj0zsa9scxcq3iqrq9msm0vqznb1xgp7q"))
+        (base32 "16pyqbyrfsxjnpmr9913x2brz3mxplhz62rxwix1c0p7afwjw835"))
        (patches
         (search-patches "diffoscope-fix-llvm-test.patch"))))
     (build-system python-build-system)
@@ -137,25 +136,12 @@
                     (lambda _
                       ;; This requires /sbin to be in $PATH.
                       (delete-file "tests/test_tools.py")))
-                  (add-after 'install 'install-extract-vmlinux
-                    (lambda* (#:key outputs #:allow-other-keys)
-                      ;; Work around bug comparing vmlinux files
-                      ;; https://salsa.debian.org/reproducible-builds/diffoscope/-/issues/305
-                      (let* ((scriptdir (string-append (assoc-ref outputs "out")
-                                                       "/lib/python"
-                                                       ,(version-major+minor
-                                                         (package-version python))
-                                                       "/site-packages/scripts/")))
-                        (mkdir-p scriptdir)
-                        (copy-file "scripts/extract-vmlinux"
-                                   (string-append scriptdir "/extract-vmlinux")))))
                   (add-after 'install 'install-man-page
                     (lambda* (#:key outputs #:allow-other-keys)
                       (let* ((out (assoc-ref outputs "out"))
                              (man (string-append out "/share/man/man1")))
                         (install-file "doc/diffoscope.1" man)))))))
     (inputs (list rpm ;for rpm-python
-                  python
                   python-debian
                   python-libarchive-c
                   python-magic
-- 
cgit v1.2.3