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

zed-editor: rename zed binary to zeditor, change pname to zed-editor #344193

Merged
merged 2 commits into from
Sep 24, 2024

Conversation

JohnRTitor
Copy link
Contributor

@JohnRTitor JohnRTitor commented Sep 24, 2024

Description of changes

At least three packages provide a "zed" binary including zfs, spicedb-zed, and zed binary which can lead to conflicts.

Renaming the cli binary to zeditor is even recommmeded in zed-editor official packaging instructions.

https://github.com/zed-industries/zed/blob/main/docs/src/development/linux.md#other-things-to-note

Even arch uses zeditor.

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.

There are like three different packages with zed
Copy link
Contributor

@GaetanLepage GaetanLepage left a comment

Choose a reason for hiding this comment

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

Makes sense indeed. Thanks.

At least three packages provide a "zed" binary including `zfs`, `spicedb-zed`, and `zed` binary which can lead to conflicts.

Renaming the `cli` binary to `zeditor` is even recommmeded in zed-editor official packaging instructions.

https://github.com/zed-industries/zed/blob/main/docs/src/development/linux.md#other-things-to-note
Signed-off-by: John Titor <[email protected]>
@JohnRTitor JohnRTitor force-pushed the fix-zed-editor-binary branch from cd9cf36 to a28f1df Compare September 24, 2024 11:40
@SigmaSquadron SigmaSquadron added the 12.approvals: 2 This PR was reviewed and approved by two reputable people label Sep 24, 2024
@GaetanLepage
Copy link
Contributor

nixpkgs-review result

Generated using nixpkgs-review.

  • Command: nixpkgs-review pr 344193
  • Systems: x86_64-linux,aarch64-linux,x86_64-darwin,aarch64-darwin

x86_64-linux

✅ 1 package built:
  • zed-editor

aarch64-linux

✅ 1 package built:
  • zed-editor

x86_64-darwin

⏩ 1 package marked as broken and skipped:
  • zed-editor

aarch64-darwin

⏩ 1 package marked as broken and skipped:
  • zed-editor

@SigmaSquadron SigmaSquadron added 12.approvals: 3+ This PR was reviewed and approved by three or more reputable people and removed 12.approvals: 2 This PR was reviewed and approved by two reputable people labels Sep 24, 2024
@JohnRTitor
Copy link
Contributor Author

  • Systems: x86_64-linux,aarch64-linux,x86_64-darwin,aarch64-darwin

Sweet, didn't know you could specify multiple systems in nixpkgs-review.

Anyways thanks for the reviews, I do not think we need release notes for this breaking change, we don't even have zed-editor in 24.05.

@JohnRTitor JohnRTitor merged commit 01ce847 into NixOS:master Sep 24, 2024
32 of 33 checks passed
@JohnRTitor JohnRTitor deleted the fix-zed-editor-binary branch September 24, 2024 18:47
@GaetanLepage
Copy link
Contributor

Sweet, didn't know you could specify multiple systems in nixpkgs-review.

It's a WIP: Mic92/nixpkgs-review#419

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-darwin: 1 10.rebuild-linux: 1-10 10.rebuild-linux: 1 12.approvals: 3+ This PR was reviewed and approved by three or more reputable people 12.approved-by: package-maintainer This PR was reviewed and approved by a maintainer listed in the package
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants