From 486baa8affbd7d64d89669a31e94f7e50912f7cd Mon Sep 17 00:00:00 2001
From: Weijia Wang <9713184+wegank@users.noreply.github.com>
Date: Mon, 3 Nov 2025 22:10:07 +0100
Subject: [PATCH] libks: 2.0.7 -> 2.0.8

---
 ...ly-request-shutdown-of-test2-threads.patch | 31 -------------------
 pkgs/by-name/li/libks/package.nix             | 10 ++----
 2 files changed, 3 insertions(+), 38 deletions(-)
 delete mode 100644 pkgs/by-name/li/libks/1001-tests-testhash.c-Properly-request-shutdown-of-test2-threads.patch

diff --git a/pkgs/by-name/li/libks/1001-tests-testhash.c-Properly-request-shutdown-of-test2-threads.patch b/pkgs/by-name/li/libks/1001-tests-testhash.c-Properly-request-shutdown-of-test2-threads.patch
deleted file mode 100644
index 5e59b385b4f8..000000000000
--- a/pkgs/by-name/li/libks/1001-tests-testhash.c-Properly-request-shutdown-of-test2-threads.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 61f2d2f7e308c42cce652db4a172cfa4b0ff6bf1 Mon Sep 17 00:00:00 2001
-From: OPNA2608 <opna2608@protonmail.com>
-Date: Sat, 18 Oct 2025 22:45:37 +0200
-Subject: [PATCH] tests/testhash.c: Properly request shutdown of test2 threads
-
-So they can be destroyed properly. Fixes sometimes-occuring SIGSEGVs.
----
- tests/testhash.c | 7 ++++++-
- 1 file changed, 6 insertions(+), 1 deletion(-)
-
-diff --git a/tests/testhash.c b/tests/testhash.c
-index 0769aa6..cb6ed24 100644
---- a/tests/testhash.c
-+++ b/tests/testhash.c
-@@ -134,7 +134,12 @@ int test2(void)
- 	}
- 
- 	for (i = 0; i < ttl; i++) {
--		ks_thread_destroy(&threads[i]);
-+		ks_thread_request_stop(threads[i]);
-+	}
-+
-+	for (i = 0; i < ttl; i++) {
-+		ks_thread_join(threads[i]);
-+		if (ks_thread_destroy(&threads[i]) != KS_STATUS_SUCCESS) return 0;
- 	}
- 
- 
--- 
-2.51.0
-
diff --git a/pkgs/by-name/li/libks/package.nix b/pkgs/by-name/li/libks/package.nix
index 811b7097c7ef..4b6943d650d5 100644
--- a/pkgs/by-name/li/libks/package.nix
+++ b/pkgs/by-name/li/libks/package.nix
@@ -15,13 +15,13 @@
 
 stdenv.mkDerivation rec {
   pname = "libks";
-  version = "2.0.7";
+  version = "2.0.8";
 
   src = fetchFromGitHub {
     owner = "signalwire";
     repo = "libks";
-    rev = "v${version}";
-    sha256 = "sha256-fiBemt71UJgN0RryGmGiK7sob1xbdmSOArEGt5Pg5YM=";
+    tag = "v${version}";
+    hash = "sha256-cBNNCOm+NcIvozN4Z4XnZWBBqq0LVELVqXubQB4JMTU=";
   };
 
   patches = [
@@ -29,9 +29,6 @@ stdenv.mkDerivation rec {
       url = "https://raw.githubusercontent.com/openwrt/telephony/5ced7ea4fc9bd746273d564bf3c102f253d2182e/libs/libks/patches/01-find-libm.patch";
       sha256 = "1hyrsdxg69d08qzvf3mbrx2363lw52jcybw8i3ynzqcl228gcg8a";
     })
-
-    # Remove when https://github.com/signalwire/libks/pull/246 merged & in release
-    ./1001-tests-testhash.c-Properly-request-shutdown-of-test2-threads.patch
   ];
 
   dontUseCmakeBuildDir = true;
@@ -72,7 +69,6 @@ stdenv.mkDerivation rec {
   };
 
   meta = with lib; {
-    broken = stdenv.hostPlatform.isDarwin;
     description = "Foundational support for signalwire C products";
     homepage = "https://github.com/signalwire/libks";
     maintainers = with lib.maintainers; [ misuzu ];