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

deltachat-desktop: init at unstable-2021-08-04 #130561

Merged
merged 5 commits into from
Aug 9, 2021
Merged

deltachat-desktop: init at unstable-2021-08-04 #130561

merged 5 commits into from
Aug 9, 2021

Conversation

dotlambda
Copy link
Member

@dotlambda dotlambda commented Jul 18, 2021 •
edited
Loading

Motivation for this change
Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS linux)
  • 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 nixpkgs-review --run "nixpkgs-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • 21.11 Release Notes (or backporting 21.05 Relase notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
    • (Module updates) Added a release notes entry if the change is significant
    • (Module addition) Added a release notes entry if adding a new NixOS module
  • Fits CONTRIBUTING.md.

I copied a lot from botamusique and element-desktop, so cc @infinisil @TredwellGit @Ma27

cc @Jikstra @Simon-Laux

@dotlambda dotlambda force-pushed the deltachat-desktop-init branch from 4ee6d1d to bf4e20e Compare July 18, 2021 17:18
@dotlambda dotlambda mentioned this pull request Jul 18, 2021
Closed
@dotlambda dotlambda requested a review from ehmry July 18, 2021 17:23
@dotlambda dotlambda force-pushed the deltachat-desktop-init branch from bf4e20e to 26cac10 Compare July 18, 2021 17:29
@dotlambda dotlambda linked an issue Jul 18, 2021 that may be closed by this pull request
deltachat-electron cannot import backup #109557
Closed
@dotlambda dotlambda requested a review from Mic92 July 18, 2021 17:33
@dotlambda dotlambda force-pushed the deltachat-desktop-init branch from 26cac10 to 1831d26 Compare July 18, 2021 17:34
@dotlambda dotlambda requested a review from Enteee July 18, 2021 17:37
@dotlambda dotlambda force-pushed the deltachat-desktop-init branch from 1831d26 to 332e1e3 Compare July 18, 2021 17:38
@ofborg ofborg bot added 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin and removed 10.rebuild-darwin: 1 10.rebuild-darwin: 1-10 labels Jul 23, 2021
@Mic92
Copy link
Member

Mic92 commented Jul 30, 2021

Would something like this work for deltachat? https://github.com/NixOS/nixpkgs/pull/131502/files#diff-b01429248f53af2ccb5c200a3af1c8ecdbabea7a0c4aadc43cbcb090a6cd03d7L8

@dotlambda dotlambda force-pushed the deltachat-desktop-init branch from b874bce to ac43b96 Compare August 1, 2021 21:31
@dotlambda
Copy link
Member Author

Would something like this work for deltachat? https://github.com/NixOS/nixpkgs/pull/131502/files#diff-b01429248f53af2ccb5c200a3af1c8ecdbabea7a0c4aadc43cbcb090a6cd03d7L8

Thanks for the suggestion. I'm using it now but am still missing an update script. Such a script could remove some unnessecary dependencies from package.json so even fewer lines are added to pkgs/development/node-packages/node-packages.nix.

@ofborg ofborg bot requested a review from midchildan August 1, 2021 21:42
@ofborg ofborg bot added 10.rebuild-darwin: 11-100 10.rebuild-linux: 11-100 and removed 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 1 labels Aug 1, 2021
@dotlambda dotlambda force-pushed the deltachat-desktop-init branch 5 times, most recently from 4b05c50 to 8f1952f Compare August 6, 2021 08:07
@ofborg ofborg bot added the 2.status: merge conflict This PR has merge conflicts with the target branch label Aug 6, 2021
@dotlambda dotlambda force-pushed the deltachat-desktop-init branch from 8f1952f to 4b7e4fe Compare August 6, 2021 10:47
@ofborg ofborg bot removed the 2.status: merge conflict This PR has merge conflicts with the target branch label Aug 6, 2021
@dotlambda dotlambda requested a review from kloenk August 6, 2021 10:59
kloenk
kloenk approved these changes Aug 6, 2021
View reviewed changes
Copy link
Member

@kloenk kloenk left a comment

Choose a reason for hiding this comment

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

2 nits, LGTM

@dotlambda dotlambda force-pushed the deltachat-desktop-init branch from 4b7e4fe to 78809fa Compare August 6, 2021 11:04
@dotlambda dotlambda marked this pull request as ready for review August 6, 2021 11:17
@dotlambda dotlambda changed the title deltachat-desktop: init at 1.20.3 deltachat-desktop: init at unstable-2021-08-04 Aug 6, 2021
@Simon-Laux
Copy link

Simon-Laux commented Aug 6, 2021 •
edited
Loading

Test results on macOS:
nix-build -A python3.pkgs.deltachat - works
nix-build -A deltachat-desktop && ./result/bin/deltachat - still broken, this time sth. different:

[6776:0807/003930.966525:FATAL:gpu_data_manager_impl_private.cc(415)] GPU process isn't usable. Goodbye.

nix-build -A kdeltachat && ./result/bin/kdeltachat - kirigami2-5.84.0 seems unavailable on macOS:

error: Package ‘kirigami2-5.84.0’ in /Users/user/nixpkgs/pkgs/development/libraries/kde-frameworks/default.nix:94 is marked as broken, refusing to evaluate.

@dotlambda dotlambda force-pushed the deltachat-desktop-init branch from 78809fa to ffb7661 Compare August 6, 2021 22:40
@Mic92
Copy link
Member

Mic92 commented Aug 8, 2021

Looks much better now!

@dotlambda
Copy link
Member Author 

[6776:0807/003930.966525:FATAL:gpu_data_manager_impl_private.cc(415)] GPU process isn't usable. Goodbye.

Same error as in #132638, will be fixed with the next force-push.

@dotlambda dotlambda force-pushed the deltachat-desktop-init branch from ffb7661 to 280d920 Compare August 9, 2021 04:59
@dotlambda
Copy link
Member Author

@Mic92 Please merge if this looks good to you.

@dotlambda
Copy link
Member Author

Result of nixpkgs-review pr 130561 run on x86_64-linux 1

15 packages built:
  • deltachat-cursed
  • deltachat-desktop
  • fast-cli
  • joplin
  • kdeltachat
  • libdeltachat
  • lumo
  • netlify-cli
  • python38Packages.deltachat
  • python39Packages.deltachat
  • redoc-cli
  • thelounge
  • vimPlugins.coc-prettier
  • vimPlugins.coc-stylelint
  • wasm-text-gen

@dotlambda
Copy link
Member Author

Result of nixpkgs-review pr 130561 run on aarch64-linux 1

15 packages built:
  • deltachat-cursed
  • deltachat-desktop
  • fast-cli
  • joplin
  • kdeltachat
  • libdeltachat
  • lumo
  • netlify-cli
  • python38Packages.deltachat
  • python39Packages.deltachat
  • redoc-cli
  • thelounge
  • vimPlugins.coc-prettier
  • vimPlugins.coc-stylelint
  • wasm-text-gen

@dotlambda dotlambda merged commit ffd075d into NixOS:master Aug 9, 2021
@dotlambda dotlambda deleted the deltachat-desktop-init branch August 9, 2021 23:55
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@kloenk kloenk kloenk approved these changes

@ehmry ehmry Awaiting requested review from ehmry

@Enteee Enteee Awaiting requested review from Enteee

@midchildan midchildan Awaiting requested review from midchildan

@Mic92 Mic92 Awaiting requested review from Mic92

@FRidh FRidh Awaiting requested review from FRidh

@jonringer jonringer Awaiting requested review from jonringer

@SuperSandro2000 SuperSandro2000 Awaiting requested review from SuperSandro2000

Assignees
No one assigned
Labels
8.has: clean-up 8.has: package (new) This PR adds a new package 10.rebuild-darwin: 11-100 10.rebuild-linux: 11-100 11.by: package-maintainer This PR was created by the maintainer of the package it changes
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

deltachat-electron cannot import backup
5 participants
@dotlambda @Mic92 @Simon-Laux @SuperSandro2000 @kloenk