From 0316b923056be12d48b53c4baae3ad5c7953928b Mon Sep 17 00:00:00 2001
From: Sigmanificient <edhyjox@gmail.com>
Date: Thu, 22 Jan 2026 23:53:36 +0100
Subject: [PATCH 1/2] python3Packages.jishaku: 2.6.0 -> 2.6.3

---
 .../python-modules/jishaku/default.nix          | 17 ++++-------------
 1 file changed, 4 insertions(+), 13 deletions(-)

diff --git a/pkgs/development/python-modules/jishaku/default.nix b/pkgs/development/python-modules/jishaku/default.nix
index 3bb5b74c6b16..7349d531be2c 100644
--- a/pkgs/development/python-modules/jishaku/default.nix
+++ b/pkgs/development/python-modules/jishaku/default.nix
@@ -3,7 +3,6 @@
   bash,
   buildPythonPackage,
   fetchFromGitHub,
-  fetchpatch,
   setuptools,
   discordpy,
   click,
@@ -12,28 +11,20 @@
   tabulate,
   pytestCheckHook,
   pytest-asyncio,
-  youtube-dl,
+  typing-extensions,
 }:
 buildPythonPackage rec {
   pname = "jishaku";
-  version = "2.6.0";
+  version = "2.6.3";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "Gorialis";
     repo = "jishaku";
     tag = version;
-    hash = "sha256-+J8Tr8jPN9K3eHLOuJTaP3We5A1kiyn9/yI1KChbuMY=";
+    hash = "sha256-8kSdzrut7LYjglpHc5dToOIQTrPsW4lVAeIWY4rzdmU=";
   };
 
-  patches = [
-    (fetchpatch {
-      # add entrypoint for install script
-      url = "https://github.com/Gorialis/jishaku/commit/b96cd55a1c2fd154c548f08019ccd6f7be9c7f90.patch";
-      hash = "sha256-laPoupwCC1Zthib8G+c1BXqTwZK0Z6up1DKVkhFicJ0=";
-    })
-  ];
-
   postPatch = ''
     substituteInPlace jishaku/shell.py \
       --replace-fail '"/bin/bash"' '"${lib.getExe bash}"'
@@ -47,12 +38,12 @@ buildPythonPackage rec {
     braceexpand
     tabulate
     import-expression
+    typing-extensions
   ];
 
   nativeCheckInputs = [
     pytestCheckHook
     pytest-asyncio
-    youtube-dl
   ];
 
   pythonImportsCheck = [

From 6afec1b95c15a536f5ba09740508629ba4f0131f Mon Sep 17 00:00:00 2001
From: Sigmanificient <edhyjox@gmail.com>
Date: Thu, 22 Jan 2026 23:55:04 +0100
Subject: [PATCH 2/2] python3Packages.jishaku: use finalAttrs

---
 pkgs/development/python-modules/jishaku/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/python-modules/jishaku/default.nix b/pkgs/development/python-modules/jishaku/default.nix
index 7349d531be2c..582b1a306064 100644
--- a/pkgs/development/python-modules/jishaku/default.nix
+++ b/pkgs/development/python-modules/jishaku/default.nix
@@ -13,7 +13,7 @@
   pytest-asyncio,
   typing-extensions,
 }:
-buildPythonPackage rec {
+buildPythonPackage (finalAttrs: {
   pname = "jishaku";
   version = "2.6.3";
   pyproject = true;
@@ -21,7 +21,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "Gorialis";
     repo = "jishaku";
-    tag = version;
+    tag = finalAttrs.version;
     hash = "sha256-8kSdzrut7LYjglpHc5dToOIQTrPsW4lVAeIWY4rzdmU=";
   };
 
@@ -55,9 +55,9 @@ buildPythonPackage rec {
   meta = {
     description = "Debugging and testing cog for discord.py bots";
     homepage = "https://jishaku.readthedocs.io/en/latest";
-    changelog = "https://github.com/Gorialis/jishaku/releases/tag/${src.tag}";
+    changelog = "https://github.com/Gorialis/jishaku/releases/tag/${finalAttrs.src.tag}";
     maintainers = [ ];
     mainProgram = "jishaku";
     license = lib.licenses.mit;
   };
-}
+})