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.

Sign up for GitHub

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

Jump to bottom

[18.09] flatpak: 1.0.2 -> 1.0.4 (cherry-picked from master) #49117

Merged
merged 1 commit into from
Oct 27, 2018
Merged

[18.09] flatpak: 1.0.2 -> 1.0.4 (cherry-picked from master) #49117

merged 1 commit into from
Oct 27, 2018
+2 −2

Conversation

alexeymuranov
Copy link
Contributor

Motivation for this change

Minor version update.

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 nox --run "nox-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)
  • Fits CONTRIBUTING.md.

Sorry, something went wrong.

@r-ryantm @alexeymuranov
flatpak: 1.0.2 -> 1.0.4
4b18023 
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/flatpak/versions

(cherry picked from commit 825f621)
@GrahamcOfBorg GrahamcOfBorg added 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 1-10 labels Oct 25, 2018
@andir
Copy link
Member

andir commented Oct 26, 2018

@GrahamcOfBorg test flatpak

@GrahamcOfBorg
Copy link

Timed out, unknown build status on x86_64-linux (full log)

Attempted: tests.flatpak

Partial log (click to expand)

cannot build derivation '/nix/store/z2n5rpv3nfrp04fmd27lgacn5vqrfkd8-system-units.drv': 8 dependencies couldn't be built
cannot build derivation '/nix/store/w80ghpbhwc7q4plz3wwqmf7xmv81818i-user-units.drv': 5 dependencies couldn't be built
cannot build derivation '/nix/store/76m90bz9s5hp4n4wkknnrnia1l0qxna7-etc.drv': 7 dependencies couldn't be built
cannot build derivation '/nix/store/xdjid6sy1xcnzn347dqra320amqpbrfp-nixos-system-machine-18.09.git.564d099.drv': 2 dependencies couldn't be built
cannot build derivation '/nix/store/8iyka0n7h79hhgb7xmi5ira597qdvx4y-closure-info.drv': 1 dependencies couldn't be built
cannot build derivation '/nix/store/0mh33qvaxpikq0yd9n9hldh45bxgdjjn-run-nixos-vm.drv': 2 dependencies couldn't be built
cannot build derivation '/nix/store/crfsncx6iz4cb00hnhha3r300fpn78b1-nixos-vm.drv': 2 dependencies couldn't be built
cannot build derivation '/nix/store/mw8p18ayxx5mxkw1c1m90qcsg2m30qj5-nixos-test-driver-flatpak.drv': 1 dependencies couldn't be built
cannot build derivation '/nix/store/7adj4z2y6z7dwasgjkrdmpa7fl0xfn9r-vm-test-run-flatpak.drv': 1 dependencies couldn't be built
error: build of '/nix/store/7adj4z2y6z7dwasgjkrdmpa7fl0xfn9r-vm-test-run-flatpak.drv' failed

@GrahamcOfBorg
Copy link

Timed out, unknown build status on aarch64-linux (full log)

Attempted: tests.flatpak

Partial log (click to expand)

machine# [ 3560.004564] gnome-desktop-testing-runner[956]: Executing: flatpak/test-oci-registry@user.wrap.test
machine# [ 3565.004626] gnome-desktop-testing-runner[956]: Executing: flatpak/test-oci-registry@user.wrap.test
machine# [ 3570.004674] gnome-desktop-testing-runner[956]: Executing: flatpak/test-oci-registry@user.wrap.test
machine# [ 3575.004659] gnome-desktop-testing-runner[956]: Executing: flatpak/test-oci-registry@user.wrap.test
machine# [ 3580.004569] gnome-desktop-testing-runner[956]: Executing: flatpak/test-oci-registry@user.wrap.test
machine# [ 3585.004553] gnome-desktop-testing-runner[956]: Executing: flatpak/test-oci-registry@user.wrap.test
machine# [ 3590.005026] gnome-desktop-testing-runner[956]: Executing: flatpak/test-oci-registry@user.wrap.test
machine# [ 3595.004626] gnome-desktop-testing-runner[956]: Executing: flatpak/test-oci-registry@user.wrap.test
building of '/nix/store/j0g0r9qpxrn3zni1mp5lfxngh8icvwgi-vm-test-run-flatpak.drv' timed out after 3600 seconds
error: build of '/nix/store/j0g0r9qpxrn3zni1mp5lfxngh8icvwgi-vm-test-run-flatpak.drv' failed

@alexeymuranov
Copy link
Contributor Author

I did

$ nix-build nixos/release.nix -A tests.flatpak.x86_64-linux
$ nix-build nixos/release.nix -A tests.xdg-desktop-portal.x86_64-linux

as suggested in this comment. The tests seem to have passed.

@c0bw3b
Copy link
Contributor

c0bw3b commented Oct 26, 2018

Just for context: what's the rationale to backport this update to 18.09 release?
v1.0.4 contains some specific fixes?

@alexeymuranov
Copy link
Contributor Author

I do not have any specific rationale, i just suppose that minor updates are generally backported, and I am using flatpak.

@c0bw3b
Copy link
Contributor

c0bw3b commented Oct 26, 2018

Well after looking it up 1.0.3 has:

permissions: Avoid errors if there is no permissions table

And 1.0.4 has:

A crash was fixed when reading invalid .flatpakref files.
A crash during updates when a local ref was unexpectedly missing was fixed.
An error case on uninstalling was incorrectly returning success even
thought there was an error.

So it seems reasonable to backport

@c0bw3b c0bw3b merged commit 76ec098 into NixOS:release-18.09 Oct 27, 2018
@alexeymuranov alexeymuranov deleted the update-flatpak-in-18.09 branch October 27, 2018 12:41
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@c0bw3b c0bw3b

Assignees
No one assigned
Labels
10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 1-10
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
5 participants
@alexeymuranov @andir @GrahamcOfBorg @c0bw3b @r-ryantm