diffoscope: 287 -> 288 #380217
Merged
diffoscope: 287 -> 288 #380217
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
|
|
|
PR to fix jefferson: #380735 |
|
diffoscope itself is still failing to build in its tests: |
|
Yup, just like the current |
|
The diffoscope build failure seems to be related to changed import paths between androguard v3.4.0a1 and v4.1.2. The current diffoscope master uses the old import path. The latest androguard packaged by debian is 3.4.0~a1-16. https://packages.debian.org/search?keywords=androguard&searchon=names&suite=all§ion=all Just replacing the import path makes the test pass for me. diff --git a/pkgs/tools/misc/diffoscope/default.nix b/pkgs/tools/misc/diffoscope/default.nix
index 4cac3e286de4..104cbbcad1af 100644
--- a/pkgs/tools/misc/diffoscope/default.nix
+++ b/pkgs/tools/misc/diffoscope/default.nix
@@ -124,6 +124,9 @@ python.pkgs.buildPythonApplication rec {
# Upstream doesn't provide a PKG-INFO file
sed -i setup.py -e "/'rpm-python',/d"
+ substituteInPlace diffoscope/comparators/apk.py \
+ --replace "from androguard.core.bytecodes import apk" "from androguard.core import apk"
+
# When generating manpage, use the installed version
substituteInPlace doc/Makefile --replace "../bin" "$out/bin"
'';I have not tested this beyond getting a successful build. |
SuperSandro2000
force-pushed
the
diffoscope-update
branch
from
b77fded to
67b6ea8
Compare
|
|
What's the deal with the |
|
The test is broken since a week https://hydra.nixos.org/build/287576616 Bisect says it failed with this update https://salsa.debian.org/reproducible-builds/diffoscope/-/compare/285...286 |
|
The failure is really weird. When building an older version of package and running diffoscope on the files it doesn't report the mode difference but when building the tests it does. It always reports the difference when the files are placed inside a directory. I have really no clue where the issue is, maybe python compiler or based on some ambient packages? Going to ignore it for now |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Changes: https://diffoscope.org/news/diffoscope-288-released/
Things done
nix.conf? (See Nix manual)sandbox = relaxedsandbox = truenix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage./result/bin/)Add a 👍 reaction to pull requests you find important.