Skip to content

diffoscope: 287 -> 288 #380217

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
SuperSandro2000 merged 1 commit into from
Feb 11, 2025
Merged

diffoscope: 287 -> 288 #380217

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions pkgs/tools/misc/diffoscope/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 = [
Expand All @@ -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 = [
Expand Down