cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

diffoscope: 233 -> 243

Browse source 
Changelog: https://diffoscope.org/news/diffoscope-243-released/
This commit is contained in:
Fabian Affolter 2023-07-02 00:20:44 +02:00
parent 569e52ad02
commit 7c75ba9ff2
1 changed files with 13 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
pkgs/tools/misc/diffoscope/default.nix
View file

@ -21,7 +21,6 @@
, enableBloat ? true , enableBloat ? true
, enableUnfree ? false , enableUnfree ? false
, enjarify , enjarify
, fetchpatch
, fetchurl , fetchurl
, file , file
, findutils , findutils
@ -44,8 +43,10 @@
, jdk , jdk
, libarchive , libarchive
, libcaca , libcaca
, libxmlb
, llvm , llvm
, lz4 , lz4
, lzip
, mono , mono
, ocaml , ocaml
, odt2txt , odt2txt
@ -79,11 +80,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 = "233"; version = "243";
src = fetchurl { src = fetchurl {
url = "https://diffoscope.org/archive/diffoscope-${version}.tar.bz2"; url = "https://diffoscope.org/archive/diffoscope-${version}.tar.bz2";
sha256 = "sha256-A2GYnhdjkzSFnMsy99FmckiOsbRdymAdtjp55hyFLp4="; hash = "sha256-lqI9MOZJxgHZ87kax343t6Wylzv1NWcQZ1cMWgmpnRo=";
}; };
outputs = [ outputs = [
@ -93,11 +94,6 @@ python3.pkgs.buildPythonApplication rec {
patches = [ patches = [
./ignore_links.patch ./ignore_links.patch
# test_text_proper_indentation requires file >= 5.44
(fetchpatch {
url = "https://salsa.debian.org/reproducible-builds/diffoscope/-/commit/9fdb78ec0bbc69f1980499dfdcbf6f1dd5e55cc8.patch";
sha256 = "sha256-F0N3L9yymj2NjeIKtSnOEDsxPe+ZTb0m/M4f8LPRHg0=";
})
]; ];
postPatch = '' postPatch = ''
@ -118,7 +114,10 @@ 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:
# aapt2
# dexdump
# docx2txt # docx2txt
# getfacl
# lipo # lipo
# otool # otool
# r2pipe # r2pipe
@ -143,7 +142,9 @@ python3.pkgs.buildPythonApplication rec {
gzip gzip
html2text html2text
libarchive libarchive
libxmlb
lz4 lz4
lzip
openssl openssl
pgpdump pgpdump
sng sng
@ -214,7 +215,7 @@ python3.pkgs.buildPythonApplication rec {
++ lib.optionals stdenv.isLinux [ oggvideotools ] ++ lib.optionals stdenv.isLinux [ oggvideotools ]
# This doesn't work on aarch64-darwin # This doesn't work on aarch64-darwin
++ lib.optionals (stdenv.hostPlatform != "aarch64-darwin") [ gnumeric ] ++ lib.optionals (stdenv.hostPlatform != "aarch64-darwin") [ gnumeric ]
# `apktool` depend on `build-tools` which requires Android SDK acceptance, therefore, the whole thing is unfree. # apktool depend on build-tools which requires Android SDK acceptance, therefore, the whole thing is unfree
++ lib.optionals enableUnfree [ apktool ] ++ lib.optionals enableUnfree [ apktool ]
)); ));
@ -223,7 +224,7 @@ python3.pkgs.buildPythonApplication rec {
] ++ pythonPath; ] ++ pythonPath;
pytestFlagsArray = [ pytestFlagsArray = [
# always show more information when tests fail # Always show more information when tests fail
"-vv" "-vv"
]; ];
@ -237,7 +238,7 @@ python3.pkgs.buildPythonApplication rec {
"test_diff_meta" "test_diff_meta"
"test_diff_meta2" "test_diff_meta2"
# fails because it fails to determine llvm version # Fails because it fails to determine llvm version
"test_item3_deflate_llvm_bitcode" "test_item3_deflate_llvm_bitcode"
] ++ lib.optionals stdenv.isDarwin [ ] ++ lib.optionals stdenv.isDarwin [
# Disable flaky tests on Darwin # Disable flaky tests on Darwin
@ -246,7 +247,7 @@ python3.pkgs.buildPythonApplication rec {
"test_symlink_root" "test_symlink_root"
]; ];
# flaky tests on Darwin # Flaky tests on Darwin
disabledTestPaths = lib.optionals stdenv.isDarwin [ disabledTestPaths = lib.optionals stdenv.isDarwin [
"tests/comparators/test_git.py" "tests/comparators/test_git.py"
"tests/comparators/test_java.py" "tests/comparators/test_java.py"