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

Jump to bottom

fractal: 4.0.0 -> 4.2.0 #65610

Merged
merged 2 commits into from Aug 1, 2019
Merged

fractal: 4.0.0 -> 4.2.0 #65610

merged 2 commits into from Aug 1, 2019

Conversation

worldofpeace
Copy link
Contributor

Commit Message

Build system changes happening in the following commits:

Submitted MR upstream to update Cargo.lock 0 and to
make scripts executable 1.

Motivation for this change
Things done

I've built this without checks because I couldn't tell what was going on with
them. Kept them enabled here to see how it goes with ofborg.

  • 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 nix-review --run "nix-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)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.
Notify maintainers

cc @dtzWill

ping @infinisil since I think he was interested in this.

@infinisil
Copy link
Member

I also got a build with this working when I tried to update it yesterday, however it crashed or threw an error when I tried to log in, logs here: https://gist.github.com/Infinisil/85f2d628d96e56fff7a8c6caa1fa12c7

Can you log in successfully?

@worldofpeace
Copy link
Contributor Author

I don't think you have a secret service running. It works for me when using gnome-keyring.

@worldofpeace
Copy link
Contributor Author

worldofpeace commented Jul 30, 2019 •
edited

Huh, looks the like the tests timed out. Not sure if they're actually doing what they should?
From what I can tell they're running the cargo tests within meson now.

Edit: it appears there's timeouts for the tests upstream with GitLab's CI...

@infinisil
Copy link
Member

The tests just took a while to run when I built it.

Oh, well that's kinda shitty, because I could at least log in with version 4.0.0 without having to run any secret service.

@worldofpeace
Copy link
Contributor Author

worldofpeace commented Jul 30, 2019 •
edited

Oh, well that's kinda shitty, because I could at least log in with version 4.0.0 without having to run any secret service.

Actually I think you should be able to at least login, it's just your password won't be remembered.
I recall that's how it worked before. (https://gitlab.gnome.org/GNOME/fractal#password-storage)

@infinisil
Copy link
Member

Yeah I just tried again with this PR, it crashes in the same way when I try to log in. I already mentioned it in the fractal matrix channel yesterday, I should open a bug for this.

@infinisil
Copy link
Member

Opened an issue: https://gitlab.gnome.org/GNOME/fractal/issues/517

@worldofpeace
Copy link
Contributor Author

worldofpeace commented Aug 1, 2019 •
edited

Updated to fetch https://gitlab.gnome.org/GNOME/fractal/merge_requests/446 because it's merged.
Couldn't get https://gitlab.gnome.org/GNOME/fractal/merge_requests/447 to apply though so we still manually chmod.

dtzWill
dtzWill approved these changes Aug 1, 2019
View reviewed changes
Copy link
Member

@dtzWill dtzWill left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Eep, something just came up sorry!

However i'm running 4.2.0 with the two commits upstream merged that were authored by you, and I'm not 100% (formatting change, this once, makes it hard to spot changes in deps if any).

If it works for you I say ship it, works for me :). Does your 2nd commit need fetching/applying or do we just do that ourselves directly?

@worldofpeace
Copy link
Contributor Author

If it works for you I say ship it, works for me :). Does your 2nd commit need fetching/applying or do we just do that ourselves directly?

Didn't seem to work.

Couldn't get https://gitlab.gnome.org/GNOME/fractal/merge_requests/447 to apply though so we still manually chmod.

Would that be like binary data need to be applied with git apply instead of patch?
Probably not worth the effort since it's just one file we needed.

@worldofpeace worldofpeace merged commit 45c62cb into NixOS:master Aug 1, 2019
@worldofpeace worldofpeace deleted the fractal-update branch August 1, 2019 23:27
@infinisil infinisil mentioned this pull request Aug 25, 2019
Open
@infinisil
Copy link
Member

Yeah so I can't use 4.2.0 after all because of above issue with gnome-keyring

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@dtzWill dtzWill dtzWill approved these changes

Assignees
No one assigned
Labels
10.rebuild-darwin: 1-10 10.rebuild-linux: 1-10 11.by: package-maintainer
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@worldofpeace @infinisil @dtzWill