From 3facf730d788b10ac893b8727c86051940a1c5ba Mon Sep 17 00:00:00 2001 From: Diogo Correia Date: Sat, 14 Mar 2026 18:13:20 +0000 Subject: [PATCH] prisma-engines_6: fix build with rust 1.94 --- .../0001-bump-metrics-to-0.23.1.diff | 16 ++++++++++++++++ pkgs/by-name/pr/prisma-engines_6/package.nix | 6 +++++- pkgs/by-name/um/umami/package.nix | 3 ++- 3 files changed, 23 insertions(+), 2 deletions(-) create mode 100644 pkgs/by-name/pr/prisma-engines_6/0001-bump-metrics-to-0.23.1.diff diff --git a/pkgs/by-name/pr/prisma-engines_6/0001-bump-metrics-to-0.23.1.diff b/pkgs/by-name/pr/prisma-engines_6/0001-bump-metrics-to-0.23.1.diff new file mode 100644 index 000000000000..9daf25ca0b2e --- /dev/null +++ b/pkgs/by-name/pr/prisma-engines_6/0001-bump-metrics-to-0.23.1.diff @@ -0,0 +1,16 @@ +diff --git a/Cargo.lock b/Cargo.lock +index 25e92d6dc0a..0ede6ae714d 100644 +--- a/Cargo.lock ++++ b/Cargo.lock +@@ -2683,9 +2683,9 @@ dependencies = [ + + [[package]] + name = "metrics" +-version = "0.23.0" ++version = "0.23.1" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "884adb57038347dfbaf2d5065887b6cf4312330dc8e94bc30a1a839bd79d3261" ++checksum = "3045b4193fbdc5b5681f32f11070da9be3609f189a79f3390706d42587f46bb5" + dependencies = [ + "ahash 0.8.11", + "portable-atomic", diff --git a/pkgs/by-name/pr/prisma-engines_6/package.nix b/pkgs/by-name/pr/prisma-engines_6/package.nix index 74f5d5964d3d..273deb308634 100644 --- a/pkgs/by-name/pr/prisma-engines_6/package.nix +++ b/pkgs/by-name/pr/prisma-engines_6/package.nix @@ -21,7 +21,11 @@ rustPlatform.buildRustPackage (finalAttrs: { hash = "sha256-z3GdnrLEMJIGPKXXbz2wrbiGpuNlgYxqg3iYINYTnPI="; }; - cargoHash = "sha256-PgCfBcmK9RCA5BMacJ5oYEpo2DnBKx2xPbdLb79yCCY="; + cargoPatches = [ + ./0001-bump-metrics-to-0.23.1.diff + ]; + + cargoHash = "sha256-8sAjYLSmNneQVrNh9iOmk5lVajtiFPWYSC8jfo5CK5U="; # Use system openssl. env.OPENSSL_NO_VENDOR = 1; diff --git a/pkgs/by-name/um/umami/package.nix b/pkgs/by-name/um/umami/package.nix index f3eae890c435..07a259104866 100644 --- a/pkgs/by-name/um/umami/package.nix +++ b/pkgs/by-name/um/umami/package.nix @@ -49,11 +49,12 @@ let tag = version; hash = "sha256-icFgoKIrr3fGSVmSczlMJiT5KSb746kVldtrk+Q0wW8="; }; - cargoHash = "sha256-PgCfBcmK9RCA5BMacJ5oYEpo2DnBKx2xPbdLb79yCCY="; + cargoHash = "sha256-8sAjYLSmNneQVrNh9iOmk5lVajtiFPWYSC8jfo5CK5U="; cargoDeps = rustPlatform.fetchCargoVendor { inherit (old) pname; inherit src version; + patches = old.cargoDeps.vendorStaging.patches or [ ]; hash = cargoHash; }; });