diff options
author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2024-02-25 18:01:23 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2024-02-25 18:01:23 +0000 |
commit | 41e7732291b75b59f4a74721c24ac0fe5c31a24d (patch) | |
tree | 7071c135bb5da13417c0340e0cce073573ce38ca /pkgs/applications/editors | |
parent | 991ec05997c74dd8158394db77e1164bb31388be (diff) | |
parent | f42891a2fa716dcab10336a1b7313993430568ea (diff) | |
download | nixlib-41e7732291b75b59f4a74721c24ac0fe5c31a24d.tar nixlib-41e7732291b75b59f4a74721c24ac0fe5c31a24d.tar.gz nixlib-41e7732291b75b59f4a74721c24ac0fe5c31a24d.tar.bz2 nixlib-41e7732291b75b59f4a74721c24ac0fe5c31a24d.tar.lz nixlib-41e7732291b75b59f4a74721c24ac0fe5c31a24d.tar.xz nixlib-41e7732291b75b59f4a74721c24ac0fe5c31a24d.tar.zst nixlib-41e7732291b75b59f4a74721c24ac0fe5c31a24d.zip |
Merge staging-next into staging
Diffstat (limited to 'pkgs/applications/editors')
4 files changed, 52 insertions, 3 deletions
diff --git a/pkgs/applications/editors/emacs/elisp-packages/elpa-packages.nix b/pkgs/applications/editors/emacs/elisp-packages/elpa-packages.nix index 112445453abb..0b142281559a 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/elpa-packages.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/elpa-packages.nix @@ -88,7 +88,7 @@ self: let ]; buildInputs = [ - pkgs.gnatcoll-xref + pkgs.gnatPackages.gnatcoll-xref ]; buildPhase = '' diff --git a/pkgs/applications/editors/neovim/build-neovim-plugin.nix b/pkgs/applications/editors/neovim/build-neovim-plugin.nix index 9f48d28a496a..9d9778c1fe3b 100644 --- a/pkgs/applications/editors/neovim/build-neovim-plugin.nix +++ b/pkgs/applications/editors/neovim/build-neovim-plugin.nix @@ -33,6 +33,7 @@ in nativeBuildInputs = oa.nativeBuildInputs or [] ++ [ lua.pkgs.luarocksMoveDataFolder ]; + version = "${originalLuaDrv.version}-unstable-${oa.version}"; })); in finalDrv diff --git a/pkgs/applications/editors/notepad-next/default.nix b/pkgs/applications/editors/notepad-next/default.nix index 2f668a6fc526..2b6502023c9a 100644 --- a/pkgs/applications/editors/notepad-next/default.nix +++ b/pkgs/applications/editors/notepad-next/default.nix @@ -2,13 +2,13 @@ mkDerivation rec { pname = "notepad-next"; - version = "0.6.4"; + version = "0.7"; src = fetchFromGitHub { owner = "dail8859"; repo = "NotepadNext"; rev = "v${version}"; - sha256 = "sha256-m8+kM9uz3gJ3kvpgZdoonSvYlh/f1WiGZlB8JKMTXh4="; + sha256 = "sha256-I2bS8oT/TGf6fuXpTwOKo2MaUo0jLFIU/DfW9h1toOk="; # External dependencies - https://github.com/dail8859/NotepadNext/issues/135 fetchSubmodules = true; }; diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index ca9408a0c123..aea3b3e3488c 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -955,6 +955,54 @@ let contextmapper.context-mapper-vscode-extension = callPackage ./contextmapper.context-mapper-vscode-extension { }; + continue.continue = buildVscodeMarketplaceExtension { + mktplcRef = + let + sources = { + "x86_64-linux" = { + arch = "linux-x64"; + sha256 = "05kh6sf3jv3510q33chf8s5n1kfp9wcm7650va7mcrdkfr9g8ysq"; + }; + "x86_64-darwin" = { + arch = "darwin-x64"; + sha256 = "0242h9kq47qvs1xynr5x8dzxkc5pwgb6km0iqpyy9kydg8ng1vp3"; + }; + "aarch64-linux" = { + arch = "linux-arm64"; + sha256 = "1qm3f2lh8mi3hnyp2bmx7j2lir6fmbbxkzh6b8zf579khhbapnaz"; + }; + "aarch64-darwin" = { + arch = "darwin-arm64"; + sha256 = "18w22z1c5qgkpw2zlwmi9gs9dx1pcm51f0r8my7ynnvgl6mp12sg"; + }; + }; + in + { + name = "continue"; + publisher = "Continue"; + version = "0.8.12"; + } // sources.${stdenv.system}; + nativeBuildInputs = [ + autoPatchelfHook + ]; + buildInputs = [ + stdenv.cc.cc.lib + ]; + postInstall = '' + cd "$out/$installPrefix" + substituteInPlace "out/extension.js" \ + --replace-fail 'await showTutorial();' '//await showTutorial();' + ''; + meta = { + description = "Open-source autopilot for software development - bring the power of ChatGPT to your IDE"; + downloadPage = "https://marketplace.visualstudio.com/items?itemName=Continue.continue"; + homepage = "https://github.com/continuedev/continue"; + license = lib.licenses.asl20; + maintainers = [ lib.maintainers.raroh73 ]; + platforms = [ "x86_64-linux" "x86_64-darwin" "aarch64-darwin" "aarch64-linux" ]; + }; + }; + coolbear.systemd-unit-file = buildVscodeMarketplaceExtension { mktplcRef = { publisher = "coolbear"; |