treewide: rename prisma -> prisma_6, prisma-engines -> prisma-engines_6

This commit is contained in:
Jon Seager
2025-12-19 13:41:33 +00:00
parent 0a89da2c4e
commit d677ffb53a
10 changed files with 50 additions and 50 deletions
+9 -9
View File
@@ -6,8 +6,8 @@
pixman,
fetchFromGitHub,
buildNpmPackage,
prisma,
prisma-engines,
prisma_6,
prisma-engines_6,
vips,
pkg-config,
cairo,
@@ -34,9 +34,9 @@ buildNpmPackage {
env.PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD = "1";
env.PRISMA_QUERY_ENGINE_LIBRARY = "${prisma-engines}/lib/libquery_engine.node";
env.PRISMA_QUERY_ENGINE_BINARY = "${prisma-engines}/bin/query-engine";
env.PRISMA_SCHEMA_ENGINE_BINARY = "${prisma-engines}/bin/schema-engine";
env.PRISMA_QUERY_ENGINE_LIBRARY = "${prisma-engines_6}/lib/libquery_engine.node";
env.PRISMA_QUERY_ENGINE_BINARY = "${prisma-engines_6}/bin/query-engine";
env.PRISMA_SCHEMA_ENGINE_BINARY = "${prisma-engines_6}/bin/schema-engine";
env.TURBO_NO_UPDATE_NOTIFIER = "true";
env.TURBO_FORCE = "true";
env.TURBO_REMOTE_CACHE_ENABLED = "false";
@@ -81,11 +81,11 @@ buildNpmPackage {
cat > $out/bin/${pname} <<EOF
#!${bash}/bin/bash
export PKG_CONFIG_PATH=${openssl.dev}/lib/pkgconfig;
export PRISMA_QUERY_ENGINE_LIBRARY=${prisma-engines}/lib/libquery_engine.node
export PRISMA_QUERY_ENGINE_BINARY=${prisma-engines}/bin/query-engine
export PRISMA_SCHEMA_ENGINE_BINARY=${prisma-engines}
export PRISMA_QUERY_ENGINE_LIBRARY=${prisma-engines_6}/lib/libquery_engine.node
export PRISMA_QUERY_ENGINE_BINARY=${prisma-engines_6}/bin/query-engine
export PRISMA_SCHEMA_ENGINE_BINARY=${prisma-engines_6}
cd $out/apps/remix
${prisma}/bin/prisma migrate deploy --schema ../../packages/prisma/schema.prisma
${prisma_6}/bin/prisma migrate deploy --schema ../../packages/prisma/schema.prisma
${nodejs}/bin/node build/server/main.js
EOF
chmod +x $out/bin/${pname}
+8 -8
View File
@@ -5,8 +5,8 @@
nodejs,
faketty,
openssl,
prisma,
prisma-engines,
prisma_6,
prisma-engines_6,
}:
buildNpmPackage rec {
@@ -30,7 +30,7 @@ buildNpmPackage rec {
npmDepsHash = "sha256-KSKqybqVw2BG/WKuVRyNsneLYyedVeyCvNBLIREx7MQ=";
nativeBuildInputs = [
prisma
prisma_6
faketty
];
@@ -67,11 +67,11 @@ buildNpmPackage rec {
--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ openssl ]} \
${lib.concatStringsSep " " (
lib.mapAttrsToList (name: value: "--set ${name} ${lib.escapeShellArg value}") {
PRISMA_SCHEMA_ENGINE_BINARY = lib.getExe' prisma-engines "schema-engine";
PRISMA_QUERY_ENGINE_BINARY = lib.getExe' prisma-engines "query-engine";
PRISMA_QUERY_ENGINE_LIBRARY = "${prisma-engines}/lib/libquery_engine.node";
PRISMA_INTROSPECTION_ENGINE_BINARY = lib.getExe' prisma-engines "introspection-engine";
PRISMA_FMT_BINARY = lib.getExe' prisma-engines "prisma-fmt";
PRISMA_SCHEMA_ENGINE_BINARY = lib.getExe' prisma-engines_6 "schema-engine";
PRISMA_QUERY_ENGINE_BINARY = lib.getExe' prisma-engines_6 "query-engine";
PRISMA_QUERY_ENGINE_LIBRARY = "${prisma-engines_6}/lib/libquery_engine.node";
PRISMA_INTROSPECTION_ENGINE_BINARY = lib.getExe' prisma-engines_6 "introspection-engine";
PRISMA_FMT_BINARY = lib.getExe' prisma-engines_6 "prisma-fmt";
}
)}
+10 -10
View File
@@ -15,8 +15,8 @@
openssl,
google-fonts,
playwright-driver,
prisma,
prisma-engines,
prisma_6,
prisma-engines_6,
}:
let
@@ -81,7 +81,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
nativeBuildInputs = [
makeBinaryWrapper
nodejs
prisma
prisma_6
yarnConfigHook
];
@@ -101,9 +101,9 @@ stdenvNoCC.mkDerivation (finalAttrs: {
preBuild = ''
export PRISMA_CLIENT_ENGINE_TYPE='binary'
export PRISMA_QUERY_ENGINE_LIBRARY="${prisma-engines}/lib/libquery_engine.node"
export PRISMA_QUERY_ENGINE_BINARY="${prisma-engines}/bin/query-engine"
export PRISMA_SCHEMA_ENGINE_BINARY="${prisma-engines}/bin/schema-engine"
export PRISMA_QUERY_ENGINE_LIBRARY="${prisma-engines_6}/lib/libquery_engine.node"
export PRISMA_QUERY_ENGINE_BINARY="${prisma-engines_6}/bin/query-engine"
export PRISMA_SCHEMA_ENGINE_BINARY="${prisma-engines_6}/bin/schema-engine"
'';
buildPhase = ''
@@ -151,7 +151,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
${lib.getExe' nodejs "npm"} start --prefix $out/share/linkwarden/apps/worker
else
echo "Starting server"
${lib.getExe prisma} migrate deploy --schema $out/share/linkwarden/packages/prisma/schema.prisma \
${lib.getExe prisma_6} migrate deploy --schema $out/share/linkwarden/packages/prisma/schema.prisma \
&& ${lib.getExe' nodejs "npm"} start --prefix $out/share/linkwarden/apps/web -- -H \$LINKWARDEN_HOST -p \$LINKWARDEN_PORT
fi
" > $out/bin/start.sh
@@ -166,9 +166,9 @@ stdenvNoCC.mkDerivation (finalAttrs: {
]
}" \
--set-default PRISMA_CLIENT_ENGINE_TYPE 'binary' \
--set-default PRISMA_QUERY_ENGINE_LIBRARY "${prisma-engines}/lib/libquery_engine.node" \
--set-default PRISMA_QUERY_ENGINE_BINARY "${prisma-engines}/bin/query-engine" \
--set-default PRISMA_SCHEMA_ENGINE_BINARY "${prisma-engines}/bin/schema-engine" \
--set-default PRISMA_QUERY_ENGINE_LIBRARY "${prisma-engines_6}/lib/libquery_engine.node" \
--set-default PRISMA_QUERY_ENGINE_BINARY "${prisma-engines_6}/bin/query-engine" \
--set-default PRISMA_SCHEMA_ENGINE_BINARY "${prisma-engines_6}/bin/schema-engine" \
--set-default PLAYWRIGHT_LAUNCH_OPTIONS_EXECUTABLE_PATH ${playwright-driver.browsers-chromium}/chromium-*/chrome-linux/chrome \
--set-default LINKWARDEN_CACHE_DIR /var/cache/linkwarden \
--set-default LINKWARDEN_HOST localhost \
@@ -12,7 +12,7 @@
# version of prisma-engines and prisma must be the same for them to
# function correctly.
rustPlatform.buildRustPackage rec {
pname = "prisma-engines";
pname = "prisma-engines_6";
version = "6.19.0";
src = fetchFromGitHub {
@@ -6,14 +6,14 @@
pnpm_10,
fetchPnpmDeps,
pnpmConfigHook,
prisma-engines,
prisma-engines_6,
jq,
makeWrapper,
moreutils,
callPackage,
}:
stdenv.mkDerivation (finalAttrs: {
pname = "prisma";
pname = "prisma_6";
version = "6.19.0";
src = fetchFromGitHub {
@@ -86,9 +86,9 @@ stdenv.mkDerivation (finalAttrs: {
makeWrapper "${lib.getExe nodejs}" "$out/bin/prisma" \
--add-flags "$out/lib/prisma/packages/cli/build/index.js" \
--set PRISMA_SCHEMA_ENGINE_BINARY ${prisma-engines}/bin/schema-engine \
--set PRISMA_QUERY_ENGINE_BINARY ${prisma-engines}/bin/query-engine \
--set PRISMA_QUERY_ENGINE_LIBRARY ${lib.getLib prisma-engines}/lib/libquery_engine.node
--set PRISMA_SCHEMA_ENGINE_BINARY ${prisma-engines_6}/bin/schema-engine \
--set PRISMA_QUERY_ENGINE_BINARY ${prisma-engines_6}/bin/query-engine \
--set PRISMA_QUERY_ENGINE_LIBRARY ${lib.getLib prisma-engines_6}/lib/libquery_engine.node
runHook postInstall
'';
@@ -1,19 +1,19 @@
{
lib,
runCommand,
prisma,
prisma-engines,
prisma_6,
prisma-engines_6,
sqlite-interactive,
}:
let
prismaMajorVersion = lib.versions.majorMinor prisma.version;
enginesMajorVersion = lib.versions.majorMinor prisma-engines.version;
prismaMajorVersion = lib.versions.majorMinor prisma_6.version;
enginesMajorVersion = lib.versions.majorMinor prisma-engines_6.version;
in
runCommand "prisma-cli-tests"
{
nativeBuildInputs = [
prisma
prisma_6
sqlite-interactive
];
meta.timeout = 60;
+4 -4
View File
@@ -9,8 +9,8 @@
fetchPnpmDeps,
pnpmConfigHook,
pnpm,
prisma,
prisma-engines,
prisma_6,
prisma-engines_6,
openssl,
rustPlatform,
# build variables
@@ -41,7 +41,7 @@ let
# Pin the specific version of prisma to the one used by upstream
# to guarantee compatibility.
prisma-engines' = prisma-engines.overrideAttrs (old: rec {
prisma-engines' = prisma-engines_6.overrideAttrs (old: rec {
version = "6.19.0";
src = fetchFromGitHub {
owner = "prisma";
@@ -57,7 +57,7 @@ let
hash = cargoHash;
};
});
prisma' = (prisma.override { prisma-engines = prisma-engines'; }).overrideAttrs (old: rec {
prisma' = (prisma_6.override { prisma-engines_6 = prisma-engines'; }).overrideAttrs (old: rec {
version = "6.19.0";
src = fetchFromGitHub {
owner = "prisma";
+7 -7
View File
@@ -7,7 +7,7 @@
pnpmConfigHook,
nodejs_24,
makeWrapper,
prisma-engines,
prisma-engines_6,
ffmpeg,
openssl,
vips,
@@ -24,11 +24,11 @@ let
NEXT_TELEMETRY_DISABLED = "1";
FFMPEG_PATH = lib.getExe ffmpeg;
FFPROBE_PATH = lib.getExe' ffmpeg "ffprobe";
PRISMA_SCHEMA_ENGINE_BINARY = lib.getExe' prisma-engines "schema-engine";
PRISMA_QUERY_ENGINE_BINARY = lib.getExe' prisma-engines "query-engine";
PRISMA_QUERY_ENGINE_LIBRARY = "${prisma-engines}/lib/libquery_engine.node";
PRISMA_INTROSPECTION_ENGINE_BINARY = lib.getExe' prisma-engines "introspection-engine";
PRISMA_FMT_BINARY = lib.getExe' prisma-engines "prisma-fmt";
PRISMA_SCHEMA_ENGINE_BINARY = lib.getExe' prisma-engines_6 "schema-engine";
PRISMA_QUERY_ENGINE_BINARY = lib.getExe' prisma-engines_6 "query-engine";
PRISMA_QUERY_ENGINE_LIBRARY = "${prisma-engines_6}/lib/libquery_engine.node";
PRISMA_INTROSPECTION_ENGINE_BINARY = lib.getExe' prisma-engines_6 "introspection-engine";
PRISMA_FMT_BINARY = lib.getExe' prisma-engines_6 "prisma-fmt";
};
pnpm' = pnpm_10.override { nodejs = nodejs_24; };
@@ -128,7 +128,7 @@ stdenv.mkDerivation (finalAttrs: {
doInstallCheck = true;
passthru = {
inherit prisma-engines;
prisma-engines = prisma-engines_6;
tests = { inherit (nixosTests) zipline; };
updateScript = nix-update-script { };
};
+1 -1
View File
@@ -287,7 +287,7 @@ mapAliases {
inherit (pkgs) prettier; # added 2025-05-31
prettier_d_slim = pkgs.prettier-d-slim; # added 2023-09-14
prettier-plugin-toml = throw "prettier-plugin-toml was removed because it provides no executable"; # added 2025-03-23
inherit (pkgs) prisma; # added 2024-08-31
inherit (pkgs) prisma_6; # added 2024-08-31
pscid = throw "'pscid' has been removed because it was unmaintained upstream"; # Added 2025-12-07
pulp = throw "'pulp' has been removed because it was unmaintained upstream"; # Added 2025-12-07
purescript-language-server = throw "'purescript-language-server' has been removed because it was unmaintained within nixpkgs"; # Added 2025-12-12