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 #64982

Merged
merged 62 commits into from Jul 25, 2019
Merged

Staging next #64982

merged 62 commits into from Jul 25, 2019

Conversation

FRidh
Copy link
Member

@FRidh FRidh commented Jul 17, 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.

FlorianFranzen and others added 30 commits March 9, 2019 20:46
This works around 'failed to open:
/homeless-shelter/.cargo/.package-cache' with Rust 1.36 even when
we're using 'cargo --frozen'.
"Not a lot of big new features in this release. Just the usual array of
small fixes across the board." [0]

File changes:
None

nix path-info -S:
5.1.0 46637048
5.2.0 46627312

[0]: https://www.spinics.net/lists/netdev/msg584562.html
This commit adds a Nix-specific module that recursively adds paths that
are on `NIX_PYTHONPATH` to `sys.path`. In order to process possible
`.pth` files `site.addsitedir` is used.

The paths listed in `PYTHONPATH` are added to `sys.path` afterwards, but
they will be added before the entries we add here and thus take
precedence.

The reason for adding support for this environment variable is that we
can set it in a wrapper without breaking support for `PYTHONPATH`.
Flags passed to the "python setup.py" command.
I merged this a bit too quick. We need to have a closer look at it.
See the points brought up in #64682.

This reverts commit 1e0ebdb.
qtbase: Fix paths returned by qmake -query
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/webkitgtk/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/libwebp/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/x265/versions
@worldofpeace
Copy link
Contributor

@FRidh I put gobject-introspection in here as well.

@FRidh
Copy link
Member Author

FRidh commented Jul 19, 2019

Some gtk issues #63874 (comment)

@FRidh
Copy link
Member Author

FRidh commented Jul 20, 2019

gtk issues hopefully solved with 3b24d6e

Open issues:

@mmahut
Copy link
Member

mmahut commented Jul 22, 2019

Known regressions caused by unzip: CVE-2019-13232 (#64909) should be fixed by 5e9f1bb and 16dec39.

@ttuegel ttuegel removed their request for review July 24, 2019 11:44
Temporary attribute until we can get rid of it everywhere.

This was triggered due to the libyaml 0.2.2 incompatibilty requiring
patches and still not building.
@FRidh
Copy link
Member Author

FRidh commented Jul 25, 2019

Pushed a fix for all occurrences of pyyaml 3 and merged master again. Let's hope this is the last evaluation.

@FRidh FRidh merged commit dcea563 into master Jul 25, 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