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

flatpak: 0.99.3 → 1.0.2 #46636

Merged
merged 7 commits into from Sep 14, 2018
Merged

flatpak: 0.99.3 → 1.0.2 #46636

merged 7 commits into from Sep 14, 2018

Conversation

jtojnar
Copy link
Contributor

@jtojnar jtojnar commented Sep 14, 2018

Motivation for this change

Flatpak update; cherry-picked from #45950 with some extra fixes

cc @hedning

Closes: #43595 cc @x80486

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.

@GrahamcOfBorg
Copy link

No attempt on x86_64-darwin (full log)

The following builds were skipped because they don't evaluate on x86_64-darwin: flatpak, flatpak-builder, ostree, pipewire, xdg-dbus-proxy, xdg-desktop-portal, xdg-desktop-portal-gtk

Partial log (click to expand)


a) For `nixos-rebuild` you can set
  { nixpkgs.config.allowUnsupportedSystem = true; }
in configuration.nix to override this.

b) For `nix-env`, `nix-build`, `nix-shell` or any other Nix command you can add
  { allowUnsupportedSystem = true; }
to ~/.config/nixpkgs/config.nix.


@GrahamcOfBorg
Copy link

Success on x86_64-linux (full log)

Attempted: flatpak, flatpak-builder, ostree, pipewire, xdg-dbus-proxy, xdg-desktop-portal, xdg-desktop-portal-gtk

Partial log (click to expand)

strip is /nix/store/h0lbngpv6ln56hjj59i6l77vxq25flbz-binutils-2.30/bin/strip
patching script interpreter paths in /nix/store/z3v1df62804kd6qbhv8iab96hxlg7bcz-flatpak-builder-1.0.0-man
checking for references to /build in /nix/store/z3v1df62804kd6qbhv8iab96hxlg7bcz-flatpak-builder-1.0.0-man...
/nix/store/qmghhz0jp8n44lgc0lccsn1l67wl7nns-flatpak-1.0.2
/nix/store/5c5giiv3ban4sfk1ikhdjbqzhzapdi8z-flatpak-builder-1.0.0
/nix/store/qjjy9ipxw93ry9gi8hwy65m44dwki0ik-ostree-2018.8
/nix/store/w3hab61zzq9nv7x2hakshmrmvsszlv2w-pipewire-0.2.3
/nix/store/7ldbblwcv9x86kb0h8vmfp25bi853wc0-xdg-dbus-proxy-0.1.0
/nix/store/qf2f7lyg03ns5a6snz2bsmf2ag5673cs-xdg-desktop-portal-1.0.2
/nix/store/ixc0hhn8l55bxax4jihgchk7kp2r9ka3-xdg-desktop-portal-gtk-1.0.2

@GrahamcOfBorg
Copy link

Success on aarch64-linux (full log)

Attempted: flatpak, flatpak-builder, ostree, pipewire, xdg-dbus-proxy, xdg-desktop-portal, xdg-desktop-portal-gtk

Partial log (click to expand)

strip is /nix/store/y4ymnvgxygpq05h03kyzbj572zmh6zla-binutils-2.30/bin/strip
patching script interpreter paths in /nix/store/j8i03d4nvd9v9vmc07b9r9z1z105v6g7-flatpak-builder-1.0.0-man
checking for references to /build in /nix/store/j8i03d4nvd9v9vmc07b9r9z1z105v6g7-flatpak-builder-1.0.0-man...
/nix/store/0dd7q1pp4xd1hhw1zgcfb8w7bx8s1zpr-flatpak-1.0.2
/nix/store/rjg68b6w8g1mxq1kh813d75nkyr5w99s-flatpak-builder-1.0.0
/nix/store/9123xd3k1qmpwg5ykp9pp26apkrmc9lr-ostree-2018.8
/nix/store/n6913ycvbvva85mbkygdvbwhvi6xgp1h-pipewire-0.2.3
/nix/store/q9hzfsk62nxw1w9snml7xdzg3wn3jf6a-xdg-dbus-proxy-0.1.0
/nix/store/skkxa1nizmqfr07w3dshsv2ja2f05pni-xdg-desktop-portal-1.0.2
/nix/store/bb1rb0d4yi9vh5s27zyrnqxnps4ah2mg-xdg-desktop-portal-gtk-1.0.2

@jtojnar
Copy link
Contributor Author

jtojnar commented Sep 14, 2018

@GrahamcOfBorg test flatpak xdg-desktop-portal ostree

@GrahamcOfBorg
Copy link

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

Attempted: tests.flatpak, tests.xdg-desktop-portal, tests.ostree

Partial log (click to expand)

machine# 127.0.0.1 - - [14/Sep/2018 04:49:56] "GET /test/objects/62/70232fd16d282e4fc2893db8c155333212a4a528b70bc018ca9666a38ab35e.filez HTTP/1.1" 200 -
machine# 127.0.0.1 - - [14/Sep/2018 04:49:56] "GET /test/objects/93/f70a6e5711a93528d8a39f676f3bc2b373a3b405244be3c59a3f0710a05835.filez HTTP/1.1" 200 -
machine# 127.0.0.1 - - [14/Sep/2018 04:49:56] "GET /test/objects/3f/811ac4761add48ad73a5ce7a4a0e545f31cea0ed3789f50031ae02ba26d188.filez HTTP/1.1" 200 -
machine# 127.0.0.1 - - [14/Sep/2018 04:49:56] "GET /test/objects/e4/ba8c9963b73bfb8207d55aa8982b539828cedd03070a7e1d2a54a1a52b01e1.filez HTTP/1.1" 200 -
machine# 127.0.0.1 - - [14/Sep/2018 04:49:56] "GET /test/objects/1a/8db38734dc71bfdabc07aee9c930c4da6887e4b73725da1a9ac8c44aa8e489.filez HTTP/1.1" 200 -
machine# 127.0.0.1 - - [14/Sep/2018 04:49:56] "GET /test/objects/83/0d9bbbf97536eae0e4b4c15ca7c42dd939cf2471b6eb8e9f7b4c5e7d00a199.filez HTTP/1.1" 200 -
machine# 127.0.0.1 - - [14/Sep/2018 04:49:56] "GET /test/objects/72/c38a2a5b9bd8f91de5655f0c57477f2a1300f5876d05de02eff4fcc1054eb7.filez HTTP/1.1" 200 -
machine# 127.0.0.1 - - [14/Sep/2018 04:49:56] "GET /test/objects/eb/874be9ae2206736eed07ab9f8096ad71182e5cc2dd9f7a49b68375065864e1.filez HTTP/1.1" 200 -
building of '/nix/store/s8g3kl9v6kdim9v3w4sl9pmdrml9p59b-vm-test-run-flatpak.drv' timed out after 1800 seconds
error: build of '/nix/store/kh9p1vcfqaw04fswhw09621pwflrb8l4-vm-test-run-ostree.drv', '/nix/store/s8g3kl9v6kdim9v3w4sl9pmdrml9p59b-vm-test-run-flatpak.drv' failed

@GrahamcOfBorg
Copy link

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

Attempted: tests.flatpak, tests.xdg-desktop-portal, tests.ostree

Partial log (click to expand)

machine# [ 3560.004748] gnome-desktop-testing-runner[958]: Executing: flatpak/test-update-remote-configuration.sh.test
machine# [ 3565.004683] gnome-desktop-testing-runner[958]: Executing: flatpak/test-update-remote-configuration.sh.test
machine# [ 3570.004639] gnome-desktop-testing-runner[958]: Executing: flatpak/test-update-remote-configuration.sh.test
machine# [ 3575.004617] gnome-desktop-testing-runner[958]: Executing: flatpak/test-update-remote-configuration.sh.test
machine# [ 3580.004780] gnome-desktop-testing-runner[958]: Executing: flatpak/test-update-remote-configuration.sh.test
machine# [ 3585.004691] gnome-desktop-testing-runner[958]: Executing: flatpak/test-update-remote-configuration.sh.test
machine# [ 3590.004612] gnome-desktop-testing-runner[958]: Executing: flatpak/test-update-remote-configuration.sh.test
machine# [ 3595.004550] gnome-desktop-testing-runner[958]: Executing: flatpak/test-update-remote-configuration.sh.test
building of '/nix/store/rw86nwnm2j868inm8a795djz505032wg-vm-test-run-flatpak.drv' timed out after 3600 seconds
error: build of '/nix/store/rw86nwnm2j868inm8a795djz505032wg-vm-test-run-flatpak.drv', '/nix/store/wvilgrqs7kzpqf2rjxx3ssxyi994k9ql-vm-test-run-ostree.drv' failed

@hedning
Copy link
Contributor

hedning commented Sep 14, 2018

The new pipewire breaks mutter, so it will require a patch or to wait for 3.30.

@jtojnar
Copy link
Contributor Author

jtojnar commented Sep 14, 2018

I have removed the pipewire dependency from mutter for now, we still do not have working wayland anyway.

@jtojnar
Copy link
Contributor Author

jtojnar commented Sep 14, 2018

Installed tests for ostree still fail due to ostreedev/ostree#1592 and ostreedev/ostree#1634; flatpak and xdg-desktop-portal are okay.

@jtojnar jtojnar merged commit 7771df1 into NixOS:master Sep 14, 2018
@jtojnar jtojnar deleted the flatpak-1.0.2 branch September 14, 2018 12:57
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Update the flatpak-builder package for YAML support
3 participants