about summary refs log tree commit diff
path: root/pkgs/applications/editors
diff options
context:
space:
mode:
authorgithub-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>2022-09-10 06:05:38 +0000
committerGitHub <noreply@github.com>2022-09-10 06:05:38 +0000
commit5e1d3d9bd083903f755c1043ceecc703dbd2c877 (patch)
tree14d0553577ec007f265e483ab6a91e3b1af04e38 /pkgs/applications/editors
parent5644fd38ad7dc7a3f116ffd07b52b897e86c3f89 (diff)
parentf71081ca56832467f5b40c682c451867f932b15c (diff)
downloadnixlib-5e1d3d9bd083903f755c1043ceecc703dbd2c877.tar
nixlib-5e1d3d9bd083903f755c1043ceecc703dbd2c877.tar.gz
nixlib-5e1d3d9bd083903f755c1043ceecc703dbd2c877.tar.bz2
nixlib-5e1d3d9bd083903f755c1043ceecc703dbd2c877.tar.lz
nixlib-5e1d3d9bd083903f755c1043ceecc703dbd2c877.tar.xz
nixlib-5e1d3d9bd083903f755c1043ceecc703dbd2c877.tar.zst
nixlib-5e1d3d9bd083903f755c1043ceecc703dbd2c877.zip
Merge master into staging-next
Diffstat (limited to 'pkgs/applications/editors')
-rw-r--r--pkgs/applications/editors/emacs/elisp-packages/manual-packages.nix2
-rw-r--r--pkgs/applications/editors/emacs/elisp-packages/yes-no/default.nix19
-rw-r--r--pkgs/applications/editors/vscode/extensions/default.nix24
3 files changed, 45 insertions, 0 deletions
diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages.nix
index ec3eeaf7fd39..b312c17d9aac 100644
--- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages.nix
+++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages.nix
@@ -232,6 +232,8 @@
   tree-sitter-langs = callPackage ./tree-sitter-langs { final = self; };
   tsc = callPackage ./tsc { };
 
+  yes-no = callPackage ./yes-no { };
+
   youtube-dl = callPackage ./youtube-dl { };
 
   # From old emacsPackages (pre emacsPackagesNg)
diff --git a/pkgs/applications/editors/emacs/elisp-packages/yes-no/default.nix b/pkgs/applications/editors/emacs/elisp-packages/yes-no/default.nix
new file mode 100644
index 000000000000..2b51332c30d4
--- /dev/null
+++ b/pkgs/applications/editors/emacs/elisp-packages/yes-no/default.nix
@@ -0,0 +1,19 @@
+{ lib, fetchurl, trivialBuild }:
+
+trivialBuild {
+  pname = "yes-no";
+  version = "2017-10-01";
+
+  src = fetchurl {
+    url = "https://raw.githubusercontent.com/emacsmirror/emacswiki.org/143bcaeb679a8fa8a548e92a5a9d5c2baff50d9c/yes-no.el";
+    sha256 = "03w4wfx885y89ckyd5d95n2571nmmzrll6kr0yan3ip2aw28xq3i";
+  };
+
+  meta = with lib; {
+    description = "Specify use of `y-or-n-p' or `yes-or-no-p' on a case-by-case basis";
+    homepage = "https://www.emacswiki.org/emacs/yes-no.el";
+    license = licenses.gpl3Plus;
+    maintainers = with maintainers; [ jcs090218 ];
+    platforms = platforms.all;
+  };
+}
diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix
index 5643cad16cbe..073379555c57 100644
--- a/pkgs/applications/editors/vscode/extensions/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/default.nix
@@ -2609,6 +2609,30 @@ let
 
       ms-vsliveshare.vsliveshare = callPackage ./ms-vsliveshare-vsliveshare { };
 
+      vscjava.vscode-java-debug = buildVscodeMarketplaceExtension {
+        mktplcRef = {
+          name = "vscode-java-debug";
+          publisher = "vscjava";
+          version = "0.44.0";
+          sha256 = "sha256-8/H7rihSKAvXp8QxK949txgMKwt6aYVN4EQdwhphIiQ=";
+        };
+        meta = {
+          license = lib.licenses.mit;
+        };
+      };
+
+      vscjava.vscode-java-test = buildVscodeMarketplaceExtension {
+        mktplcRef = {
+          name = "vscode-java-test";
+          publisher = "vscjava";
+          version = "0.37.1";
+          sha256 = "sha256-QpDMG+0RbiRY9YQYXQhA6ESBoIjBeUxq+bEZ1Y71oSM=";
+        };
+        meta = {
+          license = lib.licenses.mit;
+        };
+      };
+
       vscodevim.vim = buildVscodeMarketplaceExtension {
         mktplcRef = {
           name = "vim";