diff --git a/pkgs/development/node-packages/default.nix b/pkgs/development/node-packages/default.nix index 568c75d07ce9..8ad9f2e54a2e 100644 --- a/pkgs/development/node-packages/default.nix +++ b/pkgs/development/node-packages/default.nix @@ -267,6 +267,18 @@ let meta.mainProgram = "postcss"; }; + prisma = super.prisma.override { + nativeBuildInputs = [ pkgs.makeWrapper ]; + postInstall = with pkgs; '' + wrapProgram "$out/bin/prisma" \ + --prefix PRISMA_MIGRATION_ENGINE_BINARY : "${prisma-engines}/bin/migration-engine" \ + --prefix PRISMA_QUERY_ENGINE_BINARY : "${prisma-engines}/bin/query-engine" \ + --prefix PRISMA_QUERY_ENGINE_LIBRARY : "${lib.getLib prisma-engines}/libquery_engine.so.node" + --prefix PRISMA_INTROSPECTION_ENGINE_BINARY : "${prisma-engines}/bin/introspection-engine" \ + --prefix PRISMA_FMT_BINARY : "${prisma-engines}/bin/prisma-fmt" + ''; + }; + pulp = super.pulp.override { # tries to install purescript npmFlags = "--ignore-scripts"; diff --git a/pkgs/development/node-packages/node-packages.json b/pkgs/development/node-packages/node-packages.json index b8ac7e4e7c6d..e4e361757dfe 100644 --- a/pkgs/development/node-packages/node-packages.json +++ b/pkgs/development/node-packages/node-packages.json @@ -205,6 +205,7 @@ , "postcss-cli" , "prettier" , "prettier-plugin-toml" +, "prisma" , "pscid" , "pulp" , "purescript-language-server" diff --git a/pkgs/development/node-packages/node-packages.nix b/pkgs/development/node-packages/node-packages.nix index c34bd5206760..e9b99b055506 100644 --- a/pkgs/development/node-packages/node-packages.nix +++ b/pkgs/development/node-packages/node-packages.nix @@ -5206,6 +5206,15 @@ let sha512 = "I/gRlM2meKPKXFN/1fxLoigPXvAUsivxRCih7vgeO7o4qrNNsl6Ah85l3UBbFi0t7ttjMde2+bS1A32a1Hu0BA=="; }; }; + "@prisma/engines-2.31.0-32.2452cc6313d52b8b9a96999ac0e974d0aedf88db" = { + name = "_at_prisma_slash_engines"; + packageName = "@prisma/engines"; + version = "2.31.0-32.2452cc6313d52b8b9a96999ac0e974d0aedf88db"; + src = fetchurl { + url = "https://registry.npmjs.org/@prisma/engines/-/engines-2.31.0-32.2452cc6313d52b8b9a96999ac0e974d0aedf88db.tgz"; + sha512 = "Q9CwN6e5E5Abso7J3A1fHbcF4NXGRINyMnf7WQ07fXaebxTTARY5BNUzy2Mo5uH82eRVO5v7ImNuR044KTjLJg=="; + }; + }; "@protobufjs/aspromise-1.1.2" = { name = "_at_protobufjs_slash_aspromise"; packageName = "@protobufjs/aspromise"; @@ -5566,13 +5575,13 @@ let sha512 = "cl5uPaGg72z0sCUpF0zsOhwYYUV72Gxc1FwFfxltO8hSvMeFDvwD7JrNE4kHcIcKRjwPGbSH0fdVPUpErZ8Mog=="; }; }; - "@serverless/utils-5.8.1" = { + "@serverless/utils-5.9.0" = { name = "_at_serverless_slash_utils"; packageName = "@serverless/utils"; - version = "5.8.1"; + version = "5.9.0"; src = fetchurl { - url = "https://registry.npmjs.org/@serverless/utils/-/utils-5.8.1.tgz"; - sha512 = "tUOvlGq9xpLrq6dguH4bjAJqycoOUx7aVJIjbX4T7MZxuovxg/x2ZXc+Hrfqq0t+jRKVm78ZjHCjCASJDxbYPA=="; + url = "https://registry.npmjs.org/@serverless/utils/-/utils-5.9.0.tgz"; + sha512 = "cAPOndJ78N5o3Q4WVXfy/z1bE5QPCUwT2DPj06bd3DGHV3api+NZLeOECG4AdcyPREw/9w1oNxw9555q903KwA=="; }; }; "@serverless/utils-china-1.1.4" = { @@ -25478,15 +25487,6 @@ let sha512 = "QJYT/i0QYoiZBQ71ivxdyTqkwKkQ0oxACXHYxH2zYHJEgzi2LsbjgvtzTbLi1SZcF190Db2YP7I7eTsU2egOlw=="; }; }; - "fast-safe-stringify-2.1.0" = { - name = "fast-safe-stringify"; - packageName = "fast-safe-stringify"; - version = "2.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/fast-safe-stringify/-/fast-safe-stringify-2.1.0.tgz"; - sha512 = "xHSIyDJTOVQjtMBGcUokl3tpaOKgTyVTjlHj255V4Q4J1oho3cnrWrf5sCx8z1jq7gzNMv8y0PH53pYYuZUFPQ=="; - }; - }; "fast-safe-stringify-2.1.1" = { name = "fast-safe-stringify"; packageName = "fast-safe-stringify"; @@ -34003,13 +34003,13 @@ let sha512 = "KWYVV1c4i+jbMpaBC+U++4Va0cp8OisU185o73T1vo99hqi7w8tSJfUXYswwqqrjzwxa6KpRK54WhPvwf5w6PQ=="; }; }; - "jest-worker-27.1.0" = { + "jest-worker-27.1.1" = { name = "jest-worker"; packageName = "jest-worker"; - version = "27.1.0"; + version = "27.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/jest-worker/-/jest-worker-27.1.0.tgz"; - sha512 = "mO4PHb2QWLn9yRXGp7rkvXLAYuxwhq1ZYUo0LoDhg8wqvv4QizP1ZWEJOeolgbEgAWZLIEU0wsku8J+lGWfBhg=="; + url = "https://registry.npmjs.org/jest-worker/-/jest-worker-27.1.1.tgz"; + sha512 = "XJKCL7tu+362IUYTWvw8+3S75U7qMiYiRU6u5yqscB48bTvzwN6i8L/7wVTXiFLwkRsxARNM7TISnTvcgv9hxA=="; }; }; "jimp-compact-0.16.1" = { @@ -56400,6 +56400,33 @@ let sha1 = "06cd70795ee58d1462d100a45c660df3179d3b39"; }; }; + "ssb-bendy-butt-0.12.3" = { + name = "ssb-bendy-butt"; + packageName = "ssb-bendy-butt"; + version = "0.12.3"; + src = fetchurl { + url = "https://registry.npmjs.org/ssb-bendy-butt/-/ssb-bendy-butt-0.12.3.tgz"; + sha512 = "fo3Sspdr+cjQzq8F+EKRJiibm06Mt/pzmtAjf0HEOl/pZPTHGFolfsGtZlU4U+RuKOqqZMhxzTXNAwoJ+trdDw=="; + }; + }; + "ssb-bfe-3.1.1" = { + name = "ssb-bfe"; + packageName = "ssb-bfe"; + version = "3.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/ssb-bfe/-/ssb-bfe-3.1.1.tgz"; + sha512 = "0Z1xxYG618sccFJGNIN9om5sokRFJRv/QlIhlnFwiafNLYFdyLP/KGZ8YDZSUP/pyMWZuL8+o++v3Ro6EkIJNA=="; + }; + }; + "ssb-bfe-spec-0.3.0" = { + name = "ssb-bfe-spec"; + packageName = "ssb-bfe-spec"; + version = "0.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/ssb-bfe-spec/-/ssb-bfe-spec-0.3.0.tgz"; + sha512 = "gmsjEKrcKfR7d/926Oq7ijrd4l0CkjtFampk7rqsE+Gzr1ZpzGmHl1YxXn6GdBYy55M1i0V+w+fYAqsgxl5o4Q=="; + }; + }; "ssb-blobs-1.2.2" = { name = "ssb-blobs"; packageName = "ssb-blobs"; @@ -56454,13 +56481,13 @@ let sha512 = "pJAFizB6OcuJLX4RJJuU9HWyPwM2CqLi/vs08lhVIR3TGxacxpavvK5LzbxT+Y3iWkBchOTKS5hHCigA5aaung=="; }; }; - "ssb-db2-2.3.1" = { + "ssb-db2-2.4.0" = { name = "ssb-db2"; packageName = "ssb-db2"; - version = "2.3.1"; + version = "2.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/ssb-db2/-/ssb-db2-2.3.1.tgz"; - sha512 = "SE/GGoLn29JJeeo/SLGzjtPj5xvafn6so8fBNqM0Hfnk03DwZ7iFG0PuB8L5CMold3sLLDXFjuzdacKf85848Q=="; + url = "https://registry.npmjs.org/ssb-db2/-/ssb-db2-2.4.0.tgz"; + sha512 = "UMd6XqBGTHBNPduyEc0ynO+lkCn/8/NTedzDz9XRYQsqk4ed2Js0cWhqeREv0Bz+upfCMmPQBBHASPBw47XTOA=="; }; }; "ssb-ebt-5.6.7" = { @@ -56697,6 +56724,15 @@ let sha512 = "RcXRBLqQMwew+aKkaTZ2K0qq2kwe7he8ZUz8cX4bZ6Sr4+yszhRpxqnN6XeK1hA6TTvUltR0RNgOO/fqT3djRg=="; }; }; + "ssb-typescript-2.5.0" = { + name = "ssb-typescript"; + packageName = "ssb-typescript"; + version = "2.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/ssb-typescript/-/ssb-typescript-2.5.0.tgz"; + sha512 = "j0Q9nAbp5lKwmvIWEaaf+PT5ITHCCb83JeD3ywm/kHDWwcLGLYG8VuwMM5L3X8H1laIORXlQgZlHhK3nfn8LbA=="; + }; + }; "ssb-unix-socket-1.0.0" = { name = "ssb-unix-socket"; packageName = "ssb-unix-socket"; @@ -56706,6 +56742,15 @@ let sha512 = "Z4jBj917W+dKAiDglwxCpWm8vINOMtkpHQIgk50NQTb5jHqHI5Rcyiy7EO0uRcWwRWqXi1ZwOTEFVyLyyuittA=="; }; }; + "ssb-uri2-1.5.2" = { + name = "ssb-uri2"; + packageName = "ssb-uri2"; + version = "1.5.2"; + src = fetchurl { + url = "https://registry.npmjs.org/ssb-uri2/-/ssb-uri2-1.5.2.tgz"; + sha512 = "jlsN7w6/toFjcRZLDkCC3nq6+rKeS7NhUxZ+xGS1ASltenkudcZvdgczRb+L11ObFND4VCohkO21lVSAJV8hCQ=="; + }; + }; "ssb-validate-4.1.4" = { name = "ssb-validate"; packageName = "ssb-validate"; @@ -69128,7 +69173,7 @@ in sources."is-stream-2.0.1" sources."is-unicode-supported-0.1.0" sources."isexe-2.0.0" - (sources."jest-worker-27.1.0" // { + (sources."jest-worker-27.1.1" // { dependencies = [ sources."supports-color-8.1.1" ]; @@ -72410,7 +72455,7 @@ in sources."es-to-primitive-1.2.1" sources."events-3.3.0" sources."evp_bytestokey-1.0.3" - sources."fast-safe-stringify-2.1.0" + sources."fast-safe-stringify-2.1.1" sources."foreach-2.0.5" sources."fs.realpath-1.0.0" sources."function-bind-1.1.1" @@ -77339,7 +77384,7 @@ in sources."core-util-is-1.0.3" sources."enabled-2.0.0" sources."eventemitter3-4.0.7" - sources."fast-safe-stringify-2.1.0" + sources."fast-safe-stringify-2.1.1" sources."fecha-4.2.1" sources."fn.name-1.1.0" sources."follow-redirects-1.14.3" @@ -84467,7 +84512,7 @@ in sources."fast-deep-equal-3.1.3" sources."fast-glob-3.2.7" sources."fast-json-stable-stringify-2.1.0" - sources."fast-safe-stringify-2.1.0" + sources."fast-safe-stringify-2.1.1" sources."fastq-1.12.0" sources."faye-websocket-0.10.0" sources."fecha-4.2.1" @@ -87330,7 +87375,7 @@ in sources."fast-deep-equal-3.1.3" sources."fast-json-stable-stringify-2.1.0" sources."fast-levenshtein-2.0.6" - sources."fast-safe-stringify-2.1.0" + sources."fast-safe-stringify-2.1.1" sources."fast-text-encoding-1.0.3" (sources."fast-url-parser-1.1.3" // { dependencies = [ @@ -90628,7 +90673,7 @@ in sources."fast-deep-equal-3.1.3" sources."fast-glob-3.2.7" sources."fast-json-stable-stringify-2.1.0" - sources."fast-safe-stringify-2.1.0" + sources."fast-safe-stringify-2.1.1" sources."fastq-1.12.0" sources."figlet-1.5.0" sources."figures-3.2.0" @@ -98950,7 +98995,7 @@ in sources."extsprintf-1.3.0" sources."fast-deep-equal-3.1.3" sources."fast-json-stable-stringify-2.1.0" - sources."fast-safe-stringify-2.1.0" + sources."fast-safe-stringify-2.1.1" sources."fb-watchman-2.0.1" sources."figgy-pudding-3.5.2" sources."file-uri-to-path-1.0.0" @@ -100550,7 +100595,7 @@ in sources."diagnostics-1.1.1" sources."enabled-1.0.2" sources."env-variable-0.0.6" - sources."fast-safe-stringify-2.1.0" + sources."fast-safe-stringify-2.1.1" sources."fecha-2.3.3" sources."inherits-2.0.4" sources."is-arrayish-0.3.2" @@ -101469,7 +101514,7 @@ in sources."fast-equals-2.0.3" sources."fast-glob-2.2.7" sources."fast-levenshtein-2.0.6" - sources."fast-safe-stringify-2.1.0" + sources."fast-safe-stringify-2.1.1" sources."fastq-1.12.0" sources."fd-slicer-1.1.0" sources."fecha-4.2.1" @@ -107653,6 +107698,27 @@ in bypassCache = true; reconstructLock = true; }; + prisma = nodeEnv.buildNodePackage { + name = "prisma"; + packageName = "prisma"; + version = "3.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/prisma/-/prisma-3.0.1.tgz"; + sha512 = "ENmYAopd56nkds5/IOSTGixbkbUN2QdEzB4cp/mtaGB/G0OArbP6cnbA/9u02Pe29RdErbNOoIdCGASjpItJwQ=="; + }; + dependencies = [ + sources."@prisma/engines-2.31.0-32.2452cc6313d52b8b9a96999ac0e974d0aedf88db" + ]; + 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; + }; pscid = nodeEnv.buildNodePackage { name = "pscid"; packageName = "pscid"; @@ -107791,7 +107857,7 @@ in sources."es6-promise-3.3.1" sources."events-2.1.0" sources."evp_bytestokey-1.0.3" - sources."fast-safe-stringify-2.1.0" + sources."fast-safe-stringify-2.1.1" sources."fs.realpath-1.0.0" sources."function-bind-1.1.1" sources."gaze-1.1.3" @@ -111833,7 +111899,7 @@ in ]; }) sources."@serverless/template-1.1.4" - (sources."@serverless/utils-5.8.1" // { + (sources."@serverless/utils-5.9.0" // { dependencies = [ sources."cli-progress-footer-2.0.0" sources."get-stream-6.0.1" @@ -113282,10 +113348,10 @@ in snyk = nodeEnv.buildNodePackage { name = "snyk"; packageName = "snyk"; - version = "1.698.0"; + version = "1.700.0"; src = fetchurl { - url = "https://registry.npmjs.org/snyk/-/snyk-1.698.0.tgz"; - sha512 = "ivOZ1VCRwGvtOG6c3etxLPdwRjjnXvg9aSXRP7oOSZDQvEWouKDh9HpvkTHm8mZgFACw6hU1cmBseHyMfpYnkw=="; + url = "https://registry.npmjs.org/snyk/-/snyk-1.700.0.tgz"; + sha512 = "nhhgv2Dh8Wh/qrt5gjS+RrQjEUfwEOU4W6KZnnQrmVAfFwZ4Uis+pXcoTTJtsg/xJ0/eXV/v2UxA6PKPkYMeOw=="; }; buildInputs = globalBuildInputs; meta = { @@ -113589,6 +113655,7 @@ in sources."base64-js-1.5.1" sources."base64-url-2.3.3" sources."bash-color-0.0.4" + sources."bencode-2.0.2" sources."binary-extensions-1.13.1" sources."binary-search-1.3.6" sources."binary-search-bounds-2.0.5" @@ -114098,6 +114165,7 @@ in sources."push-stream-11.0.1" ]; }) + sources."querystringify-2.2.0" sources."quicktask-1.0.1" sources."railroad-diagrams-1.0.0" sources."randexp-0.4.6" @@ -114193,6 +114261,7 @@ in sources."remove-trailing-separator-1.1.0" sources."repeat-element-1.1.4" sources."repeat-string-1.6.1" + sources."requires-port-1.0.0" sources."resolve-1.20.0" sources."resolve-url-0.2.1" sources."restore-cursor-1.0.1" @@ -114266,12 +114335,19 @@ in sources."source-map-url-0.4.1" sources."split-buffer-1.0.0" sources."split-string-3.1.0" + (sources."ssb-bendy-butt-0.12.3" // { + dependencies = [ + sources."ssb-keys-8.2.0" + ]; + }) + sources."ssb-bfe-3.1.1" + sources."ssb-bfe-spec-0.3.0" sources."ssb-blobs-1.2.2" sources."ssb-caps-1.1.0" sources."ssb-client-4.9.0" sources."ssb-config-3.4.5" sources."ssb-db-19.2.0" - (sources."ssb-db2-2.3.1" // { + (sources."ssb-db2-2.4.0" // { dependencies = [ sources."abstract-leveldown-6.2.3" (sources."flumecodec-0.0.1" // { @@ -114325,7 +114401,9 @@ in sources."ssb-query-2.4.5" sources."ssb-ref-2.16.0" sources."ssb-replicate-1.3.3" + sources."ssb-typescript-2.5.0" sources."ssb-unix-socket-1.0.0" + sources."ssb-uri2-1.5.2" (sources."ssb-validate-4.1.4" // { dependencies = [ sources."ssb-keys-8.2.0" @@ -114418,6 +114496,7 @@ in }) sources."untildify-2.1.0" sources."urix-0.1.0" + sources."url-parse-1.5.3" sources."use-3.1.1" sources."user-home-2.0.0" sources."utf8-byte-length-1.0.4" @@ -120262,7 +120341,7 @@ in sources."isarray-0.0.1" sources."isexe-2.0.0" sources."isobject-3.0.1" - sources."jest-worker-27.1.0" + sources."jest-worker-27.1.1" sources."js-yaml-4.0.0" sources."json-parse-better-errors-1.0.2" sources."json-schema-traverse-0.4.1" @@ -122570,7 +122649,7 @@ in sources."glob-to-regexp-0.4.1" sources."graceful-fs-4.2.8" sources."has-flag-4.0.0" - sources."jest-worker-27.1.0" + sources."jest-worker-27.1.1" sources."json-parse-better-errors-1.0.2" sources."json-schema-traverse-0.4.1" sources."loader-runner-4.2.0" diff --git a/pkgs/development/tools/database/prisma-engines/default.nix b/pkgs/development/tools/database/prisma-engines/default.nix new file mode 100644 index 000000000000..a7021411b4c3 --- /dev/null +++ b/pkgs/development/tools/database/prisma-engines/default.nix @@ -0,0 +1,61 @@ +{ fetchFromGitHub +, lib +, openssl +, pkg-config +, protobuf +, rustPlatform +}: + +rustPlatform.buildRustPackage rec { + pname = "prisma-engines"; + version = "2.30.2"; + + src = fetchFromGitHub { + owner = "prisma"; + repo = "prisma-engines"; + rev = version; + sha256 = "sha256-i4r+TRC8454awbqe35Kg3M9xN2NnP8Sbd/dITtm9MDg="; + }; + + cargoPatches = [ + # Remove test from compilation targets: + # they add time to an already long compilation and some fail out-of-the-box. + ./no_tests.patch + ]; + + # Use system openssl. + OPENSSL_NO_VENDOR = 1; + + cargoSha256 = "sha256-BldEj8+tzY0dIA/fdrPLsFn3ZdfoGq6GsomCUhQBoLM="; + + outputs = [ "out" "lib" "bin" ]; + + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ openssl protobuf ]; + + preBuild = '' + export OPENSSL_DIR=${lib.getDev openssl} + export OPENSSL_LIB_DIR=${openssl.out}/lib + + export PROTOC=${protobuf}/bin/protoc + export PROTOC_INCLUDE="${protobuf}/include"; + + export SQLITE_MAX_VARIABLE_NUMBER=250000 + export SQLITE_MAX_EXPR_DEPTH=10000 + ''; + + postInstall = '' + cp target/release/libquery_engine.so $out/lib/libquery_engine.so.node + ''; + + # Tests are long to compile + doCheck = false; + + meta = with lib; { + description = "A collection of engines that power the core stack for Prisma"; + homepage = "https://www.prisma.io/"; + license = licenses.asl20; + platforms = [ "x86_64-linux" ]; + maintainers = with maintainers; [ pamplemousse ]; + }; +} diff --git a/pkgs/development/tools/database/prisma-engines/no_tests.patch b/pkgs/development/tools/database/prisma-engines/no_tests.patch new file mode 100644 index 000000000000..fb88d92e485d --- /dev/null +++ b/pkgs/development/tools/database/prisma-engines/no_tests.patch @@ -0,0 +1,459 @@ +diff --git a/Cargo.lock b/Cargo.lock +index 1070c7a30..310f7302f 100644 +--- a/Cargo.lock ++++ b/Cargo.lock +@@ -479,18 +479,6 @@ version = "1.2.1" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693" + +-[[package]] +-name = "bitvec" +-version = "0.19.5" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "8942c8d352ae1838c9dda0b0ca2ab657696ef2232a20147cf1b30ae1a9cb4321" +-dependencies = [ +- "funty", +- "radium", +- "tap", +- "wyz", +-] +- + [[package]] + name = "block-buffer" + version = "0.7.3" +@@ -706,19 +694,6 @@ dependencies = [ + "wasm-bindgen", + ] + +-[[package]] +-name = "console" +-version = "0.14.1" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "3993e6445baa160675931ec041a5e03ca84b9c6e32a056150d3aa2bdda0a1f45" +-dependencies = [ +- "encode_unicode", +- "lazy_static", +- "libc", +- "terminal_size", +- "winapi", +-] +- + [[package]] + name = "const_fn" + version = "0.4.5" +@@ -1011,24 +986,12 @@ dependencies = [ + "uuid", + ] + +-[[package]] +-name = "dtoa" +-version = "0.4.8" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "56899898ce76aaf4a0f24d914c97ea6ed976d42fec6ad33fcbb0a1103e07b2b0" +- + [[package]] + name = "either" + version = "1.6.1" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "e78d4f1cc4ae33bbfc157ed5d5a5ef3bc29227303d595861deb238fcec4e9457" + +-[[package]] +-name = "encode_unicode" +-version = "0.3.6" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "a357d28ed41a50f9c765dbfe56cbc04a64e53e5fc58ba79fbc34c10ef3df831f" +- + [[package]] + name = "encoding" + version = "0.2.33" +@@ -1114,18 +1077,6 @@ dependencies = [ + "syn", + ] + +-[[package]] +-name = "enum_dispatch" +-version = "0.3.5" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "8946e241a7774d5327d92749c50806f275f57d031d2229ecbfd65469a8ad338e" +-dependencies = [ +- "once_cell", +- "proc-macro2", +- "quote", +- "syn", +-] +- + [[package]] + name = "enumflags2" + version = "0.7.1" +@@ -1261,12 +1212,6 @@ dependencies = [ + "percent-encoding", + ] + +-[[package]] +-name = "funty" +-version = "1.1.0" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "fed34cd105917e91daa4da6b3728c47b068749d6a62c59811f06ed2ac71d9da7" +- + [[package]] + name = "futures" + version = "0.3.13" +@@ -1573,15 +1518,6 @@ dependencies = [ + "winapi", + ] + +-[[package]] +-name = "html-escape" +-version = "0.2.7" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "d64794b2265e97e459334ed47a7b7369ce8e8ee3d3450c0c363a0b563fc92233" +-dependencies = [ +- "utf8-width", +-] +- + [[package]] + name = "http" + version = "0.2.3" +@@ -1744,21 +1680,6 @@ version = "0.2.3" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "64e9829a50b42bb782c1df523f78d332fe371b10c661e78b7a3c34b0198e9fac" + +-[[package]] +-name = "insta" +-version = "1.7.1" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "c4a1b21a2971cea49ca4613c0e9fe8225ecaf5de64090fddc6002284726e9244" +-dependencies = [ +- "console", +- "lazy_static", +- "serde", +- "serde_json", +- "serde_yaml", +- "similar", +- "uuid", +-] +- + [[package]] + name = "instant" + version = "0.1.9" +@@ -1804,34 +1725,6 @@ dependencies = [ + "user-facing-errors", + ] + +-[[package]] +-name = "introspection-engine-tests" +-version = "0.1.0" +-dependencies = [ +- "barrel", +- "datamodel", +- "datamodel-connector", +- "enumflags2", +- "expect-test", +- "indoc", +- "introspection-connector", +- "introspection-core", +- "migration-connector", +- "pretty_assertions", +- "quaint", +- "serde_json", +- "sql-datamodel-connector", +- "sql-introspection-connector", +- "sql-migration-connector", +- "sql-schema-describer", +- "test-macros", +- "test-setup", +- "tokio", +- "tracing", +- "tracing-futures", +- "user-facing-errors", +-] +- + [[package]] + name = "ipconfig" + version = "0.2.2" +@@ -2178,39 +2071,6 @@ dependencies = [ + "user-facing-errors", + ] + +-[[package]] +-name = "migration-engine-tests" +-version = "0.1.0" +-dependencies = [ +- "bigdecimal", +- "chrono", +- "connection-string", +- "datamodel", +- "datamodel-connector", +- "enumflags2", +- "expect-test", +- "indoc", +- "migration-connector", +- "migration-core", +- "once_cell", +- "pretty_assertions", +- "prisma-value", +- "quaint", +- "serde", +- "serde_json", +- "sql-datamodel-connector", +- "sql-migration-connector", +- "sql-schema-describer", +- "tempfile", +- "test-macros", +- "test-setup", +- "tokio", +- "tracing", +- "tracing-futures", +- "url", +- "user-facing-errors", +-] +- + [[package]] + name = "mime" + version = "0.3.16" +@@ -2517,19 +2377,6 @@ dependencies = [ + "socket2 0.4.0", + ] + +-[[package]] +-name = "nom" +-version = "6.1.2" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "e7413f999671bd4745a7b624bd370a569fb6bc574b23c83a3c5ed2e453f3d5e2" +-dependencies = [ +- "bitvec", +- "funty", +- "lexical-core", +- "memchr", +- "version_check", +-] +- + [[package]] + name = "ntapi" + version = "0.3.6" +@@ -2773,18 +2620,6 @@ dependencies = [ + "winapi", + ] + +-[[package]] +-name = "parse-hyperlinks" +-version = "0.19.6" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "9dfd153802fdbad158c1dfa2c5df806a86955ae6e07758af642a4faaa03310ff" +-dependencies = [ +- "html-escape", +- "nom", +- "percent-encoding", +- "thiserror", +-] +- + [[package]] + name = "pbkdf2" + version = "0.7.5" +@@ -3388,72 +3223,6 @@ dependencies = [ + "user-facing-errors", + ] + +-[[package]] +-name = "query-engine-tests" +-version = "0.1.0" +-dependencies = [ +- "anyhow", +- "base64 0.13.0", +- "chrono", +- "colored", +- "datamodel-connector", +- "indoc", +- "insta", +- "prisma-value", +- "query-test-macros", +- "query-tests-setup", +- "serde_json", +- "tokio", +- "tracing", +- "tracing-futures", +- "uuid", +-] +- +-[[package]] +-name = "query-test-macros" +-version = "0.1.0" +-dependencies = [ +- "darling", +- "indoc", +- "itertools 0.10.0", +- "proc-macro2", +- "query-tests-setup", +- "quote", +- "syn", +-] +- +-[[package]] +-name = "query-tests-setup" +-version = "0.1.0" +-dependencies = [ +- "async-trait", +- "colored", +- "datamodel", +- "datamodel-connector", +- "enum_dispatch", +- "enumflags2", +- "indoc", +- "itertools 0.10.0", +- "lazy_static", +- "migration-core", +- "mongodb-datamodel-connector", +- "nom", +- "parse-hyperlinks", +- "prisma-models", +- "query-core", +- "regex", +- "request-handlers", +- "serde", +- "serde_json", +- "sql-datamodel-connector", +- "thiserror", +- "tokio", +- "tracing", +- "tracing-error", +- "tracing-futures", +- "tracing-subscriber", +-] +- + [[package]] + name = "quick-error" + version = "1.2.3" +@@ -3469,12 +3238,6 @@ dependencies = [ + "proc-macro2", + ] + +-[[package]] +-name = "radium" +-version = "0.5.3" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "941ba9d78d8e2f7ce474c015eea4d9c6d25b6a3327f9832ee29a4de27f91bbb8" +- + [[package]] + name = "rand" + version = "0.7.3" +@@ -3922,18 +3685,6 @@ dependencies = [ + "syn", + ] + +-[[package]] +-name = "serde_yaml" +-version = "0.8.17" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "15654ed4ab61726bf918a39cb8d98a2e2995b002387807fa6ba58fdf7f59bb23" +-dependencies = [ +- "dtoa", +- "linked-hash-map", +- "serde", +- "yaml-rust", +-] +- + [[package]] + name = "serial_test" + version = "0.5.1" +@@ -4028,12 +3779,6 @@ dependencies = [ + "libc", + ] + +-[[package]] +-name = "similar" +-version = "1.3.0" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "1ad1d488a557b235fc46dae55512ffbfc429d2482b08b4d9435ab07384ca8aec" +- + [[package]] + name = "simple-mutex" + version = "1.1.5" +@@ -4372,12 +4117,6 @@ version = "0.2.2" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "f764005d11ee5f36500a149ace24e00e3da98b0158b3e2d53a7495660d3f4d60" + +-[[package]] +-name = "tap" +-version = "1.0.1" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369" +- + [[package]] + name = "tempfile" + version = "3.2.0" +@@ -4392,16 +4131,6 @@ dependencies = [ + "winapi", + ] + +-[[package]] +-name = "terminal_size" +-version = "0.1.16" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "86ca8ced750734db02076f44132d802af0b33b09942331f4459dde8636fd2406" +-dependencies = [ +- "libc", +- "winapi", +-] +- + [[package]] + name = "test-cli" + version = "0.1.0" +@@ -5094,12 +4823,6 @@ dependencies = [ + "user-facing-error-macros", + ] + +-[[package]] +-name = "utf8-width" +-version = "0.1.4" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "9071ac216321a4470a69fb2b28cfc68dcd1a39acd877c8be8e014df6772d8efa" +- + [[package]] + name = "uuid" + version = "0.8.2" +@@ -5361,18 +5084,3 @@ checksum = "7daf138b6b14196e3830a588acf1e86966c694d3e8fb026fb105b8b5dca07e6e" + dependencies = [ + "winapi", + ] +- +-[[package]] +-name = "wyz" +-version = "0.2.0" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "85e60b0d1b5f99db2556934e21937020776a5d31520bf169e851ac44e6420214" +- +-[[package]] +-name = "yaml-rust" +-version = "0.4.5" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "56c1936c4cc7a1c9ab21a1ebb602eb942ba868cbd44a99cb7cdc5892335e1c85" +-dependencies = [ +- "linked-hash-map", +-] +diff --git a/Cargo.toml b/Cargo.toml +index 2411986ea..2eb2bb82d 100644 +--- a/Cargo.toml ++++ b/Cargo.toml +@@ -3,7 +3,6 @@ members = [ + "introspection-engine/connectors/introspection-connector", + "introspection-engine/connectors/sql-introspection-connector", + "introspection-engine/core", +- "introspection-engine/introspection-engine-tests", + "libs/datamodel/connectors/datamodel-connector", + "libs/datamodel/connectors/sql-datamodel-connector", + "libs/datamodel/connectors/mongodb-datamodel-connector", +@@ -12,14 +11,12 @@ members = [ + "migration-engine/connectors/sql-migration-connector", + "migration-engine/connectors/mongodb-migration-connector", + "migration-engine/core", +- "migration-engine/migration-engine-tests", + "query-engine/connectors/query-connector", + "query-engine/connectors/sql-query-connector", + "query-engine/connectors/mongodb-query-connector", + "query-engine/core", + "query-engine/query-engine", + "query-engine/query-engine-node-api", +- "query-engine/connector-test-kit-rs/query-engine-tests", + "query-engine/request-handlers", + "prisma-fmt", + "libs/datamodel/core", diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 965c9f1ce8a8..12d312b657a1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -302,6 +302,8 @@ with pkgs; mix2nix = callPackage ../development/tools/mix2nix/default.nix { }; + prisma-engines = callPackage ../development/tools/database/prisma-engines { }; + proto-contrib = callPackage ../development/tools/proto-contrib {}; protoc-gen-doc = callPackage ../development/tools/protoc-gen-doc {};