From c9a798a92686d58a7fefe3b09050dd18b790e59a Mon Sep 17 00:00:00 2001 From: Jost Alemann Date: Wed, 29 Oct 2025 17:27:01 +0100 Subject: [PATCH] ethersync: 0.8.0 -> teamtype: 0.9.0; update editor plugins ethersync was renamed to teamtype Changelog: https://github.com/teamtype/teamtype/releases/tag/v0.9.0 Diff: https://github.com/teamtype/teamtype/compare/v0.8.0...v0.9.0 update editor plugins as well --- .../editors/vim/plugins/aliases.nix | 1 + .../{ethersync => teamtype}/default.nix | 4 +- .../editors/vscode/extensions/default.nix | 2 +- .../default.nix | 12 ++-- pkgs/by-name/et/ethersync/package.nix | 42 -------------- pkgs/by-name/te/teamtype/package.nix | 58 +++++++++++++++++++ pkgs/top-level/aliases.nix | 1 + 7 files changed, 69 insertions(+), 51 deletions(-) rename pkgs/applications/editors/vim/plugins/non-generated/{ethersync => teamtype}/default.nix (79%) rename pkgs/applications/editors/vscode/extensions/{ethersync.ethersync => teamtype.teamtype}/default.nix (60%) delete mode 100644 pkgs/by-name/et/ethersync/package.nix create mode 100644 pkgs/by-name/te/teamtype/package.nix diff --git a/pkgs/applications/editors/vim/plugins/aliases.nix b/pkgs/applications/editors/vim/plugins/aliases.nix index 454b0496e86d..8a5ec6b533fe 100644 --- a/pkgs/applications/editors/vim/plugins/aliases.nix +++ b/pkgs/applications/editors/vim/plugins/aliases.nix @@ -73,6 +73,7 @@ mapAliases ( easymotion = vim-easymotion; echodoc = echodoc-vim; eighties = vim-eighties; + ethersync = teamtype; extradite = vim-extradite; feline-nvim = throw "feline.nvim has been removed: upstream deleted repository. Consider using lualine"; # Added 2025-02-09 fugitive = vim-fugitive; diff --git a/pkgs/applications/editors/vim/plugins/non-generated/ethersync/default.nix b/pkgs/applications/editors/vim/plugins/non-generated/teamtype/default.nix similarity index 79% rename from pkgs/applications/editors/vim/plugins/non-generated/ethersync/default.nix rename to pkgs/applications/editors/vim/plugins/non-generated/teamtype/default.nix index 8e6f58e1a105..7c29c2d21447 100644 --- a/pkgs/applications/editors/vim/plugins/non-generated/ethersync/default.nix +++ b/pkgs/applications/editors/vim/plugins/non-generated/teamtype/default.nix @@ -1,9 +1,9 @@ { vimUtils, - ethersync, + teamtype, }: vimUtils.buildVimPlugin rec { - inherit (ethersync) + inherit (teamtype) pname version src diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index 8c508700e94d..9e2cd3c59059 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -1617,7 +1617,7 @@ let }; }; - ethersync.ethersync = callPackage ./ethersync.ethersync { }; + teamtype.teamtype = callPackage ./teamtype.teamtype { }; eugleo.magic-racket = callPackage ./eugleo.magic-racket { }; diff --git a/pkgs/applications/editors/vscode/extensions/ethersync.ethersync/default.nix b/pkgs/applications/editors/vscode/extensions/teamtype.teamtype/default.nix similarity index 60% rename from pkgs/applications/editors/vscode/extensions/ethersync.ethersync/default.nix rename to pkgs/applications/editors/vscode/extensions/teamtype.teamtype/default.nix index b359b9c74088..67356471a408 100644 --- a/pkgs/applications/editors/vscode/extensions/ethersync.ethersync/default.nix +++ b/pkgs/applications/editors/vscode/extensions/teamtype.teamtype/default.nix @@ -5,16 +5,16 @@ vscode-utils.buildVscodeMarketplaceExtension { mktplcRef = { - publisher = "ethersync"; - name = "ethersync"; - version = "0.6.0"; - hash = "sha256-KuidePUxQ+FhnIGTUf6i+WxBQfbQVlq68xbuOeEouIE="; + publisher = "teamtype"; + name = "teamtype"; + version = "0.8.0"; + hash = "sha256-p9bynTMmCn6pu7SVEABeSawv9VjWpE8KecQOeIsE/LE="; }; meta = { description = "Extension for real-time co-editing of local text files"; - downloadPage = "https://marketplace.visualstudio.com/items?itemName=ethersync.ethersync"; - homepage = "https://github.com/ethersync/ethersync/tree/main/vscode-plugin"; + downloadPage = "https://marketplace.visualstudio.com/items?itemName=teamtype.teamtype"; + homepage = "https://github.com/teamtype/teamtype/tree/main/vscode-plugin"; license = lib.licenses.agpl3Plus; maintainers = [ lib.maintainers.ethancedwards8 ]; teams = [ lib.teams.ngi ]; diff --git a/pkgs/by-name/et/ethersync/package.nix b/pkgs/by-name/et/ethersync/package.nix deleted file mode 100644 index d33aac2b7f3a..000000000000 --- a/pkgs/by-name/et/ethersync/package.nix +++ /dev/null @@ -1,42 +0,0 @@ -{ - fetchFromGitHub, - lib, - rustPlatform, - versionCheckHook, - nix-update-script, -}: - -rustPlatform.buildRustPackage (finalAttrs: { - pname = "ethersync"; - version = "0.8.0"; - - src = fetchFromGitHub { - owner = "ethersync"; - repo = "ethersync"; - tag = "v${finalAttrs.version}"; - hash = "sha256-GPZD/TshZMr+WeCd4WRN/Ewu7zINSzPNPci52bjsV3E="; - }; - - sourceRoot = "${finalAttrs.src.name}/daemon"; - - cargoHash = "sha256-F2wVRha63TOdMCWW3KNaQ8kbYjuYbdY5yKmTHOJqODA="; - - nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; - doInstallCheck = true; - - passthru.updateScript = nix-update-script { }; - - meta = { - description = "Real-time co-editing of local text files"; - homepage = "https://ethersync.github.io/ethersync/"; - downloadPage = "https://github.com/ethersync/ethersync"; - changelog = "https://github.com/ethersync/ethersync/blob/${finalAttrs.src.tag}/CHANGELOG.md"; - license = lib.licenses.agpl3Plus; - teams = [ lib.teams.ngi ]; - maintainers = with lib.maintainers; [ - prince213 - ethancedwards8 - ]; - }; -}) diff --git a/pkgs/by-name/te/teamtype/package.nix b/pkgs/by-name/te/teamtype/package.nix new file mode 100644 index 000000000000..8ef60ecc8cfd --- /dev/null +++ b/pkgs/by-name/te/teamtype/package.nix @@ -0,0 +1,58 @@ +{ + fetchFromGitHub, + lib, + rustPlatform, + versionCheckHook, + installShellFiles, + nix-update-script, +}: + +rustPlatform.buildRustPackage (finalAttrs: { + pname = "teamtype"; + version = "0.9.0"; + + src = fetchFromGitHub { + owner = "teamtype"; + repo = "teamtype"; + tag = "v${finalAttrs.version}"; + hash = "sha256-B/4xR16cEG90fK12XQqjlpWzd6tyUVYXOBXK0j5fvNU="; + }; + + sourceRoot = "${finalAttrs.src.name}/daemon"; + + cargoHash = "sha256-yuAk4SqYzNK1gD6lqVVDOyAJNq/NIf44DWdZ3aM/Q8s="; + + nativeBuildInputs = [ installShellFiles ]; + + postInstall = '' + installManPage \ + target/manpages/teamtype.1 \ + target/manpages/teamtype-client.1 \ + target/manpages/teamtype-join.1 \ + target/manpages/teamtype-share.1 + + installShellCompletion --bash target/completions/teamtype.bash + installShellCompletion --zsh target/completions/_teamtype + installShellCompletion --fish target/completions/teamtype.fish + ''; + + nativeInstallCheckInputs = [ versionCheckHook ]; + versionCheckProgramArg = "--version"; + doInstallCheck = true; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Real-time co-editing of local text files"; + homepage = "https://teamtype.github.io/teamtype/"; + downloadPage = "https://github.com/teamtype/teamtype"; + changelog = "https://github.com/teamtype/teamtype/blob/${finalAttrs.src.tag}/CHANGELOG.md"; + license = lib.licenses.agpl3Plus; + mainProgram = "teamtype"; + teams = [ lib.teams.ngi ]; + maintainers = with lib.maintainers; [ + prince213 + ethancedwards8 + ]; + }; +}) diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index c43b9d8748f9..56e5e5bf3fde 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -530,6 +530,7 @@ mapAliases { eris-go = throw "'eris-go' has been removed due to a hostile upstream moving tags and breaking src FODs"; # Added 2025-09-01 eriscmd = throw "'eriscmd' has been removed due to a hostile upstream moving tags and breaking src FODs"; # Added 2025-09-01 erlang-ls = throw "'erlang-ls' has been removed as it has been archived upstream. Consider using 'erlang-language-platform' instead"; # Added 2025-10-02 + ethersync = teamtype; # Added 2025-10-31 eww-wayland = throw "'eww-wayland' has been renamed to/replaced by 'eww'"; # Converted to throw 2025-10-27 f3d_egl = warnAlias "'f3d' now build with egl support by default, so `f3d_egl` is deprecated, consider using 'f3d' instead." f3d; # added 2025-07-18 fastnlo_toolkit = throw "'fastnlo_toolkit' has been renamed to/replaced by 'fastnlo-toolkit'"; # Converted to throw 2025-10-27