Unverified Commit 92a6403f authored by Austin Horstman's avatar Austin Horstman Committed by GitHub
Browse files

ethersync: 0.8.0 -> teamtype: 0.9.0; update editor plugins (#456770)

parents 2a546a81 c9a798a9

pkgs/applications/editors/vim/plugins/aliases.nix

+1 −0
Original line number Diff line number Diff line
@@ -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;

pkgs/applications/editors/vim/plugins/non-generated/ethersync/default.nix→pkgs/applications/editors/vim/plugins/non-generated/teamtype/default.nix

+2 −2
Original line number Diff line number Diff line 
{

  vimUtils,

  ethersync,

  teamtype,

}:

vimUtils.buildVimPlugin rec {

  inherit (ethersync)

  inherit (teamtype)

    pname

    version

    src

pkgs/applications/editors/vscode/extensions/default.nix

+1 −1
Original line number Diff line number Diff line
@@ -1617,7 +1617,7 @@ let 
        };

      };



      ethersync.ethersync = callPackage ./ethersync.ethersync { };

      teamtype.teamtype = callPackage ./teamtype.teamtype { };



      eugleo.magic-racket = callPackage ./eugleo.magic-racket { };

pkgs/applications/editors/vscode/extensions/ethersync.ethersync/default.nix→pkgs/applications/editors/vscode/extensions/teamtype.teamtype/default.nix

+6 −6
Original line number Diff line number Diff line
@@ -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 ];

pkgs/by-name/et/ethersync/package.nix→pkgs/by-name/te/teamtype/package.nix

+58 −0
Original line number Diff line number Diff line
@@ -3,23 +3,38 @@ 
  lib,

  rustPlatform,

  versionCheckHook,

  installShellFiles,

  nix-update-script,

}:



rustPlatform.buildRustPackage (finalAttrs: {

  pname = "ethersync";

  version = "0.8.0";

  pname = "teamtype";

  version = "0.9.0";



  src = fetchFromGitHub {

    owner = "ethersync";

    repo = "ethersync";

    owner = "teamtype";

    repo = "teamtype";

    tag = "v${finalAttrs.version}";

    hash = "sha256-GPZD/TshZMr+WeCd4WRN/Ewu7zINSzPNPci52bjsV3E=";

    hash = "sha256-B/4xR16cEG90fK12XQqjlpWzd6tyUVYXOBXK0j5fvNU=";

  };



  sourceRoot = "${finalAttrs.src.name}/daemon";



  cargoHash = "sha256-F2wVRha63TOdMCWW3KNaQ8kbYjuYbdY5yKmTHOJqODA=";

  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";
@@ -29,10 +44,11 @@ rustPlatform.buildRustPackage (finalAttrs: { 


  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";

    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