lol

Merge pull request #221861 from NixOS/diffoscope-unfree

authored by

Sandro and committed by
GitHub
80264b93 a84996a7

+31 -13
+1
pkgs/development/python-modules/guestfs/default.nix
··· 20 20 description = "Use libguestfs from Python"; 21 21 license = licenses.lgpl2Plus; 22 22 maintainers = with maintainers; [ grahamc ]; 23 + inherit (libguestfs.meta) platforms; 23 24 }; 24 25 }
+1
pkgs/development/python-modules/pyxattr/default.nix
··· 21 21 meta = with lib; { 22 22 description = "A Python extension module which gives access to the extended attributes for filesystem objects available in some operating systems"; 23 23 license = licenses.lgpl21Plus; 24 + inherit (pkgs.attr.meta) platforms; 24 25 }; 25 26 }
+22 -10
pkgs/tools/misc/diffoscope/default.nix
··· 3 3 , e2fsprogs, enjarify, file, findutils, fontforge-fonttools, ffmpeg, fpc, gettext, ghc, ghostscriptX, giflib, gnumeric, gnupg, gnutar 4 4 , gzip, html2text, hdf5, imagemagick, jdk, libarchive, libcaca, llvm, lz4, mono, ocaml, oggvideotools, openssh, openssl, pdftk, pgpdump, poppler_utils, procyon, qemu, R 5 5 , radare2, sng, sqlite, squashfsTools, tcpdump, ubootTools, odt2txt, unzip, wabt, xmlbeans, xxd, xz, zip, zstd 6 - , enableBloat ? false 6 + , enableBloat ? true 7 + , enableUnfree ? false 7 8 # updater only 8 9 , writeScript 9 10 }: ··· 43 44 # To help figuring out what's missing from the list, run: ./pkgs/tools/misc/diffoscope/list-missing-tools.sh 44 45 # 45 46 # Still missing these tools: docx2txt lipo otool r2pipe 46 - pythonPath = [ 47 + # We filter automatically all packages for the host platform (some dependencies are not supported on Darwin, aarch64, etc.). 48 + pythonPath = lib.filter (lib.meta.availableOn stdenv.hostPlatform) ([ 47 49 binutils-unwrapped-all-targets bzip2 colordiff coreutils cpio db diffutils 48 50 e2fsprogs file findutils fontforge-fonttools gettext gnutar gzip 49 51 html2text libarchive lz4 openssl pgpdump sng sqlite squashfsTools unzip xxd 50 - xz zip zstd 52 + xz zip zstd cdrkit dtc 51 53 ] 52 54 ++ (with python3Packages; [ 53 55 argcomplete debian defusedxml jsondiff jsbeautifier libarchive-c 54 - python-magic progressbar33 pypdf2 tlsh 56 + python-magic progressbar33 pypdf2 tlsh pyxattr rpm 55 57 ]) 56 - ++ lib.optionals stdenv.isLinux [ python3Packages.pyxattr python3Packages.rpm acl cdrkit dtc ] 57 - ++ lib.optionals enableBloat ([ 58 - abootimg apksigcopier apksigner apktool cbfstool colord enjarify ffmpeg fpc ghc ghostscriptX giflib gnupg gnumeric 59 - hdf5 imagemagick libcaca llvm jdk mono ocaml odt2txt oggvideotools openssh pdftk poppler_utils procyon qemu R tcpdump ubootTools wabt radare2 xmlbeans 60 - ] ++ (with python3Packages; [ androguard binwalk guestfs h5py pdfminer-six ])); 58 + ++ lib.optionals enableBloat ( 59 + [ 60 + apksigcopier apksigner enjarify ffmpeg fpc ghc ghostscriptX giflib gnupg pdftk 61 + hdf5 imagemagick libcaca llvm jdk mono ocaml odt2txt openssh 62 + poppler_utils procyon qemu R tcpdump wabt radare2 xmlbeans 63 + abootimg cbfstool colord ubootTools 64 + ] 65 + ++ (with python3Packages; [ androguard binwalk h5py pdfminer-six guestfs ]) 66 + # oggvideotools is broken on Darwin, please put it back when it will be fixed? 67 + ++ lib.optionals stdenv.isLinux [ oggvideotools ] 68 + # This doesn't work on aarch64-darwin 69 + ++ lib.optionals (stdenv.hostPlatform != "aarch64-darwin") [ gnumeric ] 70 + # `apktool` depend on `build-tools` which requires Android SDK acceptance, therefore, the whole thing is unfree. 71 + ++ lib.optionals enableUnfree [ apktool ] 72 + )); 61 73 62 74 nativeCheckInputs = with python3Packages; [ pytestCheckHook ] ++ pythonPath; 63 75 ··· 121 133 ''; 122 134 homepage = "https://diffoscope.org/"; 123 135 license = licenses.gpl3Plus; 124 - maintainers = with maintainers; [ dezgeg danielfullmer ]; 136 + maintainers = with maintainers; [ dezgeg danielfullmer raitobezarius ]; 125 137 platforms = platforms.unix; 126 138 }; 127 139 }
+4
pkgs/tools/misc/oggvideotools/default.nix
··· 43 43 homepage = "http://www.streamnik.de/oggvideotools.html"; 44 44 license = licenses.gpl2Only; 45 45 maintainers = with maintainers; [ SuperSandro2000 ]; 46 + # Compilation error on Darwin: 47 + # error: invalid argument '--std=c++0x' not allowed with 'C' 48 + # make[2]: *** [src/libresample/CMakeFiles/resample.dir/build.make:76: src/libresample/CMakeFiles/resample.dir/filterkit.c.o] Error 1 49 + broken = stdenv.isDarwin; 46 50 }; 47 51 }
+3 -3
pkgs/top-level/all-packages.nix
··· 6852 6852 6853 6853 diction = callPackage ../tools/text/diction { }; 6854 6854 6855 - diffoscopeMinimal = callPackage ../tools/misc/diffoscope { 6855 + diffoscope = callPackage ../tools/misc/diffoscope { 6856 6856 jdk = jdk8; 6857 6857 }; 6858 6858 6859 - diffoscope = diffoscopeMinimal.override { 6860 - enableBloat = !stdenv.isDarwin; 6859 + diffoscopeMinimal = diffoscope.override { 6860 + enableBloat = false; 6861 6861 }; 6862 6862 6863 6863 diffr = callPackage ../tools/text/diffr {