From 14944e93bfafb7378a1dc0dc4f17e195d5ced4be Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Thu, 5 Dec 2024 11:00:22 +0100
Subject: [PATCH 1/3] materialize: minor improvements

---
 pkgs/by-name/ma/materialize/package.nix | 23 +++++++++++++----------
 1 file changed, 13 insertions(+), 10 deletions(-)

diff --git a/pkgs/by-name/ma/materialize/package.nix b/pkgs/by-name/ma/materialize/package.nix
index 4847c3dff08d..39c8944af48d 100644
--- a/pkgs/by-name/ma/materialize/package.nix
+++ b/pkgs/by-name/ma/materialize/package.nix
@@ -94,13 +94,13 @@ in
 rustPlatform.buildRustPackage rec {
   pname = "materialize";
   version = "0.84.2";
-  MZ_DEV_BUILD_SHA = "9f8cf75b461d288335cb6a7a73aaa670bab4a466";
+  MZ_DEV_BUILD_SHA = "000000000000000000000000000000000000000000000000000";
 
   src = fetchFromGitHub {
     owner = "MaterializeInc";
     repo = "materialize";
-    rev = "refs/tags/v${version}";
     hash = "sha256-+cvTCiTbuaPYPIyDxQlMWdJA5/6cbMoiTcSmjj5KPjs=";
+    tag = "v${version}";
     fetchSubmodules = true;
   };
 
@@ -156,16 +156,19 @@ rustPlatform.buildRustPackage rec {
   # Skip tests that use the network
   checkFlags = [
     "--exact"
-    "--skip test_client"
-    "--skip test_client_errors"
-    "--skip test_client_all_subjects"
-    "--skip test_client_subject_and_references"
-    "--skip test_no_block"
-    "--skip test_safe_mode"
-    "--skip test_tls"
+    "--skip=test_client"
+    "--skip=test_client_errors"
+    "--skip=test_client_all_subjects"
+    "--skip=test_client_subject_and_references"
+    "--skip=test_no_block"
+    "--skip=test_safe_mode"
+    "--skip=test_tls"
   ];
 
-  cargoBuildFlags = [ "--bin environmentd --bin clusterd" ];
+  cargoBuildFlags = [
+    "--bin=clusterd"
+    "--bin=environmentd"
+  ];
 
   postInstall = ''
     install --mode=444 -D ./misc/dist/materialized.service $out/etc/systemd/system/materialized.service

From 1137de9dc32ae7de9a7c42007e826e52c0a01b0e Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Fri, 6 Dec 2024 16:02:28 +0100
Subject: [PATCH 2/3] materialize: enable all unix platforms

Until now, aarch64-darwin was excluded.
However, the package seems to build fine there.
---
 pkgs/by-name/ma/materialize/package.nix | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/pkgs/by-name/ma/materialize/package.nix b/pkgs/by-name/ma/materialize/package.nix
index 39c8944af48d..906080b4213f 100644
--- a/pkgs/by-name/ma/materialize/package.nix
+++ b/pkgs/by-name/ma/materialize/package.nix
@@ -189,11 +189,7 @@ rustPlatform.buildRustPackage rec {
     homepage = "https://materialize.com";
     description = "Streaming SQL materialized view engine for real-time applications";
     license = lib.licenses.bsl11;
-    platforms = [
-      "x86_64-linux"
-      "x86_64-darwin"
-      "aarch64-linux"
-    ];
+    platforms = lib.platforms.unix;
     maintainers = with lib.maintainers; [ petrosagg ];
     mainProgram = "environmentd";
   };

From f3c3d07d01a1cd6a03dc6b5d341771ce591b307e Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Thu, 5 Dec 2024 18:45:56 +0100
Subject: [PATCH 3/3] materialize: 0.84.2 -> 0.87.2

Diff:
https://github.com/MaterializeInc/materialize/compare/refs/tags/v0.84.2...0.87.2
---
 pkgs/by-name/ma/materialize/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ma/materialize/package.nix b/pkgs/by-name/ma/materialize/package.nix
index 906080b4213f..c3745ba58f47 100644
--- a/pkgs/by-name/ma/materialize/package.nix
+++ b/pkgs/by-name/ma/materialize/package.nix
@@ -93,14 +93,14 @@ let
 in
 rustPlatform.buildRustPackage rec {
   pname = "materialize";
-  version = "0.84.2";
+  version = "0.87.2";
   MZ_DEV_BUILD_SHA = "000000000000000000000000000000000000000000000000000";
 
   src = fetchFromGitHub {
     owner = "MaterializeInc";
     repo = "materialize";
-    hash = "sha256-+cvTCiTbuaPYPIyDxQlMWdJA5/6cbMoiTcSmjj5KPjs=";
     tag = "v${version}";
+    hash = "sha256-EHhN+avUxzwKU48MubiMM40W9J93yZlNqV+xeP44dl0=";
     fetchSubmodules = true;
   };
 
@@ -123,7 +123,7 @@ rustPlatform.buildRustPackage rec {
   };
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-EHVuwVYPZKaoP3GYtJpYJaKG3CLsy9CWuEmajF4P7Qc=";
+  cargoHash = "sha256-+OREisZ/vw3Oi5MNCYn7u06pZKtf+2trlGyn//uAGws=";
 
   nativeBuildInputs =
     [