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 2022-11-28 #203426

Merged
merged 338 commits into from
Dec 6, 2022
Merged

staging-next 2022-11-28 #203426

merged 338 commits into from
Dec 6, 2022

Conversation

github-actions bot and others added 30 commits November 14, 2022 18:01
Since WebKit/WebKit@31ac354,
bubblewrap gets called the following way on NixOS system,
when it has `share/fonts` in `environment.pathsToLink`:

    $ bwrap --ro-bind /nix/store /nix/store --ro-bind /run/current-system /run/current-system --ro-bind-try /run/current-system/sw/share/fonts /run/current-system/sw/share/fonts -- $(realpath $(which true))
    bwrap: Can't mkdir parents for /run/current-system/sw/share/fonts: No such file or directory

It fails because `/run/current-system/sw` is a symlink
so bubblewrap is not be able to add another mountpoint inside.

Ideally, we would remove the `/run/current-system/sw` bind mount
and mount only specific subdirectories we need, like the fonts.
Unfortunately, it is not clear what else is needed. For example,
in the past, Pipewire’s Jack module was loaded from `/run/current-system/sw/lib`
756e603

So, for now, let’s keep the and mount and move the binding of NixOS directories
to the end. Adding bindings starting at leaves and moving to root should be fine.

While at it, let’s also make the binding of `/run/current-system` conditional
since it will not be available outside of NixOS.

Fixes: #197085
systemd: configure as release build
llvmpackages: patch shebangs for python subpackages
synth: apply patch to fix on rust 1.65
gi-docgen: 2022.1 → 2022.2
python310Packages.rich: 12.5.1 -> 12.6.0
libdrm: 2.4.113 -> 2.4.114
As indicated in #175875, `pyopenssl` does not support aarch64-darwin. In
 #115226, the only test that required `pyopenssl` was disabled on
`aarch64-darwin` — but unfortunately the package doesn’t build. This
commit makes two changes.

1.  The `pyopenssl` dependency is no longer pulled in on
    `aarch64-darwin`. The derivation is no longer marked broken.

2.  The test suite is patched so that `OpenSSL.SSL` is no longer
    imported; this was only used by the disabled test. As a result
    the test suite runs (and succeeds).
@vcunat
Copy link
Member Author

vcunat commented Dec 3, 2022

We have a few build regressions printing

error: invalid conversion from 'mpfr_srcptr'

but the straightforward solution rebuilds stdenv, so I suppose they will get left for the next iteration. (commit cfe4a8d)

github-actions bot and others added 11 commits December 3, 2022 18:01
They all fail for the same reason:

```
[ERROR]
Traceback (most recent call last):
  File "/nix/store/xz6krlmwsc15z96p7hgcvssmx848hvq0-python3.10-twisted-22.10.0/lib/python3.10/site-packages/twisted/internet/test/test_posixbase.py", line 55, in tearDown
    self.assertEqual(
  File "/nix/store/xz6krlmwsc15z96p7hgcvssmx848hvq0-python3.10-twisted-22.10.0/lib/python3.10/site-packages/twisted/trial/_synctest.py", line 441, in assertEqual
    super().assertEqual(first, second, msg)
  File "/nix/store/70c1n7i4c90dn4iys0myy30yfxmlsza7-python3-3.10.8/lib/python3.10/unittest/case.py", line 845, in assertEqual
    assertion_func(first, second, msg=msg)
  File "/nix/store/70c1n7i4c90dn4iys0myy30yfxmlsza7-python3-3.10.8/lib/python3.10/unittest/case.py", line 838, in _baseAssertEqual
    raise self.failureException(msg)
twisted.trial.unittest.FailTest: 3 != 0 : Warnings found at the end of the test:
[{'message': 'unclosed event loop <_UnixSelectorEventLoop running=False closed=False debug=False>', 'category': <class 'ResourceWarning'>, 'filename': '/nix/store/70c1n7i4c90dn4iys0myy30yfxmlsza7-python3-3.10.8/lib/python3.10/asyncio/base_events.py', 'lineno': 688}, {'message': 'unclosed event loop <_UnixSelectorEventLoop running=False closed=False debug=False>', 'category': <class 'ResourceWarning'>, 'filename': '/nix/store/70c1n7i4c90dn4iys0myy30yfxmlsza7-python3-3.10.8/lib/python3.10/asyncio/base_events.py', 'lineno': 688}, {'message': 'unclosed event loop <_UnixSelectorEventLoop running=False closed=False debug=False>', 'category': <class 'ResourceWarning'>, 'filename': '/nix/store/70c1n7i4c90dn4iys0myy30yfxmlsza7-python3-3.10.8/lib/python3.10/asyncio/base_events.py', 'lineno': 688}]

twisted.internet.test.test_posixbase.PosixReactorBaseTests.test_removeAllSkipsInternalReaders
```
@vcunat vcunat merged commit 089fb18 into master Dec 6, 2022
@vcunat
Copy link
Member Author

vcunat commented Dec 6, 2022

Well, rustc update broke builds of a few packages, but I assume that's fine, as it happens almost every time...

@vcunat vcunat mentioned this pull request Dec 9, 2022
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.