From 67b6ea8a964cb3e18ef78cd26a7afc5cd580c4d1 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Fri, 7 Feb 2025 22:46:54 +0000 Subject: [PATCH] diffoscope: 287 -> 288, use --replace-fail, drop old sed Changes: https://diffoscope.org/news/diffoscope-288-released/ --- pkgs/tools/misc/diffoscope/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/tools/misc/diffoscope/default.nix b/pkgs/tools/misc/diffoscope/default.nix index 6f0efb5fc4ee..d2a46860416a 100644 --- a/pkgs/tools/misc/diffoscope/default.nix +++ b/pkgs/tools/misc/diffoscope/default.nix @@ -106,11 +106,11 @@ in # Note: when upgrading this package, please run the list-missing-tools.sh script as described below! python.pkgs.buildPythonApplication rec { pname = "diffoscope"; - version = "287"; + version = "288"; src = fetchurl { url = "https://diffoscope.org/archive/diffoscope-${version}.tar.bz2"; - hash = "sha256-0s7pT8pAMCE+csd9/+Dv4AbCK0qxDacQ9fNcMYCNDbw="; + hash = "sha256-HeJfqjmuduVc/C0kfaAsiQuoKrrwlW69lkfYDz1uFlg="; }; outputs = [ @@ -121,11 +121,11 @@ python.pkgs.buildPythonApplication rec { patches = [ ./ignore_links.patch ]; postPatch = '' - # Upstream doesn't provide a PKG-INFO file - sed -i setup.py -e "/'rpm-python',/d" - # When generating manpage, use the installed version - substituteInPlace doc/Makefile --replace "../bin" "$out/bin" + substituteInPlace doc/Makefile --replace-fail "../bin" "$out/bin" + + substituteInPlace diffoscope/comparators/apk.py \ + --replace-fail "from androguard.core.bytecodes import apk" "from androguard.core import apk" ''; nativeBuildInputs = [