From a6894fba4218663ab455cbaec645cd3a4d718a93 Mon Sep 17 00:00:00 2001
From: Colin <colin@uninsane.org>
Date: Thu, 20 Jun 2024 13:19:58 +0000
Subject: [PATCH 1/3] xsimd: fix cross compilation, enable strictDeps

---
 pkgs/development/libraries/xsimd/default.nix | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/xsimd/default.nix b/pkgs/development/libraries/xsimd/default.nix
index 019b3afbefc8..4e4583af6917 100644
--- a/pkgs/development/libraries/xsimd/default.nix
+++ b/pkgs/development/libraries/xsimd/default.nix
@@ -28,10 +28,17 @@ stdenv.mkDerivation (finalAttrs: {
     ./disable-test_error_gamma.patch
   ];
 
+  # strictDeps raises the chance that xsimd will be able to be cross compiled
+  strictDeps = true;
+
   nativeBuildInputs = [
     cmake
   ];
 
+  buildInputs = [
+    doctest
+  ];
+
   cmakeFlags = [
     # Always build the tests, even if not running them, because testing whether
     # they can be built is a test in itself.
@@ -39,9 +46,6 @@ stdenv.mkDerivation (finalAttrs: {
   ];
 
   doCheck = true;
-  nativeCheckInputs = [
-    doctest
-  ];
   checkTarget = "xtest";
 
   meta = with lib; {

From 2488605670f0ca83fdbe340d4adb3c9a740fb630 Mon Sep 17 00:00:00 2001
From: superherointj <5861043+superherointj@users.noreply.github.com>
Date: Thu, 20 Jun 2024 13:46:43 -0300
Subject: [PATCH 2/3] xsimd: move package to by-name

---
 .../xs}/xsimd/disable-test_error_gamma.patch                    | 0
 .../xsimd/default.nix => by-name/xs/xsimd/package.nix}          | 0
 pkgs/top-level/all-packages.nix                                 | 2 --
 3 files changed, 2 deletions(-)
 rename pkgs/{development/libraries => by-name/xs}/xsimd/disable-test_error_gamma.patch (100%)
 rename pkgs/{development/libraries/xsimd/default.nix => by-name/xs/xsimd/package.nix} (100%)

diff --git a/pkgs/development/libraries/xsimd/disable-test_error_gamma.patch b/pkgs/by-name/xs/xsimd/disable-test_error_gamma.patch
similarity index 100%
rename from pkgs/development/libraries/xsimd/disable-test_error_gamma.patch
rename to pkgs/by-name/xs/xsimd/disable-test_error_gamma.patch
diff --git a/pkgs/development/libraries/xsimd/default.nix b/pkgs/by-name/xs/xsimd/package.nix
similarity index 100%
rename from pkgs/development/libraries/xsimd/default.nix
rename to pkgs/by-name/xs/xsimd/package.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a5ac7c085ee4..a5a96640e84b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -24896,8 +24896,6 @@ with pkgs;
 
   xlslib = callPackage ../development/libraries/xlslib { };
 
-  xsimd = callPackage ../development/libraries/xsimd { };
-
   xtensor = callPackage ../development/libraries/xtensor { };
 
   xtl = callPackage ../development/libraries/xtl { };

From b75ea1a777aeea33aa99b1727f462b00c8012e90 Mon Sep 17 00:00:00 2001
From: superherointj <5861043+superherointj@users.noreply.github.com>
Date: Thu, 20 Jun 2024 13:54:06 -0300
Subject: [PATCH 3/3] xsimd: add meta.changelog

---
 pkgs/by-name/xs/xsimd/package.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/by-name/xs/xsimd/package.nix b/pkgs/by-name/xs/xsimd/package.nix
index 4e4583af6917..8f8c72bc3f6a 100644
--- a/pkgs/by-name/xs/xsimd/package.nix
+++ b/pkgs/by-name/xs/xsimd/package.nix
@@ -49,6 +49,9 @@ stdenv.mkDerivation (finalAttrs: {
   checkTarget = "xtest";
 
   meta = with lib; {
+    changelog = "https://github.com/xtensor-stack/xsimd/blob/${finalAttrs.version}/Changelog.rst#${
+      builtins.replaceStrings [ "." ] [ "" ] finalAttrs.version
+    }";
     description = "C++ wrappers for SIMD intrinsics";
     homepage = "https://github.com/xtensor-stack/xsimd";
     license = licenses.bsd3;