1 files changed, 46 insertions, 28 deletions

diff --git a/srcds-pkgs/maretf/distancealpha.nix b/srcds-pkgs/maretf/distancealpha.nix
index 98ba910..8269691 100644
--- a/srcds-pkgs/maretf/distancealpha.nix
+++ b/srcds-pkgs/maretf/distancealpha.nix
@@ -3,18 +3,20 @@
 , qt6
 , openssl
 , python3
+, libhwy
+, libjxl
 }:
 stdenv.mkDerivation (self: {
   pname = "maretf-distancealpha";
-  version = "2026-05-19";
+  version = "2026-10-25";
 
   src = fetchFromGitHub {
     owner = "partyvan";
     repo = "maretf";
-    rev = "1022c2473596d9d22c7999ac998734671cd85e6c";
+    rev = "51674470b41cf0b6d5aff1cb263e08037815c4a4";
     
     fetchSubmodules = true;
-    hash = "sha256-ilFmM0COpc/TPrhmVDuDevzAjaVuAPFcrhYODJsxXao=";
+    hash = "sha256-Dzbd39xiK5X4yzTBbP4hTdLhPR5+7EhBoq26OtjBHmc=";
   };
 
   nativeBuildInputs = [
@@ -29,6 +31,7 @@ stdenv.mkDerivation (self: {
     pkg-config
     qt6.qtbase
     qt6.qttools
+    libhwy
   ];
   patchPhase = ''
     sed -i '/add_sourcepp_remote_library(libtommath/s/)/ EXCLUDE_FROM_ALL)/' ext/sourcepp/ext/_ext.cmake
@@ -37,8 +40,8 @@ stdenv.mkDerivation (self: {
   webp-src = fetchFromGitHub {
     owner = "webmproject";
     repo = "libwebp";
-    rev = "5003e5609eedc5680b8d838a962cbb9a6e9709ce";
-    hash = "sha256-kSH0q+YuhlCosX1szGLpwqPlBMiJ7sjNA1xuEbfZ1OQ=";
+    rev = "1844042d1ca751e62e61df7617dba19c98588339";
+    hash = "sha256-wWdLM+BzQVV+0f3I9bJmiF+/f1otbANMt/JZKBsSHXM=";
   };
 
   cmakeFlags = with self; [
@@ -46,32 +49,47 @@ stdenv.mkDerivation (self: {
       fetchFromGitHub {
         owner = "craftablescience";
         repo = "bcdec";
-        rev = "59441e17ba36b7d7eef336aeedc62e01d0cdcd5a";
-        hash = "sha256-eWzRSto52URWc9WEESxN/hP995qcozjPvmGEBhheFTY=";
+        rev = "c3542bb56443d2b1f596127200b062b6ee2888c2";
+        hash = "sha256-58A4VkiNVYj1mDh0Hpyw65x7gcm1fIoUgTsm2iRNwKA=";
       }
     }")
     (lib.cmakeFeature "FETCHCONTENT_SOURCE_DIR_BUFFERSTREAM" "${
       fetchFromGitHub {
         owner = "craftablescience";
         repo = "bufferstream";
-        rev = "5c040a17417a3cef650f49c41192b2c00ac1e865";
-        hash = "sha256-1UwU2FqgHCxZTOlmuL4lAZ2qFWgnZGO+gPyeI6D+bTY=";
+        rev = "dd1b4da701430bf7540f247482b05cb4df93ddae";
+        hash = "sha256-+pthSz3T9OLwnkLNToTQdowN57EmXmERjW053jhRIFI=";
       }
     }")
     (lib.cmakeFeature "FETCHCONTENT_SOURCE_DIR_CMP_COMPRESSONATOR" "${
       fetchFromGitHub {
         owner = "craftablescience";
-        repo = "compressonator";
-        rev = "f9c8c58fe753108c260b33ec32301805c33c08b7";
-        hash = "sha256-MjTzKSOCmWweZ9RgBo1qB4K2UEEVlKjLlCG2aH/uMM4=";
+        repo = "compressonator-clean";
+        rev = "deb05dff448817b4b7a35f34fc293d6ebd913951";
+        hash = "sha256-OFT5ZDoKHeE/DnJkdCE9TjGem1MKnzNoVKmDNuGtOZk=";
       }
     }")
+    (lib.cmakeFeature "FETCHCONTENT_SOURCE_DIR_TSL_HAT_TRIE" "${
+      fetchFromGitHub {
+        owner = "Tessil";
+        repo = "hat-trie";
+        rev = "f1380d704eccf753db5f9df175789fff8ff353e0";
+        hash = "sha256-5L3qSlwYc2G60GPFrEz06eAWdUcdBQTVBLLOf1sLP0c=";
+      }
+    }")
+    (lib.cmakeFeature "FETCHCONTENT_SOURCE_DIR_LIBJXL" "${
+      # there's technically a pinned dep but it has its own
+      # brainded dependency fetching ****SHELL SCRIPT****
+      # yes you read that correctly ****FUCKING SHELL SCRIPT****
+      # and i so utterly beyond cannot be fucked deciphering it
+      libjxl.src
+    }")
     (lib.cmakeFeature "FETCHCONTENT_SOURCE_DIR_LIBTOMMATH" "${
       fetchFromGitHub {
         owner = "craftablescience";
         repo = "libtommath";
-        rev = "03101d4556acd45175d5cfe0575601cf6acadef2";
-        hash = "sha256-guQOxzyqxDS1U7Zlsds4QjxIxbBgdnW2IQh9ylmOk5w=";
+        rev = "d0c643ffb76db2ff7592e8f0834f671d25cf8159";
+        hash = "sha256-EiGLTMU1QuJpGrHn718O7dKBLrJn8ixkah5hFMc+d9Y=";
       }
     }")
 
@@ -79,8 +97,8 @@ stdenv.mkDerivation (self: {
       fetchFromGitHub {
         owner = "libtom";
         repo = "libtomcrypt";
-        rev = "c80285ba04f87ee5359baf689ccc7ce8a31116dc";
-        hash = "sha256-aSfatMDSD4nq/yxc2lzTC/NVfBANNy0B3YZJ79aBuG4=";
+        rev = "6c6d5104de66f3ca0dfd7b68540ef86869982b07";
+        hash = "sha256-yyuFhkjZYjzf+aH87igCkIYsz0hXmKa8r8w3vOx3HEk=";
       }
     }")
 
@@ -92,8 +110,8 @@ stdenv.mkDerivation (self: {
       fetchFromGitHub {
         owner = "richgel999";
         repo = "miniz";
-        rev = "5cf1e56a9c968c11fdd1a6414f3a95f84314c437";
-        hash = "sha256-6uaGVr2Eri7VPftkiSX2mdpvviSknXN02YmJnH2okKM=";
+        rev = "2948eebafc5b9f1c69bebed80333e403a09bd62d";
+        hash = "sha256-RSgNWSX+hiz8FLheh+vS6xHLL+Hkt5tbB6IvllWBt+c=";
       }
     }") 
     (lib.cmakeFeature "FETCHCONTENT_SOURCE_DIR_MINIZIP-NG" "/build/minizip-ngtmp")
@@ -103,8 +121,8 @@ stdenv.mkDerivation (self: {
       fetchFromGitHub {
         owner = "zlib-ng";
         repo = "zlib-ng";
-        tag = "2.2.5";
-        hash = "sha256-c2RYqHi3hj/ViBzJcYWoNib27GAbq/B1SJUfvG7CPG4=";
+        rev = "2.3.3";
+        hash = "sha256-6GlHCnx9dQtmViPnvHnMS+l9Z+g6M8ynrSxLhLtmAKU=";
       }
     }")
     (lib.cmakeFeature "FETCHCONTENT_SOURCE_DIR_GOOGLETEST" "${
@@ -119,8 +137,8 @@ stdenv.mkDerivation (self: {
       fetchFromGitHub {
         owner = "tukaani-project";
         repo = "xz";
-        tag = "v5.8.1";
-        hash = "sha256-vGUNoX5VTM0aQ5GmBPXip97WGN9vaVrQLE9msToZyKs=";
+        tag = "v5.8.4";
+        hash = "sha256-C4D4MB/1Pj57IUrLFkrf+cLs2rjtVO0V5uIRFORyidg=";
       }
     }")
     (lib.cmakeFeature "FETCHCONTENT_SOURCE_DIR_ZSTD" "${
@@ -135,24 +153,24 @@ stdenv.mkDerivation (self: {
       fetchFromGitHub{
         owner = "ip7z";
         repo = "7zip";
-        tag = "26.00";
-        hash = "sha256-B+piugjEI7+8ILTuDitADY8XseltvV0lYIVecXGib7s=";
+        tag = "26.02";
+        hash = "sha256-MmnsCM4guQ5DuWDE5MslI8QIIbkUtZnddVPgAuCRWQU=";
       }
     }")
     (lib.cmakeFeature "FETCHCONTENT_SOURCE_DIR_QOI" "${
       fetchFromGitHub {
         owner = "phoboslab";
         repo = "qoi";
-        rev = "e084ec009b38c755acc40fe31d3f83ee17935b9d";
-        hash = "sha256-sPwmpkMo++Eo33fsiLHY6QYScXQNCucQyNPJdDysgFw=";
+        rev = "ffb2d2cb74a1de60819b21b939f7209aa53e91c1";
+        hash = "sha256-iA5ohbiafJxqRuMrJ/JfcDOOzcI3HstfK1W8HRpJKIw=";
       }
     }")
     (lib.cmakeFeature "FETCHCONTENT_SOURCE_DIR_TINYEXR" "${
       fetchFromGitHub {
         owner = "syoyo";
         repo = "tinyexr";
-        rev = "4946b5d92e13bcc8102ac2c8efd129596a90bf75";
-        hash = "sha256-tp+T64qQBIll0ZdZSnEgE2cLijImBXzufebPKskdSU4=";
+        rev = "010383f267cba709568319fabe5c13b4b2c3188e";
+        hash = "sha256-XwN2YHoU6Rn7ny7+tQmV/AoMw4yfpXd/sybCcKrJ+lo=";
       }
     }")
     (lib.cmakeBool "MZ_OPENSSL" true)