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

cargo-tauri: 1.7.1-unstable-2024-08-16 -> 2.1.0 #346277

Merged
merged 7 commits into from
Nov 14, 2024
Merged

cargo-tauri: 1.7.1-unstable-2024-08-16 -> 2.1.0 #346277

merged 7 commits into from
Nov 14, 2024

Conversation

getchoo
Copy link
Member

@getchoo getchoo commented Oct 3, 2024 •
edited
Loading

Closes #355468

Changelog: https://github.com/tauri-apps/tauri/releases/tag/tauri-v2.0.1
Diff: tauri-apps/tauri@2b61447...tauri-v2.0.1

This release contains breaking changes. See the migration guide

cargo-tauri_1 has also been introduced in order to keep other packages that still haven't updated to v2 building. It should be removed in 25.05 as it will no longer be maintained upstream

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.

@github-actions github-actions bot added 6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 8.has: documentation 8.has: changelog labels Oct 3, 2024
@getchoo getchoo mentioned this pull request Oct 4, 2024
Merged
13 tasks
@Eveeifyeve
Copy link
Contributor

Also add a eval warning to Nix/NixOs.

@getchoo
Copy link
Member Author

getchoo commented Oct 4, 2024

Nothing is removed, so I don't believe there is much of a need; I also wouldn't want to cause evaluation warnings for all packages in the tree that still use v1. The release notes should do well enough for now as breaking updates are expected in new releases, and then a throw can be used for cargo-tauri_1 in 25.05 once it's no longer needed here

@Eveeifyeve
Copy link
Contributor

Eveeifyeve commented Oct 4, 2024 •
edited
Loading

It seems like @ofborg is failing since it missing maintainers at hook.
/ofborg/checkout/1/repo/38dca4e3aa6bca43ea96d2fcc04e8229/mr-est/ofborg-evaluator-0/pkgs/by-name/ca/cargo-tauri/hook.nix:51:11

nim65s
nim65s suggested changes Oct 16, 2024
View reviewed changes
Copy link
Contributor

@nim65s nim65s left a comment

Choose a reason for hiding this comment

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

There is a merge conflict on master

@Eveeifyeve Eveeifyeve mentioned this pull request Oct 22, 2024
Open
@getchoo getchoo mentioned this pull request Oct 23, 2024
Closed
13 tasks
@kilianar kilianar mentioned this pull request Oct 26, 2024
Merged
13 tasks
@wegank wegank added the 2.status: merge conflict This PR has merge conflicts with the target branch label Nov 1, 2024
@kilianar
Copy link
Contributor

kilianar commented Nov 6, 2024

There’s currently a merge conflict with master due to recent changes: kiwitalk has been removed from nixpkgs, and both insulator2 and modrinth-app-unwrapped have been updated.

@getchoo getchoo changed the title cargo-tauri: 1.7.1-unstable-2024-08-16 -> 2.0.1 cargo-tauri: 1.7.1-unstable-2024-08-16 -> 2.0.6 Nov 6, 2024
@getchoo getchoo removed the 2.status: merge conflict This PR has merge conflicts with the target branch label Nov 6, 2024
@getchoo
Copy link
Member Author

getchoo commented Nov 6, 2024

Merge conflicts have been fixed, cargo-tauri was bumped from 2.0.1 -> 2.0.6, cargo-tauri-1 was bumped from 1.8.0 -> 1.8.1, and both should (hopefully) now build with the new Darwin stdenv (i.e., without the old explicit frameworks)

@gepbird gepbird added the 2.status: merge conflict This PR has merge conflicts with the target branch label Nov 7, 2024
@gepbird
Copy link
Contributor

gepbird commented Nov 7, 2024 •
edited
Loading

There's a new merge conflict in the release notes

Also eval fails

@getchoo getchoo removed the 2.status: merge conflict This PR has merge conflicts with the target branch label Nov 8, 2024
@thegrubster thegrubster mentioned this pull request Nov 8, 2024
Closed
13 tasks
@kilianar kilianar mentioned this pull request Nov 12, 2024
Closed
@getchoo
Copy link
Member Author

getchoo commented Nov 13, 2024

nixpkgs-review result

Generated using nixpkgs-review.

Command: nixpkgs-review pr 346277

aarch64-linux

⏩ 3 packages marked as broken and skipped:
  • alcom
  • modrinth-app
  • modrinth-app-unwrapped
⏩ 1 package blacklisted:
  • nixos-install-tools
❌ 1 package failed to build:
  • gitbutler
✅ 9 packages built:
  • cargo-tauri
  • cargo-tauri_1
  • en-croissant
  • gale
  • insulator2
  • mouse-actions-gui
  • pot
  • surrealist
  • wealthfolio

GitButler was previously failing. See #355157

@getchoo
Copy link
Member Author

getchoo commented Nov 14, 2024

nixpkgs-review result

Generated using nixpkgs-review.

Command: nixpkgs-review pr 346277

x86_64-darwin

⏩ 4 packages marked as broken and skipped:
  • alcom
  • alexandria
  • cinny-desktop
  • insulator2
❌ 3 packages failed to build:
  • gitbutler
  • modrinth-app
  • modrinth-app-unwrapped
✅ 3 packages built:
  • cargo-tauri
  • cargo-tauri_1
  • en-croissant

aarch64-darwin

⏩ 4 packages marked as broken and skipped:
  • alcom
  • alexandria
  • cinny-desktop
  • insulator2
❌ 1 package failed to build:
  • gitbutler
✅ 5 packages built:
  • cargo-tauri
  • cargo-tauri_1
  • en-croissant
  • modrinth-app
  • modrinth-app-unwrapped

modrinth-app fails on x86_64-darwin due to an existing build failure of turbo. gitbutler fails for the same reason as above

@Eveeifyeve
Copy link
Contributor

nixpkgs-review result

Generated using nixpkgs-review.

Command: nixpkgs-review pr 346277

x86_64-darwin

⏩ 4 packages marked as broken and skipped:
❌ 3 packages failed to build:
✅ 3 packages built:

aarch64-darwin

⏩ 4 packages marked as broken and skipped:
❌ 1 package failed to build:
✅ 5 packages built:
modrinth-app fails on x86_64-darwin due to an existing build failure of turbo. gitbutler fails for the same reason as above

How did you do this?

@getchoo
Copy link
Member Author

getchoo commented Nov 14, 2024

nixpkgs-review pr --systems 'x86_64-darwin aarch64-darwin' 346277

@getchoo
Copy link
Member Author

getchoo commented Nov 14, 2024

an existing build failure of turbo

#355802

@Scrumplex
Copy link
Member

Scrumplex commented Nov 14, 2024 •
edited
Loading

nixpkgs-review result

Generated using nixpkgs-review.

Command: nixpkgs-review pr 346277

x86_64-linux

⏩ 1 package marked as broken and skipped:
  • cinny-desktop
⏩ 2 packages blacklisted:
  • nixos-install-tools
  • tests.nixos-functions.nixos-test
❌ 3 packages failed to build:
  • alcom
  • alexandria
  • gitbutler
✅ 12 packages built:
  • cargo-tauri
  • cargo-tauri_1
  • en-croissant
  • gale
  • insulator2
  • modrinth-app
  • modrinth-app-unwrapped
  • mouse-actions-gui
  • pot
  • surrealist
  • treedome
  • wealthfolio

aarch64-linux

⏩ 4 packages marked as broken and skipped:
  • alcom
  • cinny-desktop
  • modrinth-app
  • modrinth-app-unwrapped
⏩ 2 packages blacklisted:
  • nixos-install-tools
  • tests.nixos-functions.nixos-test
❌ 8 packages failed to build:
  • en-croissant
  • gale
  • gitbutler
  • insulator2
  • mouse-actions-gui
  • pot
  • surrealist
  • wealthfolio
✅ 2 packages built:
  • cargo-tauri
  • cargo-tauri_1

x86_64-darwin

⏩ 4 packages marked as broken and skipped:
  • alcom
  • alexandria
  • cinny-desktop
  • insulator2
❌ 3 packages failed to build:
  • gitbutler
  • modrinth-app
  • modrinth-app-unwrapped
✅ 3 packages built:
  • cargo-tauri
  • cargo-tauri_1
  • en-croissant

aarch64-darwin

⏩ 4 packages marked as broken and skipped:
  • alcom
  • alexandria
  • cinny-desktop
  • insulator2
❌ 1 package failed to build:
  • gitbutler
✅ 5 packages built:
  • cargo-tauri
  • cargo-tauri_1
  • en-croissant
  • modrinth-app
  • modrinth-app-unwrapped

build logs: https://gist.github.com/Scrumplex/d4a1f8bd2137be55c730247a79906378

@Scrumplex
Copy link
Member

Could you rebase and change alcom to use cargo-tauri_1?

@Scrumplex
Copy link
Member

Scrumplex commented Nov 14, 2024 •
edited
Loading

nixpkgs-review result

Generated using nixpkgs-review.

Command: nixpkgs-review pr 346277

x86_64-linux

⏩ 1 package blacklisted:
  • nixos-install-tools
❌ 1 package failed to build:
  • gitbutler
✅ 14 packages built:
  • alcom
  • alexandria
  • cargo-tauri
  • cargo-tauri_1
  • en-croissant
  • gale
  • insulator2
  • modrinth-app
  • modrinth-app-unwrapped
  • mouse-actions-gui
  • pot
  • surrealist
  • treedome
  • wealthfolio

aarch64-linux

⏩ 3 packages marked as broken and skipped:
  • alcom
  • modrinth-app
  • modrinth-app-unwrapped
⏩ 1 package blacklisted:
  • nixos-install-tools
❌ 8 packages failed to build:
  • en-croissant
  • gale
  • gitbutler
  • insulator2
  • mouse-actions-gui
  • pot
  • surrealist
  • wealthfolio
✅ 2 packages built:
  • cargo-tauri
  • cargo-tauri_1

x86_64-darwin

⏩ 3 packages marked as broken and skipped:
  • alcom
  • alexandria
  • insulator2
❌ 3 packages failed to build:
  • gitbutler
  • modrinth-app
  • modrinth-app-unwrapped
✅ 3 packages built:
  • cargo-tauri
  • cargo-tauri_1
  • en-croissant

aarch64-darwin

⏩ 3 packages marked as broken and skipped:
  • alcom
  • alexandria
  • insulator2
❌ 3 packages failed to build:
  • gitbutler
  • modrinth-app
  • modrinth-app-unwrapped
✅ 3 packages built:
  • cargo-tauri
  • cargo-tauri_1
  • en-croissant

https://gist.github.com/Scrumplex/73d0c2e79abec82c4b8500eca91e4953

@Scrumplex
Copy link
Member

Scrumplex commented Nov 14, 2024 •
edited
Loading

I will disregard gitbutler failures, as they will be fixed with #355366, modrinth-app seems to require a similar fix (not in this PR), the aarch64-linux failures are all reporting failed to build app: Target aarch64-unknown-linux-gnu does not exist. Please run `rustup target list` to see the available targets. which might be a regression as I can also see it on master for some of these.

@Scrumplex Scrumplex mentioned this pull request Nov 14, 2024
Merged
13 tasks
@Scrumplex
Copy link
Member

I would be inclined to merge this as is, but when building some of the aarch64-linux packages touched by this PR it fails for me with failed to build app: Target aarch64-unknown-linux-gnu does not exist. Please run `rustup target list` to see the available targets..

I don't have an actual arm builder. I use binfmt.emulatedSystems, so that might be the issue here?

@getchoo
Copy link
Member Author

getchoo commented Nov 14, 2024

Seems so. This is the result when building on an Ampere server

nixpkgs-review result

Generated using nixpkgs-review.

Command: nixpkgs-review pr 346277

aarch64-linux

⏩ 3 packages marked as broken and skipped:
  • alcom
  • modrinth-app
  • modrinth-app-unwrapped
⏩ 1 package blacklisted:
  • nixos-install-tools
❌ 1 package failed to build:
  • gitbutler
✅ 9 packages built:
  • cargo-tauri
  • cargo-tauri_1
  • en-croissant
  • gale
  • insulator2
  • mouse-actions-gui
  • pot
  • surrealist
  • wealthfolio

@Scrumplex Scrumplex merged commit b22d375 into NixOS:master Nov 14, 2024
11 of 12 checks passed
@getchoo getchoo deleted the pkgs/cargo-tauri/2.0.1 branch November 14, 2024 21:21
@HannesGitH HannesGitH mentioned this pull request Nov 17, 2024
Open
@taha-yassine taha-yassine mentioned this pull request Nov 18, 2024
Open
1 task
@getchoo getchoo mentioned this pull request Nov 19, 2024
Open
13 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Eveeifyeve Eveeifyeve Eveeifyeve left review comments

@nim65s nim65s nim65s requested changes

@Scrumplex Scrumplex Scrumplex approved these changes

Assignees
No one assigned
Labels
6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 8.has: changelog 8.has: documentation 8.has: package (new) This PR adds a new package 10.rebuild-darwin: 1-10 10.rebuild-linux: 11-100
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Package request: cargo-tauri-v2
9 participants
@getchoo @Eveeifyeve @kilianar @gepbird @HannesGitH @pyrox0 @Scrumplex @nim65s @wegank