talexander/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Releases Activity

diffoscope: 287 -> 288, use --replace-fail, drop old sed

Browse Source 
Changes: https://diffoscope.org/news/diffoscope-288-released/
This commit is contained in:
Sergei Trofimovich 2025-02-07 22:46:54 +00:00 committed by Sandro Jäckel
parent 618624ae76
commit 67b6ea8a96
No known key found for this signature in database
GPG Key ID: 3AF5A43A3EECC2E5
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pkgs/tools/misc/diffoscope/default.nix
View File

@ -106,11 +106,11 @@ in
# Note: when upgrading this package, please run the list-missing-tools.sh script as described below! # Note: when upgrading this package, please run the list-missing-tools.sh script as described below!
python.pkgs.buildPythonApplication rec { python.pkgs.buildPythonApplication rec {
pname = "diffoscope"; pname = "diffoscope";
version = "287"; version = "288";
src = fetchurl { src = fetchurl {
url = "https://diffoscope.org/archive/diffoscope-${version}.tar.bz2"; url = "https://diffoscope.org/archive/diffoscope-${version}.tar.bz2";
hash = "sha256-0s7pT8pAMCE+csd9/+Dv4AbCK0qxDacQ9fNcMYCNDbw="; hash = "sha256-HeJfqjmuduVc/C0kfaAsiQuoKrrwlW69lkfYDz1uFlg=";
}; };
outputs = [ outputs = [
@ -121,11 +121,11 @@ python.pkgs.buildPythonApplication rec {
patches = [ ./ignore_links.patch ]; patches = [ ./ignore_links.patch ];
postPatch = '' postPatch = ''
# Upstream doesn't provide a PKG-INFO file
sed -i setup.py -e "/'rpm-python',/d"
# When generating manpage, use the installed version # 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 = [ nativeBuildInputs = [