netpbm: 10.82.01 → 10.89.1 #81063
Merged
netpbm: 10.82.01 → 10.89.1 #81063
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
jtojnar
commented
Feb 26, 2020
| @@ -59,12 +97,18 @@ stdenv.mkDerivation { | |||
| for prog in ppmquant; do | |||
| wrapProgram "$out/bin/$prog" --prefix PATH : "$out/bin" | |||
| done | |||
|
|
|||
| moveToOutput bin "''${!outputBin}" | |||
There was a problem hiding this comment.
Is there a better way?
|
|
||
| # h remembers if we found the pattern; on the last line, if a pattern was previously found, we exit with 1 | ||
| # https://stackoverflow.com/a/12145797/160386 | ||
| sed -i "$nixFile" -re '/(\brev\b\s*=\s*)"'"$oldRev"'"/{ s||\1"'"$latestRev"'"|; h }; ${x; /./{x; q1}; x}' && die "Unable to update revision." |
There was a problem hiding this comment.
${x; /./{x; q1}; x} is ugly, I would prefer ${x; /./{x; t}; x; q1} but that seems to swap holding space odd number of times.
* Format with nixpkgs-fmt * Move build tools to nativeBuildInputs * Clarify license
The build script check whether JPEGLIB and ZLIB are not set to NONE. We did not set the latter as pkg-config handles zlib requirement for libpng dependency and the comment in config.mk only talks about zlib being needed for libpng. Since libtiff only needs libz for static linking, we turn TIFFLIB_NEEDS_ZLIB off instead of pointlessly setting ZLIB value. Closes: #75156
It was disabled in abd3c24 but it no longer seems to fail.
We did that in the past with rgbpaths.patch in the past but it was eventually removed. This fixes the regression.
The CVE was patched upstream long ago. http://cve.circl.lu/cve/CVE-2005-2471 -dPARANOIDSAFER seems not to be supported any more. https://phabricator.wikimedia.org/T136402#2338482 https://git.ghostscript.com/?p=ghostpdl.git;a=commit;h=79a06b45e784e6839b2b2129cd2620ea606254e1
|
@jtojnar doesn't work for me: $ /nix/store/jbv7bjcxd1m6xn7hfdymsj173hpbnqa1-netpbm-10.89.1-bin/bin/ppmquant --version
/nix/store/jbv7bjcxd1m6xn7hfdymsj173hpbnqa1-netpbm-10.89.1-bin/bin/ppmquant: line 3: /nix/store/an59sy7q8c83qbfsih1g722z1apx9pni-netpbm-10.89.1/bin/.ppmquant-wrapped: No such file or directory |
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
https://sourceforge.net/p/netpbm/code/3735/tree//advanced/doc/HISTORY
Things done
sandboxinnix.confon non-NixOS linux)nix-shell -p nixpkgs-review --run "nixpkgs-review wip"./result/bin/)${!outputLib})