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

cargo-tauri: 2.0.0-rc.2 -> 1.7.1-unstable-2024-08-16 #335334

Merged
merged 1 commit into from
Aug 18, 2024

Conversation

linsui
Copy link
Contributor

@linsui linsui commented Aug 17, 2024

Description of changes

#334771 update cargo tauri to version 2 but it's not compatible with tauri 1 apps. This PR add cargo tauri 1 back and switch all tauri apps to it.

I only tested pot which doesn't build with cargo-tauri 2 but cargo-tauri_1.

@ryand56 @alyssais

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.

@linsui linsui requested a review from SuperSandro2000 August 17, 2024 10:11
@alyssais
Copy link
Member

I don't think it makes sense to switch all dependent packages back without even checking whether they build with the new one…

Has this been reported to pot upstream?

@alyssais
Copy link
Member

Oh right, tauri 2 is still an RC. In that case, maybe it makes sense just to switch cargo-tauri to this version across the board, and update to 2 once it's out?

@linsui
Copy link
Contributor Author

linsui commented Aug 17, 2024

I can't check them due to limited resource and these packages may still fail due to other crates not compatible with rust 1.80. But this PR basically just revert #334771 and provide a better fix.

In that case, maybe it makes sense just to switch cargo-tauri to this version across the board, and update to 2 once it's out?

I thought we need a cargo-tauri_1 package anyway since those packages need to be migrated. Even if tauri 2 is released they may take a long time to migrate. And it's very likely not all those packages will be migrated at the same time.

@alyssais
Copy link
Member

I thought we need a cargo-tauri_1 package anyway since those packages need to be migrated. Even if tauri 2 is released they may take a long time to migrate. And it's very likely not all those packages will be migrated at the same time.

I think we shouldn't worry about that until after tauri 2 is like, because we don't know how quickly migration will happen.

@linsui linsui changed the title cargo-tauri_1: init at 1.7.1-unstable-2024-08-16 cargo-tauri: 2.0.0-rc.2 -> 1.7.1-unstable-2024-08-16 Aug 17, 2024
@linsui
Copy link
Contributor Author

linsui commented Aug 17, 2024

OK, then let's just downgrade it. :)

@ryand56
Copy link
Member

ryand56 commented Aug 17, 2024

Sounds good, the app that I tested needed to update their config file with the new tauri version, and this is better because it includes the 1.80 fixes. Thanks 👍

@ryand56 ryand56 removed the 8.has: package (new) This PR adds a new package label Aug 17, 2024
Copy link
Member

@getchoo getchoo left a comment

Choose a reason for hiding this comment

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

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

2 packages marked as broken and skipped:
  • modrinth-app
  • modrinth-app-unwrapped
2 packages failed to build:
  • kiwitalk
  • surrealist
3 packages built:
  • cargo-tauri
  • gitbutler
  • pot

modrinth-app does build (fixes #335450). kiwitalk and surrealist fail with the infamous

error[E0282]: type annotations needed for Box<_>

so not the fault of this PR

@getchoo getchoo added the 12.approvals: 1 This PR was reviewed and approved by one reputable person label Aug 17, 2024
@ryand56 ryand56 added 12.approvals: 2 This PR was reviewed and approved by two reputable people and removed 12.approvals: 1 This PR was reviewed and approved by one reputable person labels Aug 18, 2024
@tengkuizdihar
Copy link
Contributor

thank you for this change, so that's why my tauri build fails on master lol

    @nix { "action": "setPhase", "phase": "buildPhase" }
    warning: `/build/.cargo/config` is deprecated in favor of `config.toml`
    note: if you need to support cargo 1.38 or earlier, you can symlink `config` to `config.toml`
    warning: `/build/.cargo/config` is deprecated in favor of `config.toml`
    note: if you need to support cargo 1.38 or earlier, you can symlink `config` to `config.toml`
        Error `tauri.conf.json` error on `build`: Additional properties are not allowed ('devPath', 'distDir', 'withGlobalTauri' were unexpected)
        Error `tauri.conf.json` error: Additional properties are not allowed ('package', 'tauri' were unexpected)

@nixos-discourse
Copy link

This pull request has been mentioned on NixOS Discourse. There might be relevant details there:

https://discourse.nixos.org/t/prs-already-reviewed/2617/1908

@SuperSandro2000
Copy link
Member

@SuperSandro2000 SuperSandro2000 merged commit 4c66fe4 into NixOS:master Aug 18, 2024
29 of 31 checks passed
@linsui linsui deleted the tauri branch August 18, 2024 08:47
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
10.rebuild-darwin: 1-10 10.rebuild-linux: 1-10 12.approvals: 2 This PR was reviewed and approved by two reputable people
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants