Skip to content

fix(zed, zed-nightly, zed-preview): Make compatible with ZFS #5570

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

Open
wants to merge 22 commits into
base: frawhide
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
82a7b43
fix(zed): Make compatible with ZFS
RockGrub Jun 18, 2025
eabddd5
fix(zed-nightly): Make compatible with ZFS
RockGrub Jun 18, 2025
75d86e6
fix(zed-preview): Make compatible with ZFS
RockGrub Jun 18, 2025
b005cd6
fix(zed-nightly): Change file list too
RockGrub Jun 18, 2025
780eac4
fix(zed-preview): Change file list too
RockGrub Jun 18, 2025
9165882
fix(zed): Change file list too
RockGrub Jun 18, 2025
010c749
Merge branch 'frawhide' into gil/fix/zed
RockGrub Jun 19, 2025
3f3d1b2
fix(zed-preview): Normalize release so it can be bumped up and down
RockGrub Jun 19, 2025
d2a346a
Merge branch 'frawhide' into gil/fix/zed
RockGrub Jun 19, 2025
f8b1449
Merge branch 'frawhide' into gil/fix/zed
RockGrub Jun 20, 2025
3e4c4e5
Merge branch 'frawhide' into gil/fix/zed
RockGrub Jun 20, 2025
5c6e358
Merge branch 'frawhide' into gil/fix/zed
RockGrub Jun 20, 2025
9dbce30
Merge branch 'frawhide' into gil/fix/zed
RockGrub Jun 20, 2025
8de2167
Merge branch 'frawhide' into gil/fix/zed
RockGrub Jun 21, 2025
6ae43ab
Merge branch 'frawhide' into gil/fix/zed
RockGrub Jun 22, 2025
1b49af4
Merge branch 'frawhide' into gil/fix/zed
RockGrub Jun 24, 2025
754a4a2
Merge branch 'frawhide' into gil/fix/zed
RockGrub Jun 24, 2025
8bc74e8
Merge branch 'frawhide' into gil/fix/zed
RockGrub Jun 24, 2025
77ba5cb
Merge branch 'frawhide' into gil/fix/zed
RockGrub Jun 25, 2025
a61b6ef
Merge branch 'frawhide' into gil/fix/zed
RockGrub Jun 25, 2025
d26536b
Merge branch 'frawhide' into gil/fix/zed
RockGrub Jun 25, 2025
4fb6d56
Merge branch 'frawhide' into gil/fix/zed
RockGrub Jun 26, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions anda/devs/zed/nightly/zed-nightly.spec
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@

Name: zed-nightly
Version: %ver^%commit_date.%shortcommit
Release: 1%?dist
Release: 2%?dist
Summary: Zed is a high-performance, multiplayer code editor
SourceLicense: AGPL-3.0-only AND Apache-2.0 AND GPL-3.0-or-later
License: ((Apache-2.0 OR MIT) AND BSD-3-Clause) AND ((MIT OR Apache-2.0) AND Unicode-3.0) AND (0BSD OR MIT OR Apache-2.0) AND (Apache-2.0 AND ISC) AND AGPL.3.0-only AND AGPL-3.0-or-later AND (Apache-2.0 OR BSL-1.0 OR MIT) AND (Apache-2.0 OR BSL-1.0) AND (Apache-2.0 OR ISC OR MIT) AND (Apache-2.0 OR MIT) AND (Apache-2.0 WITH LLVM-exception OR Apache-2.0 OR MIT) AND (Apache-2.0 WITH LLVM-exception) AND Apache-2.0 AND (BSD-2-Clause OR Apache-2.0 OR MIT) AND (BSD-2-Clause OR MIT OR Apache-2.0) AND BSD-2-Clause AND (CC0-1.0 OR Apache-2.0 OR Apache-2.0 WITH LLVM-exception) AND (CC0-1.0 OR Apache-2.0) AND (CC0-1.0 OR MIT-0 OR Apache-2.0) AND CC0-1.0 AND GPL-3.0-or-later AND (ISC AND (Apache-2.0 OR ISC) AND OpenSSL) AND (ISC AND (Apache-2.0 OR ISC)) AND ISC AND (MIT AND (MIT OR Apache-2.0)) AND (MIT AND BSD-3-Clause) AND (MIT OR Apache-2.0 OR CC0-1.0) AND (MIT OR Apache-2.0 OR NCSA) AND (MIT OR Apache-2.0 OR Zlib) AND (MIT OR Apache-2.0) AND (MIT OR Zlib OR Apache-2.0) AND MIT AND MPL-2.0 AND Unicode-3.0 AND (Unlicense OR MIT) AND (Zlib OR Apache-2.0 OR MIT) AND Zlib
Expand Down Expand Up @@ -82,7 +82,7 @@ script/generate-licenses

%install
install -Dm755 target/rpm/zed %{buildroot}%{_libexecdir}/zed-editor
install -Dm755 target/rpm/cli %{buildroot}%{_bindir}/zed
install -Dm755 target/rpm/cli %{buildroot}%{_bindir}/zed-cli

%__cargo clean

Expand Down Expand Up @@ -126,7 +126,7 @@ mv assets/fonts/plex-mono/license.txt LICENSE.fonts
%license LICENSE.themes
%license assets/licenses.md
%{_libexecdir}/zed-editor
%{_bindir}/zed
%{_bindir}/zed-cli
%{_datadir}/applications/%app_id.desktop
%{_datadir}/pixmaps/%app_id.png
%{_metainfodir}/%app_id.metainfo.xml
Expand Down
6 changes: 3 additions & 3 deletions anda/devs/zed/preview/zed-preview.spec
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@

Name: zed-preview
Version: %(echo %ver | sed 's/-/~/')
Release: pre2%?dist
Release: 3%?dist
Summary: Zed is a high-performance, multiplayer code editor
SourceLicense: AGPL-3.0-only AND Apache-2.0 AND GPL-3.0-or-later
License: ((Apache-2.0 OR MIT) AND BSD-3-Clause) AND ((MIT OR Apache-2.0) AND Unicode-3.0) AND (0BSD OR MIT OR Apache-2.0) AND (Apache-2.0 AND ISC) AND AGPL.3.0-only AND AGPL-3.0-or-later AND (Apache-2.0 OR BSL-1.0 OR MIT) AND (Apache-2.0 OR BSL-1.0) AND (Apache-2.0 OR ISC OR MIT) AND (Apache-2.0 OR MIT) AND (Apache-2.0 WITH LLVM-exception OR Apache-2.0 OR MIT) AND (Apache-2.0 WITH LLVM-exception) AND Apache-2.0 AND (BSD-2-Clause OR Apache-2.0 OR MIT) AND (BSD-2-Clause OR MIT OR Apache-2.0) AND BSD-2-Clause AND (CC0-1.0 OR Apache-2.0 OR Apache-2.0 WITH LLVM-exception) AND (CC0-1.0 OR Apache-2.0) AND (CC0-1.0 OR MIT-0 OR Apache-2.0) AND CC0-1.0 AND GPL-3.0-or-later AND (ISC AND (Apache-2.0 OR ISC) AND OpenSSL) AND (ISC AND (Apache-2.0 OR ISC)) AND ISC AND (MIT AND (MIT OR Apache-2.0)) AND (MIT AND BSD-3-Clause) AND (MIT OR Apache-2.0 OR CC0-1.0) AND (MIT OR Apache-2.0 OR NCSA) AND (MIT OR Apache-2.0 OR Zlib) AND (MIT OR Apache-2.0) AND (MIT OR Zlib OR Apache-2.0) AND MIT AND MPL-2.0 AND Unicode-3.0 AND (Unlicense OR MIT) AND (Zlib OR Apache-2.0 OR MIT) AND Zlib
Expand Down Expand Up @@ -78,7 +78,7 @@ script/generate-licenses

%install
install -Dm755 target/rpm/zed %{buildroot}%{_libexecdir}/zed-editor
install -Dm755 target/rpm/cli %{buildroot}%{_bindir}/zed
install -Dm755 target/rpm/cli %{buildroot}%{_bindir}/zed-cli

%__cargo clean

Expand Down Expand Up @@ -122,7 +122,7 @@ mv assets/fonts/plex-mono/license.txt LICENSE.fonts
%license LICENSE.themes
%license assets/licenses.md
%{_libexecdir}/zed-editor
%{_bindir}/zed
%{_bindir}/zed-cli
%{_datadir}/applications/%app_id.desktop
%{_datadir}/pixmaps/%app_id.png
%{_metainfodir}/%app_id.metainfo.xml
Expand Down
6 changes: 3 additions & 3 deletions anda/devs/zed/stable/zed.spec
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@

Name: zed
Version: 0.192.5
Release: 1%?dist
Release: 2%?dist
Summary: Zed is a high-performance, multiplayer code editor
SourceLicense: AGPL-3.0-only AND Apache-2.0 AND GPL-3.0-or-later
License: ((Apache-2.0 OR MIT) AND BSD-3-Clause) AND ((MIT OR Apache-2.0) AND Unicode-3.0) AND (0BSD OR MIT OR Apache-2.0) AND (Apache-2.0 AND ISC) AND AGPL.3.0-only AND AGPL-3.0-or-later AND (Apache-2.0 OR BSL-1.0 OR MIT) AND (Apache-2.0 OR BSL-1.0) AND (Apache-2.0 OR ISC OR MIT) AND (Apache-2.0 OR MIT) AND (Apache-2.0 WITH LLVM-exception OR Apache-2.0 OR MIT) AND (Apache-2.0 WITH LLVM-exception) AND Apache-2.0 AND (BSD-2-Clause OR Apache-2.0 OR MIT) AND (BSD-2-Clause OR MIT OR Apache-2.0) AND BSD-2-Clause AND (CC0-1.0 OR Apache-2.0 OR Apache-2.0 WITH LLVM-exception) AND (CC0-1.0 OR Apache-2.0) AND (CC0-1.0 OR MIT-0 OR Apache-2.0) AND CC0-1.0 AND GPL-3.0-or-later AND (ISC AND (Apache-2.0 OR ISC) AND OpenSSL) AND (ISC AND (Apache-2.0 OR ISC)) AND ISC AND (MIT AND (MIT OR Apache-2.0)) AND (MIT AND BSD-3-Clause) AND (MIT OR Apache-2.0 OR CC0-1.0) AND (MIT OR Apache-2.0 OR NCSA) AND (MIT OR Apache-2.0 OR Zlib) AND (MIT OR Apache-2.0) AND (MIT OR Zlib OR Apache-2.0) AND MIT AND MPL-2.0 AND Unicode-3.0 AND (Unlicense OR MIT) AND (Zlib OR Apache-2.0 OR MIT) AND Zlib
Expand Down Expand Up @@ -78,7 +78,7 @@ script/generate-licenses

%install
install -Dm755 target/rpm/zed %{buildroot}%{_libexecdir}/zed-editor
install -Dm755 target/rpm/cli %{buildroot}%{_bindir}/zed
install -Dm755 target/rpm/cli %{buildroot}%{_bindir}/zed-cli

%__cargo clean

Expand Down Expand Up @@ -122,7 +122,7 @@ mv assets/fonts/plex-mono/license.txt LICENSE.fonts
%license LICENSE.themes
%license assets/licenses.md
%{_libexecdir}/zed-editor
%{_bindir}/zed
%{_bindir}/zed-cli
%{_datadir}/applications/%app_id.desktop
%{_datadir}/pixmaps/%app_id.png
%{_metainfodir}/%app_id.metainfo.xml
Expand Down