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

deltachat-desktop: 1.46.8 -> 1.48.0 #355575

Merged
merged 2 commits into from
Nov 18, 2024
Merged

Conversation

dotlambda
Copy link
Member

@dotlambda dotlambda commented Nov 13, 2024

Diff: deltachat/deltachat-desktop@v1.46.8...v1.48.0

Changelog: https://github.com/deltachat/deltachat-desktop/blob/v1.48.0/CHANGELOG.md

Things done

  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandboxing enabled in nix.conf? (See Nix manual)
    • sandbox = relaxed
    • sandbox = true
  • Tested, as applicable:
  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage
  • Tested basic functionality of all binary files (usually in ./result/bin/)
  • 24.11 Release Notes (or backporting 23.11 and 24.05 Release 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.

Add a 👍 reaction to pull requests you find important.

Copy link
Member

@emilylange emilylange left a comment

Choose a reason for hiding this comment

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

Hope this helps to get this going

pkgs/by-name/de/deltachat-desktop/package.nix Outdated Show resolved Hide resolved
pkgs/by-name/de/deltachat-desktop/package.nix Show resolved Hide resolved
pkgs/by-name/de/deltachat-desktop/package.nix Show resolved Hide resolved
rm node_modules/@deltachat/stdio-rpc-server-*/deltachat-rpc-server
ln -s ${lib.getExe deltachat-rpc-server} node_modules/@deltachat/stdio-rpc-server-linux-*
'';
ln -s ${lib.getExe deltachat-rpc-server} node_modules/@deltachat/stdio-rpc-server-*
Copy link
Member Author

Choose a reason for hiding this comment

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

@Simon-Laux Does this look like the correct alternative to DELTA_CHAT_RPC_SERVER?

Copy link

@Simon-Laux Simon-Laux Nov 16, 2024

Choose a reason for hiding this comment

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

yes. I first thought generating a @deltachat/stdio-rpc-server-<os>-<arch>/package.json might be necessary for detection, but looks like it already finds it just fine.

@dotlambda
Copy link
Member Author

The Darwin build fails with

  • electron-builder  version=24.13.3 os=23.6.0
  • loaded configuration  file=/private/tmp/nix-build-deltachat-desktop-1.48.0.drv-0/source/packages/target-electron/electron-builder.json5
  • writing effective config  file=dist/builder-effective-config.yaml
  • packaging       platform=darwin arch=arm64 electron=32.2.2 appOutDir=dist/mac-arm64
  • copying Electron  source=/nix/store/6l7mmzg75dfz6hr581b0ygchaiwp6pjw-electron-32.2.2/Applications/Electron.app destination=/private/tmp/nix-build-deltachat-desktop-1.48.0.drv-0/source/packages/target-electron/dist/mac-arm64/Electron.app
  ⨯ open /private/tmp/nix-build-deltachat-desktop-1.48.0.drv-0/source/packages/target-electron/dist/mac-arm64/Electron.app/Contents/Frameworks/Electron Helper (GPU).app/Contents/Info.plist: permission denied  
  ⨯ /private/tmp/nix-build-deltachat-desktop-1.48.0.drv-0/source/node_modules/.pnpm/[email protected]/node_modules/app-builder-bin/mac/app-builder_arm64 process failed ERR_ELECTRON_BUILDER_CANNOT_EXECUTE
Exit code:
1  failedTask=build stackTrace=Error: /private/tmp/nix-build-deltachat-desktop-1.48.0.drv-0/source/node_modules/.pnpm/[email protected]/node_modules/app-builder-bin/mac/app-builder_arm64 process failed ERR_ELECTRON_BUILDER_CANNOT_EXECUTE
Exit code:
1
    at ChildProcess.<anonymous> (/private/tmp/nix-build-deltachat-desktop-1.48.0.drv-0/source/node_modules/.pnpm/[email protected]/node_modules/builder-util/src/util.ts:252:14)
    at Object.onceWrapper (node:events:634:26)
    at ChildProcess.emit (node:events:519:28)
    at maybeClose (node:internal/child_process:1105:16)
    at Process.ChildProcess._handle.onexit (node:internal/child_process:305:5)
/private/tmp/nix-build-deltachat-desktop-1.48.0.drv-0/source/packages/target-electron:
 ERR_PNPM_RECURSIVE_EXEC_FIRST_FAIL  Command failed with exit code 1: electron-builder --config ./electron-builder.json5 --dir -c.electronDist=/nix/store/6l7mmzg75dfz6hr581b0ygchaiwp6pjw-electron-32.2.2/Applications -c.electronVersion=32.2.2

Since I don't want to invest too much time into that I'll probably just mark it broken.

@dotlambda dotlambda marked this pull request as ready for review November 16, 2024 16:40
@dotlambda dotlambda merged commit 76e882d into NixOS:master Nov 18, 2024
29 of 30 checks passed
@dotlambda dotlambda deleted the deltachat-desktop branch November 18, 2024 22:06
@dotlambda dotlambda added the backport release-24.11 Backport PR automatically label Dec 3, 2024
@nix-backports
Copy link

nix-backports bot commented Dec 3, 2024

Successfully created backport PR for release-24.11:

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
8.has: clean-up 10.rebuild-darwin: 1-10 10.rebuild-linux: 11-100 11.by: package-maintainer This PR was created by the maintainer of the package it changes backport release-24.11 Backport PR automatically
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants