Merge staging-next into staging

3 files changed, 5 insertions, 22 deletions

diff --git a/pkgs/applications/editors/neovim/neovide/Cargo.lock.patch b/pkgs/applications/editors/neovim/neovide/Cargo.lock.patch
deleted file mode 100644
index ebf56a64e4a1..000000000000
--- a/pkgs/applications/editors/neovim/neovide/Cargo.lock.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/Cargo.lock b/Cargo.lock
-index f86b4b4..befc2bf 100644
---- a/Cargo.lock
-+++ b/Cargo.lock
-@@ -1326,7 +1326,7 @@ checksum = "e1bcdd74c20ad5d95aacd60ef9ba40fdf77f767051040541df557b7a9b2a2121"
- 
- [[package]]
- name = "neovide"
--version = "0.9.0"
-+version = "0.10.0"
- dependencies = [
-  "async-trait",
-  "cfg-if 1.0.0",
diff --git a/pkgs/applications/editors/neovim/neovide/default.nix b/pkgs/applications/editors/neovim/neovide/default.nix
index f74fcc937c1f..d806e6e7d56e 100644
--- a/pkgs/applications/editors/neovim/neovide/default.nix
+++ b/pkgs/applications/editors/neovim/neovide/default.nix
@@ -25,20 +25,16 @@
 }:
 rustPlatform.buildRustPackage rec {
   pname = "neovide";
-  version = "0.10.0";
+  version = "0.10.1";
 
   src = fetchFromGitHub {
     owner = "Kethku";
     repo = "neovide";
     rev = version;
-    sha256 = "sha256-4oZJZd5Allh9Wc7YOvW9sF+38Sm15dL03TJZkHTbXXc=";
-    postFetch = ''
-      cd $out
-      patch -p1 -i ${./Cargo.lock.patch}
-    '';
+    sha256 = "sha256-PViSiK6+H79MLIOFe26cNqUZ6gZdqDC/S+ksTrbOm54=";
   };
 
-  cargoSha256 = "sha256-E1Wp5tPVK+5WIQ+3OrzY3W9Vfy57DHgNccKtIp/vUy8=";
+  cargoSha256 = "sha256-GvueDUY4Hzfih/MyEfhdz/QNVd9atTC8SCF+PyuJJic=";
 
   SKIA_SOURCE_DIR =
     let
diff --git a/pkgs/applications/editors/texstudio/default.nix b/pkgs/applications/editors/texstudio/default.nix
index 89896b9dd85e..7f34fc6e0726 100644
--- a/pkgs/applications/editors/texstudio/default.nix
+++ b/pkgs/applications/editors/texstudio/default.nix
@@ -3,13 +3,13 @@
 
 mkDerivation rec {
   pname = "texstudio";
-  version = "4.2.3";
+  version = "4.3.0";
 
   src = fetchFromGitHub {
     owner = "${pname}-org";
     repo = pname;
     rev = version;
-    sha256 = "19z9dx8258qbjyzgskkg0xdn88mvx191y1sz4nk15yxsdyf2z3p8";
+    hash = "sha256-nw6LG8U4ne5nngmE7F4yFE8mTEvaRSMfwwOxg2TnAdA=";
   };
 
   nativeBuildInputs = [ qmake wrapQtAppsHook pkg-config ];