From 213cf26f5e77b176dad4f22ebc29e7880b8e8394 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Amy=20de=20Buitl=C3=A9ir?= <amy@nualeargais.ie>
Date: Tue, 2 Aug 2022 20:13:35 +0100
Subject: [PATCH] textadept: 11.3 -> 11.4

---
 .../editors/textadept/default.nix             |  5 ++-
 pkgs/applications/editors/textadept/deps.nix  | 37 ++++++++++---------
 2 files changed, 22 insertions(+), 20 deletions(-)

diff --git a/pkgs/applications/editors/textadept/default.nix b/pkgs/applications/editors/textadept/default.nix
index 74298e059f7..a1ff1b8817f 100644
--- a/pkgs/applications/editors/textadept/default.nix
+++ b/pkgs/applications/editors/textadept/default.nix
@@ -1,7 +1,7 @@
 { lib, stdenv, fetchFromGitHub, fetchurl, gtk2, glib, pkg-config, unzip, ncurses, zip }:
 
 stdenv.mkDerivation rec {
-  version = "11.3";
+  version = "11.4";
   pname = "textadept";
 
   nativeBuildInputs = [ pkg-config unzip zip ];
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
     owner = "orbitalquark";
     repo = "textadept";
     rev = "textadept_${version}";
-    sha256 = "sha256-C7J/Qr/58hLbyw39R+GU4wot1gbAXf51Cv6KGk3kg30=";
+    sha256 = "sha256-1we2NC4N8oY4QmmqIIWGSpTBuLx3MEFkZK+BjmNEfD0=";
   };
 
   preConfigure =
@@ -45,6 +45,7 @@ stdenv.mkDerivation rec {
     "PREFIX=$(out)"
     "WGET=true"
     "PIXMAPS_DIR=$(out)/share/pixmaps"
+    "GTK2=1"
   ];
 
   meta = with lib; {
diff --git a/pkgs/applications/editors/textadept/deps.nix b/pkgs/applications/editors/textadept/deps.nix
index c0744875e7a..35a5ecf060c 100644
--- a/pkgs/applications/editors/textadept/deps.nix
+++ b/pkgs/applications/editors/textadept/deps.nix
@@ -1,25 +1,25 @@
 {
-  "scintilla514.tgz" = {
-    url = "https://www.scintilla.org/scintilla514.tgz";
-    sha256 = "sha256-3IJcVUmJBWsmMURsfKKLFHyUw2XZI90Kkoq3oR3To2U=";
+  "scintilla524.tgz" = {
+    url = "https://www.scintilla.org/scintilla524.tgz";
+    sha256 = "sha256-Su8UiMmkOxcuBat2JWYEnhNdG5HKnV1fn1ClnJhazGY=";
   };
   "lexilla510.tgz" = {
     url = "https://www.scintilla.org/lexilla510.tgz";
     sha256 = "sha256-azWVJ0AFSYZxuFTPV73uwiVJZvNxcS/POnFtl6p/P9g=";
   };
+  "9088723504b19f8611b66c119933a4dc7939d7b8.zip" = {
+    url =
+      "https://github.com/orbitalquark/scintillua/archive/9088723504b19f8611b66c119933a4dc7939d7b8.zip";
+    sha256 = "sha256-V2t1kt6+SpZQvQSzLhh8n+WiAnA32SRVFnrbTaJrHRo=";
+  };
   "475d8d43f3418590c28bd2fb07ee9229d1fa2d07.zip" = {
     url =
       "https://github.com/orbitalquark/scinterm/archive/475d8d43f3418590c28bd2fb07ee9229d1fa2d07.zip";
     sha256 = "sha256-lNMK0RFcOLg9RRE5a6VelhSzUYVl5TiAiXcje2JOedE=";
-  };
-  "4cb1464ef738a098f008d6530b776fe780b19c34.zip" = {
-    url =
-      "https://github.com/orbitalquark/scintillua/archive/4cb1464ef738a098f008d6530b776fe780b19c34.zip";
-    sha256 = "sha256-OgmZ5iWnjG1cI6wprHOyeLY86DcLpU/4omGJ6stEe0c=";
-  };
-  "lua-5.4.2.tar.gz" = {
-    url = "http://www.lua.org/ftp/lua-5.4.2.tar.gz";
-    sha256 = "sha256-EVcNl+nXMDwKWVZ+0ax8ZINAzQ2xDV/VlMCSI+8vUk8=";
+  };  
+  "lua-5.4.4.tar.gz" = {
+    url = "http://www.lua.org/ftp/lua-5.4.4.tar.gz";
+    sha256 = "sha256-Fkx4SWU7gK5nvsS3RzuIS/XMjS3KBWU0dewu0nuev2E=";
   };
   "lpeg-1.0.2.tar.gz" = {
     url = "http://www.inf.puc-rio.br/~roberto/lpeg/lpeg-1.0.2.tar.gz";
@@ -29,16 +29,17 @@
     url = "https://github.com/keplerproject/luafilesystem/archive/v1_8_0.zip";
     sha256 = "sha256-46a+ynqKkFIu7THbbM3F7WWkM4JlAMaGJ4TidnG54Yo=";
   };
-  "gtdialog_1.5.zip" = {
-    url = "https://github.com/orbitalquark/gtdialog/archive/gtdialog_1.5.zip";
-    sha256 = "sha256-kk85ajgMG0okUwPAyL0TYq6BfS5cuyFmsk6i8pn7pbw=";
+  "444af9ca8a73151dbf759e6676d1035af469f01a.zip" = {
+    url =
+      "https://github.com/orbitalquark/gtdialog/archive/444af9ca8a73151dbf759e6676d1035af469f01a.zip";
+    sha256 = "sha256-7AkX7OWXJtzKq3h4uJeLzHpf6mrsz67SXtPvmyA5xxg=";
   };
   "cdk-5.0-20200923.tgz" = {
     url = "http://invisible-mirror.net/archives/cdk/cdk-5.0-20200923.tgz";
     sha256 = "sha256-AH9d6IDLLuvYVW335M2Gc9XmTJlwFH7uaSOoFMKfqu0=";
   };
-  "libtermkey-0.20.tar.gz" = {
-    url = "http://www.leonerd.org.uk/code/libtermkey/libtermkey-0.20.tar.gz";
-    sha256 = "sha256-bA2HyUq5kV527NMTuuwI3t871W3oN0PZqpI6CBk10vU=";
+  "libtermkey-0.22.tar.gz" = {
+    url = "http://www.leonerd.org.uk/code/libtermkey/libtermkey-0.22.tar.gz";
+    sha256 = "sha256-aUW9PEqqg9qD2AoEXFVj2k7dfQN0xiwNNa7AnrMBRgA=";
   };
 }