From 97c78583923bcd16c0ab451e720b91bcb2cbf507 Mon Sep 17 00:00:00 2001
From: Henner Zeller <h.zeller@acm.org>
Date: Thu, 9 Jan 2025 18:19:21 -0800
Subject: [PATCH] libsixel: 1.10.3 -> 1.10.5

---
 pkgs/by-name/li/libsixel/fix-CVE-2021-45340.patch | 12 ------------
 pkgs/by-name/li/libsixel/package.nix              |  9 ++-------
 2 files changed, 2 insertions(+), 19 deletions(-)
 delete mode 100644 pkgs/by-name/li/libsixel/fix-CVE-2021-45340.patch

diff --git a/pkgs/by-name/li/libsixel/fix-CVE-2021-45340.patch b/pkgs/by-name/li/libsixel/fix-CVE-2021-45340.patch
deleted file mode 100644
index 33e075700bb5f..0000000000000
--- a/pkgs/by-name/li/libsixel/fix-CVE-2021-45340.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/src/stb_image.h b/src/stb_image.h
-index f12c30b..526281c 100644
---- a/src/stb_image.h
-+++ b/src/stb_image.h
-@@ -1534,6 +1534,7 @@ static unsigned char *stbi__convert_format(unsigned char *data, int img_n, int r
-    int i,j;
-    unsigned char *good;
- 
-+   if (data == NULL) return data;
-    if (req_comp == img_n) return data;
-    STBI_ASSERT(req_comp >= 1 && req_comp <= 4);
- 
diff --git a/pkgs/by-name/li/libsixel/package.nix b/pkgs/by-name/li/libsixel/package.nix
index d9407b25e7d8c..186920ccf282a 100644
--- a/pkgs/by-name/li/libsixel/package.nix
+++ b/pkgs/by-name/li/libsixel/package.nix
@@ -10,20 +10,15 @@
 }:
 stdenv.mkDerivation rec {
   pname = "libsixel";
-  version = "1.10.3";
+  version = "1.10.5";
 
   src = fetchFromGitHub {
     owner = "libsixel";
     repo = "libsixel";
     rev = "v${version}";
-    sha256 = "1nny4295ipy4ajcxmmh04c796hcds0y7z7rv3qd17mj70y8j0r2d";
+    hash = "sha256-obzBZAknN3N7+Bvtd0+JHuXcemVb7wRv+Pt4VjS6Bck=";
   };
 
-  patches = [
-    # https://github.com/NixOS/nixpkgs/issues/160670
-    ./fix-CVE-2021-45340.patch
-  ];
-
   buildInputs = [
     gdk-pixbuf
     gd