Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Staging next #71221

Merged
merged 128 commits into from Oct 22, 2019
Merged

Staging next #71221

merged 128 commits into from Oct 22, 2019

Conversation

FRidh
Copy link
Member

@FRidh FRidh commented Oct 16, 2019

Motivation for this change
Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nix-review --run "nix-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.
Notify maintainers

cc @

r-ryantm and others added 30 commits May 1, 2019 18:51
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/poppler-utils/versions
Builds, at least, without it :).
https://lists.x.org/archives/xorg-announce/2019-June/003000.html

> This release boasts a bunch of cleanup work and a few new keysyms. No
functional changes to any of the protocols.
There is a bug in this feature: It allows extra arguments to leak in
from the environment. For example:

  $ export extraFlagsArray=date
  $ man ls

Note that you get the man page for date rather than for ls. This happens
because 'man' happens to use a wrapper (to add groff to its PATH).

An attempt to fix this was made in 5ae1857 in PR #19328 for
issue #2537, but 1. That change didn't actually fix the problem because
it addressed makeWrapper's environment during the build process, not the
constructed wrapper script's environment after installation, and 2. That
change was apparently accidentally lost when merged with 7ff6eec.

Rather than trying to fix the bug again, we remove the extraFlagsArray
feature, since it has never been used in the public repo in the ten
years it has been available.

wrapAclocal continues to use its own, separate flavor of extraFlagsArray
in a more limited context. The analogous bug there was fixed in
4d7d10d in 2011.
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/xonsh/versions
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/xdg-dbus-proxy/versions
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/zerotierone/versions
GO 1.12.10 has been released 5 days ago, so
bumping it in the hope that it also fixes some
flakey GC tests.

Also see #69359
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/wavebox/versions
Patches have been imported into nixpkgs and manually edited to avoid
merge conflicts on ChangeLog / NEWS files.
@worldofpeace
Copy link
Contributor

So there's a distinct difference in the shebangs on darwin after the update

Before
#!/nix/store/gaascisqfmxckzhvs5q1wbx6ycsbk4fi-python3-3.7.4/bin/python3.7
After
#!/nix/store/p2jiplya6d80vnr7kpj3dmfn9d06qysm-python3-3.7.5-env/bin/python3

I overlooked that python.withPackages creates a wrapper and scripts are not allowed in shebangs.
That's why the package links into sys.path. Interesting that it's only an issue for darwin though.

I believe if I satiate

in any other way the issue will be fixed 👍

(pr incoming once I test on darwin)

@worldofpeace worldofpeace mentioned this pull request Oct 17, 2019
10 tasks
@FRidh
Copy link
Member Author

FRidh commented Oct 18, 2019

@hedning gtk3 keeps timing out causing the majority of newly failing builds

@hedning
Copy link
Contributor

hedning commented Oct 18, 2019

@hedning gtk3 keeps timing out causing the majority of newly failing builds

Bisected it to libsass ugrade: e4b4ff8. Pretty sure it's this sass/libsass#3006, as the timed out logs doesn't contain Generating Adwaita with a custom command, while good builds do. I guess there's two options:

  • revert libsass upgrade
  • temporarily disable custom genaration of themes in gtk3 (they're shipped in the tarball by default)

This hangs when generating gtk3 templates.
sass/libsass#3006

This reverts commit e4b4ff8.
@worldofpeace
Copy link
Contributor

I think they plan to make theme generation required in the future, and not have it pre-generated in the tarball. Though I can't remember the PR.

We can't use shell scripts as shebangs so we drop using .withPackages
and just add pygments to the build env to satiate meson's checks.

#71221 (comment)
This broke after 979811f. Adding the `installTarget` locally works.
Couldn't find any other reproducible breakage.
@hedning hedning removed the request for review from jonringer October 19, 2019 18:10
@jonringer
Copy link
Contributor

@hedning i see your request :)

@hedning
Copy link
Contributor

hedning commented Oct 19, 2019

@hedning i see your request :)

My bad, no idea how that happened :)

veprbl
veprbl previously requested changes Oct 19, 2019
Copy link
Member

@veprbl veprbl left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

poppler bump breaks poppler (trivially) and texlive.bin.core (non-trivially)

I had some progress with fixing texlive by applying
https://git.archlinux.org/svntogit/packages.git/plain/texlive-bin/trunk/pdftex-poppler0.76.patch?id=8cb784073cfd2299a6c301ce7bb0d89126a47f4e
But then I'm stuck at a luatex build failure that archlinux doesn't address.

@FRidh
Copy link
Member Author

FRidh commented Oct 20, 2019

@veprbl perhaps revert poppler bump for now?

FRidh and others added 4 commits October 20, 2019 16:22
texlive.bin fails to build.

This reverts commit 6b58b46.
This reverts commit 1caceac.
This reverts commit 9908cad.
relies on zope-testrunner. Import fails, likely because of how
zope-testrunner functions.
@ttuegel
Copy link
Member

ttuegel commented Oct 20, 2019

perhaps revert poppler bump for now?

The poppler bump fixes a security issue, so if you decide to keep this reverted then please open a new issue.

@veprbl veprbl dismissed their stale review October 22, 2019 02:49

issue addressed

@FRidh FRidh merged commit d7a921c into master Oct 22, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet