Unverified Commit 9defb411 authored by Pol Dellaiera's avatar Pol Dellaiera Committed by GitHub
Browse files

Merge pull request #310202 from GaetanLepage/zed 

zed-editor: 0.133.7 -> 0.134.4
parents 07584963 e78520ec

pkgs/by-name/ze/zed-editor/Cargo.lock

+84 −30
Original line number Diff line number Diff line
@@ -16,7 +16,6 @@ dependencies = [ 
 "project",

 "smallvec",

 "ui",

 "util",

 "workspace",

]
@@ -284,21 +283,21 @@ checksum = "d92bec98840b8f03a5ff5413de5293bfcd8bf96467cf5452609f939ec6f5de16" 


[[package]]

name = "ash"

version = "0.37.3+1.3.251"

version = "0.38.0+1.3.281"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "39e9c3835d686b0a6084ab4234fcd1b07dbf6e4767dce60874b12356a25ecd4a"

checksum = "0bb44936d800fea8f016d7f2311c6a4f97aebd5dc86f09906139ec848cf3a46f"

dependencies = [

 "libloading 0.7.4",

 "libloading 0.8.0",

]



[[package]]

name = "ash-window"

version = "0.12.0"

version = "0.13.0"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "b912285a7c29f3a8f87ca6f55afc48768624e5e33ec17dbd2f2075903f5e35ab"

checksum = "52bca67b61cb81e5553babde81b8211f713cb6db79766f80168f3e5f40ea6c82"

dependencies = [

 "ash",

 "raw-window-handle 0.5.2",

 "raw-window-handle 0.6.0",

 "raw-window-metal",

]
@@ -379,9 +378,11 @@ dependencies = [ 
 "assets",

 "assistant_tooling",

 "client",

 "collections",

 "editor",

 "env_logger",

 "feature_flags",

 "fs",

 "futures 0.3.28",

 "gpui",

 "language",
@@ -399,6 +400,7 @@ dependencies = [ 
 "serde",

 "serde_json",

 "settings",

 "story",

 "theme",

 "ui",

 "util",
@@ -1479,7 +1481,7 @@ dependencies = [ 
[[package]]

name = "blade-graphics"

version = "0.4.0"

source = "git+https://github.com/kvark/blade?rev=810ec594358aafea29a4a3d8ab601d25292b2ce4#810ec594358aafea29a4a3d8ab601d25292b2ce4"

source = "git+https://github.com/kvark/blade?rev=e82eec97691c3acdb43494484be60d661edfebf3#e82eec97691c3acdb43494484be60d661edfebf3"

dependencies = [

 "ash",

 "ash-window",
@@ -1500,7 +1502,7 @@ dependencies = [ 
 "mint",

 "naga",

 "objc",

 "raw-window-handle 0.5.2",

 "raw-window-handle 0.6.0",

 "slab",

 "wasm-bindgen",

 "web-sys",
@@ -1509,7 +1511,7 @@ dependencies = [ 
[[package]]

name = "blade-macros"

version = "0.2.1"

source = "git+https://github.com/kvark/blade?rev=810ec594358aafea29a4a3d8ab601d25292b2ce4#810ec594358aafea29a4a3d8ab601d25292b2ce4"

source = "git+https://github.com/kvark/blade?rev=e82eec97691c3acdb43494484be60d661edfebf3#e82eec97691c3acdb43494484be60d661edfebf3"

dependencies = [

 "proc-macro2",

 "quote",
@@ -3181,13 +3183,17 @@ dependencies = [ 
 "anyhow",

 "client",

 "collections",

 "ctor",

 "editor",

 "env_logger",

 "futures 0.3.28",

 "gpui",

 "language",

 "log",

 "lsp",

 "pretty_assertions",

 "project",

 "rand 0.8.5",

 "schemars",

 "serde",

 "serde_json",
@@ -3434,10 +3440,18 @@ dependencies = [ 
]



[[package]]

name = "embed-manifest"

version = "1.4.0"

name = "embed-resource"

version = "2.4.2"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "41cd446c890d6bed1d8b53acef5f240069ebef91d6fae7c5f52efe61fe8b5eae"

checksum = "c6985554d0688b687c5cb73898a34fbe3ad6c24c58c238a4d91d5e840670ee9d"

dependencies = [

 "cc",

 "memchr",

 "rustc_version",

 "toml 0.8.10",

 "vswhom",

 "winreg 0.52.0",

]



[[package]]

name = "emojis"
@@ -3816,6 +3830,7 @@ dependencies = [ 
 "ctor",

 "editor",

 "env_logger",

 "futures 0.3.28",

 "fuzzy",

 "gpui",

 "itertools 0.11.0",
@@ -4051,6 +4066,7 @@ dependencies = [ 
 "anyhow",

 "async-tar",

 "async-trait",

 "cocoa",

 "collections",

 "fsevent",

 "futures 0.3.28",
@@ -4060,6 +4076,7 @@ dependencies = [ 
 "lazy_static",

 "libc",

 "notify",

 "objc",

 "parking_lot",

 "rope",

 "serde",
@@ -4493,9 +4510,9 @@ dependencies = [ 


[[package]]

name = "gpu-alloc-ash"

version = "0.6.0"

version = "0.7.0"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "d2424bc9be88170e1a56e57c25d3d0e2dfdd22e8f328e892786aeb4da1415732"

checksum = "cbda7a18a29bc98c2e0de0435c347df935bf59489935d0cbd0b73f1679b6f79a"

dependencies = [

 "ash",

 "gpu-alloc-types",
@@ -4537,6 +4554,7 @@ dependencies = [ 
 "cosmic-text",

 "ctor",

 "derive_more",

 "embed-resource",

 "env_logger",

 "etagere",

 "filedescriptor",
@@ -4562,7 +4580,6 @@ dependencies = [ 
 "postage",

 "profiling",

 "rand 0.8.5",

 "raw-window-handle 0.5.2",

 "raw-window-handle 0.6.0",

 "refineable",

 "resvg",
@@ -4725,6 +4742,7 @@ dependencies = [ 
 "project",

 "rpc",

 "settings",

 "shellexpand",

 "util",

]
@@ -5553,12 +5571,9 @@ dependencies = [ 
 "regex",

 "rope",

 "rust-embed",

 "schemars",

 "serde",

 "serde_derive",

 "serde_json",

 "settings",

 "shellexpand",

 "smol",

 "task",

 "text",
@@ -5569,12 +5584,10 @@ dependencies = [ 
 "tree-sitter-c",

 "tree-sitter-cpp",

 "tree-sitter-css",

 "tree-sitter-elixir",

 "tree-sitter-embedded-template",

 "tree-sitter-go",

 "tree-sitter-gomod",

 "tree-sitter-gowork",

 "tree-sitter-heex",

 "tree-sitter-jsdoc",

 "tree-sitter-json 0.20.0",

 "tree-sitter-markdown",
@@ -5908,6 +5921,7 @@ version = "0.1.0" 
dependencies = [

 "anyhow",

 "async-recursion 1.0.5",

 "collections",

 "editor",

 "gpui",

 "language",
@@ -7732,14 +7746,14 @@ checksum = "42a9830a0e1b9fb145ebb365b8bc4ccd75f290f98c0247deafbbe2c75cefb544" 


[[package]]

name = "raw-window-metal"

version = "0.3.2"

version = "0.4.0"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "ac4ea493258d54c24cb46aa9345d099e58e2ea3f30dd63667fc54fc892f18e76"

checksum = "76e8caa82e31bb98fee12fa8f051c94a6aa36b07cddb03f0d4fc558988360ff1"

dependencies = [

 "cocoa",

 "core-graphics",

 "objc",

 "raw-window-handle 0.5.2",

 "raw-window-handle 0.6.0",

]



[[package]]
@@ -7975,7 +7989,7 @@ dependencies = [ 
 "wasm-bindgen",

 "wasm-bindgen-futures",

 "web-sys",

 "winreg",

 "winreg 0.50.0",

]



[[package]]
@@ -8679,6 +8693,7 @@ dependencies = [ 
 "languages",

 "log",

 "open_ai",

 "parking_lot",

 "project",

 "serde",

 "serde_json",
@@ -9484,12 +9499,12 @@ name = "storybook" 
version = "0.1.0"

dependencies = [

 "anyhow",

 "assistant2",

 "clap 4.4.4",

 "collab_ui",

 "ctrlc",

 "dialoguer",

 "editor",

 "embed-manifest",

 "fuzzy",

 "gpui",

 "indoc",
@@ -10632,7 +10647,7 @@ dependencies = [ 
[[package]]

name = "tree-sitter-jsdoc"

version = "0.20.0"

source = "git+https://github.com/tree-sitter/tree-sitter-jsdoc#6a6cf9e7341af32d8e2b2e24a37fbfebefc3dc55"

source = "git+https://github.com/tree-sitter/tree-sitter-jsdoc?rev=6a6cf9e7341af32d8e2b2e24a37fbfebefc3dc55#6a6cf9e7341af32d8e2b2e24a37fbfebefc3dc55"

dependencies = [

 "cc",

 "tree-sitter",
@@ -11102,6 +11117,7 @@ dependencies = [ 
 "futures 0.3.28",

 "gpui",

 "indoc",

 "itertools 0.11.0",

 "language",

 "log",

 "lsp",
@@ -11137,6 +11153,26 @@ version = "0.8.0" 
source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "5c3082ca00d5a5ef149bb8b555a72ae84c9c59f7250f013ac822ac2e49b19c64"



[[package]]

name = "vswhom"

version = "0.1.0"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "be979b7f07507105799e854203b470ff7c78a1639e330a58f183b5fea574608b"

dependencies = [

 "libc",

 "vswhom-sys",

]



[[package]]

name = "vswhom-sys"

version = "0.1.2"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "d3b17ae1f6c8a2b28506cd96d412eebf83b4a0ff2cbefeeb952f2f9dfa44ba18"

dependencies = [

 "cc",

 "libc",

]



[[package]]

name = "vte"

version = "0.13.0"
@@ -12210,6 +12246,16 @@ dependencies = [ 
 "windows-sys 0.48.0",

]



[[package]]

name = "winreg"

version = "0.52.0"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "a277a57398d4bfa075df44f501a17cfdf8542d224f0d36095a2adc7aee4ef0a5"

dependencies = [

 "cfg-if",

 "windows-sys 0.48.0",

]



[[package]]

name = "winresource"

version = "0.1.17"
@@ -12608,7 +12654,7 @@ dependencies = [ 


[[package]]

name = "zed"

version = "0.133.7"

version = "0.134.4"

dependencies = [

 "activity_indicator",

 "anyhow",
@@ -12634,7 +12680,6 @@ dependencies = [ 
 "db",

 "diagnostics",

 "editor",

 "embed-manifest",

 "env_logger",

 "extension",

 "extensions_ui",
@@ -12658,6 +12703,7 @@ dependencies = [ 
 "markdown_preview",

 "menu",

 "mimalloc",

 "nix 0.28.0",

 "node_runtime",

 "notifications",

 "outline",
@@ -12680,6 +12726,7 @@ dependencies = [ 
 "tab_switcher",

 "task",

 "tasks_ui",

 "telemetry_events",

 "terminal_view",

 "theme",

 "theme_selector",
@@ -12725,7 +12772,7 @@ dependencies = [ 


[[package]]

name = "zed_dart"

version = "0.0.1"

version = "0.0.2"

dependencies = [

 "zed_extension_api 0.0.6 (registry+https://github.com/rust-lang/crates.io-index)",

]
@@ -12737,6 +12784,13 @@ dependencies = [ 
 "zed_extension_api 0.0.6 (registry+https://github.com/rust-lang/crates.io-index)",

]



[[package]]

name = "zed_elixir"

version = "0.0.1"

dependencies = [

 "zed_extension_api 0.0.6 (registry+https://github.com/rust-lang/crates.io-index)",

]



[[package]]

name = "zed_elm"

version = "0.0.1"

pkgs/by-name/ze/zed-editor/package.nix

+6 −46
Original line number Diff line number Diff line
@@ -22,18 +22,17 @@ 
  darwin,

  makeFontsConf,

  vulkan-loader,

  makeDesktopItem,

}:



rustPlatform.buildRustPackage rec {

  pname = "zed";

  version = "0.133.7";

  version = "0.134.4";



  src = fetchFromGitHub {

    owner = "zed-industries";

    repo = "zed";

    rev = "refs/tags/v${version}";

    hash = "sha256-alhOAcp4aika+v9FWnM2UWVLmzXnAhJD0z2WnYwDN8k=";

    hash = "sha256-2/onI/tc5FlwyRuu4Yq3xJYqwNXhnIrCebQQpCKGzfs=";

    fetchSubmodules = true;

  };
@@ -41,7 +40,7 @@ rustPlatform.buildRustPackage rec { 
    lockFile = ./Cargo.lock;

    outputHashes = {

      "async-pipe-0.1.3" = "sha256-g120X88HGT8P6GNCrzpS5SutALx5H+45Sf4iSSxzctE=";

      "blade-graphics-0.4.0" = "sha256-S1PNdQ9YbJgLLsJU1mvDZ3feVDIrZGwU37JqIm+kfcE=";

      "blade-graphics-0.4.0" = "sha256-J6mVvMC8u3+8RGp6qSwU/EpvdtUPyIs2Ry9XGGiimB0=";

      "font-kit-0.11.0" = "sha256-+4zMzjFyMS60HfLMEXGfXqKn6P+pOngLA45udV09DM8=";

      "heed-0.20.0-alpha.9" = "sha256-8bzoMmfKS+6AmeTzh0/F7WM9OBdIex+NYFER28bpA/s=";

      "lsp-types-0.94.1" = "sha256-kplgPsafrgZFMI1D9pQCwmg+FKMn5HNWLbcgdXHUFVU=";
@@ -137,50 +136,11 @@ rustPlatform.buildRustPackage rec { 


  postInstall = ''

    mv $out/bin/Zed $out/bin/zed

    install -D ${src}/crates/zed/resources/app-icon@2x.png $out/share/icons/hicolor/1024x1024@2x/apps/Zed.png

    install -D ${src}/crates/zed/resources/app-icon.png $out/share/icons/hicolor/512x512/apps/Zed.png

    install -D ${src}/crates/zed/resources/app-icon@2x.png $out/share/icons/hicolor/1024x1024@2x/apps/zed.png

    install -D ${src}/crates/zed/resources/app-icon.png $out/share/icons/hicolor/512x512/apps/zed.png

    install -D ${src}/crates/zed/resources/zed.desktop $out/share/applications/dev.zed.Zed.desktop

  '';



  desktopItems = [

    (makeDesktopItem {

      name = "dev.zed.Zed";

      exec = "zed %F";

      tryExec = "zed";

      icon = "Zed";

      comment = meta.description;

      desktopName = "Zed";

      genericName = "Text Editor";

      categories = [

        "Utility"

        "TextEditor"

        "Development"

      ];

      keywords = [

        "Text"

        "Editor"

      ];

      terminal = false;

      type = "Application";

      mimeTypes = [

        "inode/directory"

        "text/plain"

        "text/x-makefile"

        "text/x-c++hdr"

        "text/x-c++src"

        "text/x-chdr"

        "text/x-csrc"

        "text/x-java"

        "text/x-moc"

        "text/x-pascal"

        "text/x-tcl"

        "text/x-tex"

        "application/x-shellscript"

        "text/x-c"

        "text/x-c++"

      ];

    })

  ];



  meta = with lib; {

    description = "High-performance, multiplayer code editor from the creators of Atom and Tree-sitter";

    homepage = "https://zed.dev";