Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

{prisma,prisma-engines}: 5.16.1 -> 5.18.0 #337521

Merged
merged 2 commits into from
Aug 31, 2024

Conversation

szlend
Copy link
Member

@szlend szlend commented Aug 26, 2024

Description of changes

Updates prisma-engines to v5.18.0

Diff: prisma/prisma-engines@5.16.1...5.18.0

Includes a patched Cargo.lock with the time crate updated to 0.3.36 which fixes builds under Rust v1.80. Updated with the command cargo update -p time.

See prisma/prisma-engines#4989

Things done

  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandboxing enabled in nix.conf? (See Nix manual)
    • sandbox = relaxed
    • sandbox = true
  • Tested, as applicable:
  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage
  • Tested basic functionality of all binary files (usually in ./result/bin/)
  • 24.11 Release Notes (or backporting 23.11 and 24.05 Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
    • (Module updates) Added a release notes entry if the change is significant
    • (Module addition) Added a release notes entry if adding a new NixOS module
  • Fits CONTRIBUTING.md.

Add a 👍 reaction to pull requests you find important.

Copy link
Member

@aqrln aqrln left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks a lot for the PR! Prisma 5.18 is not buildable with the latest Rust, please wait until Prisma 5.19 is released later today and bump it here in this PR. No need to cherry-pick any changes, it's the release day today.

@aqrln
Copy link
Member

aqrln commented Aug 27, 2024

Hey, 5.19 is now released but prisma/prisma-engines#4992 didn't make it into the release which will be a small problem that will require patching here (or using that commit) after all.

@szlend
Copy link
Member Author

szlend commented Aug 27, 2024

I included a quick attempt at packaging prisma 5.18.0. It prints out the expected output in prisma debug, but I haven't tested whether it works fully.

Looking for initial feedback.

@szlend
Copy link
Member Author

szlend commented Aug 27, 2024

I tested init, generate, validate, format, migrate and it seems to work fine, apart from:

  • It thinks the version of prisma is 0.0.0
  • I get this while trying to run generate: Error: Command failed with exit code 127: npm i [email protected] -D --silent (but I assume this is expected)
  • It reports the version is out of date. Should we disable version checks?

@ofborg ofborg bot added the 8.has: package (new) This PR adds a new package label Aug 27, 2024
@ofborg ofborg bot requested a review from aqrln August 27, 2024 18:53
@szlend szlend force-pushed the prisma-engines-5.18 branch 2 times, most recently from c1e56de to 645cfc0 Compare August 27, 2024 20:28
@github-actions github-actions bot added 6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 8.has: documentation 8.has: changelog labels Aug 27, 2024
@szlend szlend marked this pull request as ready for review August 27, 2024 20:29
@szlend
Copy link
Member Author

szlend commented Aug 27, 2024

@aqrln unless you object, I think I would just start with 5.18.0 and update to 5.19.0 in a separate PR.

@szlend szlend changed the title prisma-engines: 5.16.1 -> 5.18.0 {prisma,prisma-engines}: 5.16.1 -> 5.18.0 Aug 27, 2024
Comment on lines 81346 to 81469
};
prisma = nodeEnv.buildNodePackage {
name = "prisma";
packageName = "prisma";
version = "5.17.0";
src = fetchurl {
url = "https://registry.npmjs.org/prisma/-/prisma-5.17.0.tgz";
sha512 = "m4UWkN5lBE6yevqeOxEvmepnL5cNPEjzMw2IqDB59AcEV6w7D8vGljDLd1gPFH+W6gUxw9x7/RmN5dCS/WTPxA==";
};
dependencies = [
sources."@prisma/debug-5.17.0"
sources."@prisma/engines-5.17.0"
sources."@prisma/engines-version-5.17.0-31.393aa359c9ad4a4bb28630fb5613f9c281cde053"
sources."@prisma/fetch-engine-5.17.0"
sources."@prisma/get-platform-5.17.0"
];
buildInputs = globalBuildInputs;
meta = {
description = "Prisma is an open-source database toolkit. It includes a JavaScript/TypeScript ORM for Node.js, migrations and a modern GUI to view and edit the data in your database. You can use Prisma in new projects or add it to an existing one.";
homepage = "https://www.prisma.io";
license = "Apache-2.0";
};
production = true;
bypassCache = true;
reconstructLock = true;
};
"@prisma/language-server" = nodeEnv.buildNodePackage {
name = "_at_prisma_slash_language-server";
packageName = "@prisma/language-server";
version = "5.17.0";
src = fetchurl {
url = "https://registry.npmjs.org/@prisma/language-server/-/language-server-5.17.0.tgz";
sha512 = "4XXTBGpwJBUFqvY2WxL/4W1q/OOstxCJER4TYftNgMGjKjnsFkQNme567QTlPwWp7VGw2jcNmyTFOcP4HdohIg==";
};
dependencies = [
sources."@prisma/prisma-schema-wasm-5.17.0-31.393aa359c9ad4a4bb28630fb5613f9c281cde053"
sources."@prisma/schema-files-loader-5.17.0"
sources."@types/js-levenshtein-1.1.3"
sources."fs-extra-11.1.1"
sources."graceful-fs-4.2.11"
sources."js-levenshtein-1.1.6"
sources."jsonfile-6.1.0"
sources."klona-2.0.6"
sources."universalify-2.0.1"
sources."vscode-jsonrpc-8.1.0"
sources."vscode-languageserver-8.1.0"
sources."vscode-languageserver-protocol-3.17.3"
sources."vscode-languageserver-textdocument-1.0.11"
sources."vscode-languageserver-types-3.17.3"
sources."vscode-uri-3.0.8"
];
buildInputs = globalBuildInputs;
meta = {
description = "Prisma Language Server";
homepage = "https://github.com/prisma/language-tools#readme";
license = "Apache-2.0";
};
production = true;
bypassCache = true;
reconstructLock = true;
};
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't know how to re-generate this file without touching unrelated packages. I manually deleted all the prisma references, but I'm sure there are probably some zombie dependencies left as a result. Let me know if there's a better way to do this.

@aqrln
Copy link
Member

aqrln commented Aug 28, 2024

I tested init, generate, validate, format, migrate and it seems to work fine, apart from:

* It thinks the version of prisma is 0.0.0

* I get this while trying to run generate: `Error: Command failed with exit code 127: npm i [email protected] -D --silent` (but I assume this is expected)

* It reports the version is out of date. Should we disable version checks?

Is this fixed now that you are patching the package.json?

@aqrln
Copy link
Member

aqrln commented Aug 28, 2024

@aqrln unless you object, I think I would just start with 5.18.0 and update to 5.19.0 in a separate PR.

It's fine with me either way. I don't see much value in keeping 5.18.0 since the next version is not a major release but I won't object if you prefer this.

pkgs/applications/office/documenso/default.nix Outdated Show resolved Hide resolved
pkgs/by-name/pr/prisma/package.nix Outdated Show resolved Hide resolved
pkgs/by-name/pr/prisma/package.nix Outdated Show resolved Hide resolved
@niklaskorz niklaskorz mentioned this pull request Aug 29, 2024
13 tasks
@szlend
Copy link
Member Author

szlend commented Aug 29, 2024

Tomorrow I should have enough time to address the comments and finish this. Though if this is blocking anyone, feel free to pick it up.

@szlend szlend force-pushed the prisma-engines-5.18 branch 3 times, most recently from 462e6aa to 4d50dba Compare August 30, 2024 19:04
@szlend
Copy link
Member Author

szlend commented Aug 30, 2024

I resolved all the issues.

Installing workspace packages is really janky without pnpm deploy. This was the best I could do given my knowledge of pnpm/npm.

I'm keeping the package at v5.18.0 until prisma/prisma-engines#4992 is tagged.

@szlend szlend requested a review from aqrln August 30, 2024 19:14
@ofborg ofborg bot requested a review from happysalada August 30, 2024 19:53
@happysalada happysalada merged commit 4dd3c85 into NixOS:master Aug 31, 2024
25 of 27 checks passed
gador added a commit to gador/nixvim that referenced this pull request Aug 31, 2024
@gador
Copy link
Member

gador commented Aug 31, 2024

I'm not familiar with the nodePackages ecosystem, but due to this PR, downstream nixvim broke (see nix-community/nixvim#2125) . Maybe it would be possible to set an alias from the nodePackages.prisma to prisma next time?

@MattSturgeon
Copy link
Contributor

Maybe it would be possible to set an alias from the nodePackages.prisma to prisma next time?

My understanding of package renames is that there should always be an alias/deprecation period, such that users upgrading from (e.g.) 24.05->24.11 would have chance to migrate without their config immediately breaking.

MattSturgeon pushed a commit to gador/nixvim that referenced this pull request Aug 31, 2024
@szlend
Copy link
Member Author

szlend commented Aug 31, 2024

Fixed in #338679

@khaneliman
Copy link
Contributor

Fixed in #338679

Thanks @szlend for getting to that so quick!

my7h3le pushed a commit to my7h3le/nixvim that referenced this pull request Sep 1, 2024
my7h3le pushed a commit to my7h3le/nixvim that referenced this pull request Sep 1, 2024
my7h3le pushed a commit to my7h3le/nixvim that referenced this pull request Sep 1, 2024
my7h3le pushed a commit to my7h3le/nixvim that referenced this pull request Sep 1, 2024
my7h3le pushed a commit to my7h3le/nixvim that referenced this pull request Sep 1, 2024
my7h3le pushed a commit to my7h3le/nixvim that referenced this pull request Sep 1, 2024
my7h3le pushed a commit to my7h3le/nixvim that referenced this pull request Sep 1, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 6.topic: nodejs 8.has: changelog 8.has: documentation 8.has: package (new) This PR adds a new package 10.rebuild-darwin: 1-10 10.rebuild-linux: 1-10
Projects
Status: Re-packaged
Development

Successfully merging this pull request may close these issues.

8 participants