testdisk: deduplicating testdisk/photorec #69945
Merged
+38
−47
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
ofborg
bot
added
8.has: clean-up
8.has: package (new)
d-goldin
force-pushed
the
testdisk-dedup
branch
from
59da89a to
20de8be
Compare
fgaz
reviewed
Oct 1, 2019
d-goldin
force-pushed
the
testdisk-dedup
branch
from
ed6f3cb to
b3b95b8
Compare
fgaz
requested changes
Oct 2, 2019
Mic92
reviewed
Oct 2, 2019
| , ncurses | ||
| , libuuid | ||
| , pkgconfig | ||
| , enableJpeg ? false, libjpeg ? null |
There was a problem hiding this comment.
Do we need so many options? Cannot users who want to disable libjpeg just do testdisk.override { libjpeg = null; }?
There was a problem hiding this comment.
Yeah, they could. For some reason I was on some explicit train at that point. I will flip at least libjpeg.
|
@fgaz: Alright, thanks for the review and the good pointers. I was not very acquainted with the qt mechanisms. Let me know if I should squash or if merger could do it. |
|
@d-goldin Well, one way or another this will need to be squashed (or the commit messages edited to match the template), so you may as well do it Also, while I'm at it: |
d-goldin
force-pushed
the
testdisk-dedup
branch
from
6a8ae8e to
6c9d1ee
Compare
fgaz
approved these changes
Oct 4, 2019
|
Is there anything left to do before this can be merged? |
vcunat
reviewed
Oct 13, 2019
Testdisk/Photorec has been packaged twice. This deduplicates the packages by consolidating the packages into one and throwing an error upon use of the outdated package. this also adds qphotorec, which was previously not built and ensures it's wrapped correctly. Please note that I took the liberty to merge the maintainers lists.
d-goldin
force-pushed
the
testdisk-dedup
branch
from
6c9d1ee to
10bfa40
Compare
Makes it easier to read since one does not need to be aware of overrides in all-packages.nix.
|
Thanks. |
Mic92
reviewed
Oct 14, 2019
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
Testdisk/Photorec has been packaged twice. This deduplicates
the packages by consolidating the packages into one and throwing
an error upon use of the outdated package.
this also adds qphotorec, which was previously not built and ensures
it's wrapped correctly.
Please note that I took the liberty to merge the maintainers lists.
See #67953
Things done
sandboxinnix.confon non-NixOS)nix-shell -p nix-review --run "nix-review wip"./result/bin/)nix path-info -Sbefore and after)Notify maintainers
cc @fgaz @edolstra