dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Merge pull request #273033 from RaitoBezarius/diffoscope-update

Browse Source
This commit is contained in:
Ryan Lahfa 2023-12-09 14:02:47 +01:00 committed by GitHub
commit a6bd197825
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,6 +1,7 @@
{ lib { lib
, stdenv , stdenv
, abootimg , abootimg
, acl
, apksigcopier , apksigcopier
, apksigner , apksigner
, apktool , apktool
@ -78,11 +79,11 @@
# 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!
python3.pkgs.buildPythonApplication rec { python3.pkgs.buildPythonApplication rec {
pname = "diffoscope"; pname = "diffoscope";
version = "252"; version = "253";
src = fetchurl { src = fetchurl {
url = "https://diffoscope.org/archive/diffoscope-${version}.tar.bz2"; url = "https://diffoscope.org/archive/diffoscope-${version}.tar.bz2";
hash = "sha256-NmYv5htZT2v04vVksIWGuaPI1rXfNmrVSmErT/faBbQ="; hash = "sha256-xI+SIEUPKFxz7sk9qqE1ibSJX0WRPnJEpco0Mqv7Wp8=";
}; };
outputs = [ outputs = [
@ -112,16 +113,20 @@ python3.pkgs.buildPythonApplication rec {
# To help figuring out what's missing from the list, run: ./pkgs/tools/misc/diffoscope/list-missing-tools.sh # To help figuring out what's missing from the list, run: ./pkgs/tools/misc/diffoscope/list-missing-tools.sh
# #
# Still missing these tools: # Still missing these tools:
# Android-specific tools:
# aapt2 # aapt2
# dexdump # dexdump
# docx2txt # Darwin-specific tools:
# getfacl
# lipo # lipo
# otool # otool
# r2pipe # Other tools:
# docx2txt <- makes tests broken:
# > FAILED tests/comparators/test_docx.py::test_diff - IndexError: list index out of range
# > FAILED tests/comparators/test_docx.py::test_compare_non_existing - AssertionError
# #
# We filter automatically all packages for the host platform (some dependencies are not supported on Darwin, aarch64, etc.). # We filter automatically all packages for the host platform (some dependencies are not supported on Darwin, aarch64, etc.).
pythonPath = lib.filter (lib.meta.availableOn stdenv.hostPlatform) ([ pythonPath = lib.filter (lib.meta.availableOn stdenv.hostPlatform) ([
acl
binutils-unwrapped-all-targets binutils-unwrapped-all-targets
bzip2 bzip2
cdrkit cdrkit
@ -209,6 +214,7 @@ python3.pkgs.buildPythonApplication rec {
guestfs guestfs
h5py h5py
pdfminer-six pdfminer-six
# docx2txt, breaks the tests.
]) ])
# oggvideotools is broken on Darwin, please put it back when it will be fixed? # oggvideotools is broken on Darwin, please put it back when it will be fixed?
++ lib.optionals stdenv.isLinux [ oggvideotools ] ++ lib.optionals stdenv.isLinux [ oggvideotools ]