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: 0.99.3 -> 1.0.2 (cherry-picked from master) #47515

Merged
merged 7 commits into from Oct 3, 2018
Merged

[18.09] flatpak: 0.99.3 -> 1.0.2 (cherry-picked from master) #47515

merged 7 commits into from Oct 3, 2018

Conversation

alexeymuranov
Copy link
Contributor

Motivation for this change

Update Flatpak to the first stable version.

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.

hedning and others added 7 commits September 29, 2018 13:21
@hedning @alexeymuranov
pipewire: 0.1.9 -> 0.2.3
727eb5e 
I also removed pipewire from mutter temporarily, since it is not compatible.

(cherry picked from commit c32b040)
@hedning @alexeymuranov
xdg-desktop-portal: 0.99 -> 1.0.2
e80820d 
(cherry picked from commit 0d99473)
@hedning @alexeymuranov
flatpak: 0.99.3 -> 1.0.2
3f0618a 
(cherry picked from commit 37a828e)
@hedning @alexeymuranov
xdg-desktop-portal-gtk: 0.99 -> 1.0.2
8063903 
(cherry picked from commit b6c17cd)
@hedning @alexeymuranov
ostree: 2018.6 -> 2018.8
7569e96 
(cherry picked from commit 87d11ae)
@jtojnar @alexeymuranov
xdg-dbus-proxy: init at 0.1.0
941941b 
(cherry picked from commit 2d19ee6)
@jtojnar @alexeymuranov
flatpak-builder: add libyaml
0f9355a 
(cherry picked from commit 7d2c8bb)
@GrahamcOfBorg GrahamcOfBorg added the 6.topic: GNOME GNOME desktop environment and its underlying platform label Sep 29, 2018
@alexeymuranov
Copy link
Contributor Author

Possibly because something is messed up in my user config of flatpak, I cannot currently do flatpak update on NixOS 18.09:

$ flatpak update
error: While opening repository /home/alexey/.local/share/flatpak/repo: min-free-space-percent and min-free-space-size are mutually exclusive

I hope this is fixed in Flatpak 1.0.2: ostreedev/ostree#1685

@xeji xeji requested a review from jtojnar September 29, 2018 19:40
@jtojnar
Copy link
Contributor

jtojnar commented Sep 29, 2018

Cannot test it but if it works for you I do not see a reason not to merge.

@alexeymuranov
Copy link
Contributor Author

@jtojnar, is there any online documentation about how I could test this? (I might be able to figure out how to build and install a modified application package, but this is a service.)

@jtojnar
Copy link
Contributor

jtojnar commented Sep 30, 2018

Usually, I just run nix-build nixos/release.nix -A tests.flatpak.x86_64-linux and nix-build nixos/release.nix -A tests.xdg-desktop-portal.x86_64-linux.

@alexeymuranov
Copy link
Contributor Author

The first command finished with:

test script finished in 4931.26s
cleaning up
killing machine (pid 597)
vde_switch: EOF on stdin, cleaning up and exiting
vde_switch: Could not remove ctl dir '/build/vde1.ctl': Directory not empty
/nix/store/qsp7pv9shizh84x7qs6hlhb95wn9msnf-vm-test-run-flatpak

The second finished with:

test script finished in 9.89s
cleaning up
killing machine (pid 597)
vde_switch: EOF on stdin, cleaning up and exiting
vde_switch: Could not remove ctl dir '/build/vde1.ctl': Directory not empty
/nix/store/javwr6pb8mc1c1cw8y4zggrlx7ms61d8-vm-test-run-xdg-desktop-portal

I do not know if this means that tests were passed.

@xeji
Copy link
Contributor

xeji commented Oct 1, 2018

Yes, it means the tests passed. You can ignore the "vde_switch" error.

@jtojnar jtojnar merged commit d6ff529 into NixOS:release-18.09 Oct 3, 2018
@alexeymuranov alexeymuranov deleted the update-flatpak-on-18.09 branch October 4, 2018 07:31
@alexeymuranov alexeymuranov mentioned this pull request Oct 26, 2018
Merged
9 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jtojnar jtojnar Awaiting requested review from jtojnar

Assignees
No one assigned
Labels
6.topic: GNOME GNOME desktop environment and its underlying platform 8.has: package (new) 10.rebuild-darwin: 0 10.rebuild-linux: 11-100
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
5 participants
@alexeymuranov @jtojnar @xeji @GrahamcOfBorg @hedning