diff options
Diffstat (limited to 'pkgs/applications/editors')
23 files changed, 633 insertions, 352 deletions
diff --git a/pkgs/applications/editors/jetbrains/default.nix b/pkgs/applications/editors/jetbrains/default.nix index fa055bd830501..4c53a5bbe59e3 100644 --- a/pkgs/applications/editors/jetbrains/default.nix +++ b/pkgs/applications/editors/jetbrains/default.nix @@ -100,10 +100,12 @@ rec { clion = (mkJetBrainsProduct { pname = "clion"; extraBuildInputs = lib.optionals (stdenv.isLinux) [ + fontconfig python3 stdenv.cc.cc openssl libxcrypt-legacy + lttng-ust_2_12 musl ] ++ lib.optionals (stdenv.isLinux && stdenv.isAarch64) [ expat diff --git a/pkgs/applications/editors/lite-xl/default.nix b/pkgs/applications/editors/lite-xl/default.nix index 51b82f266d7a6..33c0c2926fa85 100644 --- a/pkgs/applications/editors/lite-xl/default.nix +++ b/pkgs/applications/editors/lite-xl/default.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { pname = "lite-xl"; - version = "2.1.3"; + version = "2.1.4"; src = fetchFromGitHub { owner = "lite-xl"; repo = "lite-xl"; rev = "v${version}"; - hash = "sha256-4ykUdcNwJ4r/4u9H+c8pgupY3BaPi2y69X6yaDjCjac="; + hash = "sha256-TqrFI5TFb2hnnlHYUjLDUTDK3/Wgg1gOxIP8owLi/yo="; }; nativeBuildInputs = [ meson ninja pkg-config ]; diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix index 0d7964e2e6559..d8e8dfe1e554e 100644 --- a/pkgs/applications/editors/vim/plugins/generated.nix +++ b/pkgs/applications/editors/vim/plugins/generated.nix @@ -5062,6 +5062,18 @@ final: prev: meta.homepage = "https://github.com/neoclide/jsonc.vim/"; }; + jsonfly-nvim = buildVimPlugin { + pname = "jsonfly.nvim"; + version = "2024-04-12"; + src = fetchFromGitHub { + owner = "Myzel394"; + repo = "jsonfly.nvim"; + rev = "539a0b79a5ea75d201e1e90cebfe9367154d04fc"; + sha256 = "1v1i4x2px0zs65rxkf2yhnxn6clx33vdr54r9gaqq713qj5ddlfm"; + }; + meta.homepage = "https://github.com/Myzel394/jsonfly.nvim/"; + }; + julia-vim = buildVimPlugin { pname = "julia-vim"; version = "2023-12-15"; @@ -11111,6 +11123,18 @@ final: prev: meta.homepage = "https://github.com/Pocco81/true-zen.nvim/"; }; + trust-vim = buildVimPlugin { + pname = "trust.vim"; + version = "2022-04-14"; + src = fetchFromGitHub { + owner = "tesaguri"; + repo = "trust.vim"; + rev = "3e17b29ff13f862eeda269d7ce0260571dab6cb7"; + sha256 = "1zvxjgyzzhnza2gv528dvyp7m1nvsz5gjn0qp65jn0k7y4gh3nnl"; + }; + meta.homepage = "https://github.com/tesaguri/trust.vim/"; + }; + tslime-vim = buildVimPlugin { pname = "tslime.vim"; version = "2020-09-09"; diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names index ace647e29b522..66e0351298cd7 100644 --- a/pkgs/applications/editors/vim/plugins/vim-plugin-names +++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names @@ -424,6 +424,7 @@ https://github.com/nanotech/jellybeans.vim/,, https://github.com/HiPhish/jinja.vim/,HEAD, https://github.com/vito-c/jq.vim/,, https://github.com/neoclide/jsonc.vim/,, +https://github.com/Myzel394/jsonfly.nvim/,HEAD, https://github.com/JuliaEditorSupport/julia-vim/,, https://github.com/GCBallesteros/jupytext.nvim/,HEAD, https://github.com/rebelot/kanagawa.nvim/,, @@ -933,6 +934,7 @@ https://github.com/tremor-rs/tremor-vim/,, https://github.com/cappyzawa/trim.nvim/,, https://github.com/folke/trouble.nvim/,, https://github.com/Pocco81/true-zen.nvim/,, +https://github.com/tesaguri/trust.vim/,HEAD, https://github.com/jgdavey/tslime.vim/,, https://github.com/Quramy/tsuquyomi/,, https://github.com/folke/twilight.nvim/,, diff --git a/pkgs/applications/editors/vscode/extensions/README.md b/pkgs/applications/editors/vscode/extensions/README.md new file mode 100644 index 0000000000000..656ea1bdb3ae0 --- /dev/null +++ b/pkgs/applications/editors/vscode/extensions/README.md @@ -0,0 +1,37 @@ +# Visual Studio Code Extensions + +## Conventions for adding new extensions + +* Extensions are named in the **lowercase** version of the extension's unique identifier. Which is found on the marketplace extension page, and is the name under which the extension is installed by VSCode under `~/.vscode`. + Extension location should be: ${lib.strings.toLower mktplcRef.publisher}.${lib.string.toLower mktplcRef.name} + +* Move extension to a discrete directory whenever the extension needs extra parameters/packages (at top of the file) or other files (such as patches, update script, components). Global index file parameters/packages should be utilities shared by many extensions. Extension specific parameters/packages should not be in the global index page. + +* Currently `nixfmt-rfc-style` formatter is being used to format the VSCode extensions. + +* Respect `alphabetical order` whenever adding extensions. On disorder, please, kindly open a PR re-establishing the order. + +* Avoid [unnecessary](https://nix.dev/guides/best-practices.html#with-scopes) use of `with`, particularly `nested with`. + +* Use `hash` instead of `sha256`. + +* On `meta` field: + - add a `changelog`. + - `description` should mention it is a Visual Studio Code extension. + - `downloadPage` is the VSCode marketplace URL. + - `homepage` is the source-code URL. + - verify `license` in upstream. + +* On commit messages: + - Naming convention for: + - Adding a new extension: + + > vscode-extensions.publisher.extension-name: init 1.2.3 + > + > Release: https://github.com/owner/project/releases/tag/1.2.3 + - Updating an extension: + + > vscode-extensions.publisher.extension-name: 1.2.3 -> 2.3.4 + > + > Release: https://github.com/owner/project/releases/tag/2.3.4 + - Multiple extensions can be added in a single PR, but each extension requires it's own commit. diff --git a/pkgs/applications/editors/vscode/extensions/asciidoctor.asciidoctor-vscode/default.nix b/pkgs/applications/editors/vscode/extensions/asciidoctor.asciidoctor-vscode/default.nix new file mode 100644 index 0000000000000..7ab6bb7ce0c62 --- /dev/null +++ b/pkgs/applications/editors/vscode/extensions/asciidoctor.asciidoctor-vscode/default.nix @@ -0,0 +1,27 @@ +{ + asciidoctor, + lib, + vscode-utils, +}: + +vscode-utils.buildVscodeMarketplaceExtension { + mktplcRef = { + name = "asciidoctor-vscode"; + publisher = "asciidoctor"; + version = "2.8.9"; + sha256 = "1xkxx5i3nhd0dzqhhdmx0li5jifsgfhv0p5h7xwsscz3gzgsdcyb"; + }; + + postPatch = '' + substituteInPlace dist/src/text-parser.js \ + --replace "get('asciidoctor_command', 'asciidoctor')" \ + "get('asciidoctor_command', '${asciidoctor}/bin/asciidoctor')" + substituteInPlace dist/src/commands/exportAsPDF.js \ + --replace "get('asciidoctorpdf_command', 'asciidoctor-pdf')" \ + "get('asciidoctorpdf_command', '${asciidoctor}/bin/asciidoctor-pdf')" + ''; + + meta = { + license = lib.licenses.mit; + }; +} diff --git a/pkgs/applications/editors/vscode/extensions/azdavis.millet/default.nix b/pkgs/applications/editors/vscode/extensions/azdavis.millet/default.nix new file mode 100644 index 0000000000000..af1e8c3df0f35 --- /dev/null +++ b/pkgs/applications/editors/vscode/extensions/azdavis.millet/default.nix @@ -0,0 +1,30 @@ +{ + lib, + jq, + moreutils, + millet, + vscode-utils, +}: + +vscode-utils.buildVscodeMarketplaceExtension { + mktplcRef = { + name = "Millet"; + publisher = "azdavis"; + version = "0.13.5"; + hash = "sha256-sWM7N+axgu1zOGWexR4JVupVmYhZrd4cZz3pmLxRj8Q="; + }; + nativeBuildInputs = [ + jq + moreutils + ]; + postInstall = '' + cd "$out/$installPrefix" + jq '.contributes.configuration.properties."millet.server.path".default = "${millet}/bin/millet-ls"' package.json | sponge package.json + ''; + meta = { + description = "Standard ML support for VS Code"; + downloadPage = "https://marketplace.visualstudio.com/items?itemName=azdavis.millet"; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.smasher164 ]; + }; +} diff --git a/pkgs/applications/editors/vscode/extensions/b4dm4n.vscode-nixpkgs-fmt/default.nix b/pkgs/applications/editors/vscode/extensions/b4dm4n.vscode-nixpkgs-fmt/default.nix new file mode 100644 index 0000000000000..6edcaea67a7d9 --- /dev/null +++ b/pkgs/applications/editors/vscode/extensions/b4dm4n.vscode-nixpkgs-fmt/default.nix @@ -0,0 +1,27 @@ +{ + vscode-utils, + jq, + lib, + moreutils, + nixpkgs-fmt, +}: + +vscode-utils.buildVscodeMarketplaceExtension { + mktplcRef = { + name = "nixpkgs-fmt"; + publisher = "B4dM4n"; + version = "0.0.1"; + hash = "sha256-vz2kU36B1xkLci2QwLpl/SBEhfSWltIDJ1r7SorHcr8="; + }; + nativeBuildInputs = [ + jq + moreutils + ]; + postInstall = '' + cd "$out/$installPrefix" + jq '.contributes.configuration.properties."nixpkgs-fmt.path".default = "${nixpkgs-fmt}/bin/nixpkgs-fmt"' package.json | sponge package.json + ''; + meta = { + license = lib.licenses.mit; + }; +} diff --git a/pkgs/applications/editors/vscode/extensions/betterthantomorrow.calva/default.nix b/pkgs/applications/editors/vscode/extensions/betterthantomorrow.calva/default.nix new file mode 100644 index 0000000000000..4fc5c16eb7fdf --- /dev/null +++ b/pkgs/applications/editors/vscode/extensions/betterthantomorrow.calva/default.nix @@ -0,0 +1,27 @@ +{ + clojure-lsp, + jq, + lib, + moreutils, + vscode-utils, +}: + +vscode-utils.buildVscodeMarketplaceExtension { + mktplcRef = { + name = "calva"; + publisher = "betterthantomorrow"; + version = "2.0.374"; + hash = "sha256-VwdHOkduSSIrcOvrcVf7K8DSp3N1u9fvbaCVDCxp+bk="; + }; + nativeBuildInputs = [ + jq + moreutils + ]; + postInstall = '' + cd "$out/$installPrefix" + jq '.contributes.configuration[0].properties."calva.clojureLspPath".default = "${clojure-lsp}/bin/clojure-lsp"' package.json | sponge package.json + ''; + meta = { + license = lib.licenses.mit; + }; +} diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index 6171fd701b34b..5cf2b7b53d066 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -1,28 +1,17 @@ +# Before adding a new extension, read ./README.md + { config , lib , fetchurl , callPackage , vscode-utils -, asciidoctor -, nodePackages , python3Packages , jdk , llvmPackages , llvmPackages_14 -, nixpkgs-fmt , protobuf , jq -, shellcheck , moreutils -, racket -, clojure-lsp -, alejandra -, millet -, craftos-pc -, shfmt -, tinymist -, typst-lsp -, typst-preview , autoPatchelfHook , zlib , stdenv @@ -31,15 +20,6 @@ let inherit (vscode-utils) buildVscodeMarketplaceExtension; - # - # Unless there is a good reason not to, we attempt to use the lowercase - # version of the extension's unique identifier. The unique identifier can be - # found on the marketplace extension page, and is the name under which the - # extension is installed by VSCode under `~/.vscode`. - # - # This means an extension should be located at - # ${lib.strings.toLower mktplcRef.publisher}.${lib.string.toLower mktplcRef.name} - # baseExtensions = self: lib.mapAttrs (_n: lib.recurseIntoAttrs) { "13xforever".language-x86-64-assembly = buildVscodeMarketplaceExtension { @@ -368,27 +348,7 @@ let }; }; - asciidoctor.asciidoctor-vscode = buildVscodeMarketplaceExtension { - mktplcRef = { - name = "asciidoctor-vscode"; - publisher = "asciidoctor"; - version = "2.8.9"; - sha256 = "1xkxx5i3nhd0dzqhhdmx0li5jifsgfhv0p5h7xwsscz3gzgsdcyb"; - }; - - postPatch = '' - substituteInPlace dist/src/text-parser.js \ - --replace "get('asciidoctor_command', 'asciidoctor')" \ - "get('asciidoctor_command', '${asciidoctor}/bin/asciidoctor')" - substituteInPlace dist/src/commands/exportAsPDF.js \ - --replace "get('asciidoctorpdf_command', 'asciidoctor-pdf')" \ - "get('asciidoctorpdf_command', '${asciidoctor}/bin/asciidoctor-pdf')" - ''; - - meta = { - license = lib.licenses.mit; - }; - }; + asciidoctor.asciidoctor-vscode = callPackage ./asciidoctor.asciidoctor-vscode { }; asdine.cue = buildVscodeMarketplaceExtension { mktplcRef = { @@ -458,42 +418,9 @@ let }; }; - azdavis.millet = buildVscodeMarketplaceExtension { - mktplcRef = { - name = "Millet"; - publisher = "azdavis"; - version = "0.13.5"; - hash = "sha256-sWM7N+axgu1zOGWexR4JVupVmYhZrd4cZz3pmLxRj8Q="; - }; - nativeBuildInputs = [ jq moreutils ]; - postInstall = '' - cd "$out/$installPrefix" - jq '.contributes.configuration.properties."millet.server.path".default = "${millet}/bin/millet-ls"' package.json | sponge package.json - ''; - meta = { - description = "Standard ML support for VS Code"; - downloadPage = "https://marketplace.visualstudio.com/items?itemName=azdavis.millet"; - license = lib.licenses.mit; - maintainers = [ lib.maintainers.smasher164 ]; - }; - }; + azdavis.millet = callPackage ./azdavis.millet { }; - b4dm4n.vscode-nixpkgs-fmt = buildVscodeMarketplaceExtension { - mktplcRef = { - name = "nixpkgs-fmt"; - publisher = "B4dM4n"; - version = "0.0.1"; - hash = "sha256-vz2kU36B1xkLci2QwLpl/SBEhfSWltIDJ1r7SorHcr8="; - }; - nativeBuildInputs = [ jq moreutils ]; - postInstall = '' - cd "$out/$installPrefix" - jq '.contributes.configuration.properties."nixpkgs-fmt.path".default = "${nixpkgs-fmt}/bin/nixpkgs-fmt"' package.json | sponge package.json - ''; - meta = { - license = lib.licenses.mit; - }; - }; + b4dm4n.vscode-nixpkgs-fmt = callPackage ./b4dm4n.vscode-nixpkgs-fmt { }; baccata.scaladex-search = buildVscodeMarketplaceExtension { mktplcRef = { @@ -595,24 +522,9 @@ let }; }; - betterthantomorrow.calva = buildVscodeMarketplaceExtension { - mktplcRef = { - name = "calva"; - publisher = "betterthantomorrow"; - version = "2.0.374"; - hash = "sha256-VwdHOkduSSIrcOvrcVf7K8DSp3N1u9fvbaCVDCxp+bk="; - }; - nativeBuildInputs = [ jq moreutils ]; - postInstall = '' - cd "$out/$installPrefix" - jq '.contributes.configuration[0].properties."calva.clojureLspPath".default = "${clojure-lsp}/bin/clojure-lsp"' package.json | sponge package.json - ''; - meta = { - license = lib.licenses.mit; - }; - }; + betterthantomorrow.calva = callPackage ./betterthantomorrow.calva { }; - bierner.docs-view = buildVscodeMarketplaceExtension { + bierner.docs-view = buildVscodeMarketplaceExtension { mktplcRef = { name = "docs-view"; publisher = "bierner"; @@ -1137,8 +1049,8 @@ let mktplcRef = { name = "vscode-markdownlint"; publisher = "DavidAnson"; - version = "0.54.0"; - hash = "sha256-BrPFFRspJIz1U08hPbLziCmRUeZv2NhRrTCx6qvhOJw="; + version = "0.55.0"; + hash = "sha256-slfHfRPcuRu+649n6kAr2bv9H6J+DvYVN/ysq1QpPQM="; }; meta = { changelog = "https://marketplace.visualstudio.com/items/DavidAnson.vscode-markdownlint/changelog"; @@ -1634,27 +1546,7 @@ let }; }; - eugleo.magic-racket = buildVscodeMarketplaceExtension { - mktplcRef = { - name = "magic-racket"; - publisher = "evzen-wybitul"; - version = "0.6.4"; - hash = "sha256-Hxa4VPm3QvJICzpDyfk94fGHu1hr+YN9szVBwDB8X4U="; - }; - nativeBuildInputs = [ jq moreutils ]; - postInstall = '' - cd "$out/$installPrefix" - jq '.contributes.configuration.properties."magicRacket.general.racketPath".default = "${racket}/bin/racket"' package.json | sponge package.json - jq '.contributes.configuration.properties."magicRacket.general.racoPath".default = "${racket}/bin/raco"' package.json | sponge package.json - ''; - meta = { - changelog = "https://marketplace.visualstudio.com/items/evzen-wybitul.magic-racket/changelog"; - description = "The best coding experience for Racket in VS Code"; - downloadPage = "https://marketplace.visualstudio.com/items?itemName=evzen-wybitul.magic-racket"; - homepage = "https://github.com/Eugleo/magic-racket"; - license = lib.licenses.agpl3Only; - }; - }; + eugleo.magic-racket = callPackage ./eugleo.magic-racket { }; ExiaHuang.dictionary = buildVscodeMarketplaceExtension { mktplcRef = { @@ -1775,28 +1667,7 @@ let }; }; - foxundermoon.shell-format = buildVscodeMarketplaceExtension { - mktplcRef = { - name = "shell-format"; - publisher = "foxundermoon"; - version = "7.2.5"; - hash = "sha256-kfpRByJDcGY3W9+ELBzDOUMl06D/vyPlN//wPgQhByk="; - }; - - nativeBuildInputs = [ jq moreutils ]; - - postInstall = '' - cd "$out/$installPrefix" - jq '.contributes.configuration.properties."shellformat.path".default = "${shfmt}/bin/shfmt"' package.json | sponge package.json - ''; - - meta = { - downloadPage = "https://marketplace.visualstudio.com/items?itemName=foxundermoon.shell-format"; - homepage = "https://github.com/foxundermoon/vs-shell-format"; - license = lib.licenses.mit; - maintainers = [ lib.maintainers.dbirks ]; - }; - }; + foxundermoon.shell-format = callPackage ./foxundermoon.shell-format { }; freebroccolo.reasonml = buildVscodeMarketplaceExtension { meta = { @@ -2297,38 +2168,7 @@ let }; }; - jackmacwindows.craftos-pc = buildVscodeMarketplaceExtension { - mktplcRef = { - name = "craftos-pc"; - publisher = "jackmacwindows"; - version = "1.2.2"; - hash = "sha256-A+MNroXv0t9Mw/gr0Fyov3cXyF/GGzwRLKrIxQ2tKCE="; - }; - nativeBuildInputs = [ jq moreutils ]; - postInstall = '' - cd "$out/$installPrefix" - - jq -e ' - .contributes.configuration.properties."craftos-pc.executablePath.linux".default = - "${lib.meta.getExe craftos-pc}" | - .contributes.configuration.properties."craftos-pc.executablePath.mac".default = - "${lib.meta.getExe craftos-pc}" | - .contributes.configuration.properties."craftos-pc.executablePath.windows".default = - "${lib.meta.getExe craftos-pc}" - ' \ - < package.json \ - | sponge package.json - ''; - meta = { - changelog = "https://marketplace.visualstudio.com/items/jackmacwindows.craftos-pc/changelog"; - description = "A Visual Studio Code extension for opening a CraftOS-PC window"; - downloadPage = "https://marketplace.visualstudio.com/items?itemName=jackmacwindows.craftos-pc"; - homepage = "https://www.craftos-pc.cc/docs/extension"; - license = lib.licenses.mit; - maintainers = with lib.maintainers; [ tomodachi94 ]; - platforms = craftos-pc.meta.platforms; - }; - }; + jackmacwindows.craftos-pc = callPackage ./jackmacwindows.craftos-pc { }; james-yu.latex-workshop = buildVscodeMarketplaceExtension { mktplcRef = { @@ -2447,8 +2287,8 @@ let mktplcRef = { name = "nix-ide"; publisher = "jnoortheen"; - version = "0.2.2"; - hash = "sha256-jwOM+6LnHyCkvhOTVSTUZvgx77jAg6hFCCpBqY8AxIg="; + version = "0.3.1"; + hash = "sha256-05oMDHvFM/dTXB6T3rcDK3EiNG2T0tBN9Au9b+Bk7rI="; }; meta = { changelog = "https://marketplace.visualstudio.com/items/jnoortheen.nix-ide/changelog"; @@ -2512,6 +2352,23 @@ let }; }; + k--kato.intellij-idea-keybindings = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "intellij-idea-keybindings"; + publisher = "k--kato"; + version = "1.7.0"; + hash = "sha256-mIcSZANZlj5iO2oLiJBUHn08rXVhu/9SKsRhlu/hcvI="; + }; + meta = { + changelog = "https://marketplace.visualstudio.com/items/k--kato.intellij-idea-keybindings/changelog"; + description = "Visual Studio Code extension for IntelliJ IDEA keybindings"; + downloadPage = "https://marketplace.visualstudio.com/items?itemName=k--kato.intellij-idea-keybindings"; + homepage = "https://github.com/kasecato/vscode-intellij-idea-keybindings"; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.t4sm5n ]; + }; + }; + kahole.magit = buildVscodeMarketplaceExtension { mktplcRef = { name = "magit"; @@ -2546,33 +2403,7 @@ let }; }; - kamadorueda.alejandra = buildVscodeMarketplaceExtension { - mktplcRef = { - name = "alejandra"; - publisher = "kamadorueda"; - version = "1.0.0"; - hash = "sha256-COlEjKhm8tK5XfOjrpVUDQ7x3JaOLiYoZ4MdwTL8ktk="; - }; - nativeBuildInputs = [ jq moreutils ]; - postInstall = '' - cd "$out/$installPrefix" - - jq -e ' - .contributes.configuration.properties."alejandra.program".default = - "${alejandra}/bin/alejandra" | - .contributes.configurationDefaults."alejandra.program" = - "${alejandra}/bin/alejandra" - ' \ - < package.json \ - | sponge package.json - ''; - meta = { - description = "The Uncompromising Nix Code Formatter"; - homepage = "https://github.com/kamadorueda/alejandra"; - license = lib.licenses.unlicense; - maintainers = [ lib.maintainers.kamadorueda ]; - }; - }; + kamadorueda.alejandra = callPackage ./kamadorueda.alejandra { }; kamikillerto.vscode-colorize = buildVscodeMarketplaceExtension { mktplcRef = { @@ -2797,35 +2628,7 @@ let }; }; - # Keep pkgs/by-name/ty/typst-preview/package.nix in sync with this - # extension - mgt19937.typst-preview = buildVscodeMarketplaceExtension { - mktplcRef = { - name = "typst-preview"; - publisher = "mgt19937"; - version = "0.11.4"; - hash = "sha256-GwlzFphZmP87pLys01+PWTv13imcdGjunCMH6atz9xs="; - }; - - buildInputs = [ - typst-preview - ]; - - nativeBuildInputs = [ jq moreutils ]; - - postInstall = '' - cd "$out/$installPrefix" - jq '.contributes.configuration.properties."typst-preview.executable".default = "${lib.getExe typst-preview}"' package.json | sponge package.json - ''; - - meta = { - description = "Typst Preview is an extension for previewing your Typst files in vscode instantly"; - downloadPage = "https://marketplace.visualstudio.com/items?itemName=mgt19937.typst-preview"; - homepage = "https://github.com/Enter-tainer/typst-preview-vscode"; - license = lib.licenses.mit; - maintainers = [ lib.maintainers.drupol ]; - }; - }; + mgt19937.typst-preview = callPackage ./mgt19937.typst-preview { }; mhutchie.git-graph = buildVscodeMarketplaceExtension { mktplcRef = { @@ -2867,10 +2670,9 @@ let mktplcRef = { name = "direnv"; publisher = "mkhl"; - version = "0.16.0"; - hash = "sha256-u2AFjvhm3zio1ygW9yD9ZwbywLrEssd0O7/0AtfCvMo="; + version = "0.17.0"; + hash = "sha256-9sFcfTMeLBGw2ET1snqQ6Uk//D/vcD9AVsZfnUNrWNg="; }; - meta = { description = "direnv support for Visual Studio Code"; license = lib.licenses.bsd0; @@ -2979,25 +2781,7 @@ let ms-python.python = callPackage ./ms-python.python { }; - ms-python.vscode-pylance = buildVscodeMarketplaceExtension { - mktplcRef = { - name = "vscode-pylance"; - publisher = "MS-python"; - version = "2023.8.50"; - hash = "sha256-xJU/j5r/Idp/0VorEfciT4SFKRBpMCv9Z0LKO/++1Gk="; - }; - - buildInputs = [ nodePackages.pyright ]; - - meta = { - changelog = "https://marketplace.visualstudio.com/items/ms-python.vscode-pylance/changelog"; - description = "A performant, feature-rich language server for Python in VS Code"; - downloadPage = "https://marketplace.visualstudio.com/items?itemName=ms-python.vscode-pylance"; - homepage = "https://github.com/microsoft/pylance-release"; - license = lib.licenses.unfree; - maintainers = [ lib.maintainers.ericthemagician ]; - }; - }; + ms-python.vscode-pylance = callPackage ./ms-python.vscode-pylance { }; ms-toolsai.datawrangler = buildVscodeMarketplaceExtension { mktplcRef = { @@ -3269,36 +3053,7 @@ let }; }; - myriad-dreamin.tinymist = buildVscodeMarketplaceExtension { - mktplcRef = { - name = "tinymist"; - publisher = "myriad-dreamin"; - # Please update the corresponding binary (tinymist) when updating - # this extension. - version = "0.11.3"; - hash = "sha256-b5aD4gz4j+QAEPmYaNnaputbYTPoFxVFih76HmznUP8="; - }; - - nativeBuildInputs = [ jq moreutils ]; - - buildInputs = [ - tinymist - ]; - - postInstall = '' - cd "$out/$installPrefix" - jq '.contributes.configuration.properties."tinymist.serverPath".default = "${lib.getExe tinymist}"' package.json | sponge package.json - ''; - - meta = { - changelog = "https://marketplace.visualstudio.com/items/myriad-dreamin.tinymist/changelog"; - description = "A VSCode extension for providing an integration solution for Typst"; - downloadPage = "https://marketplace.visualstudio.com/items?itemName=myriad-dreamin.tinymist"; - homepage = "https://github.com/myriad-dreamin/tinymist"; - license = lib.licenses.asl20; - maintainers = [ lib.maintainers.drupol ]; - }; - }; + myriad-dreamin.tinymist = callPackage ./myriad-dreamin.tinymist { }; naumovs.color-highlight = buildVscodeMarketplaceExtension { mktplcRef = { @@ -3383,36 +3138,7 @@ let }; }; - nvarner.typst-lsp = buildVscodeMarketplaceExtension { - mktplcRef = { - name = "typst-lsp"; - publisher = "nvarner"; - # Please update the corresponding binary (typst-lsp) when updating - # this extension. - version = "0.12.1"; - hash = "sha256-JcfFaR1wU5XwapH8vnfVy7Cb7DfUWVeoLfBV3wEtCpE="; - }; - - nativeBuildInputs = [ jq moreutils ]; - - buildInputs = [ - typst-lsp - ]; - - postInstall = '' - cd "$out/$installPrefix" - jq '.contributes.configuration.properties."typst-lsp.serverPath".default = "${lib.getExe typst-lsp}"' package.json | sponge package.json - ''; - - meta = { - changelog = "https://marketplace.visualstudio.com/items/nvarner.typst-lsp/changelog"; - description = "A VSCode extension for providing a language server for Typst"; - downloadPage = "https://marketplace.visualstudio.com/items?itemName=nvarner.typst-lsp"; - homepage = "https://github.com/nvarner/typst-lsp"; - license = lib.licenses.mit; - maintainers = [ lib.maintainers.drupol ]; - }; - }; + nvarner.typst-lsp = callPackage ./nvarner.typst-lsp { }; ocamllabs.ocaml-platform = buildVscodeMarketplaceExtension { meta = { @@ -3901,6 +3627,23 @@ let }; }; + signageos.signageos-vscode-sops = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "signageos-vscode-sops"; + publisher = "signageos"; + version = "0.9.1"; + hash = "sha256-b1Gp+tL5/e97xMuqkz4EvN0PxI7cJOObusEkcp+qKfM="; + }; + meta = { + changelog = "https://marketplace.visualstudio.com/items/signageos.signageos-vscode-sops/changelog"; + description = "A Visual Studio Code extension for SOPS support"; + downloadPage = "https://marketplace.visualstudio.com/items?itemName=signageos.signageos-vscode-sops"; + homepage = "https://github.com/signageos/vscode-sops"; + license = lib.licenses.unfree; + maintainers = [ lib.maintainers.superherointj ]; + }; + }; + silofy.hackthebox = buildVscodeMarketplaceExtension { mktplcRef = { name = "hackthebox"; @@ -3986,6 +3729,8 @@ let meta.license = lib.licenses.lgpl3Only; }; + sourcery.sourcery = callPackage ./sourcery.sourcery { }; + spywhere.guides = buildVscodeMarketplaceExtension { mktplcRef = { name = "guides"; @@ -4324,26 +4069,7 @@ let }; }; - timonwong.shellcheck = buildVscodeMarketplaceExtension { - mktplcRef = { - name = "shellcheck"; - publisher = "timonwong"; - version = "0.37.0"; - sha256 = "1d0blynn6c2hz4y9fk7b5wsa3x168gxyycr5d05zqp0rx520m5wc"; - }; - nativeBuildInputs = [ jq moreutils ]; - postInstall = '' - cd "$out/$installPrefix" - jq '.contributes.configuration.properties."shellcheck.executablePath".default = "${shellcheck}/bin/shellcheck"' package.json | sponge package.json - ''; - meta = { - description = "Integrates ShellCheck into VS Code, a linter for Shell scripts"; - downloadPage = "https://marketplace.visualstudio.com/items?itemName=timonwong.shellcheck"; - homepage = "https://github.com/vscode-shellcheck/vscode-shellcheck"; - license = lib.licenses.mit; - maintainers = [ lib.maintainers.raroh73 ]; - }; - }; + timonwong.shellcheck = callPackage ./timonwong.shellcheck { }; tobiasalthoff.atom-material-theme = buildVscodeMarketplaceExtension { mktplcRef = { @@ -4495,12 +4221,12 @@ let mktplcRef = { name = "errorlens"; publisher = "usernamehw"; - version = "3.14.0"; - sha256 = "0k70f5f4hcv3jl3a04736ml8amx8w7wb3mb8f6l5gngnvq9fj528"; + version = "3.16.0"; + hash = "sha256-Y3M/A5rYLkxQPRIZ0BUjhlkvixDae+wIRUsBn4tREFw="; }; meta = { changelog = "https://marketplace.visualstudio.com/items/usernamehw.errorlens/changelog"; - description = "Improve highlighting of errors, warnings and other language diagnostics."; + description = "A Visual Studio Code extension that improves highlighting of errors, warnings and other language diagnostics"; downloadPage = "https://marketplace.visualstudio.com/items?itemName=usernamehw.errorlens"; homepage = "https://github.com/usernamehw/vscode-error-lens"; license = lib.licenses.mit; diff --git a/pkgs/applications/editors/vscode/extensions/eugleo.magic-racket/default.nix b/pkgs/applications/editors/vscode/extensions/eugleo.magic-racket/default.nix new file mode 100644 index 0000000000000..81b0520a53d71 --- /dev/null +++ b/pkgs/applications/editors/vscode/extensions/eugleo.magic-racket/default.nix @@ -0,0 +1,32 @@ +{ + lib, + jq, + moreutils, + racket, + vscode-utils, +}: + +vscode-utils.buildVscodeMarketplaceExtension { + mktplcRef = { + name = "magic-racket"; + publisher = "evzen-wybitul"; + version = "0.6.4"; + hash = "sha256-Hxa4VPm3QvJICzpDyfk94fGHu1hr+YN9szVBwDB8X4U="; + }; + nativeBuildInputs = [ + jq + moreutils + ]; + postInstall = '' + cd "$out/$installPrefix" + jq '.contributes.configuration.properties."magicRacket.general.racketPath".default = "${racket}/bin/racket"' package.json | sponge package.json + jq '.contributes.configuration.properties."magicRacket.general.racoPath".default = "${racket}/bin/raco"' package.json | sponge package.json + ''; + meta = { + changelog = "https://marketplace.visualstudio.com/items/evzen-wybitul.magic-racket/changelog"; + description = "The best coding experience for Racket in VS Code"; + downloadPage = "https://marketplace.visualstudio.com/items?itemName=evzen-wybitul.magic-racket"; + homepage = "https://github.com/Eugleo/magic-racket"; + license = lib.licenses.agpl3Only; + }; +} diff --git a/pkgs/applications/editors/vscode/extensions/foxundermoon.shell-format/default.nix b/pkgs/applications/editors/vscode/extensions/foxundermoon.shell-format/default.nix new file mode 100644 index 0000000000000..51824f34ff6e9 --- /dev/null +++ b/pkgs/applications/editors/vscode/extensions/foxundermoon.shell-format/default.nix @@ -0,0 +1,33 @@ +{ + jq, + lib, + moreutils, + shfmt, + vscode-utils, +}: + +vscode-utils.buildVscodeMarketplaceExtension { + mktplcRef = { + name = "shell-format"; + publisher = "foxundermoon"; + version = "7.2.5"; + hash = "sha256-kfpRByJDcGY3W9+ELBzDOUMl06D/vyPlN//wPgQhByk="; + }; + + nativeBuildInputs = [ + jq + moreutils + ]; + + postInstall = '' + cd "$out/$installPrefix" + jq '.contributes.configuration.properties."shellformat.path".default = "${shfmt}/bin/shfmt"' package.json | sponge package.json + ''; + + meta = { + downloadPage = "https://marketplace.visualstudio.com/items?itemName=foxundermoon.shell-format"; + homepage = "https://github.com/foxundermoon/vs-shell-format"; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.dbirks ]; + }; +} diff --git a/pkgs/applications/editors/vscode/extensions/jackmacwindows.craftos-pc/default.nix b/pkgs/applications/editors/vscode/extensions/jackmacwindows.craftos-pc/default.nix new file mode 100644 index 0000000000000..005f78f4f4ae9 --- /dev/null +++ b/pkgs/applications/editors/vscode/extensions/jackmacwindows.craftos-pc/default.nix @@ -0,0 +1,43 @@ +{ + vscode-utils, + craftos-pc, + jq, + lib, + moreutils, +}: + +vscode-utils.buildVscodeMarketplaceExtension { + mktplcRef = { + name = "craftos-pc"; + publisher = "jackmacwindows"; + version = "1.2.2"; + hash = "sha256-A+MNroXv0t9Mw/gr0Fyov3cXyF/GGzwRLKrIxQ2tKCE="; + }; + nativeBuildInputs = [ + jq + moreutils + ]; + postInstall = '' + cd "$out/$installPrefix" + + jq -e ' + .contributes.configuration.properties."craftos-pc.executablePath.linux".default = + "${lib.meta.getExe craftos-pc}" | + .contributes.configuration.properties."craftos-pc.executablePath.mac".default = + "${lib.meta.getExe craftos-pc}" | + .contributes.configuration.properties."craftos-pc.executablePath.windows".default = + "${lib.meta.getExe craftos-pc}" + ' \ + < package.json \ + | sponge package.json + ''; + meta = { + changelog = "https://marketplace.visualstudio.com/items/jackmacwindows.craftos-pc/changelog"; + description = "A Visual Studio Code extension for opening a CraftOS-PC window"; + downloadPage = "https://marketplace.visualstudio.com/items?itemName=jackmacwindows.craftos-pc"; + homepage = "https://www.craftos-pc.cc/docs/extension"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ tomodachi94 ]; + platforms = craftos-pc.meta.platforms; + }; +} diff --git a/pkgs/applications/editors/vscode/extensions/kamadorueda.alejandra/default.nix b/pkgs/applications/editors/vscode/extensions/kamadorueda.alejandra/default.nix new file mode 100644 index 0000000000000..a3658346147e3 --- /dev/null +++ b/pkgs/applications/editors/vscode/extensions/kamadorueda.alejandra/default.nix @@ -0,0 +1,38 @@ +{ + alejandra, + jq, + lib, + moreutils, + vscode-utils, +}: + +vscode-utils.buildVscodeMarketplaceExtension { + mktplcRef = { + name = "alejandra"; + publisher = "kamadorueda"; + version = "1.0.0"; + hash = "sha256-COlEjKhm8tK5XfOjrpVUDQ7x3JaOLiYoZ4MdwTL8ktk="; + }; + nativeBuildInputs = [ + jq + moreutils + ]; + postInstall = '' + cd "$out/$installPrefix" + + jq -e ' + .contributes.configuration.properties."alejandra.program".default = + "${alejandra}/bin/alejandra" | + .contributes.configurationDefaults."alejandra.program" = + "${alejandra}/bin/alejandra" + ' \ + < package.json \ + | sponge package.json + ''; + meta = { + description = "The Uncompromising Nix Code Formatter"; + homepage = "https://github.com/kamadorueda/alejandra"; + license = lib.licenses.unlicense; + maintainers = [ lib.maintainers.kamadorueda ]; + }; +} diff --git a/pkgs/applications/editors/vscode/extensions/mgt19937.typst-preview/default.nix b/pkgs/applications/editors/vscode/extensions/mgt19937.typst-preview/default.nix new file mode 100644 index 0000000000000..156e35ab06a01 --- /dev/null +++ b/pkgs/applications/editors/vscode/extensions/mgt19937.typst-preview/default.nix @@ -0,0 +1,38 @@ +# Keep pkgs/by-name/ty/typst-preview/package.nix in sync with this extension + +{ + vscode-utils, + lib, + jq, + moreutils, + typst-preview, +}: + +vscode-utils.buildVscodeMarketplaceExtension { + mktplcRef = { + name = "typst-preview"; + publisher = "mgt19937"; + version = "0.11.4"; + hash = "sha256-GwlzFphZmP87pLys01+PWTv13imcdGjunCMH6atz9xs="; + }; + + buildInputs = [ typst-preview ]; + + nativeBuildInputs = [ + jq + moreutils + ]; + + postInstall = '' + cd "$out/$installPrefix" + jq '.contributes.configuration.properties."typst-preview.executable".default = "${lib.getExe typst-preview}"' package.json | sponge package.json + ''; + + meta = { + description = "Typst Preview is an extension for previewing your Typst files in vscode instantly"; + downloadPage = "https://marketplace.visualstudio.com/items?itemName=mgt19937.typst-preview"; + homepage = "https://github.com/Enter-tainer/typst-preview-vscode"; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.drupol ]; + }; +} diff --git a/pkgs/applications/editors/vscode/extensions/ms-python.vscode-pylance/default.nix b/pkgs/applications/editors/vscode/extensions/ms-python.vscode-pylance/default.nix new file mode 100644 index 0000000000000..b06922a90c5bb --- /dev/null +++ b/pkgs/applications/editors/vscode/extensions/ms-python.vscode-pylance/default.nix @@ -0,0 +1,25 @@ +{ + lib, + nodePackages, + vscode-utils, +}: + +vscode-utils.buildVscodeMarketplaceExtension { + mktplcRef = { + name = "vscode-pylance"; + publisher = "MS-python"; + version = "2023.8.50"; + hash = "sha256-xJU/j5r/Idp/0VorEfciT4SFKRBpMCv9Z0LKO/++1Gk="; + }; + + buildInputs = [ nodePackages.pyright ]; + + meta = { + changelog = "https://marketplace.visualstudio.com/items/ms-python.vscode-pylance/changelog"; + description = "A performant, feature-rich language server for Python in VS Code"; + downloadPage = "https://marketplace.visualstudio.com/items?itemName=ms-python.vscode-pylance"; + homepage = "https://github.com/microsoft/pylance-release"; + license = lib.licenses.unfree; + maintainers = [ lib.maintainers.ericthemagician ]; + }; +} diff --git a/pkgs/applications/editors/vscode/extensions/myriad-dreamin.tinymist/default.nix b/pkgs/applications/editors/vscode/extensions/myriad-dreamin.tinymist/default.nix new file mode 100644 index 0000000000000..5e7c3f59f1982 --- /dev/null +++ b/pkgs/applications/editors/vscode/extensions/myriad-dreamin.tinymist/default.nix @@ -0,0 +1,39 @@ +{ + jq, + lib, + moreutils, + tinymist, + vscode-utils, +}: + +vscode-utils.buildVscodeMarketplaceExtension { + mktplcRef = { + name = "tinymist"; + publisher = "myriad-dreamin"; + # Please update the corresponding binary (tinymist) when updating + # this extension. + version = "0.11.4"; + hash = "sha256-VR+vl6mctwq9oSIgnfutvPFwfGUdEco8fCOjzMvPtII="; + }; + + nativeBuildInputs = [ + jq + moreutils + ]; + + buildInputs = [ tinymist ]; + + postInstall = '' + cd "$out/$installPrefix" + jq '.contributes.configuration.properties."tinymist.serverPath".default = "${lib.getExe tinymist}"' package.json | sponge package.json + ''; + + meta = { + changelog = "https://marketplace.visualstudio.com/items/myriad-dreamin.tinymist/changelog"; + description = "A VSCode extension for providing an integration solution for Typst"; + downloadPage = "https://marketplace.visualstudio.com/items?itemName=myriad-dreamin.tinymist"; + homepage = "https://github.com/myriad-dreamin/tinymist"; + license = lib.licenses.asl20; + maintainers = [ lib.maintainers.drupol ]; + }; +} diff --git a/pkgs/applications/editors/vscode/extensions/nvarner.typst-lsp/default.nix b/pkgs/applications/editors/vscode/extensions/nvarner.typst-lsp/default.nix new file mode 100644 index 0000000000000..ec054521240de --- /dev/null +++ b/pkgs/applications/editors/vscode/extensions/nvarner.typst-lsp/default.nix @@ -0,0 +1,39 @@ +{ + jq, + lib, + moreutils, + typst-lsp, + vscode-utils, +}: + +vscode-utils.buildVscodeMarketplaceExtension { + mktplcRef = { + name = "typst-lsp"; + publisher = "nvarner"; + # Please update the corresponding binary (typst-lsp) when updating + # this extension. + version = "0.12.1"; + hash = "sha256-JcfFaR1wU5XwapH8vnfVy7Cb7DfUWVeoLfBV3wEtCpE="; + }; + + nativeBuildInputs = [ + jq + moreutils + ]; + + buildInputs = [ typst-lsp ]; + + postInstall = '' + cd "$out/$installPrefix" + jq '.contributes.configuration.properties."typst-lsp.serverPath".default = "${lib.getExe typst-lsp}"' package.json | sponge package.json + ''; + + meta = { + changelog = "https://marketplace.visualstudio.com/items/nvarner.typst-lsp/changelog"; + description = "A VSCode extension for providing a language server for Typst"; + downloadPage = "https://marketplace.visualstudio.com/items?itemName=nvarner.typst-lsp"; + homepage = "https://github.com/nvarner/typst-lsp"; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.drupol ]; + }; +} diff --git a/pkgs/applications/editors/vscode/extensions/sourcery.sourcery/default.nix b/pkgs/applications/editors/vscode/extensions/sourcery.sourcery/default.nix new file mode 100644 index 0000000000000..143ce42045612 --- /dev/null +++ b/pkgs/applications/editors/vscode/extensions/sourcery.sourcery/default.nix @@ -0,0 +1,42 @@ +{ + lib, + stdenv, + vscode-utils, + autoPatchelfHook, + libxcrypt-legacy, +}: + +vscode-utils.buildVscodeMarketplaceExtension { + mktplcRef = { + name = "sourcery"; + publisher = "sourcery"; + version = "1.16.0"; + hash = "sha256-SHgS2C+ElTJW4v90Wg0QcsSL2FoSz+SxZQpgq2J4JiU="; + }; + + postPatch = '' + pushd sourcery_binaries/install + rm -r win ${if stdenv.isLinux then "mac" else "linux"} + popd + ''; + + nativeBuildInputs = lib.optionals stdenv.isLinux [ autoPatchelfHook ]; + + buildInputs = [ + stdenv.cc.cc.lib + libxcrypt-legacy + ]; + + meta = { + changelog = "https://sourcery.ai/changelog/"; + description = "A VSCode extension for Sourcery, an AI-powered code review and pair programming tool for Python"; + downloadPage = "https://marketplace.visualstudio.com/items?itemName=sourcery.sourcery"; + homepage = "https://github.com/sourcery-ai/sourcery-vscode"; + license = lib.licenses.unfree; + maintainers = with lib.maintainers; [ tomasajt ]; + platforms = [ + "x86_64-linux" + "x86_64-darwin" + ]; + }; +} diff --git a/pkgs/applications/editors/vscode/extensions/timonwong.shellcheck/default.nix b/pkgs/applications/editors/vscode/extensions/timonwong.shellcheck/default.nix new file mode 100644 index 0000000000000..469d04dbebb4b --- /dev/null +++ b/pkgs/applications/editors/vscode/extensions/timonwong.shellcheck/default.nix @@ -0,0 +1,31 @@ +{ + jq, + lib, + moreutils, + shellcheck, + vscode-utils, +}: + +vscode-utils.buildVscodeMarketplaceExtension { + mktplcRef = { + name = "shellcheck"; + publisher = "timonwong"; + version = "0.37.1"; + sha256 = "sha256-JSS0GY76+C5xmkQ0PNjt2Nu/uTUkfiUqmPL51r64tl0="; + }; + nativeBuildInputs = [ + jq + moreutils + ]; + postInstall = '' + cd "$out/$installPrefix" + jq '.contributes.configuration.properties."shellcheck.executablePath".default = "${shellcheck}/bin/shellcheck"' package.json | sponge package.json + ''; + meta = { + description = "Integrates ShellCheck into VS Code, a linter for Shell scripts"; + downloadPage = "https://marketplace.visualstudio.com/items?itemName=timonwong.shellcheck"; + homepage = "https://github.com/vscode-shellcheck/vscode-shellcheck"; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.raroh73 ]; + }; +} diff --git a/pkgs/applications/editors/vscode/extensions/vadimcn.vscode-lldb/default.nix b/pkgs/applications/editors/vscode/extensions/vadimcn.vscode-lldb/default.nix index ad7fd06cb020c..b6e47094d57a9 100644 --- a/pkgs/applications/editors/vscode/extensions/vadimcn.vscode-lldb/default.nix +++ b/pkgs/applications/editors/vscode/extensions/vadimcn.vscode-lldb/default.nix @@ -27,8 +27,14 @@ let cargoHash = "sha256-e/Jki/4pCs0qzaBVR4iiUhdBFmWlTZYREQkuFSoWYFo="; + buildInputs = lib.optionals stdenv.isDarwin [ lldb ]; + nativeBuildInputs = [ makeWrapper ]; + env = lib.optionalAttrs stdenv.isDarwin { + NIX_LDFLAGS = "-llldb -lc++abi"; + }; + buildAndTestSubdir = "adapter"; buildFeatures = [ "weak-linkage" ]; @@ -89,6 +95,15 @@ let ''; }; + # debugservers on macOS require the 'com.apple.security.cs.debugger' + # entitlement which nixpkgs' lldb-server does not yet provide; see + # <https://github.com/NixOS/nixpkgs/pull/38624> for details + lldbServer = + if stdenv.isDarwin then + "/Applications/Xcode.app/Contents/SharedFrameworks/LLDB.framework/Versions/A/Resources/debugserver" + else + "${lldb.out}/bin/lldb-server"; + in stdenv.mkDerivation { pname = "vscode-extension-${publisher}-${pname}"; inherit src version vscodeExtUniqueId vscodeExtPublisher vscodeExtName; @@ -107,6 +122,9 @@ in stdenv.mkDerivation { postConfigure = '' cp -r ${nodeDeps}/lib/node_modules . + '' + lib.optionalString stdenv.isDarwin '' + export HOME="$TMPDIR/home" + mkdir $HOME ''; cmakeFlags = [ @@ -129,7 +147,8 @@ in stdenv.mkDerivation { mv -t $ext vsix-extracted/extension/* cp -t $ext/ -r ${adapter}/share/* wrapProgram $ext/adapter/codelldb \ - --set-default LLDB_DEBUGSERVER_PATH "${lldb.out}/bin/lldb-server" + --prefix LD_LIBRARY_PATH : "$ext/lldb/lib" \ + --set-default LLDB_DEBUGSERVER_PATH "${lldbServer}" # Mark that all components are installed. touch $ext/platform.ok diff --git a/pkgs/applications/editors/vscode/vscode.nix b/pkgs/applications/editors/vscode/vscode.nix index 12f7a2d028fda..3cd3faa79014b 100644 --- a/pkgs/applications/editors/vscode/vscode.nix +++ b/pkgs/applications/editors/vscode/vscode.nix @@ -30,21 +30,21 @@ let archive_fmt = if stdenv.isDarwin then "zip" else "tar.gz"; sha256 = { - x86_64-linux = "0kr83pbjbyrpkhhpr432nr0kcjnvra5vwq2zhpdv1p2g1981dbxf"; - x86_64-darwin = "0vlbd4y649r5v61322vm6fvdf3mrn2shw1vjh1q8wcbf2j84rgcl"; - aarch64-linux = "0bp3a928sqlr103884ljyahl3s4jchyvpcvk08a648wmb1f8ibxi"; - aarch64-darwin = "1dyg4f7hpvx1bpspghfpyqaj83xy47462zjql49zrdar17cq738r"; - armv7l-linux = "16ri5icgvzf3zfg170dciqyz46dcwlsx6vy4r2y4w1j2hbb7afzn"; + x86_64-linux = "14m9w7wkg1704apd4d46yi6zwdlbrx2rp3fry9ffk2nn6kkahwk2"; + x86_64-darwin = "1cp74wdkva1zib04wxjby0h8r1c56g893kq5ksdj38404i2c5hdk"; + aarch64-linux = "00yrdmi4c5m8r11gm7vw18qb5ddcwwg5mdk8s9ykzhmxhdrkcarm"; + aarch64-darwin = "1jjhw60jcvj5brayarg8k6avxwaa00mwdn4lrkcdzbzzh1q4knvv"; + armv7l-linux = "1jddc3fsv65mp95ybpprx8sz3mpnp6j2ghp4nflky8iawmzz183v"; }.${system} or throwSystem; in callPackage ./generic.nix rec { # Please backport all compatible updates to the stable release. # This is important for the extension ecosystem. - version = "1.88.0"; + version = "1.88.1"; pname = "vscode" + lib.optionalString isInsiders "-insiders"; # This is used for VS Code - Remote SSH test - rev = "5c3e652f63e798a5ac2f31ffd0d863669328dc4c"; + rev = "e170252f762678dec6ca2cc69aba1570769a5d39"; executableName = "code" + lib.optionalString isInsiders "-insiders"; longName = "Visual Studio Code" + lib.optionalString isInsiders " - Insiders"; @@ -68,7 +68,7 @@ in src = fetchurl { name = "vscode-server-${rev}.tar.gz"; url = "https://update.code.visualstudio.com/commit:${rev}/server-linux-x64/stable"; - sha256 = "0vy3r9xx1gv92pkyff5wddywfwgr2i12d3qrydw53kdjhdykamsk"; + sha256 = "100nhm231gzav24lz84vxwxnqkn777kfn0fkkjmdcd30kc7g7ig9"; }; }; diff --git a/pkgs/applications/editors/vscode/vscodium.nix b/pkgs/applications/editors/vscode/vscodium.nix index 6ad010fd72f5e..76666b3b3c822 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 = "1a9k4w6ggmrd17i038gi40d3hp24z5vs8nidxr5kvl74fi61js6y"; - x86_64-darwin = "1q9lwx96zcz517pvr97mjqhv86p41ff3cw5jisxbsg6f76aw8y1y"; - aarch64-linux = "1fdg9xz1fq9k8fc9x0an2kb8hn2vvbsnc48nv6lbx1j5aaa3k42g"; - aarch64-darwin = "0kqqn24cimbqb8s7rz64niyknpp36w5ycdw8xfms20zfm5ybm82k"; - armv7l-linux = "14rkr7k0axlaiplf0hdcmyqfgffng25s0j2i903if3i3sqv7316i"; + x86_64-linux = "1n3gb12asid2qwwzf9fj974ws9n7has9l23ni8jscx9cp63l5rbl"; + x86_64-darwin = "0gkplg2c5g7964m58fmv7b70d69g4yqrax5zn1rm4rl2agxgwyff"; + aarch64-linux = "0412222l9r81f3aa3zlzrg42hzslvvck5kds7zrmpssjrd41jxfh"; + aarch64-darwin = "1iv49m646vsbcgaxydxhpjbxspz7918brdk51gmbqf258shf8rii"; + armv7l-linux = "1sblaigrxscx4l1kln1zxzm5da5lr50y1k6qb4igq6wxbdx55iay"; }.${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.88.0.24096"; + version = "1.88.1.24104"; pname = "vscodium"; executableName = "codium"; |