From 01bc3d29b5db49b48fe760f5427ec02ea5790319 Mon Sep 17 00:00:00 2001 From: Julius de Bruijn Date: Tue, 5 Apr 2022 17:41:49 +0200 Subject: [PATCH 1/2] nodePackages.prisma: 3.11.0 -> 3.12.0 --- pkgs/development/node-packages/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/development/node-packages/default.nix b/pkgs/development/node-packages/default.nix index 07ed3d19e4eb..9ecb7c5f3ef4 100644 --- a/pkgs/development/node-packages/default.nix +++ b/pkgs/development/node-packages/default.nix @@ -352,6 +352,9 @@ let meta.mainProgram = "postcss"; }; + # To update prisma, please first update prisma-engines to the latest + # version. Then change the correct hash to this package. The PR should hold + # two commits: one for the engines and the other one for the node package. prisma = super.prisma.override rec { nativeBuildInputs = [ pkgs.makeWrapper ]; @@ -359,7 +362,7 @@ let src = fetchurl { url = "https://registry.npmjs.org/prisma/-/prisma-${version}.tgz"; - sha512 = "sha512-8SdsLPhKR3mOfoo2o73h9mNn3v5kA/RqGA26Sv6qDS78Eh2uepPqt5e8/nwj5EOblYm5HEGuitaXQrOCLb6uTw=="; + sha512 = "sha512-ltCMZAx1i0i9xuPM692Srj8McC665h6E5RqJom999sjtVSccHSD8Z+HSdBN2183h9PJKvC5dapkn78dd0NWMBg=="; }; postInstall = with pkgs; '' wrapProgram "$out/bin/prisma" \ From 74176d27e36cd99e766b96749540ef6c2871627e Mon Sep 17 00:00:00 2001 From: Julius de Bruijn Date: Tue, 5 Apr 2022 17:41:56 +0200 Subject: [PATCH 2/2] prisma-engines: 3.11.0 -> 3.12.0 --- .../tools/database/prisma-engines/default.nix | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/database/prisma-engines/default.nix b/pkgs/development/tools/database/prisma-engines/default.nix index 015b60d9ccf0..73af1bde5ea2 100644 --- a/pkgs/development/tools/database/prisma-engines/default.nix +++ b/pkgs/development/tools/database/prisma-engines/default.nix @@ -8,21 +8,24 @@ , stdenv }: +# Updating this package will force an update for nodePackages.prisma. The +# version of prisma-engines and nodePackages.prisma must be the same for them to +# function correctly. rustPlatform.buildRustPackage rec { pname = "prisma-engines"; - version = "3.11.0"; + version = "3.12.0"; src = fetchFromGitHub { owner = "prisma"; repo = "prisma-engines"; rev = version; - sha256 = "sha256-z7ebwidY+p350XaGeyohoSHWc2DhfzpRxsRDLON1BuA="; + sha256 = "sha256-lIHE63XIPutvTS2cid0+tuo+JMSKMGuSUcnFv1mCRrM="; }; # Use system openssl. OPENSSL_NO_VENDOR = 1; - cargoSha256 = "sha256-PQdLoNJL9szPzPtFRznWS0lngTvtWK+Ko2rp4JWH9dQ="; + cargoSha256 = "sha256-SkI+GLHknC+CGhGo7KiZahBxMp/JCIukTe2C0mMTdjY="; nativeBuildInputs = [ pkg-config ];