Merge master into staging-next

5 files changed, 51 insertions, 39 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";
diff --git a/pkgs/applications/misc/nerd-font-patcher/default.nix b/pkgs/applications/misc/nerd-font-patcher/default.nix
index 9912c3231c7e..e865479f8da0 100644
--- a/pkgs/applications/misc/nerd-font-patcher/default.nix
+++ b/pkgs/applications/misc/nerd-font-patcher/default.nix
@@ -2,7 +2,7 @@
 
 python3Packages.buildPythonApplication rec {
   pname = "nerd-font-patcher";
-  version = "2.1.0";
+  version = "2.2.2";
 
   # This uses a sparse checkout because the repo is >2GB without it
   src = fetchFromGitHub {
@@ -13,7 +13,7 @@ python3Packages.buildPythonApplication rec {
       font-patcher
       /src/glyphs
     '';
-    sha256 = "sha256-06dn6M2wCFO/uBHDR7VZHNHIybT4h/VGD9nHc4G0EKA=";
+    sha256 = "sha256-boZUd1PM8puc9BTgOwCJpkfk6VMdXLsIyp+fQmW/ZqI=";
   };
 
   propagatedBuildInputs = with python3Packages; [ fontforge ];
@@ -22,15 +22,15 @@ python3Packages.buildPythonApplication rec {
 
   postPatch = ''
     sed -i font-patcher \
-      -e 's,__dir__ + "/src,"'$out'/share/${pname},'
+      -e 's,__dir__ + "/src,"'$out'/share/nerd-font-patcher,'
   '';
 
   dontBuild = true;
 
   installPhase = ''
-    mkdir -p $out/bin $out/share/${pname}
-    install -Dm755 font-patcher $out/bin/${pname}
-    cp -ra src/glyphs $out/share/${pname}
+    mkdir -p $out/bin $out/share/nerd-font-patcher
+    install -Dm755 font-patcher $out/bin/nerd-font-patcher
+    cp -ra src/glyphs $out/share/nerd-font-patcher
   '';
 
   meta = with lib; {
diff --git a/pkgs/applications/virtualization/ovmfvartool/default.nix b/pkgs/applications/virtualization/ovmfvartool/default.nix
deleted file mode 100644
index 1367087e0832..000000000000
--- a/pkgs/applications/virtualization/ovmfvartool/default.nix
+++ /dev/null
@@ -1,33 +0,0 @@
-{ lib, stdenvNoCC, fetchFromGitHub, python3 }:
-
-stdenvNoCC.mkDerivation rec {
-  pname = "ovmfvartool";
-  version = "unstable-2021-06-16";
-
-  src = fetchFromGitHub {
-    owner = "hlandau";
-    repo = pname;
-    rev = "c4c0c24dce1d201f95dfd69fd7fd9d51ea301377";
-    hash = "sha256-3OvYAB41apPn1c2YTKBIEITmHSUMQ0oEijY5DhZWWGo=";
-  };
-
-  postPatch = let
-    pythonPkg = python3.withPackages (p: with p; [ pyyaml ]);
-  in ''
-    # needed in build but /usr/bin/env is not available in sandbox
-    substituteInPlace ovmfvartool \
-      --replace "/usr/bin/env python3" "${pythonPkg.interpreter}"
-  '';
-
-  installPhase = ''
-    mkdir -p $out/bin
-    install -m 755 ovmfvartool $out/bin/
-  '';
-
-  meta = with lib; {
-    description = "Parse and generate OVMF_VARS.fd from Yaml";
-    homepage = "https://github.com/hlandau/ovmfvartool";
-    license = licenses.gpl3;
-    maintainers = with maintainers; [ baloo raitobezarius ];
-  };
-}