poppler: 21.05.0 -> 21.06.01 #127832
Merged
poppler: 21.05.0 -> 21.06.01 #127832
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
|
Result of 12 packages marked as broken and skipped:
1 package failed to build:314 packages skipped due to time constraints:
55 packages built successfully:
Note that build failures may predate this PR, and could be nondeterministic or hardware dependent. Result of 8 packages marked as broken and skipped:
2 packages failed to build:388 packages skipped due to time constraints:
51 packages built successfully:
Note that build failures may predate this PR, and could be nondeterministic or hardware dependent. |
SuperSandro2000
requested changes
Jun 23, 2021
| @@ -12,25 +27,38 @@ let | |||
| mkFlag = optset: flag: "-DENABLE_${flag}=${if optset then "on" else "off"}"; | |||
| in | |||
| stdenv.mkDerivation rec { | |||
| name = "poppler-${suffix}-${version}"; | |||
| pname = "poppler-${suffix}"; | |||
| inherit version; | |||
There was a problem hiding this comment.
Why not just move version to here?
Comment on lines
+60
to
+61
| ] | ||
| ++ lib.optional withData poppler_data; |
There was a problem hiding this comment.
Suggested change
| ] | |
| ++ lib.optional withData poppler_data; | |
| ] ++ lib.optional withData poppler_data; |
Comment on lines
25
to
27
| , qt5Support ? false, qtbase ? null | ||
| , introspectionSupport ? false, gobject-introspection ? null | ||
| , utils ? false, nss ? null |
There was a problem hiding this comment.
Suggested change
| , qt5Support ? false, qtbase ? null | |
| , introspectionSupport ? false, gobject-introspection ? null | |
| , utils ? false, nss ? null | |
| , qt5Support ? false, qtbase | |
| , introspectionSupport ? false, gobject-introspection | |
| , utils ? false, nss |
|
Any chance this could be backported? Evince on NixOS 21.05 still regularly crashes. |
AndersonTorres
added
the
9.needs: port to stable
|
Could we maybe just backport the entire PR? The constant segfaults are becoming really annoying. |
1 task
|
Successfully created backport PR #131806 for |
hmenke
added
8.has: port to stable
|
The process '/usr/bin/git' failed with exit code 1 |
jtojnar
added
the
8.has: upstream changes reviewed
|
Backport failed for Please cherry-pick the changes locally. git fetch origin staging-21.05
git worktree add -d .worktree/backport-127832-to-staging-21.05 origin/staging-21.05
cd .worktree/backport-127832-to-staging-21.05
git checkout -b backport-127832-to-staging-21.05
ancref=$(git merge-base 35aa6b0fd8b551bc4f1d5e5ae25f3087fcea51af 004970b1524ab59f791137e0954b43c2b65615bb)
git cherry-pick -x $ancref..004970b1524ab59f791137e0954b43c2b65615bb |
This was referenced Nov 4, 2023
jtojnar
added a commit
that referenced
this pull request
Nov 4, 2023
Poppler does not directly depend on PCRE. It was added in <#127832>, presumably to suppress CMake complaining about `glib-2.0` needing `pcre` because CMake is not aware that we interpret `Requires.private` field in pkg-config files differently. And GLib since switched to pcre2 anyway so the warning is back.
nyabinary
pushed a commit
to nyabinary/nixpkgs
that referenced
this pull request
Nov 14, 2023
Poppler does not directly depend on PCRE. It was added in <NixOS#127832>, presumably to suppress CMake complaining about `glib-2.0` needing `pcre` because CMake is not aware that we interpret `Requires.private` field in pkg-config files differently. And GLib since switched to pcre2 anyway so the warning is back.
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://lists.freedesktop.org/archives/poppler/2021-June/014771.html
https://lists.freedesktop.org/archives/poppler/2021-June/014772.html
Closes #126685
Things done
sandboxinnix.confon non-NixOS linux)nix-shell -p nixpkgs-review --run "nixpkgs-review wip"./result/bin/)