Unverified Commit 044e6c91 authored by Vladimír Čunát's avatar Vladimír Čunát Committed by GitHub
Browse files

[staging-next] prisma-engines_6: fix build with rust 1.94 (#499880)

parents 60a893e0 3facf730

pkgs/by-name/pr/prisma-engines_6/0001-bump-metrics-to-0.23.1.diff

0 → 100644
+16 −0
Original line number Diff line number Diff line 
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",

pkgs/by-name/pr/prisma-engines_6/package.nix

+5 −1
Original line number Diff line number Diff line
@@ -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;

pkgs/by-name/um/umami/package.nix

+2 −1
Original line number Diff line number Diff line
@@ -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;

    };

  });