From 3e8806957c5b52fbcd182cd8317a42efead9701b Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 4 Oct 2025 10:14:41 +0000
Subject: [PATCH 1/2] simdjson: 4.0.6 -> 4.0.7

---
 pkgs/by-name/si/simdjson/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/si/simdjson/package.nix b/pkgs/by-name/si/simdjson/package.nix
index e1b62c5ae255..d28da3287089 100644
--- a/pkgs/by-name/si/simdjson/package.nix
+++ b/pkgs/by-name/si/simdjson/package.nix
@@ -7,13 +7,13 @@
 
 stdenv.mkDerivation rec {
   pname = "simdjson";
-  version = "4.0.6";
+  version = "4.0.7";
 
   src = fetchFromGitHub {
     owner = "simdjson";
     repo = "simdjson";
     rev = "v${version}";
-    sha256 = "sha256-e3W5p4MUv0sE7JazWFJ3mCqo2D/A3jVHhNedSOURMv8=";
+    sha256 = "sha256-8pmFtMpML7tTXbH1E3aIpSTQkNF8TFcIPOm2nwnKxkA=";
   };
 
   nativeBuildInputs = [ cmake ];

From 4918a2610ec2cacb5e290a58a3961955ab74d9ca Mon Sep 17 00:00:00 2001
From: Nikolay Korotkiy <sikmir@disroot.org>
Date: Sat, 4 Oct 2025 14:48:07 +0400
Subject: [PATCH 2/2] simdjson: modernize

---
 pkgs/by-name/si/simdjson/package.nix | 24 +++++++++++-------------
 1 file changed, 11 insertions(+), 13 deletions(-)

diff --git a/pkgs/by-name/si/simdjson/package.nix b/pkgs/by-name/si/simdjson/package.nix
index d28da3287089..d4ee91794e25 100644
--- a/pkgs/by-name/si/simdjson/package.nix
+++ b/pkgs/by-name/si/simdjson/package.nix
@@ -5,36 +5,34 @@
   cmake,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "simdjson";
   version = "4.0.7";
 
   src = fetchFromGitHub {
     owner = "simdjson";
     repo = "simdjson";
-    rev = "v${version}";
-    sha256 = "sha256-8pmFtMpML7tTXbH1E3aIpSTQkNF8TFcIPOm2nwnKxkA=";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-8pmFtMpML7tTXbH1E3aIpSTQkNF8TFcIPOm2nwnKxkA=";
   };
 
   nativeBuildInputs = [ cmake ];
 
   cmakeFlags = [
-    "-DSIMDJSON_DEVELOPER_MODE=OFF"
-  ]
-  ++ lib.optionals stdenv.hostPlatform.isStatic [
-    "-DBUILD_SHARED_LIBS=OFF"
+    (lib.cmakeBool "SIMDJSON_DEVELOPER_MODE" false)
+    (lib.cmakeBool "BUILD_SHARED_LIBS" (!stdenv.hostPlatform.isStatic))
   ]
   ++ lib.optionals (with stdenv.hostPlatform; isPower && isBigEndian) [
     # Assume required CPU features are available, since otherwise we
     # just get a failed build.
-    "-DCMAKE_CXX_FLAGS=-mpower8-vector"
+    (lib.cmakeFeature "CMAKE_CXX_FLAGS" "-mpower8-vector")
   ];
 
-  meta = with lib; {
+  meta = {
     homepage = "https://simdjson.org/";
     description = "Parsing gigabytes of JSON per second";
-    license = licenses.asl20;
-    platforms = platforms.all;
-    maintainers = with maintainers; [ chessai ];
+    license = lib.licenses.asl20;
+    platforms = lib.platforms.all;
+    maintainers = with lib.maintainers; [ chessai ];
   };
-}
+})