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
flatpak: 1.6.3 → 1.8.1 #93771
Merged
Merged
flatpak: 1.6.3 → 1.8.1 #93771
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
Flatpak’s installed tests build Flatpak runtimes, among other things. Upstream code does this by copying some programs on `PATH` as well as some possible dependencies from host’s /usr. We patch the code to use `nix-store --query --requisites` to make the dependency discovery easier. The Flatpak’s installed tests add `socat` to `PATH` and later run `nix-store --query --requisites` on its location but it was failing with error: path '/nix/store/qcyf7nq5vvfw32967sv4j6z190inrbrc-socat-1.7.3.4' is not valid The issue occurred because, while the host Nix store is bind mounted into the test VM, the VM’s store uses its own database that only contains the packages in the VM’s closure. Since the test commands are not actually part of the VM but only passed through PTY, the `flatpak.installedTests` derivation was not part of the VM’s closure, so `nix-store` in the VM could not get information about its dependency `socat`. Let’s make the `installedTests` of the tested package part of the test VM’s closure by passing it as a global environment variable. This will also have the added benefit that user no longer has to type the path when running the installed tests manually in the VM; they can just use `gnome-desktop-testing-runner -d $TESTED_PACKAGE_INSTALLED_TESTS`, which is much more conducive to tab completion.
Along with the `socat` fix in the parent commit, this makes the Flatpak’s installed tests finally pass again. The tests seem to need slightly over 2G of disk space, and it appears that the test suite was ported to Python 3 in 1.5.1: flatpak/flatpak@2b66415
After 62 minutes, just the two new tests are failing so quite nice:
|
That is weird, there are no errors other than Full log: test-oci-registry@system.wrap.test.log |
Changes: * https://github.com/flatpak/flatpak/releases/tag/1.7.1 * https://github.com/flatpak/flatpak/releases/tag/1.7.2 * https://github.com/flatpak/flatpak/releases/tag/1.7.3 * https://github.com/flatpak/flatpak/releases/tag/1.8.0 * https://github.com/flatpak/flatpak/releases/tag/1.8.1 Commits: flatpak/flatpak@1.6.3...1.7.1 flatpak/flatpak@1.7.1...1.8.1 Notable packaging changes: * Flatpak now ships a sysusers.d file for allowing systemd to create the required users. flatpak/flatpak@4df0190 * Completion support for fish shell * If an app has filesystem access, the host /lib is accessible as /run/host/lib, etc. * New filesystem permission "host-etc" and "host-os" give access to system /usr and /etc. flatpak/flatpak@fe2536b * We now always expose the host timezone data, allowing us the expose the host /etc/localtime in a way that works better, fixing several apps that had timezone issues. flatpak/flatpak@dc4e198 * We now ship a systemd unit (not installed by default) to automatically detect plugged in usb sticks with sideload repos. * By default we no longer install the gdm env.d file, as the systemd generators work better flatpak/flatpak@7c3a85b * Use variant-schema-compiler for some GVariant code flatpak/flatpak#3366 * zstd compression for oci deltas: flatpak/flatpak@bfa71e2 Additionally: * Remove glibcLocales which is not used since 1.4 bump because glibc contains a locale archive with C.UTF-8 NixOS@1728bc8 * Stop using aliases for docbook-xsl-nons and pkg-config packages * Stop using autoreconfHook, the autogen.sh script contains some extra that are necessary when building from git. * Increase disk space for installed tests, they were running out. * Enable building developer documentation.
Turns out it was a flatpak bug, opened flatpak/flatpak#3762 with a fix. |
jtojnar
requested review from
zowoq and
worldofpeace
and removed request for
zowoq
July 24, 2020 17:42
GNOME is not necessary. Portals probably are not either, but the NixOS module requires them. Not sure why it did not work without GNOME before.
jtojnar
added
the
8.has: upstream changes reviewed
Reviewer checked the changelogs/commit logs associated with the release and did not find any issues.
label
Jul 24, 2020
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Labels
6.topic: nixos
8.has: module (update)
8.has: upstream changes reviewed
Reviewer checked the changelogs/commit logs associated with the release and did not find any issues.
10.rebuild-darwin: 1-10
10.rebuild-darwin: 1
10.rebuild-linux: 11-100
11.by: package-maintainer
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
Changes:
Commits:
flatpak/flatpak@1.6.3...1.7.1
flatpak/flatpak@1.7.1...1.8.1
Notable packaging changes:
flatpak/flatpak@4df0190
flatpak/flatpak@fe2536b
flatpak/flatpak@dc4e198
flatpak/flatpak@7c3a85b
Use variant-schema-compiler for some GVariant code flatpak/flatpak#3366
flatpak/flatpak@bfa71e2
Additionally:
1728bc8
Also fix installed test.
Things done
sandbox
innix.conf
on non-NixOS linux)flatpak.tests
passed with the test fixes before updating to 1.8.1 (took 80 min)flatpak.tests
passed with the test fixes after updating to 1.8.1 (took 63 min)nix-shell -p nixpkgs-review --run "nixpkgs-review wip"
./result/bin/
)nix path-info -S
before and after)