From d677ffb53ae66e3494146bc45e90a3defd28d07e Mon Sep 17 00:00:00 2001 From: Jon Seager Date: Fri, 19 Dec 2025 13:27:56 +0000 Subject: [PATCH] treewide: rename `prisma` -> `prisma_6`, `prisma-engines` -> `prisma-engines_6` --- pkgs/by-name/do/documenso/package.nix | 18 ++++++++--------- pkgs/by-name/gh/ghostfolio/package.nix | 16 +++++++-------- pkgs/by-name/li/linkwarden/package.nix | 20 +++++++++---------- .../package.nix | 2 +- .../setup-hook.sh | 0 .../pr/{prisma => prisma_6}/package.nix | 10 +++++----- .../pr/{prisma => prisma_6}/test-cli.nix | 10 +++++----- pkgs/by-name/um/umami/package.nix | 8 ++++---- pkgs/by-name/zi/zipline/package.nix | 14 ++++++------- pkgs/development/node-packages/aliases.nix | 2 +- 10 files changed, 50 insertions(+), 50 deletions(-) rename pkgs/by-name/pr/{prisma-engines => prisma-engines_6}/package.nix (98%) rename pkgs/by-name/pr/{prisma-engines => prisma-engines_6}/setup-hook.sh (100%) rename pkgs/by-name/pr/{prisma => prisma_6}/package.nix (92%) rename pkgs/by-name/pr/{prisma => prisma_6}/test-cli.nix (86%) diff --git a/pkgs/by-name/do/documenso/package.nix b/pkgs/by-name/do/documenso/package.nix index 48bdbc537603..7d2f14d63774 100644 --- a/pkgs/by-name/do/documenso/package.nix +++ b/pkgs/by-name/do/documenso/package.nix @@ -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} < $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 \ diff --git a/pkgs/by-name/pr/prisma-engines/package.nix b/pkgs/by-name/pr/prisma-engines_6/package.nix similarity index 98% rename from pkgs/by-name/pr/prisma-engines/package.nix rename to pkgs/by-name/pr/prisma-engines_6/package.nix index 913200c3dac2..e1194e4781ec 100644 --- a/pkgs/by-name/pr/prisma-engines/package.nix +++ b/pkgs/by-name/pr/prisma-engines_6/package.nix @@ -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 { diff --git a/pkgs/by-name/pr/prisma-engines/setup-hook.sh b/pkgs/by-name/pr/prisma-engines_6/setup-hook.sh similarity index 100% rename from pkgs/by-name/pr/prisma-engines/setup-hook.sh rename to pkgs/by-name/pr/prisma-engines_6/setup-hook.sh diff --git a/pkgs/by-name/pr/prisma/package.nix b/pkgs/by-name/pr/prisma_6/package.nix similarity index 92% rename from pkgs/by-name/pr/prisma/package.nix rename to pkgs/by-name/pr/prisma_6/package.nix index 366cf7a06e91..9ff844a86b17 100644 --- a/pkgs/by-name/pr/prisma/package.nix +++ b/pkgs/by-name/pr/prisma_6/package.nix @@ -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 ''; diff --git a/pkgs/by-name/pr/prisma/test-cli.nix b/pkgs/by-name/pr/prisma_6/test-cli.nix similarity index 86% rename from pkgs/by-name/pr/prisma/test-cli.nix rename to pkgs/by-name/pr/prisma_6/test-cli.nix index d0449df3fc05..72f0f22af251 100644 --- a/pkgs/by-name/pr/prisma/test-cli.nix +++ b/pkgs/by-name/pr/prisma_6/test-cli.nix @@ -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; diff --git a/pkgs/by-name/um/umami/package.nix b/pkgs/by-name/um/umami/package.nix index 45ce1bcab642..d07df679d077 100644 --- a/pkgs/by-name/um/umami/package.nix +++ b/pkgs/by-name/um/umami/package.nix @@ -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"; diff --git a/pkgs/by-name/zi/zipline/package.nix b/pkgs/by-name/zi/zipline/package.nix index 83889d627c27..b8a71e348804 100644 --- a/pkgs/by-name/zi/zipline/package.nix +++ b/pkgs/by-name/zi/zipline/package.nix @@ -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 { }; }; diff --git a/pkgs/development/node-packages/aliases.nix b/pkgs/development/node-packages/aliases.nix index 888896191fef..cc1b6a5f78f8 100644 --- a/pkgs/development/node-packages/aliases.nix +++ b/pkgs/development/node-packages/aliases.nix @@ -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