diffoscope: 77 -> 85 #28785
Closed
diffoscope: 77 -> 85 #28785
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
dtzWill
reviewed
Sep 4, 2017
| @@ -1,25 +1,24 @@ | |||
| { lib, stdenv, fetchgit, fetchpatch, python3, docutils | |||
| { lib, stdenv, fetchgit, fetchpatch, python3Packages, docutils | |||
| , acl, binutils, bzip2, cbfstool, cdrkit, colord, cpio, diffutils, e2fsprogs, file, fpc, gettext, ghc | |||
| , gnupg1, gzip, jdk, libcaca, mono, pdftk, poppler_utils, sng, sqlite, squashfsTools, unzip, vim, xz | |||
There was a problem hiding this comment.
I think you meant to replace vim -> xxd (otherwise the reference to xxd below doesn't work).
|
I was running diffoscope for a long time and was sad there was no progress reporting... After some wrangling the python dependencies, ended up with this: https://github.com/dtzWill/nixpkgs/tree/feature/diffoscope-progressbar Which also bumps to 86 which among other things adds support for If this sounds good, feel free to grab the relevant commits or ping me and I'll do a PR in a day or two. |
|
If you could do a PR that would be great! Please ping me when you do the PR. |
Closed
|
I've added these commits to #29009. |
|
Thanks! |
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.
Motivation for this change
diffoscope is failing on
release-17.09due to a failing test forlibarchive-c. The new version oflibarchive-cfails the same test so I disabled it, but diffoscope seems to work.Also includes an update for libarchive-c but diffoscope is the only user of that library.
If @dezgeg is cool with this, I will push it to 17.09 as well.
Things done
(nix.useSandbox on NixOS,
or option
build-use-sandboxinnix.confon non-NixOS)
nix-shell -p nox --run "nox-review wip"./result/bin/)