diff options
author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2023-10-16 18:02:05 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-10-16 18:02:05 +0000 |
commit | 12edd19d9da8c3eb621fe45c4c3abc0583dddc82 (patch) | |
tree | 39a71c4bc76659a95992c6c7d90bfb41f072497c /pkgs/applications/editors | |
parent | b4c4fd5f96f02d9e24c583f438655f5e0bc6d241 (diff) | |
parent | 3a75845d38c5181b95b92cb24c9a1ba802572386 (diff) | |
download | nixpkgs-12edd19d9da8c3eb621fe45c4c3abc0583dddc82.tar nixpkgs-12edd19d9da8c3eb621fe45c4c3abc0583dddc82.tar.gz nixpkgs-12edd19d9da8c3eb621fe45c4c3abc0583dddc82.tar.bz2 nixpkgs-12edd19d9da8c3eb621fe45c4c3abc0583dddc82.tar.lz nixpkgs-12edd19d9da8c3eb621fe45c4c3abc0583dddc82.tar.xz nixpkgs-12edd19d9da8c3eb621fe45c4c3abc0583dddc82.tar.zst nixpkgs-12edd19d9da8c3eb621fe45c4c3abc0583dddc82.zip |
Merge staging-next into staging
Diffstat (limited to 'pkgs/applications/editors')
4 files changed, 20 insertions, 15 deletions
diff --git a/pkgs/applications/editors/vim/plugins/nvim-treesitter/update.py b/pkgs/applications/editors/vim/plugins/nvim-treesitter/update.py index 6d9fd4de098..4b70d8555dd 100755 --- a/pkgs/applications/editors/vim/plugins/nvim-treesitter/update.py +++ b/pkgs/applications/editors/vim/plugins/nvim-treesitter/update.py @@ -63,14 +63,14 @@ def update_grammars(nvim_treesitter_dir: str): generated_file = """# generated by pkgs/applications/editors/vim/plugins/nvim-treesitter/update.py - { buildGrammar, """ +{ buildGrammar, """ generated_file += subprocess.check_output(["nurl", "-Ls", ", "], text=True) generated_file += """ }: - { - """ +{ +""" lockfile_path = os.path.join(nvim_treesitter_dir, "lockfile.json") log.debug("Opening %s", lockfile_path) @@ -88,7 +88,8 @@ def update_grammars(nvim_treesitter_dir: str): _generate_grammar, lockfile.items() ): generated_file += generated - generated_file += "}\n" + + generated_file += "}\n" return generated_file diff --git a/pkgs/applications/editors/vim/plugins/update.py b/pkgs/applications/editors/vim/plugins/update.py index b658ca7e2bd..e7e50c21d47 100755 --- a/pkgs/applications/editors/vim/plugins/update.py +++ b/pkgs/applications/editors/vim/plugins/update.py @@ -138,15 +138,19 @@ class VimEditor(pluginupdate.Editor): nvim_treesitter_dir = subprocess.check_output(cmd, text=True, timeout=90).strip() generated = treesitter.update_grammars(nvim_treesitter_dir) - open(os.path.join(args.nixpkgs, "generated.nix"), "w").write(generated) + treesitter_generated_nix_path = os.path.join( + NIXPKGS_NVIMTREESITTER_FOLDER, + "generated.nix" + ) + open(os.path.join(args.nixpkgs, treesitter_generated_nix_path), "w").write(generated) if self.nixpkgs_repo: index = self.nixpkgs_repo.index for diff in index.diff(None): - if diff.a_path == f"{NIXPKGS_NVIMTREESITTER_FOLDER}/generated.nix": + if diff.a_path == treesitter_generated_nix_path: msg = "vimPlugins.nvim-treesitter: update grammars" print(f"committing to nixpkgs: {msg}") - index.add([str(nvim_treesitter_dir.joinpath("generated.nix"))]) + index.add([treesitter_generated_nix_path]) index.commit(msg) return print("no updates to nvim-treesitter grammars") diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index c78623f009e..bdc1115e005 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -1229,8 +1229,8 @@ let mktplcRef = { name = "elixir-ls"; publisher = "JakeBecker"; - version = "0.17.0"; - sha256 = "sha256-jb9WHX5jCdi4vzIRvh7i6ncicuISsEBBmlIHvqquqcA="; + version = "0.17.1"; + sha256 = "sha256-WBtIdz+8zsyTl43ovU3Dz+8p154ZGvHp6BA3AQtXN/U="; }; meta = { changelog = "https://marketplace.visualstudio.com/items/JakeBecker.elixir-ls/changelog"; diff --git a/pkgs/applications/editors/vscode/vscodium.nix b/pkgs/applications/editors/vscode/vscodium.nix index f7527096f17..c34629a3cf6 100644 --- a/pkgs/applications/editors/vscode/vscodium.nix +++ b/pkgs/applications/editors/vscode/vscodium.nix @@ -15,11 +15,11 @@ let archive_fmt = if stdenv.isDarwin then "zip" else "tar.gz"; sha256 = { - x86_64-linux = "1xzmfvkzqfxblahi2pc54fr7i6rynqm76p4wpbfzxrrh5a3xjwn3"; - x86_64-darwin = "0lp6yqwqwfngl98nba8f77yypb44cfn7kcjhbc93s8kqd57m97zj"; - aarch64-linux = "1hpwjdbfc8l4a7ln50s6h68abcb6djcc5y0h686s9k5v2axm7f3v"; - aarch64-darwin = "0cbms9p8g2gjx9wmm78fzlscw62qasjv30al8v39bda3k694wnh5"; - armv7l-linux = "0hvaray6b36j8s0fvffnkbsw7kf2rn2z4y8q4wlnqx3hfyalcvcn"; + x86_64-linux = "0cqkxd4pywkrvg3b96f1dyain6vlrb3di8a0yskmq3h58qd6k8rc"; + x86_64-darwin = "09y3whpp2z8fgb42pb9lw0b4wn0np3rdjkn5l1kldjljfrcwcn9g"; + aarch64-linux = "1kh8qylj77km8jhmx9a2bck7y4bb0fjx46sll7swagxz27b8ahi0"; + aarch64-darwin = "14g60sx3c5m02ly880sxwhmzvpxqw4pfij2ibgyprzdlpap0r2b0"; + armv7l-linux = "1s4rpd5p4kwmi89cml1106l9dccdwnqq3lyr8ym781pj9p75i8wp"; }.${system} or throwSystem; sourceRoot = lib.optionalString (!stdenv.isDarwin) "."; @@ -29,7 +29,7 @@ in # Please backport all compatible updates to the stable release. # This is important for the extension ecosystem. - version = "1.82.2.23257"; + version = "1.83.1.23285"; pname = "vscodium"; executableName = "codium"; |