From 19f152c2b0318e9cb2232d43d25d44b9eb3f5110 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Christian=20K=C3=B6gler?= <ck3d@gmx.de>
Date: Sun, 14 Aug 2022 21:01:39 +0200
Subject: [PATCH] neovide: 0.9.0 -> 0.10.0

---
 .../editors/neovim/neovide/Cargo.lock.patch        | 13 +++++++++++++
 .../editors/neovim/neovide/default.nix             | 14 +++++++++-----
 .../editors/neovim/neovide/skia-externals.json     |  8 ++++----
 3 files changed, 26 insertions(+), 9 deletions(-)
 create mode 100644 pkgs/applications/editors/neovim/neovide/Cargo.lock.patch

diff --git a/pkgs/applications/editors/neovim/neovide/Cargo.lock.patch b/pkgs/applications/editors/neovim/neovide/Cargo.lock.patch
new file mode 100644
index 000000000000..ebf56a64e4a1
--- /dev/null
+++ b/pkgs/applications/editors/neovim/neovide/Cargo.lock.patch
@@ -0,0 +1,13 @@
+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 346647838e95..f74fcc937c1f 100644
--- a/pkgs/applications/editors/neovim/neovide/default.nix
+++ b/pkgs/applications/editors/neovim/neovide/default.nix
@@ -25,16 +25,20 @@
 }:
 rustPlatform.buildRustPackage rec {
   pname = "neovide";
-  version = "0.9.0";
+  version = "0.10.0";
 
   src = fetchFromGitHub {
     owner = "Kethku";
     repo = "neovide";
     rev = version;
-    sha256 = "sha256-2fN05o8Zo1MGdIYUcsCgkiW/kG6DkY8uTnpw2XrKxrI=";
+    sha256 = "sha256-4oZJZd5Allh9Wc7YOvW9sF+38Sm15dL03TJZkHTbXXc=";
+    postFetch = ''
+      cd $out
+      patch -p1 -i ${./Cargo.lock.patch}
+    '';
   };
 
-  cargoSha256 = "sha256-eATUyczkcwHI8Y7Gl2ts4dRgiFUAL8yrWDNe4JzserE=";
+  cargoSha256 = "sha256-E1Wp5tPVK+5WIQ+3OrzY3W9Vfy57DHgNccKtIp/vUy8=";
 
   SKIA_SOURCE_DIR =
     let
@@ -42,8 +46,8 @@ rustPlatform.buildRustPackage rec {
         owner = "rust-skia";
         repo = "skia";
         # see rust-skia:skia-bindings/Cargo.toml#package.metadata skia
-        rev = "m100-0.48.7";
-        sha256 = "sha256-roZUv5YoLolRi0iWAB+5WlCFV+8GdzNzS+JINnEHaMs=";
+        rev = "m103-0.51.1";
+        sha256 = "sha256-w5dw/lGm40gKkHPR1ji/L82Oa808Kuh8qaCeiqBLkLw=";
       };
       # The externals for skia are taken from skia/DEPS
       externals = lib.mapAttrs (n: fetchgit) (lib.importJSON ./skia-externals.json);
diff --git a/pkgs/applications/editors/neovim/neovide/skia-externals.json b/pkgs/applications/editors/neovim/neovide/skia-externals.json
index fe0bcdea9378..e7ee3fc53a53 100644
--- a/pkgs/applications/editors/neovim/neovide/skia-externals.json
+++ b/pkgs/applications/editors/neovim/neovide/skia-externals.json
@@ -6,8 +6,8 @@
   },
   "libjpeg-turbo": {
     "url": "https://chromium.googlesource.com/chromium/deps/libjpeg_turbo.git",
-    "rev": "02959c3ee17abacfd1339ec22ea93301292ffd56",
-    "sha256": "sha256-cuSBVhHCX2Fh2SmmRpjinYtge8yaxcM06jlSXfvCywk="
+    "rev": "22f1a22c99e9dde8cd3c72ead333f425c5a7aa77",
+    "sha256": "sha256-5MaYvyrhADFGKBxcS3kbKcn9tj0FNXAN/rAXXYW6ljs="
   },
   "icu": {
     "url": "https://chromium.googlesource.com/chromium/deps/icu.git",
@@ -21,8 +21,8 @@
   },
   "harfbuzz": {
     "url": "https://chromium.googlesource.com/external/github.com/harfbuzz/harfbuzz.git",
-    "rev": "a8b7f1880412c7f0c9ecdada0a4935011816c7dc",
-    "sha256": "sha256-QyVkeBVl45gygOylhnojcQuDIBp2DT2d7pD+OcX29VU="
+    "rev": "8d1b000a3edc90c12267b836b4ef3f81c0e53edc",
+    "sha256": "sha256-nFAT7HnYkIWZcV6kjDQiRltbPcmbtuRM4m5ecY4/s6E="
   },
   "libpng": {
     "url": "https://skia.googlesource.com/third_party/libpng.git",