Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: b3edc7f8d240
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 0dc4672d3650
Choose a head ref
  • 2 commits
  • 1 file changed
  • 1 contributor

Commits on Sep 14, 2017

  1. diffoscope: Add even more tools

    @dezgeg
    dezgeg committed Sep 14, 2017

    Unverified

    This commit is not signed, but one or more authors requires that any commit attributed to them is signed.
    Learn about vigilant mode
    Copy the full SHA
    2581865 View commit details

  2. diffoscope: Move cbfstool and poppler_utils to bloat category

    @dezgeg
    dezgeg committed Sep 14, 2017
    Copy the full SHA
    0dc4672 View commit details
Showing with 12 additions and 8 deletions.
  1. +12 −8 pkgs/tools/misc/diffoscope/default.nix
20 changes: 12 additions & 8 deletions pkgs/tools/misc/diffoscope/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
{ lib, stdenv, fetchgit, python3Packages, docutils
, acl, binutils, bzip2, cbfstool, cdrkit, colord, colordiff, coreutils, cpio, diffutils, dtc, e2fsprogs
, file, findutils, fpc, gettext, ghc, gnupg1, gnutar, gzip, imagemagick, jdk, libarchive, libcaca, llvm
, mono, openssh, pdftk, poppler_utils, sng, sqlite, squashfsTools, tcpdump, unzip, xxd, xz
, acl, apktool, binutils, bzip2, cbfstool, cdrkit, colord, colordiff, coreutils, cpio, diffutils, dtc
, e2fsprogs, file, findutils, fontforge-fonttools, fpc, gettext, ghc, ghostscriptX, giflib, gnupg1, gnutar
, gzip, imagemagick, jdk, libarchive, libcaca, llvm, mono, openssh, pdftk, pgpdump, poppler_utils, sng, sqlite
, squashfsTools, tcpdump, unoconv, unzip, xxd, xz
, enableBloat ? false
}:

@@ -24,13 +25,16 @@ python3Packages.buildPythonApplication rec {
sed -i setup.py -e "/'rpm-python',/d"
'';

# Still missing these tools: apktool docx2txt enjarify gifbuild js-beautify odt2txt oggDump pgpdump ps2ascii Rscript showttf
# Still missing these tools: docx2txt enjarify js-beautify oggDump Rscript
# Also these libraries: python3-guestfs
pythonPath = with python3Packages; [ debian libarchive-c python_magic tlsh rpm ] ++ [
acl binutils bzip2 cbfstool cdrkit colordiff coreutils cpio diffutils dtc e2fsprogs file
findutils gettext gnutar gzip libarchive libcaca poppler_utils sng sqlite squashfsTools unzip
xxd xz
] ++ lib.optionals enableBloat [ colord fpc ghc gnupg1 imagemagick llvm jdk mono openssh pdftk tcpdump ];
acl binutils bzip2 cdrkit colordiff coreutils cpio diffutils dtc e2fsprogs file findutils
fontforge-fonttools gettext gnutar gzip libarchive libcaca pgpdump sng sqlite
squashfsTools unzip xxd xz
] ++ lib.optionals enableBloat [
apktool cbfstool colord fpc ghc ghostscriptX giflib gnupg1 imagemagick
llvm jdk mono openssh pdftk poppler_utils tcpdump unoconv
];

doCheck = false; # Calls 'mknod' in squashfs tests, which needs root