From 6504eee8e06eaca10927f355d87c4ecb2dc25ddf Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 4 Sep 2024 07:06:24 +0000 Subject: [PATCH 01/84] ecc: 1.0.12 -> 1.0.27 --- pkgs/by-name/ec/ecc/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ec/ecc/package.nix b/pkgs/by-name/ec/ecc/package.nix index cf91d52875cc..09daa8a137a1 100644 --- a/pkgs/by-name/ec/ecc/package.nix +++ b/pkgs/by-name/ec/ecc/package.nix @@ -53,18 +53,18 @@ let in rustPlatform.buildRustPackage rec { pname = "ecc"; - version = "1.0.12"; + version = "1.0.27"; src = fetchFromGitHub { owner = "eunomia-bpf"; repo = "eunomia-bpf"; rev = "v${version}"; - hash = "sha256-EK/SZ9LNAk88JpHJEoxw12NHje6QdCqO/vT2TfkWlb0="; + hash = "sha256-KfYCC+TJbmjHrV46LoshD+uXcaBVMKk6+cN7TZKKYp4="; }; sourceRoot = "${src.name}/compiler/cmd"; - cargoHash = "sha256-ymBEzFsMTxKSdJRYoDY3AC0QpgtcMlU0fQV03emCxQc="; + cargoHash = "sha256-t8sPwAha90SMC/SJqZngXD9hpoaWh9e91X/kuHN4G7o="; nativeBuildInputs = [ pkg-config From e447004694c6f3397e1e04411fc8bcb42f74d385 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 21 Sep 2024 13:37:59 +0000 Subject: [PATCH 02/84] cni-plugin-flannel: 1.2.0 -> 1.5.1-flannel3 --- pkgs/tools/networking/flannel/plugin.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/flannel/plugin.nix b/pkgs/tools/networking/flannel/plugin.nix index 0ff8e600ff44..ecd5954fef0e 100644 --- a/pkgs/tools/networking/flannel/plugin.nix +++ b/pkgs/tools/networking/flannel/plugin.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "cni-plugin-flannel"; - version = "1.2.0"; + version = "1.5.1-flannel3"; src = fetchFromGitHub { owner = "flannel-io"; repo = "cni-plugin"; rev = "v${version}"; - sha256 = "sha256-9AVXm3+VJFLQwe7EHwI8LmWKxfX1r0yjmKeaReQvxR4="; + sha256 = "sha256-uYjBRfcNop84pbFoXxFa73GzC6U5wMxix3fTRFn7FsM="; }; - vendorHash = "sha256-DhvaXC/n4yiVDibB8kymzltNhEIxKdTsEDN9Sfc/wxU="; + vendorHash = "sha256-ZBd7ngYfsmdSGHE9a0kiEB7SeYc9RfaU9MILK2r3cyg="; ldflags = [ "-s" "-w" From 9ce0e1dcaf106deec0d43cfb5b0ed8c9828fe7f5 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 5 Oct 2024 08:17:34 +0000 Subject: [PATCH 03/84] eddy: 1.2.1 -> 3.6 --- pkgs/applications/graphics/eddy/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/graphics/eddy/default.nix b/pkgs/applications/graphics/eddy/default.nix index 6dac49fc5d15..f8ee5bf288d0 100644 --- a/pkgs/applications/graphics/eddy/default.nix +++ b/pkgs/applications/graphics/eddy/default.nix @@ -8,13 +8,13 @@ python3Packages.buildPythonApplication rec { pname = "eddy"; - version = "1.2.1"; + version = "3.6"; src = fetchFromGitHub { owner = "obdasystems"; repo = pname; - rev = "v${version}"; - sha256 = "12j77bbva5py9bd57c80cmjvf8vll40h19n81h16lvv2r2r7jynh"; + rev = "refs/tags/v${version}"; + sha256 = "sha256-vRmLUIqU0qfcnKzymBGb9gfM/uQiAcUHUnyz8iH/GrM="; }; propagatedBuildInputs = [ From 708a493c1397937ac2c8dc1e18b655b455d69f70 Mon Sep 17 00:00:00 2001 From: Greg Hellings Date: Thu, 24 Oct 2024 14:56:38 -0500 Subject: [PATCH 04/84] python3: proper syntax for Windows patches Windows patches were being added with a shell glob, which was dying with an error. See #351007. Use filesystem methods to walk the patch set and retrieve the patch names. Also, update the patches from the Fedora project to the latest for Python 3.11.9 and add filtering for any that are already applied to the 3.11.10 in the current cycle. python312 still fails to cross-compile after this patch, but at least 3.11 will again be available --- .../interpreters/python/cpython/default.nix | 26 +++++++++++++++---- 1 file changed, 21 insertions(+), 5 deletions(-) diff --git a/pkgs/development/interpreters/python/cpython/default.nix b/pkgs/development/interpreters/python/cpython/default.nix index 37764506e296..392aa5afb145 100644 --- a/pkgs/development/interpreters/python/cpython/default.nix +++ b/pkgs/development/interpreters/python/cpython/default.nix @@ -310,12 +310,28 @@ in with passthru; stdenv.mkDerivation (finalAttrs: { mingw-patch = fetchgit { name = "mingw-python-patches"; url = "https://src.fedoraproject.org/rpms/mingw-python3.git"; - rev = "45c45833ab9e5480ad0ae00778a05ebf35812ed4"; # for python 3.11.5 at the time of writing. - sha256 = "sha256-KIyNvO6MlYTrmSy9V/DbzXm5OsIuyT/BEpuo7Umm9DI="; + rev = "3edecdbfb4bbf1276d09cd5e80e9fb3dd88c9511"; # for python 3.11.9 at the time of writing. + hash = "sha256-kpXoIHlz53+0FAm/fK99ZBdNUg0u13erOr1XP2FSkQY="; }; - in [ - "${mingw-patch}/*.patch" - ]); + in ( + builtins.map (f: "${mingw-patch}/${f}") + [ + # The other patches in that repo are already applied to 3.11.10 + "mingw-python3_distutils.patch" + "mingw-python3_frozenmain.patch" + "mingw-python3_make-sysconfigdata.py-relocatable.patch" + "mingw-python3_mods-failed.patch" + "mingw-python3_module-select.patch" + "mingw-python3_module-socket.patch" + "mingw-python3_modules.patch" + "mingw-python3_platform-mingw.patch" + "mingw-python3_posix-layout.patch" + "mingw-python3_pthread_threadid.patch" + "mingw-python3_pythonw.patch" + "mingw-python3_setenv.patch" + "mingw-python3_win-modules.patch" + ]) + ); postPatch = optionalString (!stdenv.hostPlatform.isWindows) '' substituteInPlace Lib/subprocess.py \ From fe7142ef013aefec0375d34c250835d429672a22 Mon Sep 17 00:00:00 2001 From: wxt <3264117476@qq.com> Date: Mon, 11 Nov 2024 20:36:57 +0800 Subject: [PATCH 05/84] aws-shell: init at 0.2.2 --- pkgs/by-name/aw/aws-shell/package.nix | 55 +++++++++++++++++++++++++++ 1 file changed, 55 insertions(+) create mode 100644 pkgs/by-name/aw/aws-shell/package.nix diff --git a/pkgs/by-name/aw/aws-shell/package.nix b/pkgs/by-name/aw/aws-shell/package.nix new file mode 100644 index 000000000000..5b1222f5ef84 --- /dev/null +++ b/pkgs/by-name/aw/aws-shell/package.nix @@ -0,0 +1,55 @@ +{ + python3Packages, + lib, + fetchFromGitHub, + awscli, +}: + +python3Packages.buildPythonApplication rec { + pname = "aws-shell"; + version = "0.2.2"; + + src = fetchFromGitHub { + owner = "awslabs"; + repo = "aws-shell"; + rev = "refs/tags/${version}"; + hash = "sha256-m96XaaFDFQaD2YPjw8D1sGJ5lex4Is4LQ5RhGzVPvH4="; + }; + + build-system = with python3Packages; [ + setuptools + ]; + + dependencies = with python3Packages; [ + botocore + pygments + mock + configobj + awscli + (prompt-toolkit.overrideAttrs (old: { + src = fetchFromGitHub { + owner = "prompt-toolkit"; + repo = "python-prompt-toolkit"; + rev = "refs/tags/1.0.18"; # Need >=1.0.0,<1.1.0 + hash = "sha256-mt/fIubkpeVc7vhAaTk0pXZXI8JzB7n2MzXqgqK0wE4="; + }; + })) + ]; + + nativeCheckInputs = with python3Packages; [ + pytestCheckHook + ]; + + preCheck = '' + export HOME=$(mktemp -d) + ''; + + meta = { + homepage = "https://github.com/awslabs/aws-shell"; + description = "Integrated shell for working with the AWS CLI"; + platforms = lib.platforms.unix; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ bot-wxt1221 ]; + mainProgram = "aws-shell"; + }; +} From c567efd682d38e7fbdf19d1032cddfbd8c004628 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 13 Nov 2024 02:49:44 +0000 Subject: [PATCH 06/84] pwsafe: 1.18.0 -> 1.20.0 --- pkgs/by-name/pw/pwsafe/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/pw/pwsafe/package.nix b/pkgs/by-name/pw/pwsafe/package.nix index b2856cb7978e..87a937da7f1a 100644 --- a/pkgs/by-name/pw/pwsafe/package.nix +++ b/pkgs/by-name/pw/pwsafe/package.nix @@ -28,13 +28,13 @@ let in stdenv.mkDerivation rec { pname = "pwsafe"; - version = "1.18.0"; # do NOT update to 3.x Windows releases + version = "1.20.0"; # do NOT update to 3.x Windows releases src = fetchFromGitHub { owner = pname; repo = pname; rev = version; - hash = "sha256-2n3JJ/DPhJpNOyviYpqQQl83IAZnmnH5w7b/pOGU8K8="; + hash = "sha256-GmM7AXnTjw6kme2mZqmKrirsorosSygJ38H5fnIqTZ4="; }; strictDeps = true; From 7a87303563fa0b4906991f1a131a61489ca97866 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 16 Nov 2024 22:11:39 +0000 Subject: [PATCH 07/84] pulsarctl: 2.11.1.3 -> 4.0.0.4 --- pkgs/by-name/pu/pulsarctl/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/pu/pulsarctl/package.nix b/pkgs/by-name/pu/pulsarctl/package.nix index 3599bcb09611..0ed60854d6e0 100644 --- a/pkgs/by-name/pu/pulsarctl/package.nix +++ b/pkgs/by-name/pu/pulsarctl/package.nix @@ -10,16 +10,16 @@ buildGoModule rec { pname = "pulsarctl"; - version = "2.11.1.3"; + version = "4.0.0.4"; src = fetchFromGitHub { owner = "streamnative"; repo = "pulsarctl"; rev = "v${version}"; - hash = "sha256-sztjHw3su8KAV/zZcJqPWhjblINa8nYCN5Dzhn6X07w="; + hash = "sha256-3uRDfoxj+ra6fEOE317ENKEuv5q+qHcEm6rw2GODK5g="; }; - vendorHash = "sha256-NQ8zvrW6lBF1js+WI2PPvXhv4YRS2IBT6S4vDoE1BFc="; + vendorHash = "sha256-wNUTJn7Ar+GlePEhdr6xeolAiltJdAoIs5o5uDo8Ibs="; nativeBuildInputs = [ installShellFiles ]; From 6a2805234bbff2d37c1025983c7e29c4b6d54aad Mon Sep 17 00:00:00 2001 From: wxt <3264117476@qq.com> Date: Mon, 25 Nov 2024 14:46:48 +0800 Subject: [PATCH 08/84] apache-answer: init at 1.4.1 --- pkgs/by-name/ap/apache-answer/package.nix | 79 +++++++++++++++++++++++ 1 file changed, 79 insertions(+) create mode 100644 pkgs/by-name/ap/apache-answer/package.nix diff --git a/pkgs/by-name/ap/apache-answer/package.nix b/pkgs/by-name/ap/apache-answer/package.nix new file mode 100644 index 000000000000..20c446c38ba4 --- /dev/null +++ b/pkgs/by-name/ap/apache-answer/package.nix @@ -0,0 +1,79 @@ +{ + buildGoModule, + lib, + fetchFromGitHub, + pnpm, + nodejs, + fetchpatch, + stdenv, +}: + +buildGoModule rec { + pname = "apache-answer"; + version = "1.4.1"; + + src = fetchFromGitHub { + owner = "apache"; + repo = "incubator-answer"; + rev = "refs/tags/v${version}"; + hash = "sha256-nS3ZDwY221axzo1HAz369f5jWZ/mpCn4r3OPPqjiohI="; + }; + + webui = stdenv.mkDerivation { + pname = pname + "-webui"; + inherit version src; + + sourceRoot = "${src.name}/ui"; + + pnpmDeps = pnpm.fetchDeps { + inherit src version pname; + sourceRoot = "${src.name}/ui"; + hash = "sha256-/se6IWeHdazqS7PzOpgtT4IxCJ1WptqBzZ/BdmGb4BA="; + }; + + nativeBuildInputs = [ + pnpm.configHook + nodejs + ]; + + buildPhase = '' + runHook preBuild + + pnpm build + + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + + mkdir -p $out + cp -r build/* $out + + runHook postInstall + ''; + }; + + vendorHash = "sha256-nvXr1YAqVCyhCgPtABTOtzDH+FCQhN9kSEhxKw7ipsE="; + + preBuild = '' + cp -r ${webui}/* ui/build/ + ''; + + patches = [ + (fetchpatch { + url = "https://github.com/apache/incubator-answer/commit/57b0d0e84dd0e0bf3c8a05a38a7f55eddc5f0dda.patch"; + hash = "sha256-TfF+PtrcMYYgNjgU4lGpnshdII8xECTT2L7M26uebn0="; + }) + ]; + + meta = { + homepage = "https://answer.apache.org/"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ bot-wxt1221 ]; + platforms = lib.platforms.unix; + mainProgram = "answer"; + changelog = "https://github.com/apache/incubator-answer/releases/tag/v${version}"; + description = "Q&A platform software for teams at any scales"; + }; +} From d2bdb08ccb202c23c48602c619b4165dc4a87979 Mon Sep 17 00:00:00 2001 From: Grimmauld Date: Thu, 28 Nov 2024 11:51:25 +0100 Subject: [PATCH 09/84] apparmor: adopt --- pkgs/os-specific/linux/apparmor/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/apparmor/default.nix b/pkgs/os-specific/linux/apparmor/default.nix index 33034e2f6f5b..8a21ef667a9f 100644 --- a/pkgs/os-specific/linux/apparmor/default.nix +++ b/pkgs/os-specific/linux/apparmor/default.nix @@ -29,7 +29,7 @@ let homepage = "https://apparmor.net/"; description = "Mandatory access control system - ${component}"; license = with licenses; [ gpl2Only lgpl21Only ]; - maintainers = with maintainers; [ julm thoughtpolice ]; + maintainers = with maintainers; [ julm thoughtpolice grimmauld ]; platforms = platforms.linux; }; From ceaeeb47cb395996ccc531a7f7e6ff56e433690f Mon Sep 17 00:00:00 2001 From: Grimmauld Date: Thu, 28 Nov 2024 11:52:27 +0100 Subject: [PATCH 10/84] nixos/apparmor: adopt --- nixos/modules/security/apparmor.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/security/apparmor.nix b/nixos/modules/security/apparmor.nix index d6195d24ea8d..e463e48f675e 100644 --- a/nixos/modules/security/apparmor.nix +++ b/nixos/modules/security/apparmor.nix @@ -210,5 +210,5 @@ in }; }; - meta.maintainers = with lib.maintainers; [ julm ]; + meta.maintainers = with lib.maintainers; [ julm grimmauld ]; } From 407bd6b3446bb9c332031ddbf1effb3c10524919 Mon Sep 17 00:00:00 2001 From: Grimmauld Date: Thu, 28 Nov 2024 11:52:46 +0100 Subject: [PATCH 11/84] nixos/tests/apparmor: adopt --- nixos/tests/apparmor.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/tests/apparmor.nix b/nixos/tests/apparmor.nix index be91e9632849..f75c0c72718d 100644 --- a/nixos/tests/apparmor.nix +++ b/nixos/tests/apparmor.nix @@ -1,6 +1,6 @@ import ./make-test-python.nix ({ pkgs, lib, ... } : { name = "apparmor"; - meta.maintainers = with lib.maintainers; [ julm ]; + meta.maintainers = with lib.maintainers; [ julm grimmauld ]; nodes.machine = { lib, pkgs, config, ... }: From 0f8f5cb2f2b9809f1510b97af7880cd541d9506e Mon Sep 17 00:00:00 2001 From: Jordan Williams Date: Mon, 2 Dec 2024 07:15:16 -0600 Subject: [PATCH 12/84] wchisp: use versionCheckHook --- pkgs/by-name/wc/wchisp/package.nix | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/wc/wchisp/package.nix b/pkgs/by-name/wc/wchisp/package.nix index 251d72a3f550..a11a3d43579d 100644 --- a/pkgs/by-name/wc/wchisp/package.nix +++ b/pkgs/by-name/wc/wchisp/package.nix @@ -6,8 +6,7 @@ pkg-config, libusb1, nix-update-script, - testers, - wchisp, + versionCheckHook, }: rustPlatform.buildRustPackage rec { @@ -27,11 +26,11 @@ rustPlatform.buildRustPackage rec { libusb1 ]; + doInstallCheck = true; + nativeInstallCheckInputs = [ versionCheckHook ]; + passthru = { updateScript = nix-update-script { }; - tests.version = testers.testVersion { - package = wchisp; - }; }; meta = { From 9de368ab8743e54d39412fd7d23678cee8a0920b Mon Sep 17 00:00:00 2001 From: Jordan Williams Date: Mon, 2 Dec 2024 07:17:46 -0600 Subject: [PATCH 13/84] wlink: use versionCheckHook --- pkgs/by-name/wl/wlink/package.nix | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/wl/wlink/package.nix b/pkgs/by-name/wl/wlink/package.nix index b09bc4c69fa8..5703b6c68f38 100644 --- a/pkgs/by-name/wl/wlink/package.nix +++ b/pkgs/by-name/wl/wlink/package.nix @@ -7,8 +7,7 @@ libusb1, udev, nix-update-script, - testers, - wlink, + versionCheckHook, }: rustPlatform.buildRustPackage rec { @@ -29,11 +28,11 @@ rustPlatform.buildRustPackage rec { udev ]; + doInstallCheck = true; + nativeInstallCheckInputs = [ versionCheckHook ]; + passthru = { updateScript = nix-update-script { }; - tests.version = testers.testVersion { - package = wlink; - }; }; meta = { From 623446f9f00f24b820bc3ff362bbd3671ac3aa36 Mon Sep 17 00:00:00 2001 From: Ben Siraphob Date: Sun, 1 Dec 2024 00:24:54 -0500 Subject: [PATCH 14/84] python3Packages.eth-utils: 4.0.0 -> 5.1.0 --- .../python-modules/eth-utils/default.nix | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/pkgs/development/python-modules/eth-utils/default.nix b/pkgs/development/python-modules/eth-utils/default.nix index 2167c3e1abdd..a9e5790fcf4f 100644 --- a/pkgs/development/python-modules/eth-utils/default.nix +++ b/pkgs/development/python-modules/eth-utils/default.nix @@ -11,11 +11,12 @@ pythonOlder, setuptools, toolz, + mypy, }: buildPythonPackage rec { pname = "eth-utils"; - version = "4.0.0"; + version = "5.1.0"; pyproject = true; disabled = pythonOlder "3.6"; @@ -23,7 +24,7 @@ buildPythonPackage rec { owner = "ethereum"; repo = "eth-utils"; rev = "v${version}"; - hash = "sha256-k2pHM1eKPzoGxZlU6yT7bZMv4CCWGaZaSnFHSbT76Zo="; + hash = "sha256-uPzg1gUEsulQL2u22R/REHWx1ZtbMxvcXf6UgWqkDF4="; }; nativeBuildInputs = [ setuptools ]; @@ -36,19 +37,18 @@ buildPythonPackage rec { nativeCheckInputs = [ hypothesis pytestCheckHook + mypy ] ++ eth-hash.optional-dependencies.pycryptodome; - # Removing a poorly written test case from test suite. - # TODO work with the upstream - disabledTestPaths = [ "tests/functional-utils/test_type_inference.py" ]; - pythonImportsCheck = [ "eth_utils" ]; - meta = { + disabledTests = [ "test_install_local_wheel" ]; + + meta = with lib; { changelog = "https://github.com/ethereum/eth-utils/blob/${src.rev}/docs/release_notes.rst"; description = "Common utility functions for codebases which interact with ethereum"; homepage = "https://github.com/ethereum/eth-utils"; - license = lib.licenses.mit; - maintainers = [ ]; + license = licenses.mit; + maintainers = with maintainers; [ siraben ]; }; } From 607d6a4ed2b0b310d4348ec25989e80a9ae069c2 Mon Sep 17 00:00:00 2001 From: Nathan Regner Date: Sun, 17 Nov 2024 20:32:09 +0000 Subject: [PATCH 15/84] moonraker: 0.8.0-unstable-2023-12-27 -> 0.9.3-unstable-2024-11-17 --- pkgs/by-name/mo/moonraker/package.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/mo/moonraker/package.nix b/pkgs/by-name/mo/moonraker/package.nix index a6b3f3eb21e7..054ba5eb452e 100644 --- a/pkgs/by-name/mo/moonraker/package.nix +++ b/pkgs/by-name/mo/moonraker/package.nix @@ -20,17 +20,18 @@ let apprise python-periphery ldap3 + importlib-metadata ] ); in stdenvNoCC.mkDerivation rec { pname = "moonraker"; - version = "0.8.0-unstable-2023-12-27"; + version = "0.9.3-unstable-2024-11-17"; src = fetchFromGitHub { owner = "Arksine"; repo = "moonraker"; - rev = "c226e9c1e44d65ff6ea400b81e3cedba7f637976"; - sha256 = "sha256-wdf4uab8pJEWaX6PFN9Y9pykmylmxJ4Oo5pwSQcyjCc="; + rev = "ccfe32f2368a5ff6c2497478319909daeeeb8edf"; + sha256 = "sha256-aCYE3EmflMRIHnGnkZ/0+zScVA5liHSbavScQ7XRf/4="; }; nativeBuildInputs = [ makeWrapper ]; From 7695b70193a46586e209bf1c4e4968b6aa93327f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 4 Dec 2024 08:22:23 +0000 Subject: [PATCH 16/84] postgresqlPackages.pg_partman: 5.1.0 -> 5.2.1 --- pkgs/servers/sql/postgresql/ext/pg_partman.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/sql/postgresql/ext/pg_partman.nix b/pkgs/servers/sql/postgresql/ext/pg_partman.nix index 19c7efdf70f2..765599e00f1d 100644 --- a/pkgs/servers/sql/postgresql/ext/pg_partman.nix +++ b/pkgs/servers/sql/postgresql/ext/pg_partman.nix @@ -2,13 +2,13 @@ buildPostgresqlExtension rec { pname = "pg_partman"; - version = "5.1.0"; + version = "5.2.1"; src = fetchFromGitHub { owner = "pgpartman"; repo = pname; rev = "refs/tags/v${version}"; - sha256 = "sha256-GrVOJ5ywZMyqyDroYDLdKkXDdIJSDGhDfveO/ZvrmYs="; + sha256 = "sha256-DdF1UwfeAM4tlcvdXaiz28JA2UwNwPpXnSw5D9eZDlQ="; }; meta = with lib; { From 7625dbbe50f06c36ce150c0737d356557f30d5f5 Mon Sep 17 00:00:00 2001 From: liberodark Date: Thu, 5 Dec 2024 11:24:48 +0100 Subject: [PATCH 17/84] typora: fix --- pkgs/by-name/ty/typora/package.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/ty/typora/package.nix b/pkgs/by-name/ty/typora/package.nix index 43c655750db5..3f6f4a776767 100644 --- a/pkgs/by-name/ty/typora/package.nix +++ b/pkgs/by-name/ty/typora/package.nix @@ -60,6 +60,7 @@ let pango cairo mesa + libGL expat libxkbcommon ]) ++ (with pkgs.xorg; [ @@ -73,7 +74,7 @@ let libxcb ]); runScript = '' - Typora $* + Typora "$@" ''; }; From 33139a9c81a1a89f3aa2ca6591f8b7083de3abd9 Mon Sep 17 00:00:00 2001 From: mksafavi Date: Mon, 21 Oct 2024 20:15:42 +0330 Subject: [PATCH 18/84] turnon: init at 1.6.1 --- pkgs/by-name/tu/turnon/package.nix | 52 ++++++++++++++++++++++++++++++ 1 file changed, 52 insertions(+) create mode 100644 pkgs/by-name/tu/turnon/package.nix diff --git a/pkgs/by-name/tu/turnon/package.nix b/pkgs/by-name/tu/turnon/package.nix new file mode 100644 index 000000000000..72fcf0936ecb --- /dev/null +++ b/pkgs/by-name/tu/turnon/package.nix @@ -0,0 +1,52 @@ +{ + lib, + fetchFromGitHub, + rustPlatform, + cairo, + pango, + pkg-config, + libadwaita, + blueprint-compiler, + wrapGAppsHook4, +}: + +rustPlatform.buildRustPackage rec { + pname = "turnon"; + version = "1.6.1"; + + src = fetchFromGitHub { + owner = "swsnr"; + repo = "turnon"; + rev = "v${version}"; + hash = "sha256-727v1jQBBueLHvk0DphMHnrgJe46gap3hp0ygUYezJ0="; + }; + + cargoHash = "sha256-mywGCIjsoShRPRNMkTmVh7597QdvBSIsI/HucYv3CzY="; + + nativeBuildInputs = [ + cairo + pango + pkg-config + blueprint-compiler + wrapGAppsHook4 + ]; + + buildInputs = [ + libadwaita + ]; + + strictDeps = true; + + preBuild = '' + blueprint-compiler format resources/**/*.blp + ''; + + meta = { + description = "Turn on devices in your local network"; + homepage = "https://github.com/swsnr/turnon"; + license = lib.licenses.mpl20; + maintainers = with lib.maintainers; [ mksafavi ]; + mainProgram = "turnon"; + platforms = lib.platforms.linux; + }; +} From 7c38a1c89d44bd9faef787949d3e388fbdba1562 Mon Sep 17 00:00:00 2001 From: tsandrini Date: Thu, 5 Dec 2024 14:33:12 +0100 Subject: [PATCH 19/84] maintainers: update tsandrini contact info --- maintainers/maintainer-list.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 99c0b43aa982..8e00245315df 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -22732,7 +22732,7 @@ githubId = 332418; }; tsandrini = { - email = "tomas.sandrini@seznam.cz"; + email = "t@tsandrini.sh"; name = "Tomáš Sandrini"; github = "tsandrini"; githubId = 21975189; From 85c591ae348aa45c6664c924a2b4af0966da62fe Mon Sep 17 00:00:00 2001 From: tsandrini Date: Thu, 5 Dec 2024 14:44:13 +0100 Subject: [PATCH 20/84] vimPlugins.aw-watcher-vim: init at 2023-10-09 --- pkgs/applications/editors/vim/plugins/generated.nix | 12 ++++++++++++ pkgs/applications/editors/vim/plugins/overrides.nix | 9 +++++++++ .../patches/aw-watcher-vim/program_paths.patch | 13 +++++++++++++ 3 files changed, 34 insertions(+) create mode 100644 pkgs/applications/editors/vim/plugins/patches/aw-watcher-vim/program_paths.patch diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix index 87de33eff6ef..a49b622e57ff 100644 --- a/pkgs/applications/editors/vim/plugins/generated.nix +++ b/pkgs/applications/editors/vim/plugins/generated.nix @@ -1037,6 +1037,18 @@ final: prev: meta.homepage = "https://github.com/yetone/avante.nvim/"; }; + aw-watcher-vim = buildVimPlugin { + pname = "aw-watcher-vim"; + version = "2023-10-09"; + src = fetchFromGitHub { + owner = "ActivityWatch"; + repo = "aw-watcher-vim"; + rev = "4ba86d05a940574000c33f280fd7f6eccc284331"; + sha256 = "0kzpr2dgn80lcqbbf9ig6vx7azz6vbvadi31mxb0qyd91fyiidi3"; + }; + meta.homepage = "https://github.com/ActivityWatch/aw-watcher-vim/"; + }; + awesome-vim-colorschemes = buildVimPlugin { pname = "awesome-vim-colorschemes"; version = "2024-05-18"; diff --git a/pkgs/applications/editors/vim/plugins/overrides.nix b/pkgs/applications/editors/vim/plugins/overrides.nix index b5ff7ce37fef..427732414a7a 100644 --- a/pkgs/applications/editors/vim/plugins/overrides.nix +++ b/pkgs/applications/editors/vim/plugins/overrides.nix @@ -258,6 +258,15 @@ in } ); + aw-watcher-vim = super.aw-watcher-vim.overrideAttrs { + patches = [ + (substituteAll { + src = ./patches/aw-watcher-vim/program_paths.patch; + curl = lib.getExe curl; + }) + ]; + }; + bamboo-nvim = super.bamboo-nvim.overrideAttrs { nvimSkipModule = [ # Requires config table diff --git a/pkgs/applications/editors/vim/plugins/patches/aw-watcher-vim/program_paths.patch b/pkgs/applications/editors/vim/plugins/patches/aw-watcher-vim/program_paths.patch new file mode 100644 index 000000000000..857327664108 --- /dev/null +++ b/pkgs/applications/editors/vim/plugins/patches/aw-watcher-vim/program_paths.patch @@ -0,0 +1,13 @@ +diff --git a/plugin/activitywatch.vim b/plugin/activitywatch.vim +index 6986553..7462b02 100644 +--- a/plugin/activitywatch.vim ++++ b/plugin/activitywatch.vim +@@ -29,7 +29,7 @@ let s:heartbeat_apiurl = printf('%s/heartbeat?pulsetime=30', s:bucket_apiurl) + let s:http_response_code = {} + + function! HTTPPostJson(url, data) +- let l:req = ['curl', '-s', a:url, ++ let l:req = ['@curl@', '-s', a:url, + \ '-H', 'Content-Type: application/json', + \ '-X', 'POST', + \ '-d', json_encode(a:data), From afbcac7241774d4fddbb0ee14d0ee0dd17e6200f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 5 Dec 2024 14:41:59 +0000 Subject: [PATCH 21/84] remotebox: 2.7 -> 3.4 --- pkgs/by-name/re/remotebox/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/re/remotebox/package.nix b/pkgs/by-name/re/remotebox/package.nix index 3e7c50690896..7aede37fe70c 100644 --- a/pkgs/by-name/re/remotebox/package.nix +++ b/pkgs/by-name/re/remotebox/package.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "remotebox"; - version = "2.7"; + version = "3.4"; src = fetchurl { url = "http://remotebox.knobgoblin.org.uk/downloads/RemoteBox-${version}.tar.bz2"; - sha256 = "0csf6gd7pqq4abia4z0zpzlq865ri1z0821kjy7p3iawqlfn75pb"; + sha256 = "sha256-oIWSli/pc+kqMkYqkeHr3fZshWUHx6ecqAZXf6fl2ik="; }; buildInputs = with perlPackages; [ perl Glib Gtk2 Pango SOAPLite ]; From 9e7fccbc7cf8937f0de1e7c5190121c56e018589 Mon Sep 17 00:00:00 2001 From: dish Date: Thu, 5 Dec 2024 12:43:58 -0500 Subject: [PATCH 22/84] python312Packages.azure-mgmt-servicebus: remove unused msrestazure dependency --- .../python-modules/azure-mgmt-servicebus/default.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/development/python-modules/azure-mgmt-servicebus/default.nix b/pkgs/development/python-modules/azure-mgmt-servicebus/default.nix index 1606e56cccdc..5a65c44388ea 100644 --- a/pkgs/development/python-modules/azure-mgmt-servicebus/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-servicebus/default.nix @@ -3,7 +3,6 @@ buildPythonPackage, fetchPypi, msrest, - msrestazure, azure-common, azure-mgmt-core, pythonOlder, @@ -24,7 +23,6 @@ buildPythonPackage rec { propagatedBuildInputs = [ msrest - msrestazure azure-common azure-mgmt-core ]; From 548c320a5ed2c6d97a37ce6d304849b280b82df6 Mon Sep 17 00:00:00 2001 From: dish Date: Thu, 5 Dec 2024 12:46:59 -0500 Subject: [PATCH 23/84] python312Packages.azure-mgmt-servicebus: modernize --- .../azure-mgmt-servicebus/default.nix | 20 +++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/pkgs/development/python-modules/azure-mgmt-servicebus/default.nix b/pkgs/development/python-modules/azure-mgmt-servicebus/default.nix index 5a65c44388ea..417528219abf 100644 --- a/pkgs/development/python-modules/azure-mgmt-servicebus/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-servicebus/default.nix @@ -5,15 +5,13 @@ msrest, azure-common, azure-mgmt-core, - pythonOlder, + setuptools, }: buildPythonPackage rec { pname = "azure-mgmt-servicebus"; version = "8.2.0"; - format = "setuptools"; - - disabled = pythonOlder "3.7"; + pyproject = true; src = fetchPypi { inherit pname version; @@ -21,7 +19,9 @@ buildPythonPackage rec { hash = "sha256-i+kgjxQdmnifaNuNIZdU/3gGn9j5OQ6fdkS7laO+nsI="; }; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ msrest azure-common azure-mgmt-core @@ -30,10 +30,14 @@ buildPythonPackage rec { # Module has no tests doCheck = false; - meta = with lib; { + pythonNamespaces = [ "azure.mgmt" ]; + + pythonImportsCheck = [ "azure.mgmt.servicebus" ]; + + meta = { description = "This is the Microsoft Azure Service Bus Management Client Library"; homepage = "https://github.com/Azure/azure-sdk-for-python"; - license = licenses.mit; - maintainers = with maintainers; [ maxwilson ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ maxwilson ]; }; } From d6a797d5c95d2a2a96eedc69cb5c174f5c3ee30f Mon Sep 17 00:00:00 2001 From: dish Date: Thu, 5 Dec 2024 12:53:01 -0500 Subject: [PATCH 24/84] python312Packages.azure-mgmt-hdinsight: remove msrestazure dependency --- .../development/python-modules/azure-mgmt-hdinsight/default.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/development/python-modules/azure-mgmt-hdinsight/default.nix b/pkgs/development/python-modules/azure-mgmt-hdinsight/default.nix index 2007e304f3ab..1799336ccd64 100644 --- a/pkgs/development/python-modules/azure-mgmt-hdinsight/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-hdinsight/default.nix @@ -5,7 +5,6 @@ buildPythonPackage, fetchPypi, msrest, - msrestazure, pythonOlder, setuptools, }: @@ -29,7 +28,6 @@ buildPythonPackage rec { azure-common azure-mgmt-core msrest - msrestazure ]; # no tests included From 6faab9df8159176a1dae49c79b7e8e620323c50c Mon Sep 17 00:00:00 2001 From: dish Date: Thu, 5 Dec 2024 12:54:04 -0500 Subject: [PATCH 25/84] python312Packages.azure-mgmt-hdinsight: modernize --- .../python-modules/azure-mgmt-hdinsight/default.nix | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/azure-mgmt-hdinsight/default.nix b/pkgs/development/python-modules/azure-mgmt-hdinsight/default.nix index 1799336ccd64..f8beaa1bb742 100644 --- a/pkgs/development/python-modules/azure-mgmt-hdinsight/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-hdinsight/default.nix @@ -5,7 +5,6 @@ buildPythonPackage, fetchPypi, msrest, - pythonOlder, setuptools, }: @@ -14,8 +13,6 @@ buildPythonPackage rec { version = "9.0.0"; pyproject = true; - disabled = pythonOlder "3.9"; - src = fetchPypi { inherit pname version; hash = "sha256-QevcacDR+B0l3TBDjBT/9DMfZmOfVYBbkYuWSer/54o="; @@ -33,16 +30,17 @@ buildPythonPackage rec { # no tests included doCheck = false; + pythonNamespaces = [ "azure.mgmt" ]; + pythonImportsCheck = [ - "azure.common" "azure.mgmt.hdinsight" ]; - meta = with lib; { + meta = { description = "Microsoft Azure HDInsight Management Client Library for Python"; homepage = "https://github.com/Azure/azure-sdk-for-python/tree/main/sdk/hdinsight/azure-mgmt-hdinsight"; changelog = "https://github.com/Azure/azure-sdk-for-python/blob/azure-mgmt-hdinsight_${version}/sdk/hdinsight/azure-mgmt-hdinsight/CHANGELOG.md"; - license = licenses.mit; + license = lib.licenses.mit; maintainers = [ ]; }; } From debfc9f3bb91cab0a41c70559b2a44ad3d170386 Mon Sep 17 00:00:00 2001 From: liberodark Date: Thu, 5 Dec 2024 12:08:15 +0100 Subject: [PATCH 26/84] typora: add launcher --- pkgs/by-name/ty/typora/package.nix | 28 +++++++++++++++++++++++++++- 1 file changed, 27 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/ty/typora/package.nix b/pkgs/by-name/ty/typora/package.nix index 3f6f4a776767..e15ba4bf023f 100644 --- a/pkgs/by-name/ty/typora/package.nix +++ b/pkgs/by-name/ty/typora/package.nix @@ -16,6 +16,7 @@ , expat , alsa-lib , buildFHSEnv +, writeTextFile }: let @@ -78,6 +79,31 @@ let ''; }; + launchScript = writeTextFile { + name = "typora-launcher"; + executable = true; + text = '' + #!${stdenv.shell} + + # Configuration directory setup + XDG_CONFIG_HOME=''${XDG_CONFIG_HOME:-~/.config} + TYPORA_CONFIG_DIR="$XDG_CONFIG_HOME/Typora" + TYPORA_DICT_DIR="$TYPORA_CONFIG_DIR/typora-dictionaries" + + # Create config directories with proper permissions + mkdir -p "$TYPORA_DICT_DIR" + chmod 755 "$TYPORA_CONFIG_DIR" + chmod 755 "$TYPORA_DICT_DIR" + + # Read user flags if they exist + if [ -f "$XDG_CONFIG_HOME/typora-flags.conf" ]; then + TYPORA_USER_FLAGS="$(sed 's/#.*//' "$XDG_CONFIG_HOME/typora-flags.conf" | tr '\n' ' ')" + fi + + exec ${typoraFHS}/bin/typora-fhs "$@" $TYPORA_USER_FLAGS + ''; + }; + in stdenv.mkDerivation { inherit pname version; @@ -88,7 +114,7 @@ in stdenv.mkDerivation { installPhase = '' runHook preInstall mkdir -p $out/bin - ln -s ${typoraFHS}/bin/typora-fhs $out/bin/typora + ln -s ${launchScript} $out/bin/typora ln -s ${typoraBase}/share/ $out runHook postInstall ''; From 9486e836ccf7a15780ab3b4f89135e0d3a9085e3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christian=20K=C3=B6gler?= Date: Mon, 2 Dec 2024 12:52:18 +0100 Subject: [PATCH 27/84] zenoh: initial add 1.0.3 --- pkgs/by-name/ze/zenoh/package.nix | 92 +++++++++++++++++++++++++++++++ 1 file changed, 92 insertions(+) create mode 100644 pkgs/by-name/ze/zenoh/package.nix diff --git a/pkgs/by-name/ze/zenoh/package.nix b/pkgs/by-name/ze/zenoh/package.nix new file mode 100644 index 000000000000..63a8f7a25262 --- /dev/null +++ b/pkgs/by-name/ze/zenoh/package.nix @@ -0,0 +1,92 @@ +{ + lib, + rustPlatform, + fetchFromGitHub, + testers, + zenoh, +}: +rustPlatform.buildRustPackage rec { + pname = "zenoh"; + version = "1.0.3"; + + src = fetchFromGitHub { + owner = "eclipse-zenoh"; + repo = "zenoh"; + rev = version; + hash = "sha256-3k266sIP3A76HlFGUax4XIVQqwCKSvShJuBIuNWKJ2c="; + }; + + cargoHash = "sha256-Ny7kLFJveibDmi48a5KS0GKumX4RUAkoeh66tx9oR5g="; + + cargoBuildFlags = [ + "--workspace" + # exclude examples + "--exclude" + "examples" + "--exclude" + "zenoh-backend-example" + "--exclude" + "zenoh-plugin-example" + "--exclude" + "zenoh-ext-examples" + ]; + + checkFlags = [ + # thread 'test_liveliness_query_clique' panicked at zenoh/tests/liveliness.rs:103:43: + # called `Result::unwrap()` on an `Err` value: Can not create a new TCP listener bound to tcp/localhost:47448... + "--skip test_liveliness_query_clique" + # thread 'test_liveliness_subscriber_double_client_history_middle' panicked at zenoh/tests/liveliness.rs:845:43: + # called `Result::unwrap()` on an `Err` value: Can not create a new TCP listener bound to tcp/localhost:47456... + "--skip test_liveliness_subscriber_double_client_history_middle" + # thread 'zenoh_matching_status_remote' panicked at zenoh/tests/matching.rs:155:5: + # assertion failed: received_status.ok().flatten().map(|s| + # s.matching_subscribers()).eq(&Some(true)) + "--skip zenoh_matching_status_remote" + # thread 'qos_pubsub' panicked at zenoh/tests/qos.rs:50:18: + # called `Result::unwrap()` on an `Err` value: Elapsed(()) + "--skip qos_pubsub" + # never ending tests + "--skip router_linkstate" + "--skip three_node_combination" + "--skip three_node_combination_multicast" + # Error: Timeout at zenoh/tests/routing.rs:453. + "--skip gossip" + # thread 'zenoh_session_multicast' panicked at zenoh/tests/session.rs:85:49: + # called `Result::unwrap()` on an `Err` value: Can not create a new UDP link bound to udp/224.0.0.1:17448... + "--skip zenoh_session_multicast" + # thread 'tests::transport_multicast_compression_udp_only' panicked at io/zenoh-transport/tests/multicast_compression.rs:170:86: + # called `Result::unwrap()` on an `Err` value: Can not create a new UDP link bound to udp/224.24.220.245:21000... + "--skip tests::transport_multicast_compression_udp_only" + # thread 'tests::transport_multicast_udp_only' panicked at io/zenoh-transport/tests/multicast_transport.rs:167:86: + # called `Result::unwrap()` on an `Err` value: Can not create a new UDP link bound to udp/224.52.216.110:20000... + "--skip tests::transport_multicast_udp_only" + # thread 'openclose_tcp_only_connect_with_interface_restriction' panicked at io/zenoh-transport/tests/unicast_openclose.rs:764:63: + # index out of bounds: the len is 0 but the index is 0 + "--skip openclose_tcp_only_connect_with_interface_restriction" + # thread 'openclose_udp_only_listen_with_interface_restriction' panicked at io/zenoh-transport/tests/unicast_openclose.rs:820:72: + # index out of bounds: the len is 0 but the index is 0 + "--skip openclose_tcp_only_listen_with_interface_restriction" + # thread 'openclose_tcp_only_listen_with_interface_restriction' panicked at io/zenoh-transport/tests/unicast_openclose.rs:783:72: + # index out of bounds: the len is 0 but the index is 0 + "--skip openclose_udp_only_connect_with_interface_restriction" + # thread 'openclose_udp_only_connect_with_interface_restriction' panicked at io/zenoh-transport/tests/unicast_openclose.rs:802:63: + # index out of bounds: the len is 0 but the index is 0 + "--skip openclose_udp_only_listen_with_interface_restriction" + ]; + + passthru.tests.version = testers.testVersion { + package = zenoh; + version = "v" + version; + }; + + meta = { + description = "Communication protocol that combines pub/sub with key value storage and computation"; + longDescription = "Zenoh unifies data in motion, data in-use, data at rest and computations. It carefully blends traditional pub/sub with geo-distributed storages, queries and computations, while retaining a level of time and space efficiency that is well beyond any of the mainstream stacks"; + homepage = "https://zenoh.io"; + changelog = "https://github.com/eclipse-zenoh/zenoh/releases/tag/${src.rev}"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ ck3d ]; + mainProgram = "zenohd"; + platforms = lib.platforms.linux; + }; +} From c11e96af6cbfb9e8fc9ad04843b639ef055d9d8a Mon Sep 17 00:00:00 2001 From: hlad Date: Mon, 2 Dec 2024 18:43:51 +0100 Subject: [PATCH 28/84] audiobookshelf: 2.17.2 -> 2.17.4 --- pkgs/by-name/au/audiobookshelf/source.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/au/audiobookshelf/source.json b/pkgs/by-name/au/audiobookshelf/source.json index b5b441db8990..56af6e274452 100644 --- a/pkgs/by-name/au/audiobookshelf/source.json +++ b/pkgs/by-name/au/audiobookshelf/source.json @@ -1,9 +1,9 @@ { "owner": "advplyr", "repo": "audiobookshelf", - "rev": "f850db23fe37dfe5044c2f5f641931528b291bf2", - "hash": "sha256-iboQnPmWIk/bYjEF+opjKU+XJVSD5DGCfqp6BJQRW3w=", - "version": "2.17.2", - "depsHash": "sha256-W56EG5SCiAcjHhR5WR1UBY9Xt0D0p8duEiUzx+luLfc=", - "clientDepsHash": "sha256-gEgd2PCFWqNuRXhnFZylGS0GTMJUD0KeHbRgYxMUMPM=" + "rev": "890b0b949ee758102fd05ba26c5ed5c3ebbd747f", + "hash": "sha256-sMtUO2ltlxipjNXqcHLVXlZZ8QOAGND77hItwcxx27Q=", + "version": "2.17.4", + "depsHash": "sha256-b2mcJ+Qh+VEYaZcy4LGCFPK9dFYsy48wUaEAJGYtBwc=", + "clientDepsHash": "sha256-CfRG7GqvtLL675Bkzi/WOERwp0EKzmC3u0ozxHoj9rI=" } From 74eae6a8b48c33499bbbb0f6cfe4e62a3ff32f06 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Fri, 6 Dec 2024 21:41:55 +0800 Subject: [PATCH 29/84] nixos/cinnamon: Add x-cinnamon-mimeapps.list This is specifically for https://github.com/linuxmint/nemo/blob/6.4.0/src/nemo-desktop-application.c#L398. The same thing is already done in the GNOME module. Otherwise when you e.g try "Downloads" -> "Show in Folder" in Firefox, it will just do nothing, this is probably not a good experience. ref: https://salsa.debian.org/cinnamon-team/cinnamon-desktop/-/blob/debian/6.2.0-1/debian/x-cinnamon-mimeapps.list ref: https://src.fedoraproject.org/rpms/cinnamon-desktop/blob/f41/f/x-cinnamon-mimeapps.list --- .../services/x11/desktop-managers/cinnamon.nix | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/nixos/modules/services/x11/desktop-managers/cinnamon.nix b/nixos/modules/services/x11/desktop-managers/cinnamon.nix index 5b0a28d85f25..0be1f302ebaf 100644 --- a/nixos/modules/services/x11/desktop-managers/cinnamon.nix +++ b/nixos/modules/services/x11/desktop-managers/cinnamon.nix @@ -135,6 +135,17 @@ in }; environment.systemPackages = with pkgs; ([ + # Teach nemo-desktop how to launch file browser. + # https://github.com/linuxmint/nemo/blob/6.4.0/src/nemo-desktop-application.c#L398 + (writeTextFile { + name = "x-cinnamon-mimeapps"; + destination = "/share/applications/x-cinnamon-mimeapps.list"; + text = '' + [Default Applications] + inode/directory=nemo.desktop + ''; + }) + desktop-file-utils # common-files From bb2beebab3aac07ce3dbfe46e22809d7b57de0dd Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 6 Dec 2024 14:59:31 +0000 Subject: [PATCH 30/84] opnborg: 0.1.24 -> 0.1.44 --- pkgs/by-name/op/opnborg/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/op/opnborg/package.nix b/pkgs/by-name/op/opnborg/package.nix index ab5e289280af..e765632d177c 100644 --- a/pkgs/by-name/op/opnborg/package.nix +++ b/pkgs/by-name/op/opnborg/package.nix @@ -5,13 +5,13 @@ }: buildGoModule rec { pname = "opnborg"; - version = "0.1.24"; + version = "0.1.44"; src = fetchFromGitHub { owner = "paepckehh"; repo = "opnborg"; rev = "v${version}"; - hash = "sha256-lJPu1Ixx1BUWrZ+h6AuxLyVMScKAmcp+sK2duOxC9e0="; + hash = "sha256-I8twrDeAEfsUOKE7+Jj5IqVjkIv9oNBDZjvGx5iwHRQ="; }; vendorHash = "sha256-REXJryUcu+/AdVx1aK0nJ98Wq/EdhrZqL24kC1wK6mc="; From 66e15872076784642e2684b04033ea826f9af308 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 6 Dec 2024 16:07:38 +0000 Subject: [PATCH 31/84] geesefs: 0.42.0 -> 0.42.3 --- pkgs/by-name/ge/geesefs/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ge/geesefs/package.nix b/pkgs/by-name/ge/geesefs/package.nix index e463e88c7327..8ac28ab7d38f 100644 --- a/pkgs/by-name/ge/geesefs/package.nix +++ b/pkgs/by-name/ge/geesefs/package.nix @@ -3,7 +3,7 @@ , fetchFromGitHub }: -let version = "0.42.0"; +let version = "0.42.3"; in buildGoModule { pname = "geesefs"; inherit version; @@ -12,12 +12,12 @@ in buildGoModule { owner = "yandex-cloud"; repo = "geesefs"; rev = "v${version}"; - hash = "sha256-bScx+4g1g4mE2l8nCWVZz/QT8jKOOpksqMmlTDp+DsA="; + hash = "sha256-keF6KrkHI5sIm5XCIpWAvKD1qu5XvWx3uR70eKhOZk8="; }; # hashes differ per architecture otherwise. proxyVendor = true; - vendorHash = "sha256-50ND58TuEilORX24qRSfWlO2A1fkCakm16UPOCse11E="; + vendorHash = "sha256-SQgYB6nLSnqKUntWGJL+dQD+cAPQ69Rjdq1GXIt21xg="; subPackages = [ "." ]; From 733c49cda479c61bb6e89a0f0fc9592e5d1a9434 Mon Sep 17 00:00:00 2001 From: Alexey Orlenko Date: Thu, 28 Nov 2024 20:58:14 +0100 Subject: [PATCH 32/84] prisma-engines: 5.22.0 -> 6.0.1 --- .../tools/database/prisma-engines/Cargo.lock | 6872 ----------------- .../tools/database/prisma-engines/default.nix | 19 +- 2 files changed, 5 insertions(+), 6886 deletions(-) delete mode 100644 pkgs/development/tools/database/prisma-engines/Cargo.lock diff --git a/pkgs/development/tools/database/prisma-engines/Cargo.lock b/pkgs/development/tools/database/prisma-engines/Cargo.lock deleted file mode 100644 index bb37bb4c275a..000000000000 --- a/pkgs/development/tools/database/prisma-engines/Cargo.lock +++ /dev/null @@ -1,6872 +0,0 @@ -# This file is automatically @generated by Cargo. -# It is not intended for manual editing. -version = 3 - -[[package]] -name = "addr2line" -version = "0.20.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4fa78e18c64fce05e902adecd7a5eed15a5e0a3439f7b0e169f0252214865e3" -dependencies = [ - "gimli", -] - -[[package]] -name = "adler" -version = "1.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" - -[[package]] -name = "ahash" -version = "0.7.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "891477e0c6a8957309ee5c45a6368af3ae14bb510732d2684ffa19af310920f9" -dependencies = [ - "getrandom 0.2.11", - "once_cell", - "version_check", -] - -[[package]] -name = "ahash" -version = "0.8.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e89da841a80418a9b391ebaea17f5c112ffaaa96f621d2c285b5174da76b9011" -dependencies = [ - "cfg-if", - "getrandom 0.2.11", - "once_cell", - "version_check", - "zerocopy", -] - -[[package]] -name = "aho-corasick" -version = "1.0.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86b8f9420f797f2d9e935edf629310eb938a0d839f984e25327f3c7eed22300c" -dependencies = [ - "memchr", -] - -[[package]] -name = "allocator-api2" -version = "0.2.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0942ffc6dcaadf03badf6e6a2d0228460359d5e34b57ccdc720b7382dfbd5ec5" - -[[package]] -name = "android-tzdata" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e999941b234f3131b00bc13c22d06e8c5ff726d1b6318ac7eb276997bbb4fef0" - -[[package]] -name = "android_system_properties" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "819e7219dbd41043ac279b19830f2efc897156490d7fd6ea916720117ee66311" -dependencies = [ - "libc", -] - -[[package]] -name = "anes" -version = "0.1.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b46cbb362ab8752921c97e041f5e366ee6297bd428a31275b9fcf1e380f7299" - -[[package]] -name = "ansi_term" -version = "0.12.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d52a9bb7ec0cf484c551830a7ce27bd20d67eac647e1befb56b0be4ee39a55d2" -dependencies = [ - "winapi", -] - -[[package]] -name = "anyhow" -version = "1.0.72" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b13c32d80ecc7ab747b80c3784bce54ee8a7a0cc4fbda9bf4cda2cf6fe90854" - -[[package]] -name = "arrayvec" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23b62fc65de8e4e7f52534fb52b0f3ed04746ae267519eef2a83941e8085068b" - -[[package]] -name = "arrayvec" -version = "0.7.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711" - -[[package]] -name = "ascii" -version = "0.9.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eab1c04a571841102f5345a8fc0f6bb3d31c315dec879b5c6e42e40ce7ffa34e" - -[[package]] -name = "async-native-tls" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d57d4cec3c647232e1094dc013546c0b33ce785d8aeb251e1f20dfaf8a9a13fe" -dependencies = [ - "futures-util", - "native-tls", - "thiserror", - "url", -] - -[[package]] -name = "async-stream" -version = "0.3.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd56dd203fef61ac097dd65721a419ddccb106b2d2b70ba60a6b529f03961a51" -dependencies = [ - "async-stream-impl", - "futures-core", - "pin-project-lite", -] - -[[package]] -name = "async-stream-impl" -version = "0.3.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "16e62a023e7c117e27523144c5d2459f4397fcc3cab0085af8e2224f643a0193" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.58", -] - -[[package]] -name = "async-trait" -version = "0.1.77" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c980ee35e870bd1a4d2c8294d4c04d0499e67bca1e4b5cefcc693c2fa00caea9" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.58", -] - -[[package]] -name = "async-tungstenite" -version = "0.28.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90e661b6cb0a6eb34d02c520b052daa3aa9ac0cc02495c9d066bbce13ead132b" -dependencies = [ - "futures-io", - "futures-util", - "log", - "native-tls", - "pin-project-lite", - "tokio", - "tokio-native-tls", - "tungstenite", -] - -[[package]] -name = "async_io_stream" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6d7b9decdf35d8908a7e3ef02f64c5e9b1695e230154c0e8de3969142d9b94c" -dependencies = [ - "futures", - "pharos", - "rustc_version", - "tokio", -] - -[[package]] -name = "asynchronous-codec" -version = "0.6.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4057f2c32adbb2fc158e22fb38433c8e9bbf76b75a4732c7c0cbaf695fb65568" -dependencies = [ - "bytes", - "futures-sink", - "futures-util", - "memchr", - "pin-project-lite", -] - -[[package]] -name = "atoi" -version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f28d99ec8bfea296261ca1af174f24225171fea9664ba9003cbebee704810528" -dependencies = [ - "num-traits", -] - -[[package]] -name = "atty" -version = "0.2.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8" -dependencies = [ - "hermit-abi 0.1.19", - "libc", - "winapi", -] - -[[package]] -name = "autocfg" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" - -[[package]] -name = "backtrace" -version = "0.3.68" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4319208da049c43661739c5fade2ba182f09d1dc2299b32298d3a31692b17e12" -dependencies = [ - "addr2line", - "cc", - "cfg-if", - "libc", - "miniz_oxide", - "object", - "rustc-demangle", -] - -[[package]] -name = "barrel" -version = "0.6.6-alpha.0" -source = "git+https://github.com/prisma/barrel.git?branch=mssql-support#4e84cf3d5013b4c92eb81d7ba90cd1c1c01c6805" - -[[package]] -name = "base-x" -version = "0.2.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4cbbc9d0964165b47557570cce6c952866c2678457aca742aafc9fb771d30270" - -[[package]] -name = "base36" -version = "0.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9c26bddc1271f7112e5ec797e8eeba6de2de211c1488e506b9500196dbf77c5" -dependencies = [ - "base-x", - "failure", -] - -[[package]] -name = "base64" -version = "0.12.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3441f0f7b02788e948e47f457ca01f1d7e6d92c693bc132c22b087d3141c03ff" - -[[package]] -name = "base64" -version = "0.13.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8" - -[[package]] -name = "base64" -version = "0.21.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "604178f6c5c21f02dc555784810edfb88d34ac2c73b2eae109655649ee73ce3d" - -[[package]] -name = "base64" -version = "0.22.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6" - -[[package]] -name = "bigdecimal" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a6773ddc0eafc0e509fb60e48dff7f450f8e674a0686ae8605e8d9901bd5eefa" -dependencies = [ - "num-bigint", - "num-integer", - "num-traits", -] - -[[package]] -name = "bindgen" -version = "0.59.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2bd2a9a458e8f4304c52c43ebb0cfbd520289f8379a52e329a38afda99bf8eb8" -dependencies = [ - "bitflags 1.3.2", - "cexpr", - "clang-sys", - "lazy_static", - "lazycell", - "peeking_take_while", - "proc-macro2", - "quote", - "regex", - "rustc-hash", - "shlex", -] - -[[package]] -name = "bit-vec" -version = "0.6.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "349f9b6a179ed607305526ca489b34ad0a41aed5f7980fa90eb03160b69598fb" - -[[package]] -name = "bitflags" -version = "1.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" - -[[package]] -name = "bitflags" -version = "2.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4682ae6287fcf752ecaabbfcc7b6f9b72aa33933dc23a554d853aea8eea8635" - -[[package]] -name = "bitvec" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1bc2832c24239b0141d5674bb9174f9d68a8b5b3f2753311927c172ca46f7e9c" -dependencies = [ - "funty", - "radium", - "tap", - "wyz", -] - -[[package]] -name = "black-box-tests" -version = "0.1.0" -dependencies = [ - "anyhow", - "enumflags2", - "indoc 2.0.3", - "insta", - "prisma-metrics", - "query-engine-tests", - "query-tests-setup", - "regex", - "reqwest", - "serde_json", - "tokio", - "user-facing-errors", -] - -[[package]] -name = "block-buffer" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4152116fd6e9dadb291ae18fc1ec3575ed6d84c29642d97890f4b4a3417297e4" -dependencies = [ - "generic-array", -] - -[[package]] -name = "block-buffer" -version = "0.10.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3078c7629b62d3f0439517fa394996acacc5cbc91c5a20d8c658e77abd503a71" -dependencies = [ - "generic-array", -] - -[[package]] -name = "borsh" -version = "0.10.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4114279215a005bc675e386011e594e1d9b800918cea18fcadadcce864a2046b" -dependencies = [ - "borsh-derive", - "hashbrown 0.12.3", -] - -[[package]] -name = "borsh-derive" -version = "0.10.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0754613691538d51f329cce9af41d7b7ca150bc973056f1156611489475f54f7" -dependencies = [ - "borsh-derive-internal", - "borsh-schema-derive-internal", - "proc-macro-crate", - "proc-macro2", - "syn 1.0.109", -] - -[[package]] -name = "borsh-derive-internal" -version = "0.10.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "afb438156919598d2c7bad7e1c0adf3d26ed3840dbc010db1a882a65583ca2fb" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", -] - -[[package]] -name = "borsh-schema-derive-internal" -version = "0.10.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "634205cc43f74a1b9046ef87c4540ebda95696ec0f315024860cad7c5b0f5ccd" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", -] - -[[package]] -name = "bson" -version = "2.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d8a88e82b9106923b5c4d6edfca9e7db958d4e98a478ec115022e81b9b38e2c8" -dependencies = [ - "ahash 0.8.11", - "base64 0.13.1", - "bitvec", - "chrono", - "hex", - "indexmap 2.2.2", - "js-sys", - "once_cell", - "rand 0.8.5", - "serde", - "serde_bytes", - "serde_json", - "time", - "uuid", -] - -[[package]] -name = "bstr" -version = "0.2.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba3569f383e8f1598449f1a423e72e99569137b47740b1da11ef19af3d5c3223" -dependencies = [ - "memchr", -] - -[[package]] -name = "build-utils" -version = "0.1.0" - -[[package]] -name = "bumpalo" -version = "3.13.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a3e2c3daef883ecc1b5d58c15adae93470a91d425f3532ba1695849656af3fc1" - -[[package]] -name = "bytecheck" -version = "0.6.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b6372023ac861f6e6dc89c8344a8f398fb42aaba2b5dbc649ca0c0e9dbcb627" -dependencies = [ - "bytecheck_derive", - "ptr_meta", - "simdutf8", -] - -[[package]] -name = "bytecheck_derive" -version = "0.6.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7ec4c6f261935ad534c0c22dbef2201b45918860eb1c574b972bd213a76af61" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", -] - -[[package]] -name = "byteorder" -version = "1.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610" - -[[package]] -name = "bytes" -version = "1.7.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "428d9aa8fbc0670b7b8d6030a7fadd0f86151cae55e4dbbece15f3780a3dfaf3" - -[[package]] -name = "cast" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "37b2a672a2cb129a2e41c10b1224bb368f9f37a2b16b612598138befd7b37eb5" - -[[package]] -name = "cbindgen" -version = "0.24.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b922faaf31122819ec80c4047cc684c6979a087366c069611e33649bf98e18d" -dependencies = [ - "clap 3.2.25", - "heck 0.4.1", - "indexmap 1.9.3", - "log", - "proc-macro2", - "quote", - "serde", - "serde_json", - "syn 1.0.109", - "tempfile", - "toml", -] - -[[package]] -name = "cc" -version = "1.1.30" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b16803a61b81d9eabb7eae2588776c4c1e584b738ede45fdbb4c972cec1e9945" -dependencies = [ - "shlex", -] - -[[package]] -name = "cexpr" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6fac387a98bb7c37292057cffc56d62ecb629900026402633ae9160df93a8766" -dependencies = [ - "nom", -] - -[[package]] -name = "cfg-if" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" - -[[package]] -name = "cfg_aliases" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "613afe47fcd5fac7ccf1db93babcb082c5994d996f20b8b159f2ad1658eb5724" - -[[package]] -name = "chrono" -version = "0.4.38" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a21f936df1771bf62b77f047b726c4625ff2e8aa607c01ec06e5a05bd8463401" -dependencies = [ - "android-tzdata", - "iana-time-zone", - "js-sys", - "num-traits", - "serde", - "wasm-bindgen", - "windows-targets 0.52.0", -] - -[[package]] -name = "ciborium" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "effd91f6c78e5a4ace8a5d3c0b6bfaec9e2baaef55f3efc00e45fb2e477ee926" -dependencies = [ - "ciborium-io", - "ciborium-ll", - "serde", -] - -[[package]] -name = "ciborium-io" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cdf919175532b369853f5d5e20b26b43112613fd6fe7aee757e35f7a44642656" - -[[package]] -name = "ciborium-ll" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "defaa24ecc093c77630e6c15e17c51f5e187bf35ee514f4e2d67baaa96dae22b" -dependencies = [ - "ciborium-io", - "half", -] - -[[package]] -name = "clang-sys" -version = "1.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c688fc74432808e3eb684cae8830a86be1d66a2bd58e1f248ed0960a590baf6f" -dependencies = [ - "glob", - "libc", - "libloading 0.7.4", -] - -[[package]] -name = "clap" -version = "2.34.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a0610544180c38b88101fecf2dd634b174a62eef6946f84dfc6a7127512b381c" -dependencies = [ - "ansi_term", - "atty", - "bitflags 1.3.2", - "strsim 0.8.0", - "textwrap 0.11.0", - "unicode-width", - "vec_map", -] - -[[package]] -name = "clap" -version = "3.2.25" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ea181bf566f71cb9a5d17a59e1871af638180a18fb0035c92ae62b705207123" -dependencies = [ - "atty", - "bitflags 1.3.2", - "clap_lex", - "indexmap 1.9.3", - "strsim 0.10.0", - "termcolor", - "textwrap 0.16.0", -] - -[[package]] -name = "clap_lex" -version = "0.2.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2850f2f5a82cbf437dd5af4d49848fbdfc27c157c3d010345776f952765261c5" -dependencies = [ - "os_str_bytes", -] - -[[package]] -name = "cmake" -version = "0.1.50" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a31c789563b815f77f4250caee12365734369f942439b7defd71e18a48197130" -dependencies = [ - "cc", -] - -[[package]] -name = "codspeed" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2042d58652a59f53ee0d7f61435b6760b63a9c09a598c7044a8c8b1a0a352afe" -dependencies = [ - "colored", - "libc", -] - -[[package]] -name = "codspeed-criterion-compat" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93201017af114a2ef3df75212aa456aa1a981673d84aa18555014bb89c2a7262" -dependencies = [ - "codspeed", - "colored", - "criterion", -] - -[[package]] -name = "colored" -version = "2.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2674ec482fbc38012cf31e6c42ba0177b431a0cb6f15fe40efa5aab1bda516f6" -dependencies = [ - "is-terminal", - "lazy_static", - "windows-sys 0.48.0", -] - -[[package]] -name = "combine" -version = "3.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da3da6baa321ec19e1cc41d31bf599f00c783d0517095cdaf0332e3fe8d20680" -dependencies = [ - "ascii", - "byteorder", - "either", - "memchr", - "unreachable", -] - -[[package]] -name = "concat-idents" -version = "1.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f76990911f2267d837d9d0ad060aa63aaad170af40904b29461734c339030d4d" -dependencies = [ - "quote", - "syn 2.0.58", -] - -[[package]] -name = "concurrent-queue" -version = "2.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ca0197aee26d1ae37445ee532fefce43251d24cc7c166799f4d46817f1d3973" -dependencies = [ - "crossbeam-utils", -] - -[[package]] -name = "connection-string" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "510ca239cf13b7f8d16a2b48f263de7b4f8c566f0af58d901031473c76afb1e3" - -[[package]] -name = "console" -version = "0.15.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c926e00cc70edefdc64d3a5ff31cc65bb97a3460097762bd23afb4d8145fccf8" -dependencies = [ - "encode_unicode", - "lazy_static", - "libc", - "windows-sys 0.45.0", -] - -[[package]] -name = "convert_case" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6245d59a3e82a7fc217c5828a6692dbc6dfb63a0c8c90495621f7b9d79704a0e" - -[[package]] -name = "convert_case" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec182b0ca2f35d8fc196cf3404988fd8b8c739a4d270ff118a398feb0cbec1ca" -dependencies = [ - "unicode-segmentation", -] - -[[package]] -name = "core-foundation" -version = "0.9.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "194a7a9e6de53fa55116934067c844d9d749312f75c6f6d0980e8c252f8c2146" -dependencies = [ - "core-foundation-sys", - "libc", -] - -[[package]] -name = "core-foundation-sys" -version = "0.8.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e496a50fda8aacccc86d7529e2c1e0892dbd0f898a6b5645b5561b89c3210efa" - -[[package]] -name = "core-tests" -version = "0.1.0" -dependencies = [ - "dissimilar", - "psl", - "query-core", - "request-handlers", - "schema", - "serde_json", - "user-facing-errors", -] - -[[package]] -name = "cpufeatures" -version = "0.2.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a17b76ff3a4162b0b27f354a0c87015ddad39d35f9c0c36607a3bdd175dde1f1" -dependencies = [ - "libc", -] - -[[package]] -name = "crc32fast" -version = "1.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b540bd8bc810d3885c6ea91e2018302f68baba2129ab3e88f32389ee9370880d" -dependencies = [ - "cfg-if", -] - -[[package]] -name = "criterion" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7c76e09c1aae2bc52b3d2f29e13c6572553b30c4aa1b8a49fd70de6412654cb" -dependencies = [ - "anes", - "atty", - "cast", - "ciborium", - "clap 3.2.25", - "criterion-plot", - "itertools 0.10.5", - "lazy_static", - "num-traits", - "oorandom", - "plotters", - "rayon", - "regex", - "serde", - "serde_derive", - "serde_json", - "tinytemplate", - "walkdir", -] - -[[package]] -name = "criterion-plot" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b50826342786a51a89e2da3a28f1c32b06e387201bc2d19791f622c673706b1" -dependencies = [ - "cast", - "itertools 0.10.5", -] - -[[package]] -name = "crossbeam" -version = "0.8.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2801af0d36612ae591caa9568261fddce32ce6e08a7275ea334a06a4ad021a2c" -dependencies = [ - "cfg-if", - "crossbeam-channel", - "crossbeam-deque", - "crossbeam-epoch", - "crossbeam-queue", - "crossbeam-utils", -] - -[[package]] -name = "crossbeam-channel" -version = "0.5.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a33c2bf77f2df06183c3aa30d1e96c0695a313d4f9c453cc3762a6db39f99200" -dependencies = [ - "cfg-if", - "crossbeam-utils", -] - -[[package]] -name = "crossbeam-deque" -version = "0.8.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce6fd6f855243022dcecf8702fef0c297d4338e226845fe067f6341ad9fa0cef" -dependencies = [ - "cfg-if", - "crossbeam-epoch", - "crossbeam-utils", -] - -[[package]] -name = "crossbeam-epoch" -version = "0.9.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae211234986c545741a7dc064309f67ee1e5ad243d0e48335adc0484d960bcc7" -dependencies = [ - "autocfg", - "cfg-if", - "crossbeam-utils", - "memoffset", - "scopeguard", -] - -[[package]] -name = "crossbeam-queue" -version = "0.3.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d1cfb3ea8a53f37c40dea2c7bedcbd88bdfae54f5e2175d6ecaff1c988353add" -dependencies = [ - "cfg-if", - "crossbeam-utils", -] - -[[package]] -name = "crossbeam-utils" -version = "0.8.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a22b2d63d4d1dc0b7f1b6b2747dd0088008a9be28b6ddf0b1e7d335e3037294" -dependencies = [ - "cfg-if", -] - -[[package]] -name = "crosstarget-utils" -version = "0.1.0" -dependencies = [ - "derive_more", - "enumflags2", - "futures", - "js-sys", - "pin-project", - "regex", - "tokio", - "wasm-bindgen", - "wasm-bindgen-futures", -] - -[[package]] -name = "crypto-common" -version = "0.1.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3" -dependencies = [ - "generic-array", - "typenum", -] - -[[package]] -name = "ctor" -version = "0.2.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f34ba9a9bcb8645379e9de8cb3ecfcf4d1c85ba66d90deb3259206fa5aa193b" -dependencies = [ - "quote", - "syn 2.0.58", -] - -[[package]] -name = "cuid" -version = "1.3.2" -source = "git+https://github.com/prisma/cuid-rust?branch=wasm32-support#ccfd958c224c79758c2527a0bca9efcd71790a19" -dependencies = [ - "base36", - "cuid-util", - "cuid2", - "getrandom 0.2.11", - "js-sys", - "num", - "once_cell", - "rand 0.8.5", - "sha3", -] - -[[package]] -name = "cuid-util" -version = "0.1.0" -source = "git+https://github.com/prisma/cuid-rust?branch=wasm32-support#ccfd958c224c79758c2527a0bca9efcd71790a19" - -[[package]] -name = "cuid2" -version = "0.1.2" -source = "git+https://github.com/prisma/cuid-rust?branch=wasm32-support#ccfd958c224c79758c2527a0bca9efcd71790a19" -dependencies = [ - "cuid-util", - "num", - "rand 0.8.5", - "sha3", -] - -[[package]] -name = "darling" -version = "0.10.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d706e75d87e35569db781a9b5e2416cff1236a47ed380831f959382ccd5f858" -dependencies = [ - "darling_core 0.10.2", - "darling_macro 0.10.2", -] - -[[package]] -name = "darling" -version = "0.13.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a01d95850c592940db9b8194bc39f4bc0e89dee5c4265e4b1807c34a9aba453c" -dependencies = [ - "darling_core 0.13.4", - "darling_macro 0.13.4", -] - -[[package]] -name = "darling" -version = "0.20.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f63b86c8a8826a49b8c21f08a2d07338eec8d900540f8630dc76284be802989" -dependencies = [ - "darling_core 0.20.10", - "darling_macro 0.20.10", -] - -[[package]] -name = "darling_core" -version = "0.10.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0c960ae2da4de88a91b2d920c2a7233b400bc33cb28453a2987822d8392519b" -dependencies = [ - "fnv", - "ident_case", - "proc-macro2", - "quote", - "strsim 0.9.3", - "syn 1.0.109", -] - -[[package]] -name = "darling_core" -version = "0.13.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "859d65a907b6852c9361e3185c862aae7fafd2887876799fa55f5f99dc40d610" -dependencies = [ - "fnv", - "ident_case", - "proc-macro2", - "quote", - "strsim 0.10.0", - "syn 1.0.109", -] - -[[package]] -name = "darling_core" -version = "0.20.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95133861a8032aaea082871032f5815eb9e98cef03fa916ab4500513994df9e5" -dependencies = [ - "fnv", - "ident_case", - "proc-macro2", - "quote", - "strsim 0.11.1", - "syn 2.0.58", -] - -[[package]] -name = "darling_macro" -version = "0.10.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9b5a2f4ac4969822c62224815d069952656cadc7084fdca9751e6d959189b72" -dependencies = [ - "darling_core 0.10.2", - "quote", - "syn 1.0.109", -] - -[[package]] -name = "darling_macro" -version = "0.13.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c972679f83bdf9c42bd905396b6c3588a843a17f0f16dfcfa3e2c5d57441835" -dependencies = [ - "darling_core 0.13.4", - "quote", - "syn 1.0.109", -] - -[[package]] -name = "darling_macro" -version = "0.20.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d336a2a514f6ccccaa3e09b02d41d35330c07ddf03a62165fcec10bb561c7806" -dependencies = [ - "darling_core 0.20.10", - "quote", - "syn 2.0.58", -] - -[[package]] -name = "dashmap" -version = "5.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6943ae99c34386c84a470c499d3414f66502a41340aa895406e0d2e4a207b91d" -dependencies = [ - "cfg-if", - "hashbrown 0.14.5", - "lock_api", - "once_cell", - "parking_lot_core", -] - -[[package]] -name = "data-encoding" -version = "2.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c2e66c9d817f1720209181c316d28635c050fa304f9c79e47a520882661b7308" - -[[package]] -name = "datamodel-renderer" -version = "0.1.0" -dependencies = [ - "base64 0.13.1", - "expect-test", - "indoc 2.0.3", - "itertools 0.12.0", - "once_cell", - "psl", - "regex", -] - -[[package]] -name = "deranged" -version = "0.3.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b42b6fa04a440b495c8b04d0e71b707c585f83cb9cb28cf8cd0d976c315e31b4" -dependencies = [ - "powerfmt", - "serde", -] - -[[package]] -name = "derivative" -version = "2.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fcc3dd5e9e9c0b295d6e1e4d811fb6f157d5ffd784b8d202fc62eac8035a770b" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", -] - -[[package]] -name = "derive_more" -version = "0.99.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4fb810d30a7c1953f91334de7244731fc3f3c10d7fe163338a35b9f640960321" -dependencies = [ - "convert_case 0.4.0", - "proc-macro2", - "quote", - "rustc_version", - "syn 1.0.109", -] - -[[package]] -name = "diagnostics" -version = "0.1.0" -dependencies = [ - "colored", - "indoc 2.0.3", - "pest", -] - -[[package]] -name = "diff" -version = "0.1.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56254986775e3233ffa9c4d7d3faaf6d36a2c09d30b20687e9f88bc8bafc16c8" - -[[package]] -name = "digest" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d3dd60d1080a57a05ab032377049e0591415d2b31afd7028356dbf3cc6dcb066" -dependencies = [ - "generic-array", -] - -[[package]] -name = "digest" -version = "0.10.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292" -dependencies = [ - "block-buffer 0.10.4", - "crypto-common", - "subtle", -] - -[[package]] -name = "dissimilar" -version = "1.0.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86e3bdc80eee6e16b2b6b0f87fbc98c04bee3455e35174c0de1a125d0688c632" - -[[package]] -name = "dmmf" -version = "0.1.0" -dependencies = [ - "bigdecimal", - "colored", - "expect-test", - "flate2", - "indexmap 2.2.2", - "indoc 2.0.3", - "itertools 0.12.0", - "pretty_assertions", - "psl", - "query-structure", - "schema", - "serde", - "serde_json", - "similar", -] - -[[package]] -name = "driver-adapters" -version = "0.1.0" -dependencies = [ - "async-trait", - "expect-test", - "futures", - "js-sys", - "napi", - "napi-derive", - "once_cell", - "pin-project", - "prisma-metrics", - "quaint", - "serde", - "serde-wasm-bindgen", - "serde_json", - "serde_repr", - "tokio", - "tracing", - "tracing-core", - "tsify", - "uuid", - "wasm-bindgen", - "wasm-bindgen-futures", - "wasm-rs-dbg", -] - -[[package]] -name = "either" -version = "1.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a26ae43d7bcc3b814de94796a5e736d4029efb0ee900c12e2d54c993ad1a1e07" - -[[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" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b0d943856b990d12d3b55b359144ff341533e516d94098b1d3fc1ac666d36ec" -dependencies = [ - "encoding-index-japanese", - "encoding-index-korean", - "encoding-index-simpchinese", - "encoding-index-singlebyte", - "encoding-index-tradchinese", -] - -[[package]] -name = "encoding-index-japanese" -version = "1.20141219.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "04e8b2ff42e9a05335dbf8b5c6f7567e5591d0d916ccef4e0b1710d32a0d0c91" -dependencies = [ - "encoding_index_tests", -] - -[[package]] -name = "encoding-index-korean" -version = "1.20141219.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4dc33fb8e6bcba213fe2f14275f0963fd16f0a02c878e3095ecfdf5bee529d81" -dependencies = [ - "encoding_index_tests", -] - -[[package]] -name = "encoding-index-simpchinese" -version = "1.20141219.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d87a7194909b9118fc707194baa434a4e3b0fb6a5a757c73c3adb07aa25031f7" -dependencies = [ - "encoding_index_tests", -] - -[[package]] -name = "encoding-index-singlebyte" -version = "1.20141219.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3351d5acffb224af9ca265f435b859c7c01537c0849754d3db3fdf2bfe2ae84a" -dependencies = [ - "encoding_index_tests", -] - -[[package]] -name = "encoding-index-tradchinese" -version = "1.20141219.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd0e20d5688ce3cab59eb3ef3a2083a5c77bf496cb798dc6fcdb75f323890c18" -dependencies = [ - "encoding_index_tests", -] - -[[package]] -name = "encoding_index_tests" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a246d82be1c9d791c5dfde9a2bd045fc3cbba3fa2b11ad558f27d01712f00569" - -[[package]] -name = "encoding_rs" -version = "0.8.32" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "071a31f4ee85403370b58aca746f01041ede6f0da2730960ad001edc2b71b394" -dependencies = [ - "cfg-if", -] - -[[package]] -name = "endian-type" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c34f04666d835ff5d62e058c3995147c06f42fe86ff053337632bca83e42702d" - -[[package]] -name = "enum-as-inner" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ffccbb6966c05b32ef8fbac435df276c4ae4d3dc55a8cd0eb9745e6c12f546a" -dependencies = [ - "heck 0.4.1", - "proc-macro2", - "quote", - "syn 2.0.58", -] - -[[package]] -name = "enumflags2" -version = "0.7.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c041f5090df68b32bcd905365fd51769c8b9d553fe87fde0b683534f10c01bd2" -dependencies = [ - "enumflags2_derive", - "serde", -] - -[[package]] -name = "enumflags2_derive" -version = "0.7.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e9a1f9f7d83e59740248a6e14ecf93929ade55027844dfcea78beafccc15745" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.58", -] - -[[package]] -name = "equivalent" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" - -[[package]] -name = "errno" -version = "0.3.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a258e46cdc063eb8519c00b9fc845fc47bcfca4130e2f08e88665ceda8474245" -dependencies = [ - "libc", - "windows-sys 0.52.0", -] - -[[package]] -name = "event-listener" -version = "5.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6032be9bd27023a771701cc49f9f053c751055f71efb2e0ae5c15809093675ba" -dependencies = [ - "concurrent-queue", - "parking", - "pin-project-lite", -] - -[[package]] -name = "expect-test" -version = "1.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30d9eafeadd538e68fb28016364c9732d78e420b9ff8853fa5e4058861e9f8d3" -dependencies = [ - "dissimilar", - "once_cell", -] - -[[package]] -name = "failure" -version = "0.1.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d32e9bd16cc02eae7db7ef620b392808b89f6a5e16bb3497d159c6b92a0f4f86" -dependencies = [ - "backtrace", - "failure_derive", -] - -[[package]] -name = "failure_derive" -version = "0.1.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa4da3c766cd7a0db8242e326e9e4e081edd567072893ed320008189715366a4" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", - "synstructure", -] - -[[package]] -name = "fallible-iterator" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4443176a9f2c162692bd3d352d745ef9413eec5782a80d8fd6f8a1ac692a07f7" - -[[package]] -name = "fallible-iterator" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2acce4a10f12dc2fb14a218589d4f1f62ef011b2d0cc4b3cb1bba8e94da14649" - -[[package]] -name = "fallible-streaming-iterator" -version = "0.1.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7360491ce676a36bf9bb3c56c1aa791658183a54d2744120f27285738d90465a" - -[[package]] -name = "fastrand" -version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6999dc1837253364c2ebb0704ba97994bd874e8f195d665c50b7548f6ea92764" - -[[package]] -name = "fixedbitset" -version = "0.1.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86d4de0081402f5e88cdac65c8dcdcc73118c1a7a465e2a05f0da05843a8ea33" - -[[package]] -name = "fixedbitset" -version = "0.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80" - -[[package]] -name = "flate2" -version = "1.0.26" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b9429470923de8e8cbd4d2dc513535400b4b3fef0319fb5c4e1f520a7bef743" -dependencies = [ - "crc32fast", - "libz-sys", - "miniz_oxide", -] - -[[package]] -name = "flume" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "55ac459de2512911e4b674ce33cf20befaba382d05b62b008afc1c8b57cbf181" -dependencies = [ - "futures-core", - "futures-sink", - "spin 0.9.8", -] - -[[package]] -name = "fnv" -version = "1.0.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" - -[[package]] -name = "foreign-types" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1" -dependencies = [ - "foreign-types-shared", -] - -[[package]] -name = "foreign-types-shared" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" - -[[package]] -name = "form_urlencoded" -version = "1.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e13624c2627564efccf4934284bdd98cbaa14e79b0b5a141218e507b3a823456" -dependencies = [ - "percent-encoding", -] - -[[package]] -name = "frunk" -version = "0.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "11a351b59e12f97b4176ee78497dff72e4276fb1ceb13e19056aca7fa0206287" -dependencies = [ - "frunk_core", - "frunk_derives", - "frunk_proc_macros", -] - -[[package]] -name = "frunk_core" -version = "0.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af2469fab0bd07e64ccf0ad57a1438f63160c69b2e57f04a439653d68eb558d6" - -[[package]] -name = "frunk_derives" -version = "0.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b0fa992f1656e1707946bbba340ad244f0814009ef8c0118eb7b658395f19a2e" -dependencies = [ - "frunk_proc_macro_helpers", - "quote", - "syn 2.0.58", -] - -[[package]] -name = "frunk_proc_macro_helpers" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "35b54add839292b743aeda6ebedbd8b11e93404f902c56223e51b9ec18a13d2c" -dependencies = [ - "frunk_core", - "proc-macro2", - "quote", - "syn 2.0.58", -] - -[[package]] -name = "frunk_proc_macros" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "71b85a1d4a9a6b300b41c05e8e13ef2feca03e0334127f29eca9506a7fe13a93" -dependencies = [ - "frunk_core", - "frunk_proc_macro_helpers", - "quote", - "syn 2.0.58", -] - -[[package]] -name = "fuchsia-cprng" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a06f77d526c1a601b7c4cdd98f54b5eaabffc14d5f2f0296febdc7f357c6d3ba" - -[[package]] -name = "funty" -version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6d5a32815ae3f33302d95fdcb2ce17862f8c65363dcfd29360480ba1001fc9c" - -[[package]] -name = "futures" -version = "0.3.28" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23342abe12aba583913b2e62f22225ff9c950774065e4bfb61a19cd9770fec40" -dependencies = [ - "futures-channel", - "futures-core", - "futures-executor", - "futures-io", - "futures-sink", - "futures-task", - "futures-util", -] - -[[package]] -name = "futures-channel" -version = "0.3.28" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "955518d47e09b25bbebc7a18df10b81f0c766eaf4c4f1cccef2fca5f2a4fb5f2" -dependencies = [ - "futures-core", - "futures-sink", -] - -[[package]] -name = "futures-core" -version = "0.3.28" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4bca583b7e26f571124fe5b7561d49cb2868d79116cfa0eefce955557c6fee8c" - -[[package]] -name = "futures-executor" -version = "0.3.28" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ccecee823288125bd88b4d7f565c9e58e41858e47ab72e8ea2d64e93624386e0" -dependencies = [ - "futures-core", - "futures-task", - "futures-util", -] - -[[package]] -name = "futures-intrusive" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d930c203dd0b6ff06e0201a4a2fe9149b43c684fd4420555b26d21b1a02956f" -dependencies = [ - "futures-core", - "lock_api", - "parking_lot", -] - -[[package]] -name = "futures-io" -version = "0.3.28" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4fff74096e71ed47f8e023204cfd0aa1289cd54ae5430a9523be060cdb849964" - -[[package]] -name = "futures-macro" -version = "0.3.28" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.58", -] - -[[package]] -name = "futures-sink" -version = "0.3.28" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f43be4fe21a13b9781a69afa4985b0f6ee0e1afab2c6f454a8cf30e2b2237b6e" - -[[package]] -name = "futures-task" -version = "0.3.28" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76d3d132be6c0e6aa1534069c705a74a5997a356c0dc2f86a47765e5617c5b65" - -[[package]] -name = "futures-timer" -version = "3.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e64b03909df88034c26dc1547e8970b91f98bdb65165d6a4e9110d94263dbb2c" - -[[package]] -name = "futures-util" -version = "0.3.28" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26b01e40b772d54cf6c6d721c1d1abd0647a0106a12ecaa1c186273392a69533" -dependencies = [ - "futures-channel", - "futures-core", - "futures-io", - "futures-macro", - "futures-sink", - "futures-task", - "memchr", - "pin-project-lite", - "pin-utils", - "slab", -] - -[[package]] -name = "generic-array" -version = "0.14.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a" -dependencies = [ - "typenum", - "version_check", -] - -[[package]] -name = "getrandom" -version = "0.1.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8fc3cb4d91f53b50155bdcfd23f6a4c39ae1969c2ae85982b135750cccaf5fce" -dependencies = [ - "cfg-if", - "libc", - "wasi 0.9.0+wasi-snapshot-preview1", -] - -[[package]] -name = "getrandom" -version = "0.2.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fe9006bed769170c11f845cf00c7c1e9092aeb3f268e007c3e760ac68008070f" -dependencies = [ - "cfg-if", - "js-sys", - "libc", - "wasi 0.11.0+wasi-snapshot-preview1", - "wasm-bindgen", -] - -[[package]] -name = "gimli" -version = "0.27.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6c80984affa11d98d1b88b66ac8853f143217b399d3c74116778ff8fdb4ed2e" - -[[package]] -name = "glob" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" - -[[package]] -name = "gloo-utils" -version = "0.1.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "037fcb07216cb3a30f7292bd0176b050b7b9a052ba830ef7d5d65f6dc64ba58e" -dependencies = [ - "js-sys", - "serde", - "serde_json", - "wasm-bindgen", - "web-sys", -] - -[[package]] -name = "graphql-parser" -version = "0.3.0" -source = "git+https://github.com/prisma/graphql-parser#6a3f58bd879065588e710cb02b5bd30c1ce182c3" -dependencies = [ - "combine", - "indexmap 1.9.3", - "thiserror", -] - -[[package]] -name = "h2" -version = "0.3.26" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81fe527a889e1532da5c525686d96d4c2e74cdd345badf8dfef9f6b39dd5f5e8" -dependencies = [ - "bytes", - "fnv", - "futures-core", - "futures-sink", - "futures-util", - "http 0.2.9", - "indexmap 2.2.2", - "slab", - "tokio", - "tokio-util 0.7.8", - "tracing", -] - -[[package]] -name = "half" -version = "1.8.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eabb4a44450da02c90444cf74558da904edde8fb4e9035a9a6a4e15445af0bd7" - -[[package]] -name = "hashbrown" -version = "0.12.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" -dependencies = [ - "ahash 0.7.8", -] - -[[package]] -name = "hashbrown" -version = "0.14.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1" -dependencies = [ - "ahash 0.8.11", - "allocator-api2", -] - -[[package]] -name = "hashlink" -version = "0.9.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ba4ff7128dee98c7dc9794b6a411377e1404dba1c97deb8d1a55297bd25d8af" -dependencies = [ - "hashbrown 0.14.5", -] - -[[package]] -name = "heck" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d621efb26863f0e9924c6ac577e8275e5e6b77455db64ffa6c65c904e9e132c" -dependencies = [ - "unicode-segmentation", -] - -[[package]] -name = "heck" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" - -[[package]] -name = "hermit-abi" -version = "0.1.19" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33" -dependencies = [ - "libc", -] - -[[package]] -name = "hermit-abi" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "443144c8cdadd93ebf52ddb4056d257f5b52c04d3c804e657d19eb73fc33668b" - -[[package]] -name = "hex" -version = "0.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" - -[[package]] -name = "hickory-proto" -version = "0.24.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "07698b8420e2f0d6447a436ba999ec85d8fbf2a398bbd737b82cac4a2e96e512" -dependencies = [ - "async-trait", - "cfg-if", - "data-encoding", - "enum-as-inner", - "futures-channel", - "futures-io", - "futures-util", - "idna 0.4.0", - "ipnet", - "once_cell", - "rand 0.8.5", - "thiserror", - "tinyvec", - "tokio", - "tracing", - "url", -] - -[[package]] -name = "hickory-resolver" -version = "0.24.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "28757f23aa75c98f254cf0405e6d8c25b831b32921b050a66692427679b1f243" -dependencies = [ - "cfg-if", - "futures-util", - "hickory-proto", - "ipconfig", - "lru-cache", - "once_cell", - "parking_lot", - "rand 0.8.5", - "resolv-conf", - "smallvec", - "thiserror", - "tokio", - "tracing", -] - -[[package]] -name = "hmac" -version = "0.12.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c49c37c09c17a53d937dfbb742eb3a961d65a994e6bcdcf37e7399d0cc8ab5e" -dependencies = [ - "digest 0.10.7", -] - -[[package]] -name = "hostname" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c731c3e10504cc8ed35cfe2f1db4c9274c3d35fa486e3b31df46f068ef3e867" -dependencies = [ - "libc", - "match_cfg", - "winapi", -] - -[[package]] -name = "html-escape" -version = "0.2.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d1ad449764d627e22bfd7cd5e8868264fc9236e07c752972b4080cd351cb476" -dependencies = [ - "utf8-width", -] - -[[package]] -name = "http" -version = "0.2.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd6effc99afb63425aff9b05836f029929e345a6148a14b7ecd5ab67af944482" -dependencies = [ - "bytes", - "fnv", - "itoa", -] - -[[package]] -name = "http" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "21b9ddb458710bc376481b842f5da65cdf31522de232c1ca8146abce2a358258" -dependencies = [ - "bytes", - "fnv", - "itoa", -] - -[[package]] -name = "http-body" -version = "0.4.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d5f38f16d184e36f2408a55281cd658ecbd3ca05cce6d6510a176eca393e26d1" -dependencies = [ - "bytes", - "http 0.2.9", - "pin-project-lite", -] - -[[package]] -name = "httparse" -version = "1.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d897f394bad6a705d5f4104762e116a75639e470d80901eed05a860a95cb1904" - -[[package]] -name = "httpdate" -version = "1.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4a1e36c821dbe04574f602848a19f742f4fb3c98d40449f11bcad18d6b17421" - -[[package]] -name = "hyper" -version = "0.14.27" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ffb1cfd654a8219eaef89881fdb3bb3b1cdc5fa75ded05d6933b2b382e395468" -dependencies = [ - "bytes", - "futures-channel", - "futures-core", - "futures-util", - "h2", - "http 0.2.9", - "http-body", - "httparse", - "httpdate", - "itoa", - "pin-project-lite", - "socket2 0.4.9", - "tokio", - "tower-service", - "tracing", - "want", -] - -[[package]] -name = "hyper-timeout" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbb958482e8c7be4bc3cf272a766a2b0bf1a6755e7a6ae777f017a31d11b13b1" -dependencies = [ - "hyper", - "pin-project-lite", - "tokio", - "tokio-io-timeout", -] - -[[package]] -name = "hyper-tls" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d6183ddfa99b85da61a140bea0efc93fdf56ceaa041b37d553518030827f9905" -dependencies = [ - "bytes", - "hyper", - "native-tls", - "tokio", - "tokio-native-tls", -] - -[[package]] -name = "iana-time-zone" -version = "0.1.57" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2fad5b825842d2b38bd206f3e81d6957625fd7f0a361e345c30e01a0ae2dd613" -dependencies = [ - "android_system_properties", - "core-foundation-sys", - "iana-time-zone-haiku", - "js-sys", - "wasm-bindgen", - "windows", -] - -[[package]] -name = "iana-time-zone-haiku" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f31827a206f56af32e590ba56d5d2d085f558508192593743f16b2306495269f" -dependencies = [ - "cc", -] - -[[package]] -name = "ident_case" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39" - -[[package]] -name = "idna" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d20d6b07bfbc108882d88ed8e37d39636dcc260e15e30c45e6ba089610b917c" -dependencies = [ - "unicode-bidi", - "unicode-normalization", -] - -[[package]] -name = "idna" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "634d9b1461af396cad843f47fdba5597a4f9e6ddd4bfb6ff5d85028c25cb12f6" -dependencies = [ - "unicode-bidi", - "unicode-normalization", -] - -[[package]] -name = "indexmap" -version = "1.9.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99" -dependencies = [ - "autocfg", - "hashbrown 0.12.3", - "serde", -] - -[[package]] -name = "indexmap" -version = "2.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "824b2ae422412366ba479e8111fd301f7b5faece8149317bb81925979a53f520" -dependencies = [ - "equivalent", - "hashbrown 0.14.5", - "serde", -] - -[[package]] -name = "indoc" -version = "0.3.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "47741a8bc60fb26eb8d6e0238bbb26d8575ff623fdc97b1a2c00c050b9684ed8" -dependencies = [ - "indoc-impl", - "proc-macro-hack", -] - -[[package]] -name = "indoc" -version = "2.0.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c785eefb63ebd0e33416dfcb8d6da0bf27ce752843a45632a67bf10d4d4b5c4" - -[[package]] -name = "indoc-impl" -version = "0.3.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce046d161f000fffde5f432a0d034d0341dc152643b2598ed5bfce44c4f3a8f0" -dependencies = [ - "proc-macro-hack", - "proc-macro2", - "quote", - "syn 1.0.109", - "unindent", -] - -[[package]] -name = "insta" -version = "1.34.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d64600be34b2fcfc267740a243fa7744441bb4947a619ac4e5bb6507f35fbfc" -dependencies = [ - "console", - "lazy_static", - "linked-hash-map", - "pest", - "pest_derive", - "serde", - "similar", - "yaml-rust", -] - -[[package]] -name = "ipconfig" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b58db92f96b720de98181bbbe63c831e87005ab460c1bf306eb2622b4707997f" -dependencies = [ - "socket2 0.5.7", - "widestring", - "windows-sys 0.48.0", - "winreg 0.50.0", -] - -[[package]] -name = "ipnet" -version = "2.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "28b29a3cd74f0f4598934efe3aeba42bae0eb4680554128851ebbecb02af14e6" - -[[package]] -name = "is-terminal" -version = "0.4.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb0889898416213fab133e1d33a0e5858a48177452750691bde3666d0fdbaf8b" -dependencies = [ - "hermit-abi 0.3.2", - "rustix", - "windows-sys 0.48.0", -] - -[[package]] -name = "itertools" -version = "0.10.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b0fd2260e829bddf4cb6ea802289de2f86d6a7a690192fbe91b3f46e0f2c8473" -dependencies = [ - "either", -] - -[[package]] -name = "itertools" -version = "0.12.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "25db6b064527c5d482d0423354fcd07a89a2dfe07b67892e62411946db7f07b0" -dependencies = [ - "either", -] - -[[package]] -name = "itoa" -version = "1.0.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af150ab688ff2122fcef229be89cb50dd66af9e01a4ff320cc137eecc9bacc38" - -[[package]] -name = "js-sys" -version = "0.3.65" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "54c0c35952f67de54bb584e9fd912b3023117cbafc0a77d8f3dee1fb5f572fe8" -dependencies = [ - "wasm-bindgen", -] - -[[package]] -name = "json-rpc-api-build" -version = "0.1.0" -dependencies = [ - "backtrace", - "heck 0.3.3", - "serde", - "toml", -] - -[[package]] -name = "jsonrpc-core" -version = "17.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d4467ab6dfa369b69e52bd0692e480c4d117410538526a57a304a0f2250fd95e" -dependencies = [ - "futures", - "futures-executor", - "futures-util", - "log", - "serde", - "serde_derive", - "serde_json", -] - -[[package]] -name = "keccak" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f6d5ed8676d904364de097082f4e7d240b571b67989ced0240f08b7f966f940" -dependencies = [ - "cpufeatures", -] - -[[package]] -name = "lazy_static" -version = "1.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" - -[[package]] -name = "lazycell" -version = "1.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55" - -[[package]] -name = "lexical" -version = "6.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c7aefb36fd43fef7003334742cbf77b243fcd36418a1d1bdd480d613a67968f6" -dependencies = [ - "lexical-core", -] - -[[package]] -name = "lexical-core" -version = "0.8.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2cde5de06e8d4c2faabc400238f9ae1c74d5412d03a7bd067645ccbc47070e46" -dependencies = [ - "lexical-parse-float", - "lexical-parse-integer", - "lexical-util", - "lexical-write-float", - "lexical-write-integer", -] - -[[package]] -name = "lexical-parse-float" -version = "0.8.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "683b3a5ebd0130b8fb52ba0bdc718cc56815b6a097e28ae5a6997d0ad17dc05f" -dependencies = [ - "lexical-parse-integer", - "lexical-util", - "static_assertions", -] - -[[package]] -name = "lexical-parse-integer" -version = "0.8.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d0994485ed0c312f6d965766754ea177d07f9c00c9b82a5ee62ed5b47945ee9" -dependencies = [ - "lexical-util", - "static_assertions", -] - -[[package]] -name = "lexical-util" -version = "0.8.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5255b9ff16ff898710eb9eb63cb39248ea8a5bb036bea8085b1a767ff6c4e3fc" -dependencies = [ - "static_assertions", -] - -[[package]] -name = "lexical-write-float" -version = "0.8.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "accabaa1c4581f05a3923d1b4cfd124c329352288b7b9da09e766b0668116862" -dependencies = [ - "lexical-util", - "lexical-write-integer", - "static_assertions", -] - -[[package]] -name = "lexical-write-integer" -version = "0.8.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e1b6f3d1f4422866b68192d62f77bc5c700bee84f3069f2469d7bc8c77852446" -dependencies = [ - "lexical-util", - "static_assertions", -] - -[[package]] -name = "libc" -version = "0.2.151" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "302d7ab3130588088d277783b1e2d2e10c9e9e4a16dd9050e6ec93fb3e7048f4" - -[[package]] -name = "libloading" -version = "0.7.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b67380fd3b2fbe7527a606e18729d21c6f3951633d0500574c4dc22d2d638b9f" -dependencies = [ - "cfg-if", - "winapi", -] - -[[package]] -name = "libloading" -version = "0.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c571b676ddfc9a8c12f1f3d3085a7b163966a8fd8098a90640953ce5f6170161" -dependencies = [ - "cfg-if", - "windows-sys 0.48.0", -] - -[[package]] -name = "libsqlite3-sys" -version = "0.28.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c10584274047cb335c23d3e61bcef8e323adae7c5c8c760540f73610177fc3f" -dependencies = [ - "cc", - "pkg-config", - "vcpkg", -] - -[[package]] -name = "libz-sys" -version = "1.1.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d97137b25e321a73eef1418d1d5d2eda4d77e12813f8e6dead84bc52c5870a7b" -dependencies = [ - "cc", - "pkg-config", - "vcpkg", -] - -[[package]] -name = "linked-hash-map" -version = "0.5.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0717cef1bc8b636c6e1c1bbdefc09e6322da8a9321966e8928ef80d20f7f770f" - -[[package]] -name = "linux-raw-sys" -version = "0.4.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "01cda141df6706de531b6c46c3a33ecca755538219bd484262fa09410c13539c" - -[[package]] -name = "lock_api" -version = "0.4.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1cc9717a20b1bb222f333e6a92fd32f7d8a18ddc5a3191a11af45dcbf4dcd16" -dependencies = [ - "autocfg", - "scopeguard", -] - -[[package]] -name = "log" -version = "0.4.19" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b06a4cde4c0f271a446782e3eff8de789548ce57dbc8eca9292c27f4a42004b4" - -[[package]] -name = "lru" -version = "0.7.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e999beba7b6e8345721bd280141ed958096a2e4abdf74f67ff4ce49b4b54e47a" -dependencies = [ - "hashbrown 0.12.3", -] - -[[package]] -name = "lru" -version = "0.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6e8aaa3f231bb4bd57b84b2d5dc3ae7f350265df8aa96492e0bc394a1571909" -dependencies = [ - "hashbrown 0.12.3", -] - -[[package]] -name = "lru-cache" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31e24f1ad8321ca0e8a1e0ac13f23cb668e6f5466c2c57319f6a5cf1cc8e3b1c" -dependencies = [ - "linked-hash-map", -] - -[[package]] -name = "lsp-types" -version = "0.95.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e34d33a8e9b006cd3fc4fe69a921affa097bae4bb65f76271f4644f9a334365" -dependencies = [ - "bitflags 1.3.2", - "serde", - "serde_json", - "serde_repr", - "url", -] - -[[package]] -name = "match_cfg" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ffbee8634e0d45d258acb448e7eaab3fce7a0a467395d4d9f228e3c1f01fb2e4" - -[[package]] -name = "matchers" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8263075bb86c5a1b1427b5ae862e8889656f126e9f77c484496e8b47cf5c5558" -dependencies = [ - "regex-automata 0.1.10", -] - -[[package]] -name = "md-5" -version = "0.10.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6365506850d44bff6e2fbcb5176cf63650e48bd45ef2fe2665ae1570e0f4b9ca" -dependencies = [ - "digest 0.10.7", -] - -[[package]] -name = "md5" -version = "0.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e6bcd6433cff03a4bfc3d9834d504467db1f1cf6d0ea765d37d330249ed629d" - -[[package]] -name = "memchr" -version = "2.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "523dc4f511e55ab87b694dc30d0f820d60906ef06413f93d4d7a1385599cc149" - -[[package]] -name = "memoffset" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a634b1c61a95585bd15607c6ab0c4e5b226e695ff2800ba0cdccddf208c406c" -dependencies = [ - "autocfg", -] - -[[package]] -name = "metrics" -version = "0.23.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "884adb57038347dfbaf2d5065887b6cf4312330dc8e94bc30a1a839bd79d3261" -dependencies = [ - "ahash 0.8.11", - "portable-atomic", -] - -[[package]] -name = "metrics-exporter-prometheus" -version = "0.15.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4f0c8427b39666bf970460908b213ec09b3b350f20c0c2eabcbba51704a08e6" -dependencies = [ - "base64 0.22.1", - "indexmap 2.2.2", - "metrics", - "metrics-util", - "quanta", - "thiserror", -] - -[[package]] -name = "metrics-util" -version = "0.17.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4259040465c955f9f2f1a4a8a16dc46726169bca0f88e8fb2dbeced487c3e828" -dependencies = [ - "aho-corasick", - "crossbeam-epoch", - "crossbeam-utils", - "hashbrown 0.14.5", - "indexmap 2.2.2", - "metrics", - "num_cpus", - "ordered-float", - "quanta", - "radix_trie", - "sketches-ddsketch", -] - -[[package]] -name = "mime" -version = "0.3.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a" - -[[package]] -name = "minimal-lexical" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" - -[[package]] -name = "miniz_oxide" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7810e0be55b428ada41041c41f32c9f1a42817901b4ccf45fa3d4b6561e74c7" -dependencies = [ - "adler", -] - -[[package]] -name = "mio" -version = "0.8.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4a650543ca06a924e8b371db273b2756685faae30f8487da1b56505a8f78b0c" -dependencies = [ - "libc", - "log", - "wasi 0.11.0+wasi-snapshot-preview1", - "windows-sys 0.48.0", -] - -[[package]] -name = "mobc" -version = "0.8.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "316a7d198b51958a0ab57248bf5f42d8409551203cb3c821d5925819a8d5415f" -dependencies = [ - "async-trait", - "futures-channel", - "futures-core", - "futures-timer", - "futures-util", - "log", - "metrics", - "thiserror", - "tokio", - "tracing", - "tracing-subscriber", -] - -[[package]] -name = "mongodb" -version = "3.0.0" -source = "git+https://github.com/prisma/mongo-rust-driver.git?branch=RUST-1994/happy-eyeballs#31e0356391a7871bec000ae35fe0edc35582449e" -dependencies = [ - "async-trait", - "base64 0.13.1", - "bitflags 1.3.2", - "bson", - "chrono", - "derivative", - "derive_more", - "futures-core", - "futures-executor", - "futures-io", - "futures-util", - "hex", - "hickory-proto", - "hickory-resolver", - "hmac", - "md-5", - "mongodb-internal-macros", - "once_cell", - "pbkdf2", - "percent-encoding", - "rand 0.8.5", - "rustc_version_runtime", - "rustls 0.21.10", - "rustls-pemfile", - "serde", - "serde_bytes", - "serde_with", - "sha-1", - "sha2 0.10.7", - "socket2 0.5.7", - "stringprep", - "strsim 0.11.1", - "take_mut", - "thiserror", - "tokio", - "tokio-rustls 0.24.1", - "tokio-util 0.7.8", - "typed-builder", - "uuid", - "webpki-roots", -] - -[[package]] -name = "mongodb-client" -version = "0.1.0" -dependencies = [ - "mongodb", - "once_cell", - "percent-encoding", - "thiserror", -] - -[[package]] -name = "mongodb-internal-macros" -version = "3.0.0" -source = "git+https://github.com/prisma/mongo-rust-driver.git?branch=RUST-1994/happy-eyeballs#31e0356391a7871bec000ae35fe0edc35582449e" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.58", -] - -[[package]] -name = "mongodb-query-connector" -version = "0.1.0" -dependencies = [ - "anyhow", - "async-trait", - "bigdecimal", - "bson", - "chrono", - "cuid", - "derive_more", - "futures", - "indexmap 2.2.2", - "itertools 0.12.0", - "mongodb", - "mongodb-client", - "pretty_assertions", - "prisma-metrics", - "prisma-value", - "psl", - "query-connector", - "query-structure", - "rand 0.8.5", - "regex", - "serde", - "serde_json", - "telemetry", - "thiserror", - "tokio", - "tracing", - "tracing-futures", - "user-facing-errors", - "uuid", -] - -[[package]] -name = "mongodb-schema-connector" -version = "0.1.0" -dependencies = [ - "bson", - "convert_case 0.6.0", - "datamodel-renderer", - "dissimilar", - "enumflags2", - "expect-test", - "futures", - "indoc 2.0.3", - "itertools 0.12.0", - "mongodb", - "mongodb-client", - "mongodb-schema-describer", - "names 0.12.0", - "once_cell", - "psl", - "regex", - "schema-connector", - "serde", - "serde_json", - "tokio", - "tracing", - "url", - "user-facing-errors", -] - -[[package]] -name = "mongodb-schema-describer" -version = "0.1.0" -dependencies = [ - "bson", - "futures", - "mongodb", - "serde", -] - -[[package]] -name = "multimap" -version = "0.8.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5ce46fe64a9d73be07dcbe690a38ce1b293be448fd8ce1e6c1b8062c9f72c6a" - -[[package]] -name = "mysql_async" -version = "0.31.3" -source = "git+https://github.com/prisma/mysql_async?branch=vendored-openssl#0d40d0d2c332fc97512bff81e82e62002f03c224" -dependencies = [ - "bytes", - "crossbeam", - "flate2", - "futures-core", - "futures-sink", - "futures-util", - "lazy_static", - "lexical", - "lru 0.8.1", - "mio", - "mysql_common", - "native-tls", - "once_cell", - "pem", - "percent-encoding", - "pin-project", - "priority-queue", - "regex", - "serde", - "serde_json", - "socket2 0.4.9", - "thiserror", - "tokio", - "tokio-native-tls", - "tokio-util 0.7.8", - "twox-hash", - "url", -] - -[[package]] -name = "mysql_common" -version = "0.29.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9006c95034ccf7b903d955f210469119f6c3477fc9c9e7a7845ce38a3e665c2a" -dependencies = [ - "base64 0.13.1", - "bigdecimal", - "bindgen", - "bitflags 1.3.2", - "bitvec", - "byteorder", - "bytes", - "cc", - "cmake", - "crc32fast", - "flate2", - "frunk", - "lazy_static", - "lexical", - "num-bigint", - "num-traits", - "rand 0.8.5", - "regex", - "rust_decimal", - "saturating", - "serde", - "serde_json", - "sha1", - "sha2 0.10.7", - "smallvec", - "subprocess", - "thiserror", - "time", - "uuid", -] - -[[package]] -name = "names" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef320dab323286b50fb5cdda23f61c796a72a89998ab565ca32525c5c556f2da" -dependencies = [ - "rand 0.3.23", -] - -[[package]] -name = "names" -version = "0.12.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "10a8690bf09abf659851e58cd666c3d37ac6af07c2bd7a9e332cfba471715775" -dependencies = [ - "rand 0.8.5", -] - -[[package]] -name = "nanoid" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3ffa00dec017b5b1a8b7cf5e2c008bfda1aa7e0697ac1508b491fdf2622fb4d8" -dependencies = [ - "rand 0.8.5", -] - -[[package]] -name = "napi" -version = "2.16.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "214f07a80874bb96a8433b3cdfc84980d56c7b02e1a0d7ba4ba0db5cef785e2b" -dependencies = [ - "bitflags 2.4.0", - "ctor", - "napi-derive", - "napi-sys", - "once_cell", - "serde", - "serde_json", - "tokio", -] - -[[package]] -name = "napi-build" -version = "1.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ebd4419172727423cf30351406c54f6cc1b354a2cfb4f1dba3e6cd07f6d5522b" - -[[package]] -name = "napi-derive" -version = "2.16.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17435f7a00bfdab20b0c27d9c56f58f6499e418252253081bfff448099da31d1" -dependencies = [ - "cfg-if", - "convert_case 0.6.0", - "napi-derive-backend", - "proc-macro2", - "quote", - "syn 2.0.58", -] - -[[package]] -name = "napi-derive-backend" -version = "1.0.74" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "967c485e00f0bf3b1bdbe510a38a4606919cf1d34d9a37ad41f25a81aa077abe" -dependencies = [ - "convert_case 0.6.0", - "once_cell", - "proc-macro2", - "quote", - "regex", - "semver", - "syn 2.0.58", -] - -[[package]] -name = "napi-sys" -version = "2.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "427802e8ec3a734331fec1035594a210ce1ff4dc5bc1950530920ab717964ea3" -dependencies = [ - "libloading 0.8.1", -] - -[[package]] -name = "native-tls" -version = "0.2.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "07226173c32f2926027b63cce4bcd8076c3552846cbe7925f3aaffeac0a3b92e" -dependencies = [ - "lazy_static", - "libc", - "log", - "openssl", - "openssl-probe", - "openssl-sys", - "schannel", - "security-framework", - "security-framework-sys", - "tempfile", -] - -[[package]] -name = "nibble_vec" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77a5d83df9f36fe23f0c3648c6bbb8b0298bb5f1939c8f2704431371f4b84d43" -dependencies = [ - "smallvec", -] - -[[package]] -name = "nom" -version = "7.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d273983c5a657a70a3e8f2a01329822f3b8c8172b73826411a55751e404a0a4a" -dependencies = [ - "memchr", - "minimal-lexical", -] - -[[package]] -name = "nu-ansi-term" -version = "0.46.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77a8165726e8236064dbb45459242600304b42a5ea24ee2948e18e023bf7ba84" -dependencies = [ - "overload", - "winapi", -] - -[[package]] -name = "num" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b05180d69e3da0e530ba2a1dae5110317e49e3b7f3d41be227dc5f92e49ee7af" -dependencies = [ - "num-bigint", - "num-complex", - "num-integer", - "num-iter", - "num-rational", - "num-traits", -] - -[[package]] -name = "num-bigint" -version = "0.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f93ab6289c7b344a8a9f60f88d80aa20032336fe78da341afc91c8a2341fc75f" -dependencies = [ - "autocfg", - "num-integer", - "num-traits", -] - -[[package]] -name = "num-complex" -version = "0.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "02e0d21255c828d6f128a1e41534206671e8c3ea0c62f32291e808dc82cff17d" -dependencies = [ - "num-traits", -] - -[[package]] -name = "num-conv" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9" - -[[package]] -name = "num-integer" -version = "0.1.45" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "225d3389fb3509a24c93f5c29eb6bde2586b98d9f016636dff58d7c6f7569cd9" -dependencies = [ - "autocfg", - "num-traits", -] - -[[package]] -name = "num-iter" -version = "0.1.43" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d03e6c028c5dc5cac6e2dec0efda81fc887605bb3d884578bb6d6bf7514e252" -dependencies = [ - "autocfg", - "num-integer", - "num-traits", -] - -[[package]] -name = "num-rational" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0638a1c9d0a3c0914158145bc76cff373a75a627e6ecbfb71cbe6f453a5a19b0" -dependencies = [ - "autocfg", - "num-bigint", - "num-integer", - "num-traits", -] - -[[package]] -name = "num-traits" -version = "0.2.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f30b0abd723be7e2ffca1272140fac1a2f084c77ec3e123c192b66af1ee9e6c2" -dependencies = [ - "autocfg", -] - -[[package]] -name = "num_cpus" -version = "1.16.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43" -dependencies = [ - "hermit-abi 0.3.2", - "libc", -] - -[[package]] -name = "object" -version = "0.31.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8bda667d9f2b5051b8833f59f3bf748b28ef54f850f4fcb389a252aa383866d1" -dependencies = [ - "memchr", -] - -[[package]] -name = "once_cell" -version = "1.19.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" - -[[package]] -name = "oorandom" -version = "11.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ab1bc2a289d34bd04a330323ac98a1b4bc82c9d9fcb1e66b63caa84da26b575" - -[[package]] -name = "opaque-debug" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5" - -[[package]] -name = "openssl" -version = "0.10.60" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "79a4c6c3a2b158f7f8f2a2fc5a969fa3a068df6fc9dbb4a43845436e3af7c800" -dependencies = [ - "bitflags 2.4.0", - "cfg-if", - "foreign-types", - "libc", - "once_cell", - "openssl-macros", - "openssl-sys", -] - -[[package]] -name = "openssl-macros" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.58", -] - -[[package]] -name = "openssl-probe" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" - -[[package]] -name = "openssl-src" -version = "300.1.6+3.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "439fac53e092cd7442a3660c85dde4643ab3b5bd39040912388dcdabf6b88085" -dependencies = [ - "cc", -] - -[[package]] -name = "openssl-sys" -version = "0.9.96" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3812c071ba60da8b5677cc12bcb1d42989a65553772897a7e0355545a819838f" -dependencies = [ - "cc", - "libc", - "openssl-src", - "pkg-config", - "vcpkg", -] - -[[package]] -name = "opentelemetry" -version = "0.17.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6105e89802af13fdf48c49d7646d3b533a70e536d818aae7e78ba0433d01acb8" -dependencies = [ - "async-trait", - "crossbeam-channel", - "futures-channel", - "futures-executor", - "futures-util", - "js-sys", - "lazy_static", - "percent-encoding", - "pin-project", - "rand 0.8.5", - "serde", - "thiserror", - "tokio", - "tokio-stream", -] - -[[package]] -name = "opentelemetry-otlp" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d1a6ca9de4c8b00aa7f1a153bd76cb263287155cec642680d79d98706f3d28a" -dependencies = [ - "async-trait", - "futures", - "futures-util", - "http 0.2.9", - "opentelemetry", - "prost", - "thiserror", - "tokio", - "tonic", - "tonic-build", -] - -[[package]] -name = "opentls" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f561874f8d6ecfb674fc08863414040c93cc90c0b6963fe679895fab8b65560" -dependencies = [ - "futures-util", - "log", - "openssl", - "openssl-probe", - "openssl-sys", - "url", -] - -[[package]] -name = "ordered-float" -version = "4.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44d501f1a72f71d3c063a6bbc8f7271fa73aa09fe5d6283b6571e2ed176a2537" -dependencies = [ - "num-traits", -] - -[[package]] -name = "ordermap" -version = "0.3.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a86ed3f5f244b372d6b1a00b72ef7f8876d0bc6a78a4c9985c53614041512063" - -[[package]] -name = "os_str_bytes" -version = "6.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d5d9eb14b174ee9aa2ef96dc2b94637a2d4b6e7cb873c7e171f0c20c6cf3eac" - -[[package]] -name = "overload" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39" - -[[package]] -name = "parking" -version = "2.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb813b8af86854136c6922af0598d719255ecb2179515e6e7730d468f05c9cae" - -[[package]] -name = "parking_lot" -version = "0.12.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f" -dependencies = [ - "lock_api", - "parking_lot_core", -] - -[[package]] -name = "parking_lot_core" -version = "0.9.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93f00c865fe7cabf650081affecd3871070f26767e7b2070a3ffae14c654b447" -dependencies = [ - "cfg-if", - "libc", - "redox_syscall 0.3.5", - "smallvec", - "windows-targets 0.48.1", -] - -[[package]] -name = "parse-hyperlinks" -version = "0.23.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0181d37c4d5ae35cc8be7cf823c1a933005661da6a08bcb2855aa392c9a54b8e" -dependencies = [ - "html-escape", - "nom", - "percent-encoding", - "thiserror", -] - -[[package]] -name = "parser-database" -version = "0.1.0" -dependencies = [ - "diagnostics", - "either", - "enumflags2", - "indexmap 2.2.2", - "rustc-hash", - "schema-ast", -] - -[[package]] -name = "paste" -version = "1.0.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "de3145af08024dea9fa9914f381a17b8fc6034dfb00f3a84013f7ff43f29ed4c" - -[[package]] -name = "pbkdf2" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "83a0692ec44e4cf1ef28ca317f14f8f07da2d95ec3fa01f86e4467b725e60917" -dependencies = [ - "digest 0.10.7", -] - -[[package]] -name = "peeking_take_while" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "19b17cddbe7ec3f8bc800887bab5e717348c95ea2ca0b1bf0837fb964dc67099" - -[[package]] -name = "pem" -version = "1.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8835c273a76a90455d7344889b0964598e3316e2a79ede8e36f16bdcf2228b8" -dependencies = [ - "base64 0.13.1", -] - -[[package]] -name = "percent-encoding" -version = "2.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" - -[[package]] -name = "pest" -version = "2.7.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "560131c633294438da9f7c4b08189194b20946c8274c6b9e38881a7874dc8ee8" -dependencies = [ - "memchr", - "thiserror", - "ucd-trie", -] - -[[package]] -name = "pest_derive" -version = "2.7.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26293c9193fbca7b1a3bf9b79dc1e388e927e6cacaa78b4a3ab705a1d3d41459" -dependencies = [ - "pest", - "pest_generator", -] - -[[package]] -name = "pest_generator" -version = "2.7.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3ec22af7d3fb470a85dd2ca96b7c577a1eb4ef6f1683a9fe9a8c16e136c04687" -dependencies = [ - "pest", - "pest_meta", - "proc-macro2", - "quote", - "syn 2.0.58", -] - -[[package]] -name = "pest_meta" -version = "2.7.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d7a240022f37c361ec1878d646fc5b7d7c4d28d5946e1a80ad5a7a4f4ca0bdcd" -dependencies = [ - "once_cell", - "pest", - "sha2 0.10.7", -] - -[[package]] -name = "petgraph" -version = "0.4.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c3659d1ee90221741f65dd128d9998311b0e40c5d3c23a62445938214abce4f" -dependencies = [ - "fixedbitset 0.1.9", - "ordermap", -] - -[[package]] -name = "petgraph" -version = "0.6.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4dd7d28ee937e54fe3080c91faa1c3a46c06de6252988a7f4592ba2310ef22a4" -dependencies = [ - "fixedbitset 0.4.2", - "indexmap 1.9.3", -] - -[[package]] -name = "pharos" -version = "0.5.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e9567389417feee6ce15dd6527a8a1ecac205ef62c2932bcf3d9f6fc5b78b414" -dependencies = [ - "futures", - "rustc_version", -] - -[[package]] -name = "phf" -version = "0.11.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ade2d8b8f33c7333b51bcf0428d37e217e9f32192ae4772156f65063b8ce03dc" -dependencies = [ - "phf_shared", -] - -[[package]] -name = "phf_shared" -version = "0.11.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90fcb95eef784c2ac79119d1dd819e162b5da872ce6f3c3abe1e8ca1c082f72b" -dependencies = [ - "siphasher", -] - -[[package]] -name = "pin-project" -version = "1.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fda4ed1c6c173e3fc7a83629421152e01d7b1f9b7f65fb301e490e8cfc656422" -dependencies = [ - "pin-project-internal", -] - -[[package]] -name = "pin-project-internal" -version = "1.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4359fd9c9171ec6e8c62926d6faaf553a8dc3f64e1507e76da7911b4f6a04405" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.58", -] - -[[package]] -name = "pin-project-lite" -version = "0.2.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12cc1b0bf1727a77a54b6654e7b5f1af8604923edc8b81885f8ec92f9e3f0a05" - -[[package]] -name = "pin-utils" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" - -[[package]] -name = "pkg-config" -version = "0.3.27" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26072860ba924cbfa98ea39c8c19b4dd6a4a25423dbdf219c1eca91aa0cf6964" - -[[package]] -name = "plotters" -version = "0.3.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2c224ba00d7cadd4d5c660deaf2098e5e80e07846537c51f9cfa4be50c1fd45" -dependencies = [ - "num-traits", - "plotters-backend", - "plotters-svg", - "wasm-bindgen", - "web-sys", -] - -[[package]] -name = "plotters-backend" -version = "0.3.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e76628b4d3a7581389a35d5b6e2139607ad7c75b17aed325f210aa91f4a9609" - -[[package]] -name = "plotters-svg" -version = "0.3.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38f6d39893cca0701371e3c27294f09797214b86f1fb951b89ade8ec04e2abab" -dependencies = [ - "plotters-backend", -] - -[[package]] -name = "portable-atomic" -version = "1.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc9c68a3f6da06753e9335d63e27f6b9754dd1920d941135b7ea8224f141adb2" - -[[package]] -name = "postgres-native-tls" -version = "0.5.0" -source = "git+https://github.com/prisma/rust-postgres?branch=pgbouncer-mode#c62b9928d402685e152161907e8480603c29ef65" -dependencies = [ - "native-tls", - "tokio", - "tokio-native-tls", - "tokio-postgres", -] - -[[package]] -name = "postgres-protocol" -version = "0.6.7" -source = "git+https://github.com/prisma/rust-postgres?branch=pgbouncer-mode#c62b9928d402685e152161907e8480603c29ef65" -dependencies = [ - "base64 0.22.1", - "byteorder", - "bytes", - "fallible-iterator 0.2.0", - "hmac", - "md-5", - "memchr", - "rand 0.8.5", - "sha2 0.10.7", - "stringprep", -] - -[[package]] -name = "postgres-types" -version = "0.2.8" -source = "git+https://github.com/prisma/rust-postgres?branch=pgbouncer-mode#c62b9928d402685e152161907e8480603c29ef65" -dependencies = [ - "bit-vec", - "bytes", - "chrono", - "fallible-iterator 0.2.0", - "postgres-protocol", - "serde", - "serde_json", - "uuid", -] - -[[package]] -name = "powerfmt" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391" - -[[package]] -name = "ppv-lite86" -version = "0.2.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" - -[[package]] -name = "pretty-hex" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c6fa0831dd7cc608c38a5e323422a0077678fa5744aa2be4ad91c4ece8eec8d5" - -[[package]] -name = "pretty_assertions" -version = "1.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af7cee1a6c8a5b9208b3cb1061f10c0cb689087b3d8ce85fb9d2dd7a29b6ba66" -dependencies = [ - "diff", - "yansi", -] - -[[package]] -name = "priority-queue" -version = "1.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fff39edfcaec0d64e8d0da38564fad195d2d51b680940295fcc307366e101e61" -dependencies = [ - "autocfg", - "indexmap 1.9.3", -] - -[[package]] -name = "prisma-fmt" -version = "0.1.0" -dependencies = [ - "build-utils", - "colored", - "dissimilar", - "dmmf", - "enumflags2", - "expect-test", - "indoc 2.0.3", - "log", - "lsp-types", - "once_cell", - "psl", - "serde", - "serde_json", - "structopt", -] - -[[package]] -name = "prisma-metrics" -version = "0.1.0" -dependencies = [ - "derive_more", - "expect-test", - "futures", - "metrics", - "metrics-exporter-prometheus", - "metrics-util", - "once_cell", - "parking_lot", - "pin-project", - "serde", - "serde_json", - "tokio", - "tracing", - "tracing-futures", - "tracing-subscriber", -] - -[[package]] -name = "prisma-schema-build" -version = "0.1.0" -dependencies = [ - "prisma-fmt", - "wasm-bindgen", - "wasm-logger", -] - -[[package]] -name = "prisma-value" -version = "0.1.0" -dependencies = [ - "base64 0.13.1", - "bigdecimal", - "chrono", - "once_cell", - "regex", - "serde", - "serde_json", - "uuid", -] - -[[package]] -name = "proc-macro-crate" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d6ea3c4595b96363c13943497db34af4460fb474a95c43f4446ad341b8c9785" -dependencies = [ - "toml", -] - -[[package]] -name = "proc-macro-error" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c" -dependencies = [ - "proc-macro-error-attr", - "proc-macro2", - "quote", - "syn 1.0.109", - "version_check", -] - -[[package]] -name = "proc-macro-error-attr" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869" -dependencies = [ - "proc-macro2", - "quote", - "version_check", -] - -[[package]] -name = "proc-macro-hack" -version = "0.5.20+deprecated" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc375e1527247fe1a97d8b7156678dfe7c1af2fc075c9a4db3690ecd2a148068" - -[[package]] -name = "proc-macro2" -version = "1.0.78" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2422ad645d89c99f8f3e6b88a9fdeca7fabeac836b1002371c4367c8f984aae" -dependencies = [ - "unicode-ident", -] - -[[package]] -name = "prost" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "444879275cb4fd84958b1a1d5420d15e6fcf7c235fe47f053c9c2a80aceb6001" -dependencies = [ - "bytes", - "prost-derive", -] - -[[package]] -name = "prost-build" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62941722fb675d463659e49c4f3fe1fe792ff24fe5bbaa9c08cd3b98a1c354f5" -dependencies = [ - "bytes", - "heck 0.3.3", - "itertools 0.10.5", - "lazy_static", - "log", - "multimap", - "petgraph 0.6.3", - "prost", - "prost-types", - "regex", - "tempfile", - "which", -] - -[[package]] -name = "prost-derive" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9cc1a3263e07e0bf68e96268f37665207b49560d98739662cdfaae215c720fe" -dependencies = [ - "anyhow", - "itertools 0.10.5", - "proc-macro2", - "quote", - "syn 1.0.109", -] - -[[package]] -name = "prost-types" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "534b7a0e836e3c482d2693070f982e39e7611da9695d4d1f5a4b186b51faef0a" -dependencies = [ - "bytes", - "prost", -] - -[[package]] -name = "psl" -version = "0.1.0" -dependencies = [ - "base64 0.13.1", - "dissimilar", - "either", - "expect-test", - "indoc 2.0.3", - "psl-core", -] - -[[package]] -name = "psl-core" -version = "0.1.0" -dependencies = [ - "bigdecimal", - "cfg-if", - "chrono", - "connection-string", - "diagnostics", - "either", - "enumflags2", - "hex", - "indoc 2.0.3", - "itertools 0.12.0", - "lsp-types", - "once_cell", - "parser-database", - "prisma-value", - "regex", - "schema-ast", - "serde", - "serde_json", - "url", -] - -[[package]] -name = "ptr_meta" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0738ccf7ea06b608c10564b31debd4f5bc5e197fc8bfe088f68ae5ce81e7a4f1" -dependencies = [ - "ptr_meta_derive", -] - -[[package]] -name = "ptr_meta_derive" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "16b845dbfca988fa33db069c0e230574d15a3088f147a87b64c7589eb662c9ac" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", -] - -[[package]] -name = "qe-setup" -version = "0.1.0" -dependencies = [ - "connection-string", - "enumflags2", - "mongodb", - "mongodb-client", - "once_cell", - "psl", - "quaint", - "schema-core", - "serde", - "serde_json", - "sql-schema-connector", - "test-setup", - "tokio", - "url", -] - -[[package]] -name = "quaint" -version = "0.2.0-alpha.13" -dependencies = [ - "async-trait", - "async-tungstenite", - "base64 0.12.3", - "bigdecimal", - "bit-vec", - "byteorder", - "bytes", - "cfg_aliases", - "chrono", - "concat-idents", - "connection-string", - "crosstarget-utils", - "either", - "enumflags2", - "expect-test", - "futures", - "getrandom 0.2.11", - "hex", - "indoc 0.3.6", - "itertools 0.12.0", - "lru-cache", - "mobc", - "mysql_async", - "names 0.11.0", - "native-tls", - "num_cpus", - "once_cell", - "paste", - "percent-encoding", - "postgres-native-tls", - "postgres-types", - "prisma-metrics", - "quaint-test-macros", - "quaint-test-setup", - "regex", - "rusqlite", - "serde", - "serde_json", - "sqlformat", - "thiserror", - "tiberius", - "tokio", - "tokio-postgres", - "tokio-util 0.7.8", - "tracing", - "tracing-futures", - "url", - "uuid", - "ws_stream_tungstenite", -] - -[[package]] -name = "quaint-test-macros" -version = "0.1.0" -dependencies = [ - "darling 0.10.2", - "once_cell", - "proc-macro2", - "quaint-test-setup", - "quote", - "syn 1.0.109", -] - -[[package]] -name = "quaint-test-setup" -version = "0.1.0" -dependencies = [ - "async-trait", - "bitflags 1.3.2", - "names 0.11.0", - "once_cell", - "quaint", - "tokio", -] - -[[package]] -name = "quanta" -version = "0.12.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e5167a477619228a0b284fac2674e3c388cba90631d7b7de620e6f1fcd08da5" -dependencies = [ - "crossbeam-utils", - "libc", - "once_cell", - "raw-cpuid", - "wasi 0.11.0+wasi-snapshot-preview1", - "web-sys", - "winapi", -] - -[[package]] -name = "query-connector" -version = "0.1.0" -dependencies = [ - "anyhow", - "async-trait", - "chrono", - "futures", - "indexmap 2.2.2", - "itertools 0.12.0", - "prisma-value", - "query-structure", - "serde", - "serde_json", - "telemetry", - "thiserror", - "user-facing-errors", - "uuid", -] - -[[package]] -name = "query-core" -version = "0.1.0" -dependencies = [ - "async-trait", - "bigdecimal", - "chrono", - "connection-string", - "crossbeam-channel", - "crosstarget-utils", - "cuid", - "derive_more", - "enumflags2", - "futures", - "indexmap 2.2.2", - "itertools 0.12.0", - "lru 0.7.8", - "once_cell", - "opentelemetry", - "petgraph 0.4.13", - "prisma-metrics", - "psl", - "query-connector", - "query-structure", - "schema", - "serde", - "serde_json", - "telemetry", - "thiserror", - "tokio", - "tracing", - "tracing-futures", - "tracing-opentelemetry", - "tracing-subscriber", - "user-facing-errors", - "uuid", -] - -[[package]] -name = "query-engine" -version = "0.1.0" -dependencies = [ - "anyhow", - "async-trait", - "base64 0.13.1", - "build-utils", - "connection-string", - "enumflags2", - "graphql-parser", - "hyper", - "indoc 2.0.3", - "mongodb-query-connector", - "opentelemetry", - "opentelemetry-otlp", - "prisma-metrics", - "psl", - "quaint", - "query-connector", - "query-core", - "request-handlers", - "serde", - "serde_json", - "serial_test", - "sql-query-connector", - "structopt", - "telemetry", - "thiserror", - "tokio", - "tracing", - "tracing-opentelemetry", - "tracing-subscriber", - "url", - "user-facing-errors", -] - -[[package]] -name = "query-engine-c-abi" -version = "0.1.0" -dependencies = [ - "anyhow", - "async-trait", - "build-utils", - "cbindgen", - "chrono", - "connection-string", - "futures", - "indoc 2.0.3", - "once_cell", - "opentelemetry", - "psl", - "quaint", - "query-connector", - "query-core", - "query-engine-common", - "query-structure", - "request-handlers", - "rusqlite", - "serde", - "serde_json", - "sql-query-connector", - "telemetry", - "thiserror", - "tokio", - "tracing", - "tracing-futures", - "tracing-opentelemetry", - "tracing-subscriber", - "url", - "user-facing-errors", - "uuid", -] - -[[package]] -name = "query-engine-common" -version = "0.1.0" -dependencies = [ - "async-trait", - "connection-string", - "napi", - "opentelemetry", - "prisma-metrics", - "psl", - "query-connector", - "query-core", - "serde", - "serde_json", - "telemetry", - "thiserror", - "tracing", - "tracing-futures", - "tracing-opentelemetry", - "tracing-subscriber", - "tsify", - "url", - "user-facing-errors", - "wasm-bindgen", -] - -[[package]] -name = "query-engine-node-api" -version = "0.1.0" -dependencies = [ - "anyhow", - "async-trait", - "build-utils", - "connection-string", - "driver-adapters", - "futures", - "napi", - "napi-build", - "napi-derive", - "opentelemetry", - "prisma-metrics", - "psl", - "quaint", - "query-connector", - "query-core", - "query-engine-common", - "query-structure", - "request-handlers", - "serde", - "serde_json", - "sql-query-connector", - "telemetry", - "thiserror", - "tokio", - "tracing", - "tracing-futures", - "tracing-opentelemetry", - "tracing-subscriber", - "url", - "user-facing-errors", -] - -[[package]] -name = "query-engine-tests" -version = "0.1.0" -dependencies = [ - "anyhow", - "base64 0.13.1", - "chrono", - "colored", - "enumflags2", - "futures", - "indoc 2.0.3", - "insta", - "itertools 0.12.0", - "once_cell", - "paste", - "prisma-metrics", - "prisma-value", - "psl", - "query-test-macros", - "query-tests-setup", - "serde_json", - "tokio", - "tracing", - "tracing-futures", - "user-facing-errors", - "uuid", -] - -[[package]] -name = "query-engine-wasm" -version = "0.1.0" -dependencies = [ - "anyhow", - "async-trait", - "build-utils", - "connection-string", - "driver-adapters", - "futures", - "js-sys", - "opentelemetry", - "psl", - "quaint", - "query-connector", - "query-core", - "query-engine-common", - "query-structure", - "request-handlers", - "serde", - "serde-wasm-bindgen", - "serde_json", - "sql-query-connector", - "telemetry", - "thiserror", - "tokio", - "tracing", - "tracing-futures", - "tracing-opentelemetry", - "tracing-subscriber", - "tsify", - "url", - "user-facing-errors", - "wasm-bindgen", - "wasm-bindgen-futures", - "wasm-rs-dbg", -] - -[[package]] -name = "query-structure" -version = "0.0.0" -dependencies = [ - "bigdecimal", - "chrono", - "cuid", - "getrandom 0.2.11", - "itertools 0.12.0", - "nanoid", - "prisma-value", - "psl", - "thiserror", - "uuid", -] - -[[package]] -name = "query-test-macros" -version = "0.1.0" -dependencies = [ - "darling 0.13.4", - "proc-macro2", - "quote", - "syn 1.0.109", -] - -[[package]] -name = "query-tests-setup" -version = "0.1.0" -dependencies = [ - "async-trait", - "colored", - "enumflags2", - "hyper", - "indexmap 2.2.2", - "indoc 2.0.3", - "insta", - "itertools 0.12.0", - "jsonrpc-core", - "nom", - "once_cell", - "parse-hyperlinks", - "prisma-metrics", - "psl", - "qe-setup", - "quaint", - "query-core", - "query-engine", - "query-structure", - "regex", - "request-handlers", - "serde", - "serde_json", - "sql-query-connector", - "strip-ansi-escapes", - "telemetry", - "thiserror", - "tokio", - "tracing", - "tracing-error", - "tracing-futures", - "tracing-subscriber", - "user-facing-errors", -] - -[[package]] -name = "quick-error" -version = "1.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0" - -[[package]] -name = "quote" -version = "1.0.35" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef" -dependencies = [ - "proc-macro2", -] - -[[package]] -name = "radium" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc33ff2d4973d518d823d61aa239014831e521c75da58e3df4840d3f47749d09" - -[[package]] -name = "radix_trie" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c069c179fcdc6a2fe24d8d18305cf085fdbd4f922c041943e203685d6a1c58fd" -dependencies = [ - "endian-type", - "nibble_vec", -] - -[[package]] -name = "rand" -version = "0.3.23" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "64ac302d8f83c0c1974bf758f6b041c6c8ada916fbb44a609158ca8b064cc76c" -dependencies = [ - "libc", - "rand 0.4.6", -] - -[[package]] -name = "rand" -version = "0.4.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "552840b97013b1a26992c11eac34bdd778e464601a4c2054b5f0bff7c6761293" -dependencies = [ - "fuchsia-cprng", - "libc", - "rand_core 0.3.1", - "rdrand", - "winapi", -] - -[[package]] -name = "rand" -version = "0.7.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a6b1679d49b24bbfe0c803429aa1874472f50d9b363131f0e89fc356b544d03" -dependencies = [ - "getrandom 0.1.16", - "libc", - "rand_chacha 0.2.2", - "rand_core 0.5.1", - "rand_hc", -] - -[[package]] -name = "rand" -version = "0.8.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404" -dependencies = [ - "libc", - "rand_chacha 0.3.1", - "rand_core 0.6.4", -] - -[[package]] -name = "rand_chacha" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4c8ed856279c9737206bf725bf36935d8666ead7aa69b52be55af369d193402" -dependencies = [ - "ppv-lite86", - "rand_core 0.5.1", -] - -[[package]] -name = "rand_chacha" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88" -dependencies = [ - "ppv-lite86", - "rand_core 0.6.4", -] - -[[package]] -name = "rand_core" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a6fdeb83b075e8266dcc8762c22776f6877a63111121f5f8c7411e5be7eed4b" -dependencies = [ - "rand_core 0.4.2", -] - -[[package]] -name = "rand_core" -version = "0.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c33a3c44ca05fa6f1807d8e6743f3824e8509beca625669633be0acbdf509dc" - -[[package]] -name = "rand_core" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90bde5296fc891b0cef12a6d03ddccc162ce7b2aff54160af9338f8d40df6d19" -dependencies = [ - "getrandom 0.1.16", -] - -[[package]] -name = "rand_core" -version = "0.6.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" -dependencies = [ - "getrandom 0.2.11", -] - -[[package]] -name = "rand_hc" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca3129af7b92a17112d59ad498c6f81eaf463253766b90396d39ea7a39d6613c" -dependencies = [ - "rand_core 0.5.1", -] - -[[package]] -name = "raw-cpuid" -version = "11.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ab240315c661615f2ee9f0f2cd32d5a7343a84d5ebcccb99d46e6637565e7b0" -dependencies = [ - "bitflags 2.4.0", -] - -[[package]] -name = "rayon" -version = "1.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d2df5196e37bcc87abebc0053e20787d73847bb33134a69841207dd0a47f03b" -dependencies = [ - "either", - "rayon-core", -] - -[[package]] -name = "rayon-core" -version = "1.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b8f95bd6966f5c87776639160a66bd8ab9895d9d4ab01ddba9fc60661aebe8d" -dependencies = [ - "crossbeam-channel", - "crossbeam-deque", - "crossbeam-utils", - "num_cpus", -] - -[[package]] -name = "rdrand" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "678054eb77286b51581ba43620cc911abf02758c91f93f479767aed0f90458b2" -dependencies = [ - "rand_core 0.3.1", -] - -[[package]] -name = "redox_syscall" -version = "0.3.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29" -dependencies = [ - "bitflags 1.3.2", -] - -[[package]] -name = "redox_syscall" -version = "0.5.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b6dfecf2c74bce2466cabf93f6664d6998a69eb21e39f4207930065b27b771f" -dependencies = [ - "bitflags 2.4.0", -] - -[[package]] -name = "regex" -version = "1.10.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4219d74c6b67a3654a9fbebc4b419e22126d13d2f3c4a07ee0cb61ff79a79619" -dependencies = [ - "aho-corasick", - "memchr", - "regex-automata 0.4.5", - "regex-syntax 0.8.2", -] - -[[package]] -name = "regex-automata" -version = "0.1.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132" -dependencies = [ - "regex-syntax 0.6.29", -] - -[[package]] -name = "regex-automata" -version = "0.4.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5bb987efffd3c6d0d8f5f89510bb458559eab11e4f869acb20bf845e016259cd" -dependencies = [ - "aho-corasick", - "memchr", - "regex-syntax 0.8.2", -] - -[[package]] -name = "regex-syntax" -version = "0.6.29" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1" - -[[package]] -name = "regex-syntax" -version = "0.8.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f" - -[[package]] -name = "rend" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "581008d2099240d37fb08d77ad713bcaec2c4d89d50b5b21a8bb1996bbab68ab" -dependencies = [ - "bytecheck", -] - -[[package]] -name = "request-handlers" -version = "0.1.0" -dependencies = [ - "bigdecimal", - "cfg_aliases", - "codspeed-criterion-compat", - "connection-string", - "dmmf", - "futures", - "graphql-parser", - "indexmap 2.2.2", - "insta", - "itertools 0.12.0", - "mongodb-query-connector", - "once_cell", - "psl", - "quaint", - "query-core", - "query-structure", - "schema", - "serde", - "serde_json", - "sql-query-connector", - "telemetry", - "thiserror", - "tracing", - "url", - "user-facing-errors", -] - -[[package]] -name = "reqwest" -version = "0.11.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cde824a14b7c14f85caff81225f411faacc04a2013f41670f41443742b1c1c55" -dependencies = [ - "base64 0.21.2", - "bytes", - "encoding_rs", - "futures-core", - "futures-util", - "h2", - "http 0.2.9", - "http-body", - "hyper", - "hyper-tls", - "ipnet", - "js-sys", - "log", - "mime", - "native-tls", - "once_cell", - "percent-encoding", - "pin-project-lite", - "serde", - "serde_json", - "serde_urlencoded", - "tokio", - "tokio-native-tls", - "tower-service", - "url", - "wasm-bindgen", - "wasm-bindgen-futures", - "web-sys", - "winreg 0.10.1", -] - -[[package]] -name = "resolv-conf" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "52e44394d2086d010551b14b53b1f24e31647570cd1deb0379e2c21b329aba00" -dependencies = [ - "hostname", - "quick-error", -] - -[[package]] -name = "ring" -version = "0.16.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3053cf52e236a3ed746dfc745aa9cacf1b791d846bdaf412f60a8d7d6e17c8fc" -dependencies = [ - "cc", - "libc", - "once_cell", - "spin 0.5.2", - "untrusted 0.7.1", - "web-sys", - "winapi", -] - -[[package]] -name = "ring" -version = "0.17.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "688c63d65483050968b2a8937f7995f443e27041a0f7700aa59b0822aedebb74" -dependencies = [ - "cc", - "getrandom 0.2.11", - "libc", - "spin 0.9.8", - "untrusted 0.9.0", - "windows-sys 0.48.0", -] - -[[package]] -name = "rkyv" -version = "0.7.42" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0200c8230b013893c0b2d6213d6ec64ed2b9be2e0e016682b7224ff82cff5c58" -dependencies = [ - "bitvec", - "bytecheck", - "hashbrown 0.12.3", - "ptr_meta", - "rend", - "rkyv_derive", - "seahash", - "tinyvec", - "uuid", -] - -[[package]] -name = "rkyv_derive" -version = "0.7.42" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2e06b915b5c230a17d7a736d1e2e63ee753c256a8614ef3f5147b13a4f5541d" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", -] - -[[package]] -name = "rusqlite" -version = "0.31.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b838eba278d213a8beaf485bd313fd580ca4505a00d5871caeb1457c55322cae" -dependencies = [ - "bitflags 2.4.0", - "chrono", - "fallible-iterator 0.3.0", - "fallible-streaming-iterator", - "hashlink", - "libsqlite3-sys", - "smallvec", -] - -[[package]] -name = "rust_decimal" -version = "1.31.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4a2ab0025103a60ecaaf3abf24db1db240a4e1c15837090d2c32f625ac98abea" -dependencies = [ - "arrayvec 0.7.4", - "borsh", - "byteorder", - "bytes", - "num-traits", - "rand 0.8.5", - "rkyv", - "serde", - "serde_json", -] - -[[package]] -name = "rustc-demangle" -version = "0.1.23" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76" - -[[package]] -name = "rustc-hash" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" - -[[package]] -name = "rustc_version" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366" -dependencies = [ - "semver", -] - -[[package]] -name = "rustc_version_runtime" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2dd18cd2bae1820af0b6ad5e54f4a51d0f3fcc53b05f845675074efcc7af071d" -dependencies = [ - "rustc_version", - "semver", -] - -[[package]] -name = "rustix" -version = "0.38.28" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72e572a5e8ca657d7366229cdde4bd14c4eb5499a9573d4d366fe1b599daa316" -dependencies = [ - "bitflags 2.4.0", - "errno", - "libc", - "linux-raw-sys", - "windows-sys 0.52.0", -] - -[[package]] -name = "rustls" -version = "0.19.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "35edb675feee39aec9c99fa5ff985081995a06d594114ae14cbe797ad7b7a6d7" -dependencies = [ - "base64 0.13.1", - "log", - "ring 0.16.20", - "sct 0.6.1", - "webpki", -] - -[[package]] -name = "rustls" -version = "0.21.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9d5a6813c0759e4609cd494e8e725babae6a2ca7b62a5536a13daaec6fcb7ba" -dependencies = [ - "log", - "ring 0.17.7", - "rustls-webpki", - "sct 0.7.0", -] - -[[package]] -name = "rustls-native-certs" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a07b7c1885bd8ed3831c289b7870b13ef46fe0e856d288c30d9cc17d75a2092" -dependencies = [ - "openssl-probe", - "rustls 0.19.1", - "schannel", - "security-framework", -] - -[[package]] -name = "rustls-pemfile" -version = "1.0.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2d3987094b1d07b653b7dfdc3f70ce9a1da9c51ac18c1b06b662e4f9a0e9f4b2" -dependencies = [ - "base64 0.21.2", -] - -[[package]] -name = "rustls-webpki" -version = "0.101.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b6275d1ee7a1cd780b64aca7726599a1dbc893b1e64144529e55c3c2f745765" -dependencies = [ - "ring 0.17.7", - "untrusted 0.9.0", -] - -[[package]] -name = "ryu" -version = "1.0.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ad4cc8da4ef723ed60bced201181d83791ad433213d8c24efffda1eec85d741" - -[[package]] -name = "same-file" -version = "1.0.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502" -dependencies = [ - "winapi-util", -] - -[[package]] -name = "saturating" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ece8e78b2f38ec51c51f5d475df0a7187ba5111b2a28bdc761ee05b075d40a71" - -[[package]] -name = "schannel" -version = "0.1.22" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c3733bf4cf7ea0880754e19cb5a462007c4a8c1914bff372ccc95b464f1df88" -dependencies = [ - "windows-sys 0.48.0", -] - -[[package]] -name = "schema" -version = "0.1.0" -dependencies = [ - "codspeed-criterion-compat", - "once_cell", - "psl", - "query-structure", - "rustc-hash", -] - -[[package]] -name = "schema-ast" -version = "0.1.0" -dependencies = [ - "diagnostics", - "pest", - "pest_derive", - "serde", - "serde_json", -] - -[[package]] -name = "schema-connector" -version = "0.1.0" -dependencies = [ - "chrono", - "enumflags2", - "psl", - "quaint", - "serde", - "serde_json", - "sha2 0.9.9", - "tracing", - "tracing-error", - "user-facing-errors", -] - -[[package]] -name = "schema-core" -version = "0.1.0" -dependencies = [ - "async-trait", - "chrono", - "enumflags2", - "json-rpc-api-build", - "jsonrpc-core", - "mongodb-schema-connector", - "psl", - "schema-connector", - "serde", - "serde_json", - "sql-schema-connector", - "tokio", - "tracing", - "tracing-futures", - "tracing-subscriber", - "url", - "user-facing-errors", -] - -[[package]] -name = "schema-engine-cli" -version = "0.1.0" -dependencies = [ - "backtrace", - "base64 0.13.1", - "build-utils", - "connection-string", - "expect-test", - "indoc 2.0.3", - "jsonrpc-core", - "quaint", - "schema-connector", - "schema-core", - "serde", - "serde_json", - "structopt", - "tempfile", - "test-macros", - "test-setup", - "tokio", - "tracing", - "tracing-error", - "tracing-subscriber", - "url", - "user-facing-errors", -] - -[[package]] -name = "scopeguard" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" - -[[package]] -name = "sct" -version = "0.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b362b83898e0e69f38515b82ee15aa80636befe47c3b6d3d89a911e78fc228ce" -dependencies = [ - "ring 0.16.20", - "untrusted 0.7.1", -] - -[[package]] -name = "sct" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d53dcdb7c9f8158937a7981b48accfd39a43af418591a5d008c7b22b5e1b7ca4" -dependencies = [ - "ring 0.16.20", - "untrusted 0.7.1", -] - -[[package]] -name = "seahash" -version = "4.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1c107b6f4780854c8b126e228ea8869f4d7b71260f962fefb57b996b8959ba6b" - -[[package]] -name = "security-framework" -version = "2.9.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05b64fb303737d99b81884b2c63433e9ae28abebe5eb5045dcdd175dc2ecf4de" -dependencies = [ - "bitflags 1.3.2", - "core-foundation", - "core-foundation-sys", - "libc", - "security-framework-sys", -] - -[[package]] -name = "security-framework-sys" -version = "2.9.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e932934257d3b408ed8f30db49d85ea163bfe74961f017f405b025af298f0c7a" -dependencies = [ - "core-foundation-sys", - "libc", -] - -[[package]] -name = "semver" -version = "1.0.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b0293b4b29daaf487284529cc2f5675b8e57c61f70167ba415a463651fd6a918" - -[[package]] -name = "serde" -version = "1.0.206" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b3e4cd94123dd520a128bcd11e34d9e9e423e7e3e50425cb1b4b1e3549d0284" -dependencies = [ - "serde_derive", -] - -[[package]] -name = "serde-wasm-bindgen" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f3b143e2833c57ab9ad3ea280d21fd34e285a42837aeb0ee301f4f41890fa00e" -dependencies = [ - "js-sys", - "serde", - "wasm-bindgen", -] - -[[package]] -name = "serde_bytes" -version = "0.11.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab33ec92f677585af6d88c65593ae2375adde54efdbf16d597f2cbc7a6d368ff" -dependencies = [ - "serde", -] - -[[package]] -name = "serde_derive" -version = "1.0.206" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fabfb6138d2383ea8208cf98ccf69cdfb1aff4088460681d84189aa259762f97" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.58", -] - -[[package]] -name = "serde_derive_internals" -version = "0.28.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e578a843d40b4189a4d66bba51d7684f57da5bd7c304c64e14bd63efbef49509" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.58", -] - -[[package]] -name = "serde_json" -version = "1.0.104" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "076066c5f1078eac5b722a31827a8832fe108bed65dfa75e233c89f8206e976c" -dependencies = [ - "indexmap 2.2.2", - "itoa", - "ryu", - "serde", -] - -[[package]] -name = "serde_repr" -version = "0.1.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3081f5ffbb02284dda55132aa26daecedd7372a42417bbbab6f14ab7d6bb9145" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.58", -] - -[[package]] -name = "serde_urlencoded" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d3491c14715ca2294c4d6a88f15e84739788c1d030eed8c110436aafdaa2f3fd" -dependencies = [ - "form_urlencoded", - "itoa", - "ryu", - "serde", -] - -[[package]] -name = "serde_with" -version = "3.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "69cecfa94848272156ea67b2b1a53f20fc7bc638c4a46d2f8abde08f05f4b857" -dependencies = [ - "base64 0.22.1", - "chrono", - "hex", - "indexmap 1.9.3", - "indexmap 2.2.2", - "serde", - "serde_derive", - "serde_json", - "serde_with_macros", - "time", -] - -[[package]] -name = "serde_with_macros" -version = "3.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8fee4991ef4f274617a51ad4af30519438dacb2f56ac773b08a1922ff743350" -dependencies = [ - "darling 0.20.10", - "proc-macro2", - "quote", - "syn 2.0.58", -] - -[[package]] -name = "serial_test" -version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0e56dd856803e253c8f298af3f4d7eb0ae5e23a737252cd90bb4f3b435033b2d" -dependencies = [ - "dashmap", - "futures", - "lazy_static", - "log", - "parking_lot", - "serial_test_derive", -] - -[[package]] -name = "serial_test_derive" -version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91d129178576168c589c9ec973feedf7d3126c01ac2bf08795109aa35b69fb8f" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.58", -] - -[[package]] -name = "sha-1" -version = "0.10.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f5058ada175748e33390e40e872bd0fe59a19f265d0158daa551c5a88a76009c" -dependencies = [ - "cfg-if", - "cpufeatures", - "digest 0.10.7", -] - -[[package]] -name = "sha1" -version = "0.10.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f04293dc80c3993519f2d7f6f511707ee7094fe0c6d3406feb330cdb3540eba3" -dependencies = [ - "cfg-if", - "cpufeatures", - "digest 0.10.7", -] - -[[package]] -name = "sha2" -version = "0.9.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d58a1e1bf39749807d89cf2d98ac2dfa0ff1cb3faa38fbb64dd88ac8013d800" -dependencies = [ - "block-buffer 0.9.0", - "cfg-if", - "cpufeatures", - "digest 0.9.0", - "opaque-debug", -] - -[[package]] -name = "sha2" -version = "0.10.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "479fb9d862239e610720565ca91403019f2f00410f1864c5aa7479b950a76ed8" -dependencies = [ - "cfg-if", - "cpufeatures", - "digest 0.10.7", -] - -[[package]] -name = "sha3" -version = "0.10.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "75872d278a8f37ef87fa0ddbda7802605cb18344497949862c0d4dcb291eba60" -dependencies = [ - "digest 0.10.7", - "keccak", -] - -[[package]] -name = "sharded-slab" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "900fba806f70c630b0a382d0d825e17a0f19fcd059a2ade1ff237bcddf446b31" -dependencies = [ - "lazy_static", -] - -[[package]] -name = "shlex" -version = "1.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64" - -[[package]] -name = "signal-hook-registry" -version = "1.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d8229b473baa5980ac72ef434c4415e70c4b5e71b423043adb4ba059f89c99a1" -dependencies = [ - "libc", -] - -[[package]] -name = "simdutf8" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f27f6278552951f1f2b8cf9da965d10969b2efdea95a6ec47987ab46edfe263a" - -[[package]] -name = "similar" -version = "2.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "420acb44afdae038210c99e69aae24109f32f15500aa708e81d46c9f29d55fcf" -dependencies = [ - "bstr", -] - -[[package]] -name = "siphasher" -version = "0.3.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7bd3e3206899af3f8b12af284fafc038cc1dc2b41d1b89dd17297221c5d225de" - -[[package]] -name = "sketches-ddsketch" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85636c14b73d81f541e525f585c0a2109e6744e1565b5c1668e31c70c10ed65c" - -[[package]] -name = "slab" -version = "0.4.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6528351c9bc8ab22353f9d776db39a20288e8d6c37ef8cfe3317cf875eecfc2d" -dependencies = [ - "autocfg", -] - -[[package]] -name = "smallvec" -version = "1.13.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67" - -[[package]] -name = "socket2" -version = "0.4.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "64a4a911eed85daf18834cfaa86a79b7d266ff93ff5ba14005426219480ed662" -dependencies = [ - "libc", - "winapi", -] - -[[package]] -name = "socket2" -version = "0.5.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce305eb0b4296696835b71df73eb912e0f1ffd2556a501fcede6e0c50349191c" -dependencies = [ - "libc", - "windows-sys 0.52.0", -] - -[[package]] -name = "spin" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d" - -[[package]] -name = "spin" -version = "0.9.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67" -dependencies = [ - "lock_api", -] - -[[package]] -name = "sql-ddl" -version = "0.1.0" -dependencies = [ - "indoc 2.0.3", -] - -[[package]] -name = "sql-introspection-tests" -version = "0.1.0" -dependencies = [ - "barrel", - "connection-string", - "enumflags2", - "expect-test", - "indoc 2.0.3", - "itertools 0.12.0", - "pretty_assertions", - "psl", - "quaint", - "schema-connector", - "sql-schema-connector", - "sql-schema-describer", - "test-macros", - "test-setup", - "tokio", - "tracing", - "tracing-futures", - "url", - "user-facing-errors", -] - -[[package]] -name = "sql-migration-tests" -version = "0.1.0" -dependencies = [ - "bigdecimal", - "chrono", - "colored", - "connection-string", - "enumflags2", - "expect-test", - "indoc 2.0.3", - "jsonrpc-core", - "once_cell", - "paste", - "pretty_assertions", - "prisma-value", - "psl", - "quaint", - "schema-core", - "serde", - "serde_json", - "sql-schema-connector", - "sql-schema-describer", - "tempfile", - "test-macros", - "test-setup", - "tokio", - "tracing", - "tracing-futures", - "url", - "user-facing-errors", -] - -[[package]] -name = "sql-query-connector" -version = "0.1.0" -dependencies = [ - "anyhow", - "async-trait", - "bigdecimal", - "chrono", - "cuid", - "expect-test", - "futures", - "itertools 0.12.0", - "once_cell", - "opentelemetry", - "prisma-value", - "psl", - "quaint", - "query-connector", - "query-structure", - "rand 0.8.5", - "serde", - "serde_json", - "telemetry", - "thiserror", - "tokio", - "tracing", - "tracing-futures", - "tracing-opentelemetry", - "user-facing-errors", - "uuid", -] - -[[package]] -name = "sql-schema-connector" -version = "0.1.0" -dependencies = [ - "chrono", - "connection-string", - "datamodel-renderer", - "either", - "enumflags2", - "expect-test", - "indexmap 2.2.2", - "indoc 2.0.3", - "once_cell", - "prisma-value", - "psl", - "quaint", - "regex", - "schema-connector", - "serde", - "serde_json", - "sql-ddl", - "sql-schema-describer", - "sqlformat", - "sqlparser", - "sqlx-core", - "sqlx-sqlite", - "tokio", - "tracing", - "tracing-futures", - "url", - "user-facing-errors", - "uuid", - "versions", -] - -[[package]] -name = "sql-schema-describer" -version = "0.1.0" -dependencies = [ - "async-trait", - "bigdecimal", - "either", - "enumflags2", - "expect-test", - "indexmap 2.2.2", - "indoc 2.0.3", - "once_cell", - "pretty_assertions", - "prisma-value", - "psl", - "quaint", - "regex", - "serde", - "test-macros", - "test-setup", - "tokio", - "tracing", - "tracing-error", - "tracing-futures", -] - -[[package]] -name = "sqlformat" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce81b7bd7c4493975347ef60d8c7e8b742d4694f4c49f93e0a12ea263938176c" -dependencies = [ - "itertools 0.12.0", - "nom", - "unicode_categories", -] - -[[package]] -name = "sqlparser" -version = "0.32.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0366f270dbabb5cc2e4c88427dc4c08bba144f81e32fbd459a013f26a4d16aa0" -dependencies = [ - "log", -] - -[[package]] -name = "sqlx-core" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a999083c1af5b5d6c071d34a708a19ba3e02106ad82ef7bbd69f5e48266b613b" -dependencies = [ - "atoi", - "byteorder", - "bytes", - "crossbeam-queue", - "either", - "event-listener", - "futures-channel", - "futures-core", - "futures-intrusive", - "futures-io", - "futures-util", - "hashbrown 0.14.5", - "hashlink", - "hex", - "indexmap 2.2.2", - "log", - "memchr", - "once_cell", - "paste", - "percent-encoding", - "smallvec", - "sqlformat", - "thiserror", - "tracing", - "url", -] - -[[package]] -name = "sqlx-sqlite" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b2cdd83c008a622d94499c0006d8ee5f821f36c89b7d625c900e5dc30b5c5ee" -dependencies = [ - "atoi", - "flume", - "futures-channel", - "futures-core", - "futures-executor", - "futures-intrusive", - "futures-util", - "libsqlite3-sys", - "log", - "percent-encoding", - "serde_urlencoded", - "sqlx-core", - "tracing", - "url", -] - -[[package]] -name = "static_assertions" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" - -[[package]] -name = "stringprep" -version = "0.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db3737bde7edce97102e0e2b15365bf7a20bfdb5f60f4f9e8d7004258a51a8da" -dependencies = [ - "unicode-bidi", - "unicode-normalization", -] - -[[package]] -name = "strip-ansi-escapes" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "011cbb39cf7c1f62871aea3cc46e5817b0937b49e9447370c93cacbe93a766d8" -dependencies = [ - "vte", -] - -[[package]] -name = "strsim" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a" - -[[package]] -name = "strsim" -version = "0.9.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6446ced80d6c486436db5c078dde11a9f73d42b57fb273121e160b84f63d894c" - -[[package]] -name = "strsim" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" - -[[package]] -name = "strsim" -version = "0.11.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f" - -[[package]] -name = "structopt" -version = "0.3.26" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c6b5c64445ba8094a6ab0c3cd2ad323e07171012d9c98b0b15651daf1787a10" -dependencies = [ - "clap 2.34.0", - "lazy_static", - "structopt-derive", -] - -[[package]] -name = "structopt-derive" -version = "0.4.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dcb5ae327f9cc13b68763b5749770cb9e048a99bd9dfdfa58d0cf05d5f64afe0" -dependencies = [ - "heck 0.3.3", - "proc-macro-error", - "proc-macro2", - "quote", - "syn 1.0.109", -] - -[[package]] -name = "subprocess" -version = "0.2.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c2e86926081dda636c546d8c5e641661049d7562a68f5488be4a1f7f66f6086" -dependencies = [ - "libc", - "winapi", -] - -[[package]] -name = "subtle" -version = "2.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81cdd64d312baedb58e21336b31bc043b77e01cc99033ce76ef539f78e965ebc" - -[[package]] -name = "syn" -version = "1.0.109" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" -dependencies = [ - "proc-macro2", - "quote", - "unicode-ident", -] - -[[package]] -name = "syn" -version = "2.0.58" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44cfb93f38070beee36b3fef7d4f5a16f27751d94b187b666a5cc5e9b0d30687" -dependencies = [ - "proc-macro2", - "quote", - "unicode-ident", -] - -[[package]] -name = "synstructure" -version = "0.12.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f36bdaa60a83aca3921b5259d5400cbf5e90fc51931376a9bd4a0eb79aa7210f" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", - "unicode-xid", -] - -[[package]] -name = "take_mut" -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 = "telemetry" -version = "0.1.0" -dependencies = [ - "async-trait", - "crossbeam-channel", - "crosstarget-utils", - "cuid", - "derive_more", - "enumflags2", - "futures", - "indexmap 2.2.2", - "itertools 0.12.0", - "lru 0.7.8", - "once_cell", - "opentelemetry", - "prisma-metrics", - "psl", - "rand 0.8.5", - "serde", - "serde_json", - "thiserror", - "tokio", - "tracing", - "tracing-futures", - "tracing-opentelemetry", - "tracing-subscriber", - "uuid", -] - -[[package]] -name = "tempfile" -version = "3.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc02fddf48964c42031a0b3fe0428320ecf3a73c401040fc0096f97794310651" -dependencies = [ - "cfg-if", - "fastrand", - "redox_syscall 0.3.5", - "rustix", - "windows-sys 0.48.0", -] - -[[package]] -name = "termcolor" -version = "1.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff1bc3d3f05aff0403e8ac0d92ced918ec05b666a43f83297ccef5bea8a3d449" -dependencies = [ - "winapi-util", -] - -[[package]] -name = "test-cli" -version = "0.1.0" -dependencies = [ - "anyhow", - "async-trait", - "build-utils", - "colored", - "dmmf", - "enumflags2", - "psl", - "schema-connector", - "schema-core", - "serde_json", - "structopt", - "tokio", - "tracing", - "tracing-error", - "tracing-subscriber", -] - -[[package]] -name = "test-macros" -version = "0.1.0" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", -] - -[[package]] -name = "test-setup" -version = "0.1.0" -dependencies = [ - "connection-string", - "dissimilar", - "enumflags2", - "once_cell", - "quaint", - "tokio", - "tracing", - "tracing-error", - "tracing-subscriber", - "url", -] - -[[package]] -name = "textwrap" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060" -dependencies = [ - "unicode-width", -] - -[[package]] -name = "textwrap" -version = "0.16.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "222a222a5bfe1bba4a77b45ec488a741b3cb8872e5e499451fd7d0129c9c7c3d" - -[[package]] -name = "thiserror" -version = "1.0.44" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "611040a08a0439f8248d1990b111c95baa9c704c805fa1f62104b39655fd7f90" -dependencies = [ - "thiserror-impl", -] - -[[package]] -name = "thiserror-impl" -version = "1.0.44" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "090198534930841fab3a5d1bb637cde49e339654e606195f8d9c76eeb081dc96" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.58", -] - -[[package]] -name = "thread_local" -version = "1.1.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fdd6f064ccff2d6567adcb3873ca630700f00b5ad3f060c25b5dcfd9a4ce152" -dependencies = [ - "cfg-if", - "once_cell", -] - -[[package]] -name = "tiberius" -version = "0.11.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "091052ba8f20c1e14f85913a5242a663a09d17ff4c0137b9b1f0735cb3c5dabc" -dependencies = [ - "async-native-tls", - "async-trait", - "asynchronous-codec", - "bigdecimal", - "byteorder", - "bytes", - "chrono", - "connection-string", - "encoding", - "enumflags2", - "futures", - "futures-sink", - "futures-util", - "num-traits", - "once_cell", - "opentls", - "pin-project-lite", - "pretty-hex", - "thiserror", - "tokio", - "tokio-util 0.7.8", - "tracing", - "uuid", - "winauth", -] - -[[package]] -name = "time" -version = "0.3.36" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885" -dependencies = [ - "deranged", - "itoa", - "num-conv", - "powerfmt", - "serde", - "time-core", - "time-macros", -] - -[[package]] -name = "time-core" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3" - -[[package]] -name = "time-macros" -version = "0.2.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f252a68540fde3a3877aeea552b832b40ab9a69e318efd078774a01ddee1ccf" -dependencies = [ - "num-conv", - "time-core", -] - -[[package]] -name = "tinytemplate" -version = "1.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be4d6b5f19ff7664e8c98d03e2139cb510db9b0a60b55f8e8709b689d939b6bc" -dependencies = [ - "serde", - "serde_json", -] - -[[package]] -name = "tinyvec" -version = "1.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87cc5ceb3875bb20c2890005a4e226a4651264a5c75edb2421b52861a0a0cb50" -dependencies = [ - "tinyvec_macros", -] - -[[package]] -name = "tinyvec_macros" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" - -[[package]] -name = "tokio" -version = "1.38.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb2caba9f80616f438e09748d5acda951967e1ea58508ef53d9c6402485a46df" -dependencies = [ - "backtrace", - "bytes", - "libc", - "mio", - "num_cpus", - "parking_lot", - "pin-project-lite", - "signal-hook-registry", - "socket2 0.5.7", - "tokio-macros", - "windows-sys 0.48.0", -] - -[[package]] -name = "tokio-io-timeout" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30b74022ada614a1b4834de765f9bb43877f910cc8ce4be40e89042c9223a8bf" -dependencies = [ - "pin-project-lite", - "tokio", -] - -[[package]] -name = "tokio-macros" -version = "2.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f5ae998a069d4b5aba8ee9dad856af7d520c3699e6159b185c2acd48155d39a" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.58", -] - -[[package]] -name = "tokio-native-tls" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbae76ab933c85776efabc971569dd6119c580d8f5d448769dec1764bf796ef2" -dependencies = [ - "native-tls", - "tokio", -] - -[[package]] -name = "tokio-postgres" -version = "0.7.12" -source = "git+https://github.com/prisma/rust-postgres?branch=pgbouncer-mode#c62b9928d402685e152161907e8480603c29ef65" -dependencies = [ - "async-trait", - "byteorder", - "bytes", - "fallible-iterator 0.2.0", - "futures-channel", - "futures-util", - "log", - "parking_lot", - "percent-encoding", - "phf", - "pin-project-lite", - "postgres-protocol", - "postgres-types", - "rand 0.8.5", - "socket2 0.5.7", - "tokio", - "tokio-util 0.7.8", - "whoami", -] - -[[package]] -name = "tokio-rustls" -version = "0.22.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc6844de72e57df1980054b38be3a9f4702aba4858be64dd700181a8a6d0e1b6" -dependencies = [ - "rustls 0.19.1", - "tokio", - "webpki", -] - -[[package]] -name = "tokio-rustls" -version = "0.24.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c28327cf380ac148141087fbfb9de9d7bd4e84ab5d2c28fbc911d753de8a7081" -dependencies = [ - "rustls 0.21.10", - "tokio", -] - -[[package]] -name = "tokio-stream" -version = "0.1.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "397c988d37662c7dda6d2208364a706264bf3d6138b11d436cbac0ad38832842" -dependencies = [ - "futures-core", - "pin-project-lite", - "tokio", -] - -[[package]] -name = "tokio-util" -version = "0.6.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "36943ee01a6d67977dd3f84a5a1d2efeb4ada3a1ae771cadfaa535d9d9fc6507" -dependencies = [ - "bytes", - "futures-core", - "futures-sink", - "log", - "pin-project-lite", - "tokio", -] - -[[package]] -name = "tokio-util" -version = "0.7.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "806fe8c2c87eccc8b3267cbae29ed3ab2d0bd37fca70ab622e46aaa9375ddb7d" -dependencies = [ - "bytes", - "futures-core", - "futures-io", - "futures-sink", - "pin-project-lite", - "tokio", - "tracing", -] - -[[package]] -name = "toml" -version = "0.5.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4f7f0dd8d50a853a531c426359045b1998f04219d88799810762cd4ad314234" -dependencies = [ - "serde", -] - -[[package]] -name = "tonic" -version = "0.6.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff08f4649d10a70ffa3522ca559031285d8e421d727ac85c60825761818f5d0a" -dependencies = [ - "async-stream", - "async-trait", - "base64 0.13.1", - "bytes", - "futures-core", - "futures-util", - "h2", - "http 0.2.9", - "http-body", - "hyper", - "hyper-timeout", - "percent-encoding", - "pin-project", - "prost", - "prost-derive", - "rustls-native-certs", - "tokio", - "tokio-rustls 0.22.0", - "tokio-stream", - "tokio-util 0.6.10", - "tower", - "tower-layer", - "tower-service", - "tracing", - "tracing-futures", -] - -[[package]] -name = "tonic-build" -version = "0.6.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9403f1bafde247186684b230dc6f38b5cd514584e8bec1dd32514be4745fa757" -dependencies = [ - "proc-macro2", - "prost-build", - "quote", - "syn 1.0.109", -] - -[[package]] -name = "tower" -version = "0.4.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b8fa9be0de6cf49e536ce1851f987bd21a43b771b09473c3549a6c853db37c1c" -dependencies = [ - "futures-core", - "futures-util", - "indexmap 1.9.3", - "pin-project", - "pin-project-lite", - "rand 0.8.5", - "slab", - "tokio", - "tokio-util 0.7.8", - "tower-layer", - "tower-service", - "tracing", -] - -[[package]] -name = "tower-layer" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c20c8dbed6283a09604c3e69b4b7eeb54e298b8a600d4d5ecb5ad39de609f1d0" - -[[package]] -name = "tower-service" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6bc1c9ce2b5135ac7f93c72918fc37feb872bdc6a5533a8b85eb4b86bfdae52" - -[[package]] -name = "tracing" -version = "0.1.37" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ce8c33a8d48bd45d624a6e523445fd21ec13d3653cd51f681abf67418f54eb8" -dependencies = [ - "cfg-if", - "log", - "pin-project-lite", - "tracing-attributes", - "tracing-core", -] - -[[package]] -name = "tracing-attributes" -version = "0.1.26" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f4f31f56159e98206da9efd823404b79b6ef3143b4a7ab76e67b1751b25a4ab" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.58", -] - -[[package]] -name = "tracing-core" -version = "0.1.31" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0955b8137a1df6f1a2e9a37d8a6656291ff0297c1a97c24e0d8425fe2312f79a" -dependencies = [ - "once_cell", - "valuable", -] - -[[package]] -name = "tracing-error" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d686ec1c0f384b1277f097b2f279a2ecc11afe8c133c1aabf036a27cb4cd206e" -dependencies = [ - "tracing", - "tracing-subscriber", -] - -[[package]] -name = "tracing-futures" -version = "0.2.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97d095ae15e245a057c8e8451bab9b3ee1e1f68e9ba2b4fbc18d0ac5237835f2" -dependencies = [ - "pin-project", - "tracing", -] - -[[package]] -name = "tracing-log" -version = "0.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "78ddad33d2d10b1ed7eb9d1f518a5674713876e97e5bb9b7345a7984fbb4f922" -dependencies = [ - "lazy_static", - "log", - "tracing-core", -] - -[[package]] -name = "tracing-opentelemetry" -version = "0.17.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fbbe89715c1dbbb790059e2565353978564924ee85017b5fff365c872ff6721f" -dependencies = [ - "once_cell", - "opentelemetry", - "tracing", - "tracing-core", - "tracing-log", - "tracing-subscriber", -] - -[[package]] -name = "tracing-serde" -version = "0.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc6b213177105856957181934e4920de57730fc69bf42c37ee5bb664d406d9e1" -dependencies = [ - "serde", - "tracing-core", -] - -[[package]] -name = "tracing-subscriber" -version = "0.3.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30a651bc37f915e81f087d86e62a18eec5f79550c7faff886f7090b4ea757c77" -dependencies = [ - "matchers", - "nu-ansi-term", - "once_cell", - "regex", - "serde", - "serde_json", - "sharded-slab", - "smallvec", - "thread_local", - "time", - "tracing", - "tracing-core", - "tracing-log", - "tracing-serde", -] - -[[package]] -name = "try-lock" -version = "0.2.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3528ecfd12c466c6f163363caf2d02a71161dd5e1cc6ae7b34207ea2d42d81ed" - -[[package]] -name = "tsify" -version = "0.4.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d6b26cf145f2f3b9ff84e182c448eaf05468e247f148cf3d2a7d67d78ff023a0" -dependencies = [ - "gloo-utils", - "serde", - "serde_json", - "tsify-macros", - "wasm-bindgen", -] - -[[package]] -name = "tsify-macros" -version = "0.4.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a94b0f0954b3e59bfc2c246b4c8574390d94a4ad4ad246aaf2fb07d7dfd3b47" -dependencies = [ - "proc-macro2", - "quote", - "serde_derive_internals", - "syn 2.0.58", -] - -[[package]] -name = "tungstenite" -version = "0.24.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "18e5b8366ee7a95b16d32197d0b2604b43a0be89dc5fac9f8e96ccafbaedda8a" -dependencies = [ - "byteorder", - "bytes", - "data-encoding", - "http 1.1.0", - "httparse", - "log", - "native-tls", - "rand 0.8.5", - "sha1", - "thiserror", - "utf-8", -] - -[[package]] -name = "twox-hash" -version = "1.6.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97fee6b57c6a41524a810daee9286c02d7752c4253064d0b05472833a438f675" -dependencies = [ - "cfg-if", - "rand 0.3.23", - "static_assertions", -] - -[[package]] -name = "typed-builder" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89851716b67b937e393b3daa8423e67ddfc4bbbf1654bcf05488e95e0828db0c" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", -] - -[[package]] -name = "typenum" -version = "1.16.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "497961ef93d974e23eb6f433eb5fe1b7930b659f06d12dec6fc44a8f554c0bba" - -[[package]] -name = "ucd-trie" -version = "0.1.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed646292ffc8188ef8ea4d1e0e0150fb15a5c2e12ad9b8fc191ae7a8a7f3c4b9" - -[[package]] -name = "unicode-bidi" -version = "0.3.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "92888ba5573ff080736b3648696b70cafad7d250551175acbaa4e0385b3e1460" - -[[package]] -name = "unicode-ident" -version = "1.0.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "301abaae475aa91687eb82514b328ab47a211a533026cb25fc3e519b86adfc3c" - -[[package]] -name = "unicode-normalization" -version = "0.1.22" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c5713f0fc4b5db668a2ac63cdb7bb4469d8c9fed047b1d0292cc7b0ce2ba921" -dependencies = [ - "tinyvec", -] - -[[package]] -name = "unicode-segmentation" -version = "1.10.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1dd624098567895118886609431a7c3b8f516e41d30e0643f03d94592a147e36" - -[[package]] -name = "unicode-width" -version = "0.1.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0edd1e5b14653f783770bce4a4dabb4a5108a5370a5f5d8cfe8710c361f6c8b" - -[[package]] -name = "unicode-xid" -version = "0.2.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f962df74c8c05a667b5ee8bcf162993134c104e96440b663c8daa176dc772d8c" - -[[package]] -name = "unicode_categories" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39ec24b3121d976906ece63c9daad25b85969647682eee313cb5779fdd69e14e" - -[[package]] -name = "unindent" -version = "0.1.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e1766d682d402817b5ac4490b3c3002d91dfa0d22812f341609f97b08757359c" - -[[package]] -name = "unreachable" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "382810877fe448991dfc7f0dd6e3ae5d58088fd0ea5e35189655f84e6814fa56" -dependencies = [ - "void", -] - -[[package]] -name = "untrusted" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a156c684c91ea7d62626509bce3cb4e1d9ed5c4d978f7b4352658f96a4c26b4a" - -[[package]] -name = "untrusted" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1" - -[[package]] -name = "url" -version = "2.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31e6302e3bb753d46e83516cae55ae196fc0c309407cf11ab35cc51a4c2a4633" -dependencies = [ - "form_urlencoded", - "idna 0.5.0", - "percent-encoding", - "serde", -] - -[[package]] -name = "user-facing-error-macros" -version = "0.1.0" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", -] - -[[package]] -name = "user-facing-errors" -version = "0.1.0" -dependencies = [ - "backtrace", - "indoc 2.0.3", - "itertools 0.12.0", - "quaint", - "serde", - "serde_json", - "tracing", - "user-facing-error-macros", -] - -[[package]] -name = "utf-8" -version = "0.7.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09cc8ee72d2a9becf2f2febe0205bbed8fc6615b7cb429ad062dc7b7ddd036a9" - -[[package]] -name = "utf8-width" -version = "0.1.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5190c9442dcdaf0ddd50f37420417d219ae5261bbf5db120d0f9bab996c9cba1" - -[[package]] -name = "utf8parse" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a" - -[[package]] -name = "uuid" -version = "1.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81dfa00651efa65069b0b6b651f4aaa31ba9e3c3ce0137aaad053604ee7e0314" -dependencies = [ - "getrandom 0.2.11", - "serde", - "wasm-bindgen", -] - -[[package]] -name = "valuable" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d" - -[[package]] -name = "vcpkg" -version = "0.2.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426" - -[[package]] -name = "vec_map" -version = "0.8.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1bddf1187be692e79c5ffeab891132dfb0f236ed36a43c7ed39f1165ee20191" - -[[package]] -name = "version_check" -version = "0.9.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" - -[[package]] -name = "versions" -version = "6.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f37ff4899935ba747849dd9eeb27c0bdd0da0210236704b7e4681a6c7bd6f9c6" -dependencies = [ - "itertools 0.12.0", - "nom", -] - -[[package]] -name = "void" -version = "1.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a02e4885ed3bc0f2de90ea6dd45ebcbb66dacffe03547fadbb0eeae2770887d" - -[[package]] -name = "vte" -version = "0.10.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6cbce692ab4ca2f1f3047fcf732430249c0e971bfdd2b234cf2c47ad93af5983" -dependencies = [ - "arrayvec 0.5.2", - "utf8parse", - "vte_generate_state_changes", -] - -[[package]] -name = "vte_generate_state_changes" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d257817081c7dffcdbab24b9e62d2def62e2ff7d00b1c20062551e6cccc145ff" -dependencies = [ - "proc-macro2", - "quote", -] - -[[package]] -name = "walkdir" -version = "2.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "36df944cda56c7d8d8b7496af378e6b16de9284591917d307c9b4d313c44e698" -dependencies = [ - "same-file", - "winapi-util", -] - -[[package]] -name = "want" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bfa7760aed19e106de2c7c0b581b509f2f25d3dacaf737cb82ac61bc6d760b0e" -dependencies = [ - "try-lock", -] - -[[package]] -name = "wasi" -version = "0.9.0+wasi-snapshot-preview1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519" - -[[package]] -name = "wasi" -version = "0.11.0+wasi-snapshot-preview1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" - -[[package]] -name = "wasite" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b8dad83b4f25e74f184f64c43b150b91efe7647395b42289f38e50566d82855b" - -[[package]] -name = "wasm-bindgen" -version = "0.2.93" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a82edfc16a6c469f5f44dc7b571814045d60404b55a0ee849f9bcfa2e63dd9b5" -dependencies = [ - "cfg-if", - "once_cell", - "wasm-bindgen-macro", -] - -[[package]] -name = "wasm-bindgen-backend" -version = "0.2.93" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9de396da306523044d3302746f1208fa71d7532227f15e347e2d93e4145dd77b" -dependencies = [ - "bumpalo", - "log", - "once_cell", - "proc-macro2", - "quote", - "syn 2.0.58", - "wasm-bindgen-shared", -] - -[[package]] -name = "wasm-bindgen-futures" -version = "0.4.34" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f219e0d211ba40266969f6dbdd90636da12f75bee4fc9d6c23d1260dadb51454" -dependencies = [ - "cfg-if", - "js-sys", - "wasm-bindgen", - "web-sys", -] - -[[package]] -name = "wasm-bindgen-macro" -version = "0.2.93" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "585c4c91a46b072c92e908d99cb1dcdf95c5218eeb6f3bf1efa991ee7a68cccf" -dependencies = [ - "quote", - "wasm-bindgen-macro-support", -] - -[[package]] -name = "wasm-bindgen-macro-support" -version = "0.2.93" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "afc340c74d9005395cf9dd098506f7f44e38f2b4a21c6aaacf9a105ea5e1e836" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.58", - "wasm-bindgen-backend", - "wasm-bindgen-shared", -] - -[[package]] -name = "wasm-bindgen-shared" -version = "0.2.93" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c62a0a307cb4a311d3a07867860911ca130c3494e8c2719593806c08bc5d0484" - -[[package]] -name = "wasm-logger" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "074649a66bb306c8f2068c9016395fa65d8e08d2affcbf95acf3c24c3ab19718" -dependencies = [ - "log", - "wasm-bindgen", - "web-sys", -] - -[[package]] -name = "wasm-rs-dbg" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61e5fe4ac478ca5cf1db842029f41a5881da39e70320deb0006912f226ea63f4" -dependencies = [ - "web-sys", -] - -[[package]] -name = "web-sys" -version = "0.3.65" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5db499c5f66323272151db0e666cd34f78617522fb0c1604d31a27c50c206a85" -dependencies = [ - "js-sys", - "wasm-bindgen", -] - -[[package]] -name = "webpki" -version = "0.21.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b8e38c0608262c46d4a56202ebabdeb094cef7e560ca7a226c6bf055188aa4ea" -dependencies = [ - "ring 0.16.20", - "untrusted 0.7.1", -] - -[[package]] -name = "webpki-roots" -version = "0.25.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1778a42e8b3b90bff8d0f5032bf22250792889a5cdc752aa0020c84abe3aaf10" - -[[package]] -name = "which" -version = "4.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2441c784c52b289a054b7201fc93253e288f094e2f4be9058343127c4226a269" -dependencies = [ - "either", - "libc", - "once_cell", -] - -[[package]] -name = "whoami" -version = "1.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "372d5b87f58ec45c384ba03563b03544dc5fadc3983e434b286913f5b4a9bb6d" -dependencies = [ - "redox_syscall 0.5.7", - "wasite", - "web-sys", -] - -[[package]] -name = "widestring" -version = "1.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "653f141f39ec16bba3c5abe400a0c60da7468261cc2cbf36805022876bc721a8" - -[[package]] -name = "winapi" -version = "0.3.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" -dependencies = [ - "winapi-i686-pc-windows-gnu", - "winapi-x86_64-pc-windows-gnu", -] - -[[package]] -name = "winapi-i686-pc-windows-gnu" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" - -[[package]] -name = "winapi-util" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178" -dependencies = [ - "winapi", -] - -[[package]] -name = "winapi-x86_64-pc-windows-gnu" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" - -[[package]] -name = "winauth" -version = "0.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f820cd208ce9c6b050812dc2d724ba98c6c1e9db5ce9b3f58d925ae5723a5e6" -dependencies = [ - "bitflags 1.3.2", - "byteorder", - "md5", - "rand 0.7.3", - "winapi", -] - -[[package]] -name = "windows" -version = "0.48.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e686886bc078bc1b0b600cac0147aadb815089b6e4da64016cbd754b6342700f" -dependencies = [ - "windows-targets 0.48.1", -] - -[[package]] -name = "windows-sys" -version = "0.45.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0" -dependencies = [ - "windows-targets 0.42.2", -] - -[[package]] -name = "windows-sys" -version = "0.48.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" -dependencies = [ - "windows-targets 0.48.1", -] - -[[package]] -name = "windows-sys" -version = "0.52.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" -dependencies = [ - "windows-targets 0.52.0", -] - -[[package]] -name = "windows-targets" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e5180c00cd44c9b1c88adb3693291f1cd93605ded80c250a75d472756b4d071" -dependencies = [ - "windows_aarch64_gnullvm 0.42.2", - "windows_aarch64_msvc 0.42.2", - "windows_i686_gnu 0.42.2", - "windows_i686_msvc 0.42.2", - "windows_x86_64_gnu 0.42.2", - "windows_x86_64_gnullvm 0.42.2", - "windows_x86_64_msvc 0.42.2", -] - -[[package]] -name = "windows-targets" -version = "0.48.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05d4b17490f70499f20b9e791dcf6a299785ce8af4d709018206dc5b4953e95f" -dependencies = [ - "windows_aarch64_gnullvm 0.48.0", - "windows_aarch64_msvc 0.48.0", - "windows_i686_gnu 0.48.0", - "windows_i686_msvc 0.48.0", - "windows_x86_64_gnu 0.48.0", - "windows_x86_64_gnullvm 0.48.0", - "windows_x86_64_msvc 0.48.0", -] - -[[package]] -name = "windows-targets" -version = "0.52.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a18201040b24831fbb9e4eb208f8892e1f50a37feb53cc7ff887feb8f50e7cd" -dependencies = [ - "windows_aarch64_gnullvm 0.52.0", - "windows_aarch64_msvc 0.52.0", - "windows_i686_gnu 0.52.0", - "windows_i686_msvc 0.52.0", - "windows_x86_64_gnu 0.52.0", - "windows_x86_64_gnullvm 0.52.0", - "windows_x86_64_msvc 0.52.0", -] - -[[package]] -name = "windows_aarch64_gnullvm" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "597a5118570b68bc08d8d59125332c54f1ba9d9adeedeef5b99b02ba2b0698f8" - -[[package]] -name = "windows_aarch64_gnullvm" -version = "0.48.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91ae572e1b79dba883e0d315474df7305d12f569b400fcf90581b06062f7e1bc" - -[[package]] -name = "windows_aarch64_gnullvm" -version = "0.52.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb7764e35d4db8a7921e09562a0304bf2f93e0a51bfccee0bd0bb0b666b015ea" - -[[package]] -name = "windows_aarch64_msvc" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43" - -[[package]] -name = "windows_aarch64_msvc" -version = "0.48.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2ef27e0d7bdfcfc7b868b317c1d32c641a6fe4629c171b8928c7b08d98d7cf3" - -[[package]] -name = "windows_aarch64_msvc" -version = "0.52.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbaa0368d4f1d2aaefc55b6fcfee13f41544ddf36801e793edbbfd7d7df075ef" - -[[package]] -name = "windows_i686_gnu" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f" - -[[package]] -name = "windows_i686_gnu" -version = "0.48.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "622a1962a7db830d6fd0a69683c80a18fda201879f0f447f065a3b7467daa241" - -[[package]] -name = "windows_i686_gnu" -version = "0.52.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a28637cb1fa3560a16915793afb20081aba2c92ee8af57b4d5f28e4b3e7df313" - -[[package]] -name = "windows_i686_msvc" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060" - -[[package]] -name = "windows_i686_msvc" -version = "0.48.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4542c6e364ce21bf45d69fdd2a8e455fa38d316158cfd43b3ac1c5b1b19f8e00" - -[[package]] -name = "windows_i686_msvc" -version = "0.52.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ffe5e8e31046ce6230cc7215707b816e339ff4d4d67c65dffa206fd0f7aa7b9a" - -[[package]] -name = "windows_x86_64_gnu" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36" - -[[package]] -name = "windows_x86_64_gnu" -version = "0.48.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca2b8a661f7628cbd23440e50b05d705db3686f894fc9580820623656af974b1" - -[[package]] -name = "windows_x86_64_gnu" -version = "0.52.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d6fa32db2bc4a2f5abeacf2b69f7992cd09dca97498da74a151a3132c26befd" - -[[package]] -name = "windows_x86_64_gnullvm" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26d41b46a36d453748aedef1486d5c7a85db22e56aff34643984ea85514e94a3" - -[[package]] -name = "windows_x86_64_gnullvm" -version = "0.48.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7896dbc1f41e08872e9d5e8f8baa8fdd2677f29468c4e156210174edc7f7b953" - -[[package]] -name = "windows_x86_64_gnullvm" -version = "0.52.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a657e1e9d3f514745a572a6846d3c7aa7dbe1658c056ed9c3344c4109a6949e" - -[[package]] -name = "windows_x86_64_msvc" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0" - -[[package]] -name = "windows_x86_64_msvc" -version = "0.48.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a515f5799fe4961cb532f983ce2b23082366b898e52ffbce459c86f67c8378a" - -[[package]] -name = "windows_x86_64_msvc" -version = "0.52.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dff9641d1cd4be8d1a070daf9e3773c5f67e78b4d9d42263020c057706765c04" - -[[package]] -name = "winreg" -version = "0.10.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "80d0f4e272c85def139476380b12f9ac60926689dd2e01d4923222f40580869d" -dependencies = [ - "winapi", -] - -[[package]] -name = "winreg" -version = "0.50.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "524e57b2c537c0f9b1e69f1965311ec12182b4122e45035b1508cd24d2adadb1" -dependencies = [ - "cfg-if", - "windows-sys 0.48.0", -] - -[[package]] -name = "ws_stream_tungstenite" -version = "0.14.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed39ff9f8b2eda91bf6390f9f49eee93d655489e15708e3bb638c1c4f07cecb4" -dependencies = [ - "async-tungstenite", - "async_io_stream", - "bitflags 2.4.0", - "futures-core", - "futures-io", - "futures-sink", - "futures-util", - "pharos", - "rustc_version", - "tokio", - "tracing", - "tungstenite", -] - -[[package]] -name = "wyz" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05f360fc0b24296329c78fda852a1e9ae82de9cf7b27dae4b7f62f118f77b9ed" -dependencies = [ - "tap", -] - -[[package]] -name = "yaml-rust" -version = "0.4.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56c1936c4cc7a1c9ab21a1ebb602eb942ba868cbd44a99cb7cdc5892335e1c85" -dependencies = [ - "linked-hash-map", -] - -[[package]] -name = "yansi" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09041cd90cf85f7f8b2df60c646f853b7f535ce68f85244eb6731cf89fa498ec" - -[[package]] -name = "zerocopy" -version = "0.7.32" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "74d4d3961e53fa4c9a25a8637fc2bfaf2595b3d3ae34875568a5cf64787716be" -dependencies = [ - "zerocopy-derive", -] - -[[package]] -name = "zerocopy-derive" -version = "0.7.32" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ce1b18ccd8e73a9321186f97e46f9f04b778851177567b1975109d26a08d2a6" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.58", -] diff --git a/pkgs/development/tools/database/prisma-engines/default.nix b/pkgs/development/tools/database/prisma-engines/default.nix index 777088bb7c64..c61bde4f96c3 100644 --- a/pkgs/development/tools/database/prisma-engines/default.nix +++ b/pkgs/development/tools/database/prisma-engines/default.nix @@ -12,30 +12,21 @@ # function correctly. rustPlatform.buildRustPackage rec { pname = "prisma-engines"; - version = "5.22.0"; + version = "6.0.1"; src = fetchFromGitHub { owner = "prisma"; repo = "prisma-engines"; rev = version; - hash = "sha256-aCzm7pEsgbZ4ZNir3DLNnUlmiydOpLNcW2FpIQ44B6E="; + hash = "sha256-wrhOUUF3N0JvDxcqypL7q+B7SwAfLq9M0Zqs86jnB/M="; }; + useFetchCargoVendor = true; + cargoHash = "sha256-l5b7TcVgnTdUsUncvfJYBcmh0xhF3fMfoCx0cyjpJ8Y="; + # Use system openssl. OPENSSL_NO_VENDOR = 1; - cargoLock = { - lockFile = ./Cargo.lock; - outputHashes = { - "barrel-0.6.6-alpha.0" = "sha256-USh0lQ1z+3Spgc69bRFySUzhuY79qprLlEExTmYWFN8="; - "cuid-1.3.2" = "sha256-qBu1k/dJiA6rWBwk4nOOqouIneD9h2TTBT8tvs0TDfA="; - "graphql-parser-0.3.0" = "sha256-0ZAsj2mW6fCLhwTETucjbu4rPNzfbNiHu2wVTBlTNe4="; - "mysql_async-0.31.3" = "sha256-2wOupQ/LFV9pUifqBLwTvA0tySv+XWbxHiqs7iTzvvg="; - "postgres-native-tls-0.5.0" = "sha256-pzMPNZzlvMaQqBu/V3ExPYVnoIaALeUaYJ4oo/hY9lA="; - "mongodb-3.0.0" = "sha256-1WQgY0zSZhFjt1nrLYTUBrpqBxpCCgKRSeGJLtkE6pw="; - }; - }; - nativeBuildInputs = [ pkg-config ]; buildInputs = [ From 6cedd792b1d0235ce02fa86d5a484e4060dc355f Mon Sep 17 00:00:00 2001 From: Alexey Orlenko Date: Thu, 28 Nov 2024 21:02:56 +0100 Subject: [PATCH 33/84] prisma: 5.22.0 -> 6.0.1 --- nixos/doc/manual/release-notes/rl-2505.section.md | 5 +++++ pkgs/by-name/pr/prisma/package.nix | 6 +++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/nixos/doc/manual/release-notes/rl-2505.section.md b/nixos/doc/manual/release-notes/rl-2505.section.md index 4b0525444f28..16649474fbf8 100644 --- a/nixos/doc/manual/release-notes/rl-2505.section.md +++ b/nixos/doc/manual/release-notes/rl-2505.section.md @@ -85,6 +85,11 @@ add `vimPlugins.notmuch-vim` to your (Neo)vim configuration if you want the vim plugin. +- `prisma` and `prisma-engines` have been updated to version 6.0.1, which + introduces several breaking changes. See the + [Prisma ORM upgrade guide](https://www.prisma.io/docs/orm/more/upgrade-guides/upgrading-versions/upgrading-to-prisma-6) + for more information. + ## Other Notable Changes {#sec-release-25.05-notable-changes} diff --git a/pkgs/by-name/pr/prisma/package.nix b/pkgs/by-name/pr/prisma/package.nix index 25136ffeb359..6d1308c8c0ac 100644 --- a/pkgs/by-name/pr/prisma/package.nix +++ b/pkgs/by-name/pr/prisma/package.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "prisma"; - version = "5.22.0"; + version = "6.0.1"; src = fetchFromGitHub { owner = "prisma"; repo = "prisma"; rev = finalAttrs.version; - hash = "sha256-Z7zSL2eixoNqWpgzVbiDUG2ViSmJtho7lRmvZ10ft3I="; + hash = "sha256-mwGFuJLry2WvwLclRw+ulMVgp8tfZbhzrdgKjQ4D7LE="; }; nativeBuildInputs = [ @@ -32,7 +32,7 @@ stdenv.mkDerivation (finalAttrs: { pnpmDeps = pnpm_8.fetchDeps { inherit (finalAttrs) pname version src; - hash = "sha256-2o6ClY0zMctLR4nFmApiYnzXlrN1EqbHkAP/FEcXnEQ="; + hash = "sha256-fOg32w/fQkyn8HBMffUKob7XzOQLtsB642pDdEz/y2E="; }; patchPhase = '' From 3b3d38924b441e111498a9c527999683e34348eb Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Fri, 6 Dec 2024 18:37:40 +0100 Subject: [PATCH 34/84] ankama-launcher: 3.12.24 -> 3.12.26 --- pkgs/by-name/an/ankama-launcher/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/an/ankama-launcher/package.nix b/pkgs/by-name/an/ankama-launcher/package.nix index d2977d638a51..25b3c3c34046 100644 --- a/pkgs/by-name/an/ankama-launcher/package.nix +++ b/pkgs/by-name/an/ankama-launcher/package.nix @@ -5,15 +5,15 @@ }: let pname = "ankama-launcher"; - version = "3.12.24"; + version = "3.12.26"; # The original URL for the launcher is: # https://launcher.cdn.ankama.com/installers/production/Ankama%20Launcher-Setup-x86_64.AppImage # As it does not encode the version, we use the wayback machine (web.archive.org) to get a fixed URL. # To update the client, head to web.archive.org and create a new snapshot of the download page. src = fetchurl { - url = "https://web.archive.org/web/20241202103051/https://launcher.cdn.ankama.com/installers/production/Ankama%20Launcher-Setup-x86_64.AppImage"; - hash = "sha256-jI/qcIIrNU9ViaZ/LKMkUETXZpintDsofSgiRfe4GOU="; + url = "https://web.archive.org/web/20241206172526/https://launcher.cdn.ankama.com/installers/production/Ankama%20Launcher-Setup-x86_64.AppImage"; + hash = "sha256-K/qe/qxMfcGWU5gyEfPdl0ptjTCWaqIXMCy4O8WEKCQ="; }; appimageContents = appimageTools.extract { inherit pname version src; }; From 40c579ca29d3aba71928e47e2be48181ba1f731d Mon Sep 17 00:00:00 2001 From: Ulysses Zhan Date: Sat, 23 Nov 2024 11:00:20 -0800 Subject: [PATCH 35/84] buildFHSEnvBubblewrap: format default.nix --- .../build-fhsenv-bubblewrap/default.nix | 517 ++++++++++-------- 1 file changed, 282 insertions(+), 235 deletions(-) diff --git a/pkgs/build-support/build-fhsenv-bubblewrap/default.nix b/pkgs/build-support/build-fhsenv-bubblewrap/default.nix index af1d4cd97072..5926d4e6d045 100644 --- a/pkgs/build-support/build-fhsenv-bubblewrap/default.nix +++ b/pkgs/build-support/build-fhsenv-bubblewrap/default.nix @@ -1,32 +1,34 @@ -{ lib -, stdenv -, callPackage -, runCommandLocal -, writeShellScript -, glibc -, pkgsHostTarget -, runCommandCC -, coreutils -, bubblewrap +{ + lib, + stdenv, + callPackage, + runCommandLocal, + writeShellScript, + glibc, + pkgsHostTarget, + runCommandCC, + coreutils, + bubblewrap, }: -{ runScript ? "bash" -, nativeBuildInputs ? [] -, extraInstallCommands ? "" -, meta ? {} -, passthru ? {} -, extraPreBwrapCmds ? "" -, extraBwrapArgs ? [] -, unshareUser ? false -, unshareIpc ? false -, unsharePid ? false -, unshareNet ? false -, unshareUts ? false -, unshareCgroup ? false -, privateTmp ? false -, dieWithParent ? true -, ... -} @ args: +{ + runScript ? "bash", + nativeBuildInputs ? [ ], + extraInstallCommands ? "", + meta ? { }, + passthru ? { }, + extraPreBwrapCmds ? "", + extraBwrapArgs ? [ ], + unshareUser ? false, + unshareIpc ? false, + unsharePid ? false, + unshareNet ? false, + unshareUts ? false, + unshareCgroup ? false, + privateTmp ? false, + dieWithParent ? true, + ... +}@args: assert (!args ? pname || !args ? version) -> (args ? name); # You must provide name if pname or version (preferred) is missing. @@ -49,59 +51,82 @@ let name = args.name or "${args.pname}-${args.version}"; executableName = args.pname or args.name; # we don't know which have been supplied, and want to avoid defaulting missing attrs to null. Passed into runCommandLocal - nameAttrs = lib.filterAttrs (key: value: builtins.elem key [ "name" "pname" "version" ]) args; + nameAttrs = lib.filterAttrs ( + key: value: + builtins.elem key [ + "name" + "pname" + "version" + ] + ) args; buildFHSEnv = callPackage ./buildFHSEnv.nix { }; - fhsenv = buildFHSEnv (removeAttrs args [ - "runScript" "extraInstallCommands" "meta" "passthru" "extraPreBwrapCmds" "extraBwrapArgs" "dieWithParent" - "unshareUser" "unshareCgroup" "unshareUts" "unshareNet" "unsharePid" "unshareIpc" "privateTmp" - ]); + fhsenv = buildFHSEnv ( + removeAttrs args [ + "runScript" + "extraInstallCommands" + "meta" + "passthru" + "extraPreBwrapCmds" + "extraBwrapArgs" + "dieWithParent" + "unshareUser" + "unshareCgroup" + "unshareUts" + "unshareNet" + "unsharePid" + "unshareIpc" + "privateTmp" + ] + ); - etcBindEntries = let - files = [ - # NixOS Compatibility - "static" - "nix" # mainly for nixUnstable users, but also for access to nix/netrc - # Shells - "shells" - "bashrc" - "zshenv" - "zshrc" - "zinputrc" - "zprofile" - # Users, Groups, NSS - "passwd" - "group" - "shadow" - "hosts" - "resolv.conf" - "nsswitch.conf" - # User profiles - "profiles" - # Sudo & Su - "login.defs" - "sudoers" - "sudoers.d" - # Time - "localtime" - "zoneinfo" - # Other Core Stuff - "machine-id" - "os-release" - # PAM - "pam.d" - # Fonts - "fonts" - # ALSA - "alsa" - "asound.conf" - # SSL - "ssl/certs" - "ca-certificates" - "pki" - ]; - in map (path: "/etc/${path}") files; + etcBindEntries = + let + files = [ + # NixOS Compatibility + "static" + "nix" # mainly for nixUnstable users, but also for access to nix/netrc + # Shells + "shells" + "bashrc" + "zshenv" + "zshrc" + "zinputrc" + "zprofile" + # Users, Groups, NSS + "passwd" + "group" + "shadow" + "hosts" + "resolv.conf" + "nsswitch.conf" + # User profiles + "profiles" + # Sudo & Su + "login.defs" + "sudoers" + "sudoers.d" + # Time + "localtime" + "zoneinfo" + # Other Core Stuff + "machine-id" + "os-release" + # PAM + "pam.d" + # Fonts + "fonts" + # ALSA + "alsa" + "asound.conf" + # SSL + "ssl/certs" + "ca-certificates" + "pki" + ]; + in + map (path: "/etc/${path}") files; # Here's the problem case: # - we need to run bash to run the init script @@ -119,182 +144,204 @@ let # # Also, the real init is placed strategically at /init, so we don't # have to recompile this every time. - containerInit = runCommandCC "container-init" { - buildInputs = [ stdenv.cc.libc.static or null ]; - } '' - $CXX -static -s -o $out ${./container-init.cc} - ''; + containerInit = + runCommandCC "container-init" + { + buildInputs = [ stdenv.cc.libc.static or null ]; + } + '' + $CXX -static -s -o $out ${./container-init.cc} + ''; - realInit = run: writeShellScript "${name}-init" '' - source /etc/profile - exec ${run} "$@" - ''; + realInit = + run: + writeShellScript "${name}-init" '' + source /etc/profile + exec ${run} "$@" + ''; indentLines = str: concatLines (map (s: " " + s) (filter (s: s != "") (splitString "\n" str))); - bwrapCmd = { initArgs ? "" }: '' - ignored=(/nix /dev /proc /etc ${optionalString privateTmp "/tmp"}) - ro_mounts=() - symlinks=() - etc_ignored=() + bwrapCmd = + { + initArgs ? "", + }: + '' + ignored=(/nix /dev /proc /etc ${optionalString privateTmp "/tmp"}) + ro_mounts=() + symlinks=() + etc_ignored=() - ${extraPreBwrapCmds} + ${extraPreBwrapCmds} - # loop through all entries of root in the fhs environment, except its /etc. - for i in ${fhsenv}/*; do - path="/''${i##*/}" - if [[ $path == '/etc' ]]; then - : - elif [[ -L $i ]]; then - symlinks+=(--symlink "$(${coreutils}/bin/readlink "$i")" "$path") - ignored+=("$path") - else - ro_mounts+=(--ro-bind "$i" "$path") - ignored+=("$path") - fi - done - - # loop through the entries of /etc in the fhs environment. - if [[ -d ${fhsenv}/etc ]]; then - for i in ${fhsenv}/etc/*; do + # loop through all entries of root in the fhs environment, except its /etc. + for i in ${fhsenv}/*; do path="/''${i##*/}" - # NOTE: we're binding /etc/fonts and /etc/ssl/certs from the host so we - # don't want to override it with a path from the FHS environment. - if [[ $path == '/fonts' || $path == '/ssl' ]]; then + if [[ $path == '/etc' ]]; then + : + elif [[ -L $i ]]; then + symlinks+=(--symlink "$(${coreutils}/bin/readlink "$i")" "$path") + ignored+=("$path") + else + ro_mounts+=(--ro-bind "$i" "$path") + ignored+=("$path") + fi + done + + # loop through the entries of /etc in the fhs environment. + if [[ -d ${fhsenv}/etc ]]; then + for i in ${fhsenv}/etc/*; do + path="/''${i##*/}" + # NOTE: we're binding /etc/fonts and /etc/ssl/certs from the host so we + # don't want to override it with a path from the FHS environment. + if [[ $path == '/fonts' || $path == '/ssl' ]]; then + continue + fi + if [[ -L $i ]]; then + symlinks+=(--symlink "$i" "/etc$path") + else + ro_mounts+=(--ro-bind "$i" "/etc$path") + fi + etc_ignored+=("/etc$path") + done + fi + + # propagate /etc from the actual host if nested + if [[ -e /.host-etc ]]; then + ro_mounts+=(--ro-bind /.host-etc /.host-etc) + else + ro_mounts+=(--ro-bind /etc /.host-etc) + fi + + # link selected etc entries from the actual root + for i in ${escapeShellArgs etcBindEntries}; do + if [[ "''${etc_ignored[@]}" =~ "$i" ]]; then continue fi - if [[ -L $i ]]; then - symlinks+=(--symlink "$i" "/etc$path") - else - ro_mounts+=(--ro-bind "$i" "/etc$path") + if [[ -e $i ]]; then + symlinks+=(--symlink "/.host-etc/''${i#/etc/}" "$i") fi - etc_ignored+=("/etc$path") done - fi - # propagate /etc from the actual host if nested - if [[ -e /.host-etc ]]; then - ro_mounts+=(--ro-bind /.host-etc /.host-etc) - else - ro_mounts+=(--ro-bind /etc /.host-etc) - fi - - # link selected etc entries from the actual root - for i in ${escapeShellArgs etcBindEntries}; do - if [[ "''${etc_ignored[@]}" =~ "$i" ]]; then - continue - fi - if [[ -e $i ]]; then - symlinks+=(--symlink "/.host-etc/''${i#/etc/}" "$i") - fi - done - - declare -a auto_mounts - # loop through all directories in the root - for dir in /*; do - # if it is a directory and it is not ignored - if [[ -d "$dir" ]] && [[ ! "''${ignored[@]}" =~ "$dir" ]]; then - # add it to the mount list - auto_mounts+=(--bind "$dir" "$dir") - fi - done - - declare -a x11_args - # Always mount a tmpfs on /tmp/.X11-unix - # Rationale: https://github.com/flatpak/flatpak/blob/be2de97e862e5ca223da40a895e54e7bf24dbfb9/common/flatpak-run.c#L277 - x11_args+=(--tmpfs /tmp/.X11-unix) - - # Try to guess X socket path. This doesn't cover _everything_, but it covers some things. - if [[ "$DISPLAY" == *:* ]]; then - # recover display number from $DISPLAY formatted [host]:num[.screen] - display_nr=''${DISPLAY/#*:} # strip host - display_nr=''${display_nr/%.*} # strip screen - local_socket=/tmp/.X11-unix/X$display_nr - x11_args+=(--ro-bind-try "$local_socket" "$local_socket") - fi - - ${optionalString privateTmp '' - # sddm places XAUTHORITY in /tmp - if [[ "$XAUTHORITY" == /tmp/* ]]; then - x11_args+=(--ro-bind-try "$XAUTHORITY" "$XAUTHORITY") - fi - - # dbus-run-session puts the socket in /tmp - IFS=";" read -ra addrs <<<"$DBUS_SESSION_BUS_ADDRESS" - for addr in "''${addrs[@]}"; do - [[ "$addr" == unix:* ]] || continue - IFS="," read -ra parts <<<"''${addr#unix:}" - for part in "''${parts[@]}"; do - printf -v part '%s' "''${part//\\/\\\\}" - printf -v part '%b' "''${part//%/\\x}" - [[ "$part" == path=/tmp/* ]] || continue - x11_args+=(--ro-bind-try "''${part#path=}" "''${part#path=}") + declare -a auto_mounts + # loop through all directories in the root + for dir in /*; do + # if it is a directory and it is not ignored + if [[ -d "$dir" ]] && [[ ! "''${ignored[@]}" =~ "$dir" ]]; then + # add it to the mount list + auto_mounts+=(--bind "$dir" "$dir") + fi done - done - ''} - cmd=( - ${bubblewrap}/bin/bwrap - --dev-bind /dev /dev - --proc /proc - --chdir "$(pwd)" - ${optionalString unshareUser "--unshare-user"} - ${optionalString unshareIpc "--unshare-ipc"} - ${optionalString unsharePid "--unshare-pid"} - ${optionalString unshareNet "--unshare-net"} - ${optionalString unshareUts "--unshare-uts"} - ${optionalString unshareCgroup "--unshare-cgroup"} - ${optionalString dieWithParent "--die-with-parent"} - --ro-bind /nix /nix - ${optionalString privateTmp "--tmpfs /tmp"} - # Our glibc will look for the cache in its own path in `/nix/store`. - # As such, we need a cache to exist there, because pressure-vessel - # depends on the existence of an ld cache. However, adding one - # globally proved to be a bad idea (see #100655), the solution we - # settled on being mounting one via bwrap. - # Also, the cache needs to go to both 32 and 64 bit glibcs, for games - # of both architectures to work. - --tmpfs ${glibc}/etc \ - --tmpfs /etc \ - --symlink /etc/ld.so.conf ${glibc}/etc/ld.so.conf \ - --symlink /etc/ld.so.cache ${glibc}/etc/ld.so.cache \ - --ro-bind ${glibc}/etc/rpc ${glibc}/etc/rpc \ - --remount-ro ${glibc}/etc \ - --symlink ${realInit runScript} /init \ - '' + optionalString fhsenv.isMultiBuild (indentLines '' + declare -a x11_args + # Always mount a tmpfs on /tmp/.X11-unix + # Rationale: https://github.com/flatpak/flatpak/blob/be2de97e862e5ca223da40a895e54e7bf24dbfb9/common/flatpak-run.c#L277 + x11_args+=(--tmpfs /tmp/.X11-unix) + + # Try to guess X socket path. This doesn't cover _everything_, but it covers some things. + if [[ "$DISPLAY" == *:* ]]; then + # recover display number from $DISPLAY formatted [host]:num[.screen] + display_nr=''${DISPLAY/#*:} # strip host + display_nr=''${display_nr/%.*} # strip screen + local_socket=/tmp/.X11-unix/X$display_nr + x11_args+=(--ro-bind-try "$local_socket" "$local_socket") + fi + + ${optionalString privateTmp '' + # sddm places XAUTHORITY in /tmp + if [[ "$XAUTHORITY" == /tmp/* ]]; then + x11_args+=(--ro-bind-try "$XAUTHORITY" "$XAUTHORITY") + fi + + # dbus-run-session puts the socket in /tmp + IFS=";" read -ra addrs <<<"$DBUS_SESSION_BUS_ADDRESS" + for addr in "''${addrs[@]}"; do + [[ "$addr" == unix:* ]] || continue + IFS="," read -ra parts <<<"''${addr#unix:}" + for part in "''${parts[@]}"; do + printf -v part '%s' "''${part//\\/\\\\}" + printf -v part '%b' "''${part//%/\\x}" + [[ "$part" == path=/tmp/* ]] || continue + x11_args+=(--ro-bind-try "''${part#path=}" "''${part#path=}") + done + done + ''} + + cmd=( + ${bubblewrap}/bin/bwrap + --dev-bind /dev /dev + --proc /proc + --chdir "$(pwd)" + ${optionalString unshareUser "--unshare-user"} + ${optionalString unshareIpc "--unshare-ipc"} + ${optionalString unsharePid "--unshare-pid"} + ${optionalString unshareNet "--unshare-net"} + ${optionalString unshareUts "--unshare-uts"} + ${optionalString unshareCgroup "--unshare-cgroup"} + ${optionalString dieWithParent "--die-with-parent"} + --ro-bind /nix /nix + ${optionalString privateTmp "--tmpfs /tmp"} + # Our glibc will look for the cache in its own path in `/nix/store`. + # As such, we need a cache to exist there, because pressure-vessel + # depends on the existence of an ld cache. However, adding one + # globally proved to be a bad idea (see #100655), the solution we + # settled on being mounting one via bwrap. + # Also, the cache needs to go to both 32 and 64 bit glibcs, for games + # of both architectures to work. + --tmpfs ${glibc}/etc \ + --tmpfs /etc \ + --symlink /etc/ld.so.conf ${glibc}/etc/ld.so.conf \ + --symlink /etc/ld.so.cache ${glibc}/etc/ld.so.cache \ + --ro-bind ${glibc}/etc/rpc ${glibc}/etc/rpc \ + --remount-ro ${glibc}/etc \ + --symlink ${realInit runScript} /init \ + '' + + optionalString fhsenv.isMultiBuild (indentLines '' --tmpfs ${pkgsi686Linux.glibc}/etc \ --symlink /etc/ld.so.conf ${pkgsi686Linux.glibc}/etc/ld.so.conf \ --symlink /etc/ld.so.cache ${pkgsi686Linux.glibc}/etc/ld.so.cache \ --ro-bind ${pkgsi686Linux.glibc}/etc/rpc ${pkgsi686Linux.glibc}/etc/rpc \ --remount-ro ${pkgsi686Linux.glibc}/etc \ - '') + '' - "''${ro_mounts[@]}" - "''${symlinks[@]}" - "''${auto_mounts[@]}" - "''${x11_args[@]}" - ${concatStringsSep "\n " extraBwrapArgs} - ${containerInit} ${initArgs} - ) - exec "''${cmd[@]}" - ''; - - bin = writeShellScript "${name}-bwrap" (bwrapCmd { initArgs = ''"$@"''; }); -in runCommandLocal name (nameAttrs // { - inherit nativeBuildInputs meta; - - passthru = passthru // { - env = runCommandLocal "${name}-shell-env" { - shellHook = bwrapCmd {}; - } '' - echo >&2 "" - echo >&2 "*** User chroot 'env' attributes are intended for interactive nix-shell sessions, not for building! ***" - echo >&2 "" - exit 1 + '') + + '' + "''${ro_mounts[@]}" + "''${symlinks[@]}" + "''${auto_mounts[@]}" + "''${x11_args[@]}" + ${concatStringsSep "\n " extraBwrapArgs} + ${containerInit} ${initArgs} + ) + exec "''${cmd[@]}" ''; - inherit args fhsenv; - }; -}) '' - mkdir -p $out/bin - ln -s ${bin} $out/bin/${executableName} - ${extraInstallCommands} -'' + bin = writeShellScript "${name}-bwrap" (bwrapCmd { + initArgs = ''"$@"''; + }); +in +runCommandLocal name + ( + nameAttrs + // { + inherit nativeBuildInputs meta; + + passthru = passthru // { + env = + runCommandLocal "${name}-shell-env" + { + shellHook = bwrapCmd { }; + } + '' + echo >&2 "" + echo >&2 "*** User chroot 'env' attributes are intended for interactive nix-shell sessions, not for building! ***" + echo >&2 "" + exit 1 + ''; + inherit args fhsenv; + }; + } + ) + '' + mkdir -p $out/bin + ln -s ${bin} $out/bin/${executableName} + + ${extraInstallCommands} + '' From e6199124df8e78eb8e5d5a3dfaa8e74ba9c76b51 Mon Sep 17 00:00:00 2001 From: Ulysses Zhan Date: Sat, 23 Nov 2024 11:09:55 -0800 Subject: [PATCH 36/84] buildFHSEnvBubblewrap: set meta.mainProgram --- pkgs/build-support/build-fhsenv-bubblewrap/default.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/build-support/build-fhsenv-bubblewrap/default.nix b/pkgs/build-support/build-fhsenv-bubblewrap/default.nix index 5926d4e6d045..3a340c4766c4 100644 --- a/pkgs/build-support/build-fhsenv-bubblewrap/default.nix +++ b/pkgs/build-support/build-fhsenv-bubblewrap/default.nix @@ -321,7 +321,7 @@ runCommandLocal name ( nameAttrs // { - inherit nativeBuildInputs meta; + inherit nativeBuildInputs; passthru = passthru // { env = @@ -337,6 +337,10 @@ runCommandLocal name ''; inherit args fhsenv; }; + + meta = { + mainProgram = executableName; + } // meta; } ) '' From e157e54d4d1c2e4280f5d74d10122e889a85b498 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 6 Dec 2024 20:20:08 +0000 Subject: [PATCH 37/84] code-cursor: 0.43.0 -> 0.43.6 --- pkgs/by-name/co/code-cursor/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/co/code-cursor/package.nix b/pkgs/by-name/co/code-cursor/package.nix index 2ff381e098a0..ff8543b7fd60 100644 --- a/pkgs/by-name/co/code-cursor/package.nix +++ b/pkgs/by-name/co/code-cursor/package.nix @@ -8,11 +8,11 @@ }: let pname = "cursor"; - version = "0.43.0"; + version = "0.43.6"; appKey = "230313mzl4w4u92"; src = fetchurl { - url = "https://download.todesktop.com/230313mzl4w4u92/cursor-0.43.0-build-24112423a8e6ct7-x86_64.AppImage"; - hash = "sha256-IcAUXGSMHxGd5Ak4cYA9/2YYg8UA+cRBGgnOupDuRXs="; + url = "https://download.todesktop.com/230313mzl4w4u92/cursor-0.43.6-build-241206z7j6me2e2-x86_64.AppImage"; + hash = "sha256-adEyDExGvxwpvAT0qYiCfvkpINP9BJ6a+LSwQHQ/H/U="; }; appimageContents = appimageTools.extractType2 { inherit version pname src; }; in From ced9c85be3043b152f67df28d342da782972f6b9 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 6 Dec 2024 20:41:11 +0000 Subject: [PATCH 38/84] gh-copilot: 1.0.1 -> 1.0.5 --- pkgs/by-name/gh/gh-copilot/package.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/gh/gh-copilot/package.nix b/pkgs/by-name/gh/gh-copilot/package.nix index 9caec9b59fea..7865ab095842 100644 --- a/pkgs/by-name/gh/gh-copilot/package.nix +++ b/pkgs/by-name/gh/gh-copilot/package.nix @@ -9,26 +9,26 @@ let systemToPlatform = { "x86_64-linux" = { name = "linux-amd64"; - hash = "sha256-uEG9wvoUyX54rcsZI2dgSfEy9d/FMfjf4+kn5wJoojY="; + hash = "sha256-QKrDFCVCWYYX2jM8le2X/OLhNcwxR+liUtXHhW7jcSw="; }; "aarch64-linux" = { name = "linux-arm64"; - hash = "sha256-r0Vo9lZygIEQeSqPv1ix/NK347wqoCkaIL635qeP5ok="; + hash = "sha256-+l1hBwep/YMP7EOrEIn2xCIiVgWB0JCWz+fj2ZfivNQ="; }; "x86_64-darwin" = { name = "darwin-amd64"; - hash = "sha256-Hu7A/M5JvwFaA5AmO1WO65D7KD3dYTGnNb0A5CqAPH0="; + hash = "sha256-YFQh4vDtT+mjAIMt0IEtleOFTlxkHMbJq/SrI+IzNjc="; }; "aarch64-darwin" = { name = "darwin-arm64"; - hash = "sha256-d6db1YOmo7If/2PTkgScsTaMqZZNZl6OL/qpgYfCa3s="; + hash = "sha256-qVsItCI3LxPraOLtEvVaoTzhoGEcIySTWooMBSMLvAc="; }; }; platform = systemToPlatform.${system} or throwSystem; in stdenv.mkDerivation (finalAttrs: { pname = "gh-copilot"; - version = "1.0.1"; + version = "1.0.5"; src = fetchurl { name = "gh-copilot"; From 6cdb99fb6222e46f12b9ece66eb2730c76dbe7df Mon Sep 17 00:00:00 2001 From: Ryan Horiguchi Date: Fri, 6 Dec 2024 23:28:38 +0100 Subject: [PATCH 39/84] bazecor: 1.5.4 -> 1.6.1 --- pkgs/by-name/ba/bazecor/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ba/bazecor/package.nix b/pkgs/by-name/ba/bazecor/package.nix index 173acc6d3b46..bce13edccf9b 100644 --- a/pkgs/by-name/ba/bazecor/package.nix +++ b/pkgs/by-name/ba/bazecor/package.nix @@ -6,12 +6,12 @@ }: let pname = "bazecor"; - version = "1.5.4"; + version = "1.6.1"; src = appimageTools.extract { inherit pname version; src = fetchurl { url = "https://github.com/Dygmalab/Bazecor/releases/download/v${version}/Bazecor-${version}-x64.AppImage"; - hash = "sha256-gu3XPl4gKL+k9hX9OVJYGvG3R81c5lZauRJdUFrqtqk="; + hash = "sha256-Qf9FqHgTSCD2rYp8PC/gYHyiYcfFTJJmG4oRK/bch8Y="; }; # Workaround for https://github.com/Dygmalab/Bazecor/issues/370 From 05435f152ee632efbf06fc5eb3bccb8ada6e3761 Mon Sep 17 00:00:00 2001 From: aucub <78630225+aucub@users.noreply.github.com> Date: Sat, 7 Dec 2024 08:08:04 +0800 Subject: [PATCH 40/84] mangayomi: 0.3.75 -> 0.3.8 --- pkgs/by-name/ma/mangayomi/package.nix | 8 +++---- pkgs/by-name/ma/mangayomi/pubspec.lock.json | 24 ++++++++++----------- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/pkgs/by-name/ma/mangayomi/package.nix b/pkgs/by-name/ma/mangayomi/package.nix index 8cead8d79bed..3491375298e3 100644 --- a/pkgs/by-name/ma/mangayomi/package.nix +++ b/pkgs/by-name/ma/mangayomi/package.nix @@ -43,19 +43,19 @@ }: let pname = "mangayomi"; - version = "0.3.75"; + version = "0.3.8"; src = fetchFromGitHub { owner = "kodjodevf"; repo = "mangayomi"; tag = "v${version}"; - hash = "sha256-kVAtUXEysaCJSLobXlgAgK59pgLq8Ze/XDqQNNdKdzg="; + hash = "sha256-TOCDGmJ5tlpcGS8NeVdIdx946rM1/ItQVY9OnDS6uZ0="; }; rustDep = rustPlatform.buildRustPackage { inherit pname version src; sourceRoot = "${src.name}/rust"; - cargoHash = "sha256-b4PRFe8FgP/PXHwSw2qmderPRFCBC1ISQuf8uZcsxpY="; + cargoHash = "sha256-6Iraw5gtlVW3iSrT2zQh6JLubVTZy/y8/5quXKee2Ko="; passthru.libraryPath = "lib/librust_lib_mangayomi.so"; }; @@ -90,7 +90,7 @@ flutter324.buildFlutterApplication { }; gitHashes = { - desktop_webview_window = "sha256-Z9ehzDKe1W3wGa2AcZoP73hlSwydggO6DaXd9mop+cM="; + desktop_webview_window = "sha256-wRxQPlJZZe4t2C6+G5dMx3+w8scxWENLwII08dlZ4IA="; flutter_qjs = "sha256-m+Z0bCswylfd1E2Y6X6bdPivkSlXUxO4J0Icbco+/0A="; media_kit_libs_windows_video = "sha256-SYVVOR6vViAsDH5MclInJk8bTt/Um4ccYgYDFrb5LBk="; media_kit_native_event_loop = "sha256-SYVVOR6vViAsDH5MclInJk8bTt/Um4ccYgYDFrb5LBk="; diff --git a/pkgs/by-name/ma/mangayomi/pubspec.lock.json b/pkgs/by-name/ma/mangayomi/pubspec.lock.json index a2f9c0042a36..4f91358cf451 100644 --- a/pkgs/by-name/ma/mangayomi/pubspec.lock.json +++ b/pkgs/by-name/ma/mangayomi/pubspec.lock.json @@ -399,10 +399,10 @@ "desktop_webview_window": { "dependency": "direct main", "description": { - "path": ".", - "ref": "no_texture", - "resolved-ref": "109f1739727a71d8da60696143f5af91061faab2", - "url": "https://github.com/Predidit/linux_webview_window.git" + "path": "packages/desktop_webview_window", + "ref": "main", + "resolved-ref": "2aa8d449881974182d033df9635cf7c198d2553a", + "url": "https://github.com/kodjodevf/desktop_webview_window.git" }, "source": "git", "version": "0.2.4" @@ -441,11 +441,11 @@ "dependency": "transitive", "description": { "name": "equatable", - "sha256": "c2b87cb7756efdf69892005af546c56c0b5037f54d2a88269b4f347a505e3ca2", + "sha256": "567c64b3cb4cf82397aac55f4f0cbd3ca20d77c6c03bedbc4ceaddc08904aef7", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.0.5" + "version": "2.0.7" }, "exception_templates": { "dependency": "transitive", @@ -836,11 +836,11 @@ "dependency": "direct main", "description": { "name": "go_router", - "sha256": "8ae664a70174163b9f65ea68dd8673e29db8f9095de7b5cd00e167c621f4fef5", + "sha256": "8660b74171fafae4aa8202100fa2e55349e078281dadc73a241eb8e758534d9d", "url": "https://pub.dev" }, "source": "hosted", - "version": "14.6.0" + "version": "14.6.1" }, "google_fonts": { "dependency": "direct main", @@ -1379,11 +1379,11 @@ "dependency": "transitive", "description": { "name": "path_provider_android", - "sha256": "c464428172cb986b758c6d1724c603097febb8fb855aa265aeecc9280c294d4a", + "sha256": "8c4967f8b7cb46dc914e178daa29813d83ae502e0529d7b0478330616a691ef7", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.2.12" + "version": "2.2.14" }, "path_provider_foundation": { "dependency": "transitive", @@ -1788,11 +1788,11 @@ "dependency": "transitive", "description": { "name": "shelf_web_socket", - "sha256": "073c147238594ecd0d193f3456a5fe91c4b0abbcc68bf5cd95b36c4e194ac611", + "sha256": "cc36c297b52866d203dbf9332263c94becc2fe0ceaa9681d07b6ef9807023b67", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.0.0" + "version": "2.0.1" }, "sky_engine": { "dependency": "transitive", From 117edf2f5cb9b228b9c1081bfef058ee3209a4c0 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 7 Dec 2024 04:49:05 +0000 Subject: [PATCH 41/84] firebase-tools: 13.20.2 -> 13.28.0 --- pkgs/by-name/fi/firebase-tools/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/fi/firebase-tools/package.nix b/pkgs/by-name/fi/firebase-tools/package.nix index 22085eb49017..700e3b9f6134 100644 --- a/pkgs/by-name/fi/firebase-tools/package.nix +++ b/pkgs/by-name/fi/firebase-tools/package.nix @@ -8,19 +8,19 @@ }: let - version = "13.20.2"; + version = "13.28.0"; src = fetchFromGitHub { owner = "firebase"; repo = "firebase-tools"; rev = "refs/tags/v${version}"; - hash = "sha256-FIflfCSTXm7J2WectS175vc0ccztWa4tE2E2kcbhwJg="; + hash = "sha256-bOuOBzEEfVi+0lGqKgZQVmxKUBWoWWdaQ1jlCR1xBcM="; }; in buildNpmPackage { pname = "firebase-tools"; inherit version src; - npmDepsHash = "sha256-qEerq6rFBN6HmzDS4xQJorzmzapBV/WhzCwG3rHU458="; + npmDepsHash = "sha256-3wc1DPZ+yYlBtUTWpa4XFaetS7caNqX5JFSXkmzHyqg="; postPatch = '' ln -s npm-shrinkwrap.json package-lock.json From 8c6400ff8377becce303a071de7d50246b8c4342 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 7 Dec 2024 06:20:08 +0000 Subject: [PATCH 42/84] bazel-gazelle: 0.39.1 -> 0.40.0 --- pkgs/by-name/ba/bazel-gazelle/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ba/bazel-gazelle/package.nix b/pkgs/by-name/ba/bazel-gazelle/package.nix index 487e71225679..2a733e9fed9e 100644 --- a/pkgs/by-name/ba/bazel-gazelle/package.nix +++ b/pkgs/by-name/ba/bazel-gazelle/package.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "bazel-gazelle"; - version = "0.39.1"; + version = "0.40.0"; src = fetchFromGitHub { owner = "bazelbuild"; repo = pname; rev = "v${version}"; - hash = "sha256-Y+k8ObfMwN6fLR2+Lwn64xHljDf3kxw2xp0YpJKbrDM="; + hash = "sha256-cGRE+AX62U6lZbUEid0QWb9zMTiIemop6Gqrqvz5+nk="; }; vendorHash = null; From 63dcaf4badb13115e4449299a2e08b9663e59efd Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 7 Dec 2024 06:53:03 +0000 Subject: [PATCH 43/84] mozillavpn: 2.24.1 -> 2.24.3 --- pkgs/by-name/mo/mozillavpn/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/mo/mozillavpn/package.nix b/pkgs/by-name/mo/mozillavpn/package.nix index dbb920db3495..8a5f309fb7fb 100644 --- a/pkgs/by-name/mo/mozillavpn/package.nix +++ b/pkgs/by-name/mo/mozillavpn/package.nix @@ -23,13 +23,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "mozillavpn"; - version = "2.24.1"; + version = "2.24.3"; src = fetchFromGitHub { owner = "mozilla-mobile"; repo = "mozilla-vpn-client"; rev = "v${finalAttrs.version}"; fetchSubmodules = true; - hash = "sha256-X2rtHAZ9vbWjuOmD3B/uPasUQ1Q+b4SkNqk4MqGMaYo="; + hash = "sha256-GRt0diDt8bEeMfDwiEtYyR+20/bJAVcDal9eGfvk340="; }; patches = [ # Fix build errors from deprecated `QByteArray::count()`, `QVariant::type()`, `QEventPoint::pos()` (#9961) From a2110386c1e7dc4a1c3157d374d3b73166cdcb13 Mon Sep 17 00:00:00 2001 From: DontEatOreo <57304299+DontEatOreo@users.noreply.github.com> Date: Sat, 7 Dec 2024 10:05:10 +0000 Subject: [PATCH 44/84] discord: bump all versions --- .../instant-messengers/discord/default.nix | 28 +++++++++---------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/discord/default.nix b/pkgs/applications/networking/instant-messengers/discord/default.nix index 40e1b478bad9..ad0939f8f27c 100644 --- a/pkgs/applications/networking/instant-messengers/discord/default.nix +++ b/pkgs/applications/networking/instant-messengers/discord/default.nix @@ -10,16 +10,16 @@ let if stdenv.hostPlatform.isLinux then { stable = "0.0.76"; - ptb = "0.0.118"; - canary = "0.0.528"; - development = "0.0.50"; + ptb = "0.0.121"; + canary = "0.0.535"; + development = "0.0.53"; } else { - stable = "0.0.327"; - ptb = "0.0.148"; - canary = "0.0.639"; - development = "0.0.65"; + stable = "0.0.328"; + ptb = "0.0.151"; + canary = "0.0.647"; + development = "0.0.67"; }; version = versions.${branch}; srcs = rec { @@ -30,33 +30,33 @@ let }; ptb = fetchurl { url = "https://ptb.dl2.discordapp.net/apps/linux/${version}/discord-ptb-${version}.tar.gz"; - hash = "sha256-msheT6PXTkIq7EwowYwL7g0kgOdLBZHeI5w2kijJUtw="; + hash = "sha256-Zaf6Pg6xeSyiIFJMlT+VkE/sXJULSqGzGHmK5MpBuhg="; }; canary = fetchurl { url = "https://canary.dl2.discordapp.net/apps/linux/${version}/discord-canary-${version}.tar.gz"; - hash = "sha256-ajQHWSpjpuadFlT5WVXsSZf5Ng8ta4SyGbZp7TTb+8Q="; + hash = "sha256-YUuqkhb04nTTdL6W6VB0ampp3qEi0Gj5iz3lCt7AfMA="; }; development = fetchurl { url = "https://development.dl2.discordapp.net/apps/linux/${version}/discord-development-${version}.tar.gz"; - hash = "sha256-Ygwneo9GY1iVKBl3y6jSj81sexUsSY2J7i/DKxmJJyA="; + hash = "sha256-4FxdZsVTQTr5yzuzV6IZYZ6qk7sa9WZ27zCtVA1/uOg="; }; }; x86_64-darwin = { stable = fetchurl { url = "https://stable.dl2.discordapp.net/apps/osx/${version}/Discord.dmg"; - hash = "sha256-5XzjJv2IebVMVml/e+VTVKrlbHTCj+t0lYsq1CwvLi0="; + hash = "sha256-yYQHoBv3Cco07WQhS8+BruV1gjGZti+bTS+jlRg0u14="; }; ptb = fetchurl { url = "https://ptb.dl2.discordapp.net/apps/osx/${version}/DiscordPTB.dmg"; - hash = "sha256-YW6wgiplt+ue59i5+2Ap5tVAEhO1xgeP8jVOffkSWj4="; + hash = "sha256-R8R3r2i/+ru+82OBGBmF+Kn502RK/64VwtbdRVSwj0g="; }; canary = fetchurl { url = "https://canary.dl2.discordapp.net/apps/osx/${version}/DiscordCanary.dmg"; - hash = "sha256-C+2Cr8D2ZqfdRp0m996p8HvOjkPzN82ywgbx2KMBqAE="; + hash = "sha256-GbR6XLK+2jBHGdvWeZv3HXbCr4mylBrdY/3rCFCkeCY="; }; development = fetchurl { url = "https://development.dl2.discordapp.net/apps/osx/${version}/DiscordDevelopment.dmg"; - hash = "sha256-IckTw2wKTwGMGvQAOYG85yU1w9E6PdWA1G0f2BaXJ1Q="; + hash = "sha256-nyOQhSjlARvIjFc3uDi7IFtKxxIpO/V6M1eIg56dMdU="; }; }; aarch64-darwin = x86_64-darwin; From e5d0a078a5471a955ced55bd3716717d78655d89 Mon Sep 17 00:00:00 2001 From: eymeric Date: Thu, 24 Oct 2024 22:41:00 +0200 Subject: [PATCH 45/84] j-mc-2-obj: init at 126 --- pkgs/by-name/jm/jmc2obj/package.nix | 44 +++++++++++++++++++++++++++++ 1 file changed, 44 insertions(+) create mode 100644 pkgs/by-name/jm/jmc2obj/package.nix diff --git a/pkgs/by-name/jm/jmc2obj/package.nix b/pkgs/by-name/jm/jmc2obj/package.nix new file mode 100644 index 000000000000..c0a1595ed827 --- /dev/null +++ b/pkgs/by-name/jm/jmc2obj/package.nix @@ -0,0 +1,44 @@ +{ + lib, + fetchFromGitHub, + jre, + makeWrapper, + maven, +}: + +maven.buildMavenPackage rec { + pname = "j-mc-2-obj"; + version = "126"; + + src = fetchFromGitHub { + owner = "jmc2obj"; + repo = pname; + rev = version; + hash = "sha256-c0qLryv9Gx9BlKXmwSKkK5/v3Wypny841htNfsNNxpg="; + }; + + mvnHash = "sha256-ya8E/6tOxyW+AO7v9p0dg72qFpQjWwvntZOw+TEKq0k="; + + mvnParameters = "-Dmaven.gitcommitid.skip=true"; + + nativeBuildInputs = [ makeWrapper ]; + + installPhase = '' + runHook preInstall + mkdir -p $out/bin $out/share/jMc2Obj + install -Dm644 JAR/jMc2Obj-${version}.jar $out/share/jMc2Obj + + makeWrapper ${lib.getExe jre} $out/bin/jMc2Obj \ + --add-flags "-jar $out/share/jMc2Obj/jMc2Obj-${version}.jar" + runHook postInstall + ''; + + meta = { + changelog = "https://github.com/jmc2obj/j-mc-2-obj/releases/tag/${version}"; + description = "Java-based Minecraft-to-OBJ exporter"; + homepage = "https://github.com/jmc2obj/j-mc-2-obj"; + license = lib.licenses.gpl2Only; + maintainers = with lib.maintainers; [ eymeric ]; + mainProgram = "jMc2Obj"; + }; +} From 1e1fd8ffae11a2f7b22b74185ded1170ca55730f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 7 Dec 2024 11:59:31 +0000 Subject: [PATCH 46/84] shellhub-agent: 0.16.4 -> 0.17.2 --- pkgs/by-name/sh/shellhub-agent/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/sh/shellhub-agent/package.nix b/pkgs/by-name/sh/shellhub-agent/package.nix index b5d6c4474e53..92ca7ad326f6 100644 --- a/pkgs/by-name/sh/shellhub-agent/package.nix +++ b/pkgs/by-name/sh/shellhub-agent/package.nix @@ -11,18 +11,18 @@ buildGoModule rec { pname = "shellhub-agent"; - version = "0.16.4"; + version = "0.17.2"; src = fetchFromGitHub { owner = "shellhub-io"; repo = "shellhub"; rev = "v${version}"; - hash = "sha256-pxV9WLx0trgG0htWuYG/j634iaQRo5/TXOOU8rOmxDw="; + hash = "sha256-zMAAimFrOMcBVKuFwl/UpJLEWJHrjH7DNno5KCEvGrM="; }; modRoot = "./agent"; - vendorHash = "sha256-qqh9KdhOt6KDgwUhf6lzb6I7YAhocBSZ7UeyBT0e0eM="; + vendorHash = "sha256-jQNWuOwaAx//wDUVOrMc+ETWWbTCTp/SLwL2guERJB8="; ldflags = [ "-s" "-w" "-X main.AgentVersion=v${version}" ]; From 87bd47ac5afc5ef85140238b8bdf7b45583f8654 Mon Sep 17 00:00:00 2001 From: networkException Date: Wed, 4 Dec 2024 00:17:51 +0100 Subject: [PATCH 47/84] chromium: support manually specifying the ungoogled patchset rev in update script This patch adds support for manually specifying the rev of the ungoogled-chromium patchset to use, instead of fetching the latest release by tags. This allows testing an unreleased ungoogled-chromium commit with the nixpkgs chromium build system. See 1940f323661495d71cac8981b267c1f5dfa23794 for the initial implementation in the old python update script. --- .../networking/browsers/chromium/update.mjs | 34 +++++++++++++------ 1 file changed, 24 insertions(+), 10 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/update.mjs b/pkgs/applications/networking/browsers/chromium/update.mjs index 73bad4378dca..c6b2cd3e1e5d 100755 --- a/pkgs/applications/networking/browsers/chromium/update.mjs +++ b/pkgs/applications/networking/browsers/chromium/update.mjs @@ -29,26 +29,31 @@ const flush_to_file_proxy = { }, } const lockfile = new Proxy(structuredClone(lockfile_initial), flush_to_file_proxy) - +const ungoogled_rev = argv['ungoogled-chromium-rev'] for (const attr_path of Object.keys(lockfile)) { - if (!argv[attr_path]) { + const ungoogled = attr_path === 'ungoogled-chromium' + + if (!argv[attr_path] && !(ungoogled && ungoogled_rev)) { console.log(`[${attr_path}] Skipping ${attr_path}. Pass --${attr_path} as argument to update.`) continue } - const ungoogled = attr_path === 'ungoogled-chromium' const version_nixpkgs = !ungoogled ? lockfile[attr_path].version : lockfile[attr_path].deps['ungoogled-patches'].rev - const version_upstream = !ungoogled ? await get_latest_chromium_release() : await get_latest_ungoogled_release() + const version_upstream = !ungoogled ? await get_latest_chromium_release() : + ungoogled_rev ?? await get_latest_ungoogled_release() console.log(`[${attr_path}] ${chalk.red(version_nixpkgs)} (nixpkgs)`) console.log(`[${attr_path}] ${chalk.green(version_upstream)} (upstream)`) - if (version_greater_than(version_upstream, version_nixpkgs)) { + if (ungoogled_rev || version_greater_than(version_upstream, version_nixpkgs)) { console.log(`[${attr_path}] ${chalk.green(version_upstream)} from upstream is newer than our ${chalk.red(version_nixpkgs)}...`) - // unconditionally remove ungoogled-chromium's epoch/sub-version (e.g. 130.0.6723.116-1 -> 130.0.6723.116) - const version_chromium = version_upstream.split('-')[0] + let ungoogled_patches = ungoogled ? await fetch_ungoogled(version_upstream) : undefined + + // For ungoogled-chromium we need to remove the patch revision (e.g. 130.0.6723.116-1 -> 130.0.6723.116) + // by just using the chromium_version.txt content from the patches checkout (to also work with commit revs). + const version_chromium = ungoogled_patches?.chromium_version ?? version_upstream const chromium_rev = await chromium_resolve_tag_to_rev(version_chromium) @@ -58,7 +63,10 @@ for (const attr_path of Object.keys(lockfile)) { deps: { depot_tools: {}, gn: {}, - 'ungoogled-patches': ungoogled ? await fetch_ungoogled(version_upstream) : undefined, + 'ungoogled-patches': !ungoogled ? undefined : { + rev: ungoogled_patches.rev, + hash: ungoogled_patches.hash, + }, npmHash: dummy_hash, }, DEPS: {}, @@ -187,13 +195,19 @@ async function fetch_ungoogled(rev) { const expr = (hash) => [`(import ./. {}).fetchFromGitHub { owner = "ungoogled-software"; repo = "ungoogled-chromium"; rev = "${rev}"; hash = "${hash}"; }`] const hash = await prefetch_FOD('--expr', expr('')) - const checkout = await $nixpkgs`nix-build --expr ${expr(hash)}` + const checkout = await $nixpkgs`nix-build --expr ${expr(hash)}` + const checkout_path = checkout.stdout.trim() - await fs.copy(`${checkout.stdout.trim()}/flags.gn`, './ungoogled-flags.toml') + await fs.copy(path.join(checkout_path, 'flags.gn'), './ungoogled-flags.toml') + + const chromium_version = (await fs.readFile(path.join(checkout_path, 'chromium_version.txt'))).toString().trim() + + console.log(`[ungoogled-chromium] ${chalk.green(rev)} patch revision resolves to chromium version ${chalk.green(chromium_version)}`) return { rev, hash, + chromium_version, } } From 502f5c45a8f60742b37f52d5f7a6f6cf404e189b Mon Sep 17 00:00:00 2001 From: networkException Date: Sat, 7 Dec 2024 15:39:59 +0100 Subject: [PATCH 48/84] ungoogled-chromium: 131.0.6778.85-1 -> 131.0.6778.108-1 https://chromereleases.googleblog.com/2024/12/stable-channel-update-for-desktop.html This update includes 4 security fixes. CVEs: CVE-2024-12053 --- .../networking/browsers/chromium/info.json | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/info.json b/pkgs/applications/networking/browsers/chromium/info.json index 618730284074..5906d5749b44 100644 --- a/pkgs/applications/networking/browsers/chromium/info.json +++ b/pkgs/applications/networking/browsers/chromium/info.json @@ -766,7 +766,7 @@ } }, "ungoogled-chromium": { - "version": "131.0.6778.85", + "version": "131.0.6778.108", "deps": { "depot_tools": { "rev": "20b9bdcace7ed561d6a75728c85373503473cb6b", @@ -777,16 +777,16 @@ "hash": "sha256-a8yCdBsl0nBMPS+pCLwrkAvQNP/THx/z/GySyOgx4Jk=" }, "ungoogled-patches": { - "rev": "131.0.6778.85-1", - "hash": "sha256-mcSshjdfUEH4ur4z+0P0oWCjlV8EhFMc+7rdfIIPASI=" + "rev": "131.0.6778.108-1", + "hash": "sha256-xFtxgZRbtG8qxvTyt++wa69dQvr61K29mTubkxoI1Y8=" }, "npmHash": "sha256-b1l8SwjAfoColoa3zhTMPEF/rRuxzT3ATHE77rWU5EA=" }, "DEPS": { "src": { "url": "https://chromium.googlesource.com/chromium/src.git", - "rev": "3d81e41b6f3ac8bcae63b32e8145c9eb0cd60a2d", - "hash": "sha256-fREToEHVbTD0IVGx/sn7csSju4BYajWZ+LDCiKWV4cI=", + "rev": "3b014839fbc4fb688b2f5af512d6ce312ad208b1", + "hash": "sha256-ypzu3LveMFcOFm7+JlaERjzs3SK/n9+sfm5wOKB8/zw=", "recompress": true }, "src/third_party/clang-format/script": { @@ -886,8 +886,8 @@ }, "src/third_party/dawn": { "url": "https://dawn.googlesource.com/dawn.git", - "rev": "7e742cac42c29a14ab7f54b134b2f17592711267", - "hash": "sha256-K2gwKNwonzCIu4hnlYuOaYyKaRV11hwDzF4oykiKsl0=" + "rev": "740d2502dbbd719a76c5a8d3fb4dac1b5363f42e", + "hash": "sha256-R41YVv4uWCU6SsACXPRppeCDguTs+/NVJckvMGGTgJE=" }, "src/third_party/dawn/third_party/glfw": { "url": "https://chromium.googlesource.com/external/github.com/glfw/glfw", @@ -1366,8 +1366,8 @@ }, "src/third_party/skia": { "url": "https://skia.googlesource.com/skia.git", - "rev": "94631d9b9a10697325589e1642af63a0137cac94", - "hash": "sha256-SKKLOxjimQWt8W+Q3wlCJaUC/lxw6EIZDFBuVQKmnVY=" + "rev": "f14f6b1ab7cf544c0190074488d17821281cfa4d", + "hash": "sha256-0p57otDuIShl6MngYs22XA1QYxptDVa3vCwJsH59H34=" }, "src/third_party/smhasher/src": { "url": "https://chromium.googlesource.com/external/smhasher.git", @@ -1491,8 +1491,8 @@ }, "src/third_party/webrtc": { "url": "https://webrtc.googlesource.com/src.git", - "rev": "8445abdf8069cadcbd134369b70d0ebd436ef477", - "hash": "sha256-EitEjXNtm0gB9wtAwIYHBHkU7paHg5zvsTz171hRmK4=" + "rev": "79aff54b0fa9238ce3518dd9eaf9610cd6f22e82", + "hash": "sha256-xkMnUduSG88EWiwq6PITN0KgAKjFd4QOis3dgxedK30=" }, "src/third_party/wuffs/src": { "url": "https://skia.googlesource.com/external/github.com/google/wuffs-mirror-release-c.git", @@ -1526,8 +1526,8 @@ }, "src/v8": { "url": "https://chromium.googlesource.com/v8/v8.git", - "rev": "bd2671b973062afc614b852ec190524b80aaef8a", - "hash": "sha256-uq0CE7Chqzy2d+iifC3hV9RTnDVinpwjl1pOzyNGbSo=" + "rev": "e38771cb283b9689683c5ac0b5831dd89f8ec690", + "hash": "sha256-csSDnepYxil0R3PD/LVxW7JBcasOKG4l6q6vj8zHV/I=" } } } From f7ad3137441e3da0d3cc4fa23893b28a0c20cef7 Mon Sep 17 00:00:00 2001 From: Artur Manuel Date: Thu, 5 Dec 2024 21:39:36 +0000 Subject: [PATCH 49/84] gruvbox-material-gtk-theme: init at 0-unstable-2024-08-09 --- .../gr/gruvbox-material-gtk-theme/package.nix | 38 +++++++++++++++++++ 1 file changed, 38 insertions(+) create mode 100644 pkgs/by-name/gr/gruvbox-material-gtk-theme/package.nix diff --git a/pkgs/by-name/gr/gruvbox-material-gtk-theme/package.nix b/pkgs/by-name/gr/gruvbox-material-gtk-theme/package.nix new file mode 100644 index 000000000000..1b76dc8743a2 --- /dev/null +++ b/pkgs/by-name/gr/gruvbox-material-gtk-theme/package.nix @@ -0,0 +1,38 @@ +{ + stdenvNoCC, + fetchFromGitHub, + gtk-engine-murrine, + lib, +}: +stdenvNoCC.mkDerivation { + pname = "gruvbox-material-gtk-theme"; + version = "0-unstable-2024-08-09"; + + src = fetchFromGitHub { + owner = "TheGreatMcPain"; + repo = "gruvbox-material-gtk"; + rev = "808959bcfe8b9409b49a7f92052198f0882ae8bc"; + hash = "sha256-NHjE/HI/BJyjrRfoH9gOKIU8HsUIBPV9vyvuW12D01M="; + }; + + propagatedUserEnvPkgs = [ gtk-engine-murrine ]; + + dontBuild = true; + + installPhase = '' + runHook preInstall + mkdir -p "$out/share/"{themes,icons} + for i in "icons" "themes"; do + cp -a "$i/"* "$out/share/$i" + done + runHook postInstall + ''; + + meta = { + description = "GTK Theme based off of the Gruvbox Material colour palette"; + homepage = "https://github.com/TheGreatMcPain/gruvbox-material-gtk"; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.amadaluzia ]; + platforms = lib.platforms.unix; + }; +} From 50815eab387a5da4829252ad6541e95ed7ca3a2f Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 7 Dec 2024 17:40:48 +0100 Subject: [PATCH 50/84] python312Packages.yalexs-ble: 2.5.1 -> 2.5.2 Diff: https://github.com/bdraco/yalexs-ble/compare/refs/tags/v2.5.1...v2.5.2 Changelog: https://github.com/bdraco/yalexs-ble/blob/v2.5.2/CHANGELOG.md --- pkgs/development/python-modules/yalexs-ble/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/yalexs-ble/default.nix b/pkgs/development/python-modules/yalexs-ble/default.nix index 420fa77d4cd3..0105579be077 100644 --- a/pkgs/development/python-modules/yalexs-ble/default.nix +++ b/pkgs/development/python-modules/yalexs-ble/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "yalexs-ble"; - version = "2.5.1"; + version = "2.5.2"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "bdraco"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-AaDV2EBWCFR9uceWc+GtwhhkUEqRxxVNCgOvu0kFzUU="; + hash = "sha256-scHdQbjIClV+TpLOVC0uf+SVx3kR1DDzcaKWnKMsHoY="; }; nativeBuildInputs = [ poetry-core ]; From bffe151d39139cd40f933a9e30dcd645ae90e58c Mon Sep 17 00:00:00 2001 From: Alex Martens Date: Sat, 7 Dec 2024 08:58:47 -0800 Subject: [PATCH 51/84] tealdeer: move to pkgs/by-name --- .../tealdeer/default.nix => by-name/te/tealdeer/package.nix} | 4 ++-- pkgs/top-level/all-packages.nix | 4 ---- 2 files changed, 2 insertions(+), 6 deletions(-) rename pkgs/{tools/misc/tealdeer/default.nix => by-name/te/tealdeer/package.nix} (93%) diff --git a/pkgs/tools/misc/tealdeer/default.nix b/pkgs/by-name/te/tealdeer/package.nix similarity index 93% rename from pkgs/tools/misc/tealdeer/default.nix rename to pkgs/by-name/te/tealdeer/package.nix index 2de33cdd09b0..51d43799621e 100644 --- a/pkgs/tools/misc/tealdeer/default.nix +++ b/pkgs/by-name/te/tealdeer/package.nix @@ -3,7 +3,7 @@ , rustPlatform , fetchFromGitHub , installShellFiles -, Security +, apple-sdk_11 }: rustPlatform.buildRustPackage rec { @@ -19,7 +19,7 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-ZKaq/JqH/Y2Cs9LLnlt1Gawe4R+kvS3vpUcNK95uujk="; - buildInputs = lib.optional stdenv.hostPlatform.isDarwin Security; + buildInputs = lib.optional stdenv.hostPlatform.isDarwin apple-sdk_11; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ea5a92dd4be6..ac662b01aa8b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3229,10 +3229,6 @@ with pkgs; schleuder-cli = callPackage ../tools/security/schleuder/cli { }; - tealdeer = callPackage ../tools/misc/tealdeer { - inherit (darwin.apple_sdk.frameworks) Security; - }; - teamocil = callPackage ../tools/misc/teamocil { }; tsm-client-withGui = callPackage ../by-name/ts/tsm-client/package.nix { enableGui = true; }; From 85b2760359fb547c01b10902e868fb85fd0a84bb Mon Sep 17 00:00:00 2001 From: Arnaud Venturi Date: Sat, 7 Dec 2024 18:34:45 +0100 Subject: [PATCH 52/84] Fix documentation typo in user mgmt manual page --- nixos/doc/manual/configuration/user-mgmt.chapter.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/doc/manual/configuration/user-mgmt.chapter.md b/nixos/doc/manual/configuration/user-mgmt.chapter.md index 2edca78f4a38..89604941bf11 100644 --- a/nixos/doc/manual/configuration/user-mgmt.chapter.md +++ b/nixos/doc/manual/configuration/user-mgmt.chapter.md @@ -122,7 +122,7 @@ The primary benefit of this is to remove a dependency on perl. This is experimental. ::: -Like systemd-sysusers, Userborn adoesn't depend on Perl but offers some more +Like systemd-sysusers, Userborn doesn't depend on Perl but offers some more advantages over systemd-sysusers: 1. It can create "normal" users (with a GID >= 1000). From d6c3f538eaf7383488d3b53bb188c53ecfd0018d Mon Sep 17 00:00:00 2001 From: Leah Amelia Chen Date: Sat, 7 Dec 2024 19:44:14 +0100 Subject: [PATCH 53/84] vesktop: 1.5.3 -> 1.5.4 (#362579) --- pkgs/by-name/ve/vesktop/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ve/vesktop/package.nix b/pkgs/by-name/ve/vesktop/package.nix index 6a2108e67573..9c3fedbf3ad6 100644 --- a/pkgs/by-name/ve/vesktop/package.nix +++ b/pkgs/by-name/ve/vesktop/package.nix @@ -24,13 +24,13 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "vesktop"; - version = "1.5.3"; + version = "1.5.4"; src = fetchFromGitHub { owner = "Vencord"; repo = "Vesktop"; rev = "v${finalAttrs.version}"; - hash = "sha256-HlT7ddlrMHG1qOCqdaYjuWhJD+5FF1Nkv2sfXLWd07o="; + hash = "sha256-zvyDKgNTRha7Z7KGAA7x9LRJrL+1zyb5TZEFFK8Ffrc="; }; pnpmDeps = pnpm_9.fetchDeps { @@ -40,7 +40,7 @@ stdenv.mkDerivation (finalAttrs: { src patches ; - hash = "sha256-BOVjbaDbZw6H6X8o945M0Bx6fqnRQjFBviOLkTYVJ1I="; + hash = "sha256-GSAOdvd8X4dQNTDZMnzc4oMY54TKvdPuAOMb6DRzCEM="; }; nativeBuildInputs = From 87f98369e0d0e9b25bf7e13387c8d0b935b22217 Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Wed, 4 Dec 2024 00:04:44 +0100 Subject: [PATCH 54/84] haskell.compiler.ghc984: init at 9.8.4 https://www.haskell.org/ghc/blog/20241202-ghc-9.8.4-released.html --- pkgs/development/compilers/ghc/9.8.4.nix | 4 ++++ pkgs/top-level/haskell-packages.nix | 23 +++++++++++++++++++++++ pkgs/top-level/release-haskell.nix | 7 ++++--- 3 files changed, 31 insertions(+), 3 deletions(-) create mode 100644 pkgs/development/compilers/ghc/9.8.4.nix diff --git a/pkgs/development/compilers/ghc/9.8.4.nix b/pkgs/development/compilers/ghc/9.8.4.nix new file mode 100644 index 000000000000..2596249a70b4 --- /dev/null +++ b/pkgs/development/compilers/ghc/9.8.4.nix @@ -0,0 +1,4 @@ +import ./common-hadrian.nix rec { + version = "9.8.4"; + sha256 = "17e8188f3c8a5c2f73fb4e35d01032e8dc258835ec876d52c8ad8ee3d24b2fc5"; +} diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index ececbd86ee3e..c0ce67d2df9b 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -400,6 +400,24 @@ in { buildTargetLlvmPackages = pkgsBuildTarget.llvmPackages_15; llvmPackages = pkgs.llvmPackages_15; }; + ghc984 = callPackage ../development/compilers/ghc/9.8.4.nix { + bootPkgs = + # For GHC 9.6 no armv7l bindists are available. + if stdenv.buildPlatform.isAarch32 then + bb.packages.ghc963 + else if stdenv.buildPlatform.isPower64 && stdenv.buildPlatform.isLittleEndian then + bb.packages.ghc963 + else + bb.packages.ghc963Binary; + inherit (buildPackages.python3Packages) sphinx; + # Need to use apple's patched xattr until + # https://github.com/xattr/xattr/issues/44 and + # https://github.com/xattr/xattr/issues/55 are solved. + inherit (buildPackages.darwin) xattr autoSignDarwinBinariesHook; + # Support range >= 11 && < 16 + buildTargetLlvmPackages = pkgsBuildTarget.llvmPackages_15; + llvmPackages = pkgs.llvmPackages_15; + }; ghc98 = compiler.ghc982; # HLS doesn't work yet with 9.8.3 ghc9101 = callPackage ../development/compilers/ghc/9.10.1.nix { bootPkgs = @@ -589,6 +607,11 @@ in { ghc = bh.compiler.ghc983; compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-9.8.x.nix { }; }; + ghc984 = callPackage ../development/haskell-modules { + buildHaskellPackages = bh.packages.ghc984; + ghc = bh.compiler.ghc984; + compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-9.8.x.nix { }; + }; ghc98 = packages.ghc982; # HLS doesn't work yet with 9.8.3 ghc9101 = callPackage ../development/haskell-modules { buildHaskellPackages = bh.packages.ghc9101; diff --git a/pkgs/top-level/release-haskell.nix b/pkgs/top-level/release-haskell.nix index 7df396f4327f..4ba7c60ad29a 100644 --- a/pkgs/top-level/release-haskell.nix +++ b/pkgs/top-level/release-haskell.nix @@ -76,6 +76,7 @@ let ghc981 ghc982 ghc983 + ghc984 ghc9101 ]; @@ -466,8 +467,8 @@ let ; }; - haskell.packages.native-bignum.ghc983 = { - inherit (packagePlatforms pkgs.pkgsStatic.haskell.packages.native-bignum.ghc983) + haskell.packages.native-bignum.ghc984 = { + inherit (packagePlatforms pkgs.pkgsStatic.haskell.packages.native-bignum.ghc984) hello random QuickCheck @@ -721,7 +722,7 @@ let constituents = accumulateDerivations [ jobs.pkgsStatic.haskell.packages.native-bignum.ghc948 # non-hadrian jobs.pkgsStatic.haskellPackages - jobs.pkgsStatic.haskell.packages.native-bignum.ghc983 + jobs.pkgsStatic.haskell.packages.native-bignum.ghc984 ]; }; } From f9bf2712731fa838fdeb5b0200ade07d3b711f28 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 7 Dec 2024 20:14:33 +0000 Subject: [PATCH 55/84] google-cloud-sql-proxy: 2.14.0 -> 2.14.1 --- pkgs/by-name/go/google-cloud-sql-proxy/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/go/google-cloud-sql-proxy/package.nix b/pkgs/by-name/go/google-cloud-sql-proxy/package.nix index c7a4f328fa0d..3778d911c53f 100644 --- a/pkgs/by-name/go/google-cloud-sql-proxy/package.nix +++ b/pkgs/by-name/go/google-cloud-sql-proxy/package.nix @@ -6,18 +6,18 @@ buildGoModule rec { pname = "google-cloud-sql-proxy"; - version = "2.14.0"; + version = "2.14.1"; src = fetchFromGitHub { owner = "GoogleCloudPlatform"; repo = "cloud-sql-proxy"; rev = "v${version}"; - hash = "sha256-SM74Z9+oo472BIM/moSj9zyZh2HefkAkqoC4L1tu+X8="; + hash = "sha256-GS+FILQI6z7bFgngDgnC+H5APILiDpBLkA+EFT4cWMw="; }; subPackages = [ "." ]; - vendorHash = "sha256-Ao/kSC4gcsZpRaSu7FhqJs1ulUbfrzOpO4CMropCywo="; + vendorHash = "sha256-TbVpYfAEo0WtteeEImcPORxgYhMdgayj+LcpLW3jAMo="; checkFlags = [ "-short" From 1c306ed6f5bc56e66707e9250825586a97fb200d Mon Sep 17 00:00:00 2001 From: Augustin Trancart Date: Fri, 29 Nov 2024 22:22:29 +0100 Subject: [PATCH 56/84] geos: remove 3.11 version The last package using it was python3Packages.shapely_1_8, removed in 5c493ae9edbc. So we can finally drop this package. --- pkgs/development/libraries/geos/3.11.nix | 52 ------------------------ pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 2 - 3 files changed, 1 insertion(+), 54 deletions(-) delete mode 100644 pkgs/development/libraries/geos/3.11.nix diff --git a/pkgs/development/libraries/geos/3.11.nix b/pkgs/development/libraries/geos/3.11.nix deleted file mode 100644 index 32e1f39965d7..000000000000 --- a/pkgs/development/libraries/geos/3.11.nix +++ /dev/null @@ -1,52 +0,0 @@ -{ lib -, stdenv -, callPackage -, fetchpatch -, fetchurl -, testers - -, cmake -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "geos"; - version = "3.11.4"; - - src = fetchurl { - url = "https://download.osgeo.org/geos/geos-${finalAttrs.version}.tar.bz2"; - hash = "sha256-NkyIzPw4qlDPZccA57KuRwbtEDMmEoST2/dQx40TbSw="; - }; - - patches = [ - # Pull upstream fix of `gcc-13` build failure: - # https://github.com/libgeos/geos/pull/805 - (fetchpatch { - name = "gcc-13.patch"; - url = "https://github.com/libgeos/geos/commit/bea3188be44075034fd349f5bb117c943bdb7fb1.patch"; - hash = "sha256-dQT3Hf9YJchgjon/r46TLIXXbE6C0ZnewyvfYJea4jM="; - }) - ]; - - nativeBuildInputs = [ cmake ]; - - # https://github.com/libgeos/geos/issues/930 - cmakeFlags = lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) [ - "-DCMAKE_CTEST_ARGUMENTS=--exclude-regex;unit-geom-Envelope" - ]; - - doCheck = true; - - passthru.tests = { - pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; - geos = callPackage ./tests.nix { geos = finalAttrs.finalPackage; }; - }; - - meta = with lib; { - description = "C/C++ library for computational geometry with a focus on algorithms used in geographic information systems (GIS) software"; - homepage = "https://libgeos.org"; - license = licenses.lgpl21Only; - maintainers = teams.geospatial.members; - pkgConfigModules = [ "geos" ]; - mainProgram = "geosop"; - }; -}) diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 56a4fcbcd822..fb65e4d71181 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -423,6 +423,7 @@ mapAliases { gcj = gcj6; # Added 2024-09-13 gcj6 = throw "gcj6 has been removed from Nixpkgs, as it is unmaintained and obsolete"; # Added 2024-09-13 gcolor2 = throw "'gcolor2' has been removed due to lack of maintenance upstream and depending on gtk2. Consider using 'gcolor3' or 'eyedropper' instead"; # Added 2024-09-15 + geos_3_11 = throw "geos_3_11 has been removed from nixpgks. Please use a more recent 'geos' instead."; gfortran48 = throw "'gfortran48' has been removed from nixpkgs"; # Added 2024-09-10 gfortran49 = throw "'gfortran49' has been removed from nixpkgs"; # Added 2024-09-11 gfortran7 = throw "gfortran7 has been removed from Nixpkgs, as it is unmaintained and obsolete"; # Added 2024-11-20 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4b6419813241..097db64bb509 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9222,8 +9222,6 @@ with pkgs; geos_3_9 = callPackage ../development/libraries/geos/3.9.nix { }; - geos_3_11 = callPackage ../development/libraries/geos/3.11.nix { }; - inherit (callPackages ../development/libraries/getdns { }) getdns stubby; From 0cdb43baad175052c981b7a80ae6e1f694aea229 Mon Sep 17 00:00:00 2001 From: Carter Ison Date: Sat, 7 Dec 2024 15:05:55 -0700 Subject: [PATCH 57/84] maintainers: add pyrotelekinetic --- maintainers/maintainer-list.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 9a4e26d944d6..6c5f8510fb2b 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -18104,6 +18104,13 @@ githubId = 4579165; name = "Danny Bautista"; }; + pyrotelekinetic = { + name = "Clover"; + email = "carter@isons.org"; + github = "pyrotelekinetic"; + githubId = 29682759; + keys = [ { fingerprint = "5963 78DB 25AA 608D 2743 D466 5D6A D9AE 71B3 F983"; } ]; + }; pyrox0 = { name = "Pyrox"; email = "pyrox@pyrox.dev"; From 10ec359f00bff4e780c8f708f0004d5cb027e065 Mon Sep 17 00:00:00 2001 From: Leah Amelia Chen Date: Sat, 7 Dec 2024 23:32:36 +0100 Subject: [PATCH 58/84] crates-tui: 0.1.20 -> 0.1.22 (#362581) --- pkgs/by-name/cr/crates-tui/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/cr/crates-tui/package.nix b/pkgs/by-name/cr/crates-tui/package.nix index 8c3af939719b..78c36c3b6cec 100644 --- a/pkgs/by-name/cr/crates-tui/package.nix +++ b/pkgs/by-name/cr/crates-tui/package.nix @@ -8,7 +8,7 @@ nix-update-script, }: let - version = "0.1.20"; + version = "0.1.22"; in rustPlatform.buildRustPackage { pname = "crates-tui"; @@ -18,10 +18,10 @@ rustPlatform.buildRustPackage { owner = "ratatui"; repo = "crates-tui"; rev = "refs/tags/v${version}"; - hash = "sha256-K3ttXoSS4GZyHnqS95op8kmbAi4/KjKa0P6Nzqqpjyw="; + hash = "sha256-+fyCNkSTmWrztEEsQkRoMXikOn1Q+suP2IZuSXb3ELQ="; }; - cargoHash = "sha256-ztLBM6CR2WMKR9cfBY95BvSaD05C+AEa6C/nOdDxqf0="; + cargoHash = "sha256-RnrPh0DBtX4BKSE8qC8MuyL6VXlH05wXYW/iOAs4SD8="; nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl ]; From 9d4887eea159c7bb18b8ff7ed0a84b25b6f9ebae Mon Sep 17 00:00:00 2001 From: Leah Amelia Chen Date: Sat, 7 Dec 2024 23:33:49 +0100 Subject: [PATCH 59/84] tomboy-ng: 0.40 -> 0.41 (#362578) --- pkgs/by-name/to/tomboy-ng/package.nix | 4 +-- .../to/tomboy-ng/simplify-build-script.patch | 28 ++++++++----------- 2 files changed, 14 insertions(+), 18 deletions(-) diff --git a/pkgs/by-name/to/tomboy-ng/package.nix b/pkgs/by-name/to/tomboy-ng/package.nix index 4341d4ac8325..83edbf65cfa5 100644 --- a/pkgs/by-name/to/tomboy-ng/package.nix +++ b/pkgs/by-name/to/tomboy-ng/package.nix @@ -19,13 +19,13 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "tomboy-ng"; - version = "0.40"; + version = "0.41"; src = fetchFromGitHub { owner = "tomboy-notes"; repo = "tomboy-ng"; rev = "v${finalAttrs.version}"; - hash = "sha256-QRv0LVZpRxW9c/cCcDsMSAYQ3zuYa39VJbcys5N+1x0="; + hash = "sha256-W5pW2QwAFKhs8O5TqUbe2i+uMGDU1G4wZ+f+rfn9+ds="; }; kcontrols = fetchFromGitHub { owner = "davidbannon"; diff --git a/pkgs/by-name/to/tomboy-ng/simplify-build-script.patch b/pkgs/by-name/to/tomboy-ng/simplify-build-script.patch index d2b08ca2a080..9fce6305945a 100644 --- a/pkgs/by-name/to/tomboy-ng/simplify-build-script.patch +++ b/pkgs/by-name/to/tomboy-ng/simplify-build-script.patch @@ -1,17 +1,17 @@ diff --git a/buildit.bash b/buildit.bash -index 6606562..57b9e14 100755 +index 47e861b..ce52387 100755 --- a/buildit.bash +++ b/buildit.bash -@@ -61,7 +61,7 @@ EXCLUDEMESSAGE=" -vm6058,2005,5027 " # cut down on compiler noise +@@ -63,7 +63,7 @@ EXCLUDEMESSAGE=" -vm6058,2005,5027 " # cut down on compiler noise # 6058 - note about things not being inlined # 5027 - var not used # 2005 - level 2 comment --FPCHARD=" -Cg -k-pie -k-znow " -+FPCHARD="" - AUTODOWNLOAD=FALSE # downloading large file, use -d to allow it +-FPCHARD=" -Cg -k-pie -k-znow " # might get cancelled with a NOHARDENING semaphore file. ++FPCHARD="" # might get cancelled with a NOHARDENING semaphore file. + AUTODOWNLOAD=FALSE # downloading large file, use -d to allow it # ------------------------ Some functions ------------------------ -@@ -180,8 +180,6 @@ if [ "$CPU" = "powerpc64le" ]; then # power does not like intel switches ! +@@ -196,8 +196,6 @@ if [ "$CPU" = "powerpc64le" ]; then # power does not like intel switches ! fi TARGET="$CPU-$OS" @@ -20,7 +20,7 @@ index 6606562..57b9e14 100755 CheckForQt5 # OK, if to here, we have a fpc and lazbuild, but which FPC ? -@@ -228,8 +226,8 @@ cd "$K_DIR" # WARNING, kcontrols is not part of the github zip file, its added +@@ -244,8 +242,8 @@ cd "$K_DIR" # WARNING, kcontrols is not part of the github zip file, its added # Here we build just the kmemo.pas part of kcontrols. @@ -31,7 +31,7 @@ index 6606562..57b9e14 100755 FPCKOPT=" -B -MObjFPC -Scgi -Cg -O1 -g -gl -l -vewnibq -vh- $EXCLUDEMESSAGES -Fi$K_DIR" FPCKUNITS=" -Fu$LAZ_DIR/packager/units/$TARGET -Fu$LAZ_DIR/components/lazutils/lib/$TARGET" -@@ -237,7 +235,7 @@ FPCKUNITS="$FPCKUNITS -Fu$LAZ_DIR/components/buildintf/units/$TARGET -Fu$LAZ_DIR +@@ -253,7 +251,7 @@ FPCKUNITS="$FPCKUNITS -Fu$LAZ_DIR/components/buildintf/units/$TARGET -Fu$LAZ_DIR FPCKUNITS="$FPCKUNITS -Fu$LAZ_DIR/lib/$TARGET -Fu$LAZ_DIR/lcl/units/$TARGET -Fu$LAZ_DIR/lcl/units/$TARGET/$WIDGET" FPCKUNITS="$FPCKUNITS -Fu$LAZ_DIR/components/cairocanvas/lib/$TARGET/$WIDGET -Fu$LAZ_DIR/components/lazcontrols/lib/$TARGET/$WIDGET" FPCKUNITS="$FPCKUNITS -Fu$LAZ_DIR/components/ideintf/units/$TARGET/$WIDGET -Fu$LAZ_DIR/components/printers/lib/$TARGET/$WIDGET" @@ -40,7 +40,7 @@ index 6606562..57b9e14 100755 RUNIT="$COMPILER $EXCLUDEMESSAGE $FPCKOPT $FPCHARD $LAZUNITSRC $FPCKUNITS kmemo.pas" -@@ -245,12 +243,12 @@ echo "--------------- kcontrols COMPILE COMMAND -------------" +@@ -261,12 +259,12 @@ echo "--------------- kcontrols COMPILE COMMAND -------------" echo "$RUNIT" echo "-----------------" @@ -55,7 +55,7 @@ index 6606562..57b9e14 100755 echo "ERROR failed to build KControls, exiting..." K_DIR="" exit 1 -@@ -301,7 +299,7 @@ UNITS="$UNITS -Fu$LAZ_DIR/lcl/units/$TARGET" +@@ -318,7 +316,7 @@ UNITS="$UNITS -Fu$LAZ_DIR/lcl/units/$TARGET" UNITS="$UNITS -Fu$LAZ_DIR/packager/units/$TARGET" UNITS="$UNITS -Fu$SOURCE_DIR/" @@ -64,7 +64,7 @@ index 6606562..57b9e14 100755 OPT2=" -dLCL -dLCL$WIDGET" DEFS="-dDisableLCLGIF -dDisableLCLJPEG -dDisableLCLPNM -dDisableLCLTIFF" -@@ -322,11 +320,10 @@ RUNIT="$COMPILER $OPT1 $FPCHARD $UNITS $LAZUNITSRC $OPT2 $DEFS $PROJ.lpr" +@@ -339,7 +337,7 @@ RUNIT="$COMPILER $OPT1 $FPCHARD $UNITS $LAZUNITSRC $OPT2 $DEFS $PROJ.lpr" echo "------------ tomboy-ng COMPILE COMMAND --------------------" echo "$RUNIT" @@ -72,8 +72,4 @@ index 6606562..57b9e14 100755 +TOMBOY_NG_VER="$VERSION" $RUNIT if [ ! -e "$PROJ" ]; then - echo "======================== ERROR, COMPILE FAILED source/tomboy-ng.log =====" -- cat tomboy-ng.log - echo "=========================================================== END of LOG ==" - exit 1 - else + echo "======== ERROR, COMPILE FAILED see source/tomboy-ng.log =====" From 60319a2712c06690773cce07a516d17284d17a9b Mon Sep 17 00:00:00 2001 From: Leah Amelia Chen Date: Sat, 7 Dec 2024 23:34:33 +0100 Subject: [PATCH 60/84] lla: 0.2.9 -> 0.2.10 (#362577) --- pkgs/by-name/ll/lla/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ll/lla/package.nix b/pkgs/by-name/ll/lla/package.nix index 1cf6fe437eae..ce2b8cb7ffc6 100644 --- a/pkgs/by-name/ll/lla/package.nix +++ b/pkgs/by-name/ll/lla/package.nix @@ -7,7 +7,7 @@ nix-update-script, }: let - version = "0.2.9"; + version = "0.2.10"; in rustPlatform.buildRustPackage { pname = "lla"; @@ -17,12 +17,12 @@ rustPlatform.buildRustPackage { owner = "triyanox"; repo = "lla"; rev = "refs/tags/v${version}"; - hash = "sha256-bemu4MuZYmn6LDIGxCAxIuS78alz8UE6qHhLoxtZSUk="; + hash = "sha256-zHtHlEAh170t05DO5b/vspODkqx5G9C3nt5G8dtm8wI="; }; nativeBuildInputs = [ makeBinaryWrapper ]; - cargoHash = "sha256-sjJUG32jchAG/q4y649PyTJ2kqjT+0COSvO2QM6GnV0="; + cargoHash = "sha256-ar7NEQKTdxM96dT9b9BBfYZA3zVlhN6OciKRo4ZhBSU="; cargoBuildFlags = [ "--workspace" ]; From b0d48f0a52b505c25553f52df6249252233b5caa Mon Sep 17 00:00:00 2001 From: Leah Amelia Chen Date: Sat, 7 Dec 2024 23:35:18 +0100 Subject: [PATCH 61/84] novelwriter: 2.5.2 -> 2.5.3 (#362576) --- pkgs/by-name/no/novelwriter/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/no/novelwriter/package.nix b/pkgs/by-name/no/novelwriter/package.nix index f33aa1b03a42..1c798122be50 100644 --- a/pkgs/by-name/no/novelwriter/package.nix +++ b/pkgs/by-name/no/novelwriter/package.nix @@ -7,7 +7,7 @@ nix-update-script, }: let - version = "2.5.2"; + version = "2.5.3"; in python3.pkgs.buildPythonApplication { pname = "novelwriter"; @@ -18,7 +18,7 @@ python3.pkgs.buildPythonApplication { owner = "vkbo"; repo = "novelWriter"; rev = "v${version}"; - hash = "sha256-xRSq6lBZ6jHtNve027uF2uNs3/40s0YdFN9F9O7m5VU="; + hash = "sha256-OrsDL5zpMDV2spxC0jtpuhaSWBIS6XBEWZuVxHAS/QM="; }; nativeBuildInputs = [ qt5.wrapQtAppsHook ]; From c13b9231a22836e38c44c0f46ae32bcda71124b2 Mon Sep 17 00:00:00 2001 From: Sebastian Neubauer Date: Sat, 7 Dec 2024 23:38:55 +0100 Subject: [PATCH 62/84] umr: 1.0.8 -> 1.0.10 (#362535) Update to 1.0.10 (latest tag: https://gitlab.freedesktop.org/tomstdenis/umr/-/tags) Static libs are not installed anymore, so remove `postInstall`. --- pkgs/by-name/um/umr/package.nix | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/pkgs/by-name/um/umr/package.nix b/pkgs/by-name/um/umr/package.nix index aa9b63c3d0d7..8325fe4f3654 100644 --- a/pkgs/by-name/um/umr/package.nix +++ b/pkgs/by-name/um/umr/package.nix @@ -20,14 +20,14 @@ stdenv.mkDerivation rec { pname = "umr"; - version = "1.0.8"; + version = "1.0.10"; src = fetchFromGitLab { domain = "gitlab.freedesktop.org"; owner = "tomstdenis"; repo = "umr"; rev = version; - hash = "sha256-ODkTYHDrKWNvjiEeIyfsCByf7hyr5Ps9ytbKb3253bU="; + hash = "sha256-i0pTcg1Y+G/nGZSbMtlg37z12gF4heitEl5L4gfVO9c="; }; nativeBuildInputs = [ @@ -47,11 +47,6 @@ stdenv.mkDerivation rec { bash-completion # Tries to create bash-completions in /var/empty otherwise? ]; - # Remove static libraries (there are no dynamic libraries in there) - postInstall = '' - rm -r $out/lib - ''; - passthru.updateScript = nix-update-script { }; meta = with lib; { From bd50ced026838647cb0c0d7c6499bf7016138952 Mon Sep 17 00:00:00 2001 From: Thomas Gerbet Date: Sat, 7 Dec 2024 23:48:02 +0100 Subject: [PATCH 63/84] gitsign: 0.10.2 -> 0.11.0 (#362589) Changes: https://github.com/sigstore/gitsign/releases/tag/v0.11.0 --- pkgs/by-name/gi/gitsign/package.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/gi/gitsign/package.nix b/pkgs/by-name/gi/gitsign/package.nix index abc1e6a32594..3ff679c9ae37 100644 --- a/pkgs/by-name/gi/gitsign/package.nix +++ b/pkgs/by-name/gi/gitsign/package.nix @@ -2,15 +2,15 @@ buildGoModule rec { pname = "gitsign"; - version = "0.10.2"; + version = "0.11.0"; src = fetchFromGitHub { owner = "sigstore"; repo = pname; rev = "v${version}"; - hash = "sha256-JNCz5MVqn8PeTfYUVowIVZwtpfD+Gx9yBckter6PfXA="; + hash = "sha256-103sW7X5Bddvqat9oHfkpG2BReu7g24xGH2ia0JLAjQ="; }; - vendorHash = "sha256-QW+ZWYEXkhSQR4HvmPLENzY/VEfjEX43mBPhmhsEBMI="; + vendorHash = "sha256-XzKpzEYAKQUkGT+/XQJPzEp/qYuBOnE7jWHXtmitZDI="; subPackages = [ "." @@ -18,6 +18,7 @@ buildGoModule rec { ]; nativeBuildInputs = [ makeWrapper ]; + nativeCheckInputs = [ gitMinimal ]; ldflags = [ "-s" "-w" "-X github.com/sigstore/gitsign/pkg/version.gitVersion=${version}" ]; @@ -40,5 +41,6 @@ buildGoModule rec { description = "Keyless Git signing using Sigstore"; license = lib.licenses.asl20; maintainers = with lib.maintainers; [ lesuisse developer-guy ]; + mainProgram = "gitsign"; }; } From 1e2c885bb936bb7edb1d3458f02bc80f13b03dc0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gutyina=20Gerg=C5=91?= Date: Sun, 8 Dec 2024 00:04:30 +0100 Subject: [PATCH 64/84] lurk: add aarch64-linux support (#362757) * lurk: refactor * lurk: add aarch64-linux support --- pkgs/by-name/lu/lurk/package.nix | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/pkgs/by-name/lu/lurk/package.nix b/pkgs/by-name/lu/lurk/package.nix index 3f72762eec95..daa459636fb5 100644 --- a/pkgs/by-name/lu/lurk/package.nix +++ b/pkgs/by-name/lu/lurk/package.nix @@ -10,8 +10,8 @@ rustPlatform.buildRustPackage rec { src = fetchFromGitHub { owner = "jakwai01"; - repo = pname; - rev = "v${version}"; + repo = "lurk"; + tag = "v${version}"; hash = "sha256-KiM5w0YPxEpJ4cR/8YfhWlTrffqf5Ak1eu0yxgOmqUs="; }; @@ -22,16 +22,19 @@ rustPlatform.buildRustPackage rec { --replace-fail '/usr/bin/ls' 'ls' ''; - meta = with lib; { + meta = { + changelog = "https://github.com/jakwai01/lurk/releases/tag/v${version}"; description = "Simple and pretty alternative to strace"; - mainProgram = "lurk"; homepage = "https://github.com/jakwai01/lurk"; - changelog = "https://github.com/jakwai01/lurk/releases/tag/${src.rev}"; - license = licenses.agpl3Only; - maintainers = with maintainers; [ figsoda ]; + license = lib.licenses.agpl3Only; + mainProgram = "lurk"; + maintainers = with lib.maintainers; [ + figsoda + ]; platforms = [ "i686-linux" "x86_64-linux" + "aarch64-linux" ]; }; } From 386044c2082ec86ac814e2c7cc84fdf25416f90a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Oliv=C3=A9r=20Falvai?= Date: Sun, 8 Dec 2024 00:05:23 +0100 Subject: [PATCH 65/84] broot: modernize (#362840) * broot: Darwin cleanups About withClipboard: the feature both compiles and works perfectly on Darwin now. * broot: clean up buildInputs libxcb is no longer a dependency, according to the latest Cargo.lock, xcb-sys been replaced with x11rb * broot: move to pkgs/by-name --- .../default.nix => by-name/br/broot/package.nix} | 12 +++--------- pkgs/top-level/all-packages.nix | 4 ---- 2 files changed, 3 insertions(+), 13 deletions(-) rename pkgs/{tools/misc/broot/default.nix => by-name/br/broot/package.nix} (91%) diff --git a/pkgs/tools/misc/broot/default.nix b/pkgs/by-name/br/broot/package.nix similarity index 91% rename from pkgs/tools/misc/broot/default.nix rename to pkgs/by-name/br/broot/package.nix index 38fc65a74d6c..c1c705a7d40b 100644 --- a/pkgs/tools/misc/broot/default.nix +++ b/pkgs/by-name/br/broot/package.nix @@ -7,13 +7,9 @@ , pkg-config , libgit2 , oniguruma -, libiconv -, Foundation -, Security -, xorg , zlib , buildPackages -, withClipboard ? !stdenv.hostPlatform.isDarwin +, withClipboard ? true , withTrash ? !stdenv.hostPlatform.isDarwin }: @@ -36,10 +32,8 @@ rustPlatform.buildRustPackage rec { pkg-config ]; - buildInputs = [ libgit2 oniguruma xorg.libxcb ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ - Foundation - libiconv - Security + # TODO: once https://github.com/Canop/broot/issues/956 is released, oniguruma can be removed. + buildInputs = [ libgit2 oniguruma ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ zlib ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b354419c57a3..68bb87fd22fa 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2063,10 +2063,6 @@ with pkgs; brasero = callPackage ../tools/cd-dvd/brasero/wrapper.nix { }; - broot = callPackage ../tools/misc/broot { - inherit (darwin.apple_sdk.frameworks) Foundation Security; - }; - ssdfs-utils = callPackage ../tools/filesystems/ssdfs-utils { }; btlejack = python3Packages.callPackage ../applications/radio/btlejack { }; From 4fbf61a2b62a56697df39513551ce444c17ea8f0 Mon Sep 17 00:00:00 2001 From: "Jean-Baptiste G." Date: Sun, 8 Dec 2024 00:23:06 +0100 Subject: [PATCH 66/84] gancio: add generic updateScript and update to 1.21.0 (#360430) * gancio: add generic updateScript * gancio: 1.19.4 -> 1.21.0 * gancioPlugins.telegram-bridge: 1.0.4 -> 1.0.5 --- pkgs/by-name/ga/gancio/package.nix | 6 ++++-- pkgs/by-name/ga/gancio/plugin-telegram-bridge/default.nix | 6 ++++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/ga/gancio/package.nix b/pkgs/by-name/ga/gancio/package.nix index be6523319ee2..7c3c207779c0 100644 --- a/pkgs/by-name/ga/gancio/package.nix +++ b/pkgs/by-name/ga/gancio/package.nix @@ -14,18 +14,19 @@ sqlite, nixosTests, + nix-update-script, }: stdenv.mkDerivation (finalAttrs: { pname = "gancio"; - version = "1.19.4"; + version = "1.21.0"; src = fetchFromGitLab { domain = "framagit.org"; owner = "les"; repo = "gancio"; rev = "v${finalAttrs.version}"; - hash = "sha256-x8s7eBVmHCY3kAjHjACotCncvZq6OBiLPJGF6hvfawE="; + hash = "sha256-hpOTiGU2DGOeKqggYQhdBZgFBp6S0CAQ2stpr9zzItg="; }; offlineCache = fetchYarnDeps { @@ -69,6 +70,7 @@ stdenv.mkDerivation (finalAttrs: { tests = { inherit (nixosTests) gancio; }; + updateScript = nix-update-script { }; }; meta = { diff --git a/pkgs/by-name/ga/gancio/plugin-telegram-bridge/default.nix b/pkgs/by-name/ga/gancio/plugin-telegram-bridge/default.nix index 8cd55fd38197..989ad2354952 100644 --- a/pkgs/by-name/ga/gancio/plugin-telegram-bridge/default.nix +++ b/pkgs/by-name/ga/gancio/plugin-telegram-bridge/default.nix @@ -6,18 +6,19 @@ yarnConfigHook, yarnInstallHook, nodejs, + nix-update-script, }: stdenv.mkDerivation rec { pname = "gancio-plugin-telegram-bridge"; - version = "1.0.4"; + version = "1.0.5"; src = fetchFromGitLab { domain = "framagit.org"; owner = "bcn.convocala"; repo = "gancio-plugin-telegram-bridge"; rev = "v${version}"; - hash = "sha256-Da8PxCX1Z1dKJu9AiwdRDfb1r1P2KiZe8BClYB9Rz48="; + hash = "sha256-URiyV7bl8t25NlVJM/gEqPB67TZ4vQdfu4mvHITteSQ="; }; # upstream doesn't provide a yarn.lock file @@ -43,6 +44,7 @@ stdenv.mkDerivation rec { passthru = { inherit nodejs; + updateScript = nix-update-script { }; }; meta = { From 583501865ae8f55e1d8651e65ccd99bb2631eb7e Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Mon, 2 Dec 2024 00:45:16 +0100 Subject: [PATCH 67/84] quodlibet: Auto-inject libsoup_3 dependency --- pkgs/applications/audio/quodlibet/default.nix | 4 ++-- pkgs/top-level/all-packages.nix | 5 ----- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/pkgs/applications/audio/quodlibet/default.nix b/pkgs/applications/audio/quodlibet/default.nix index 7a0063238d49..d4d8b736acc2 100644 --- a/pkgs/applications/audio/quodlibet/default.nix +++ b/pkgs/applications/audio/quodlibet/default.nix @@ -20,7 +20,7 @@ libappindicator-gtk3, libmodplug, librsvg, - libsoup, + libsoup_3, webkitgtk_4_0, # optional features @@ -89,7 +89,7 @@ python3.pkgs.buildPythonApplication { keybinder3 libappindicator-gtk3 libmodplug - libsoup + libsoup_3 webkitgtk_4_0 ] ++ lib.optionals (withXineBackend) [ xine-lib ] diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 68bb87fd22fa..0ebb3376a153 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15351,17 +15351,14 @@ with pkgs; keybinder3 = null; libappindicator-gtk3 = null; libmodplug = null; - libsoup = libsoup_3; }; quodlibet-without-gst-plugins = quodlibet.override { - libsoup = libsoup_3; tag = "-without-gst-plugins"; withGstPlugins = false; }; quodlibet-xine = quodlibet.override { - libsoup = libsoup_3; tag = "-xine"; withGstreamerBackend = false; withXineBackend = true; @@ -15373,7 +15370,6 @@ with pkgs; keybinder3 = keybinder3; libappindicator-gtk3 = libappindicator-gtk3; libmodplug = libmodplug; - libsoup = libsoup_3; tag = "-full"; withDbusPython = true; withMusicBrainzNgs = true; @@ -15383,7 +15379,6 @@ with pkgs; }; quodlibet-xine-full = quodlibet-full.override { - libsoup = libsoup_3; tag = "-xine-full"; withGstreamerBackend = false; withXineBackend = true; From 0d60f6f66cafa2dc5048609264fd552275bd6e33 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Mon, 2 Dec 2024 00:46:16 +0100 Subject: [PATCH 68/84] quodlibet: Remove webkitgtk dependency It is unused since 4.5.0: https://github.com/quodlibet/quodlibet/commit/b973220cccc9f3cdb411e68f595d2c79bf4bf76a --- pkgs/applications/audio/quodlibet/default.nix | 2 -- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/pkgs/applications/audio/quodlibet/default.nix b/pkgs/applications/audio/quodlibet/default.nix index d4d8b736acc2..ee2b4f8a842b 100644 --- a/pkgs/applications/audio/quodlibet/default.nix +++ b/pkgs/applications/audio/quodlibet/default.nix @@ -21,7 +21,6 @@ libmodplug, librsvg, libsoup_3, - webkitgtk_4_0, # optional features withDbusPython ? false, @@ -90,7 +89,6 @@ python3.pkgs.buildPythonApplication { libappindicator-gtk3 libmodplug libsoup_3 - webkitgtk_4_0 ] ++ lib.optionals (withXineBackend) [ xine-lib ] ++ lib.optionals (withGstreamerBackend) ( diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0ebb3376a153..4549a4d068ec 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15365,7 +15365,7 @@ with pkgs; }; quodlibet-full = quodlibet.override { - inherit gtksourceview webkitgtk_4_0; + inherit gtksourceview; kakasi = kakasi; keybinder3 = keybinder3; libappindicator-gtk3 = libappindicator-gtk3; From 78b998647fbfc39796d2710d78318153637b453d Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Mon, 2 Dec 2024 00:48:39 +0100 Subject: [PATCH 69/84] wealthfolio: Use libsoup 3.0 WebKitGTK 4.1 ABI requires libsoup 3.0. It probably only worked because `webkitgtk_4_1` propagates `libsoup_3` and we were lucky that that version got picked up. --- pkgs/by-name/we/wealthfolio/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/we/wealthfolio/package.nix b/pkgs/by-name/we/wealthfolio/package.nix index a3586299ad25..fd9b1311182c 100644 --- a/pkgs/by-name/we/wealthfolio/package.nix +++ b/pkgs/by-name/we/wealthfolio/package.nix @@ -3,7 +3,7 @@ stdenv, fetchFromGitHub, cargo-tauri, - libsoup, + libsoup_3, nodejs, openssl, pkg-config, @@ -48,7 +48,7 @@ stdenv.mkDerivation (finalAttrs: { ]; buildInputs = [ - libsoup + libsoup_3 openssl webkitgtk_4_1 ]; From fd26de120c5dddbb87979ba1e2cd215b5a5fcf22 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Mon, 2 Dec 2024 00:48:45 +0100 Subject: [PATCH 70/84] snx-rs: Use libsoup 3.0 WebKitGTK 4.1 ABI requires libsoup 3.0. It probably only worked because `webkitgtk_4_1` propagates `libsoup_3` and we were lucky that that version got picked up. --- pkgs/by-name/sn/snx-rs/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/sn/snx-rs/package.nix b/pkgs/by-name/sn/snx-rs/package.nix index 29468c2f669f..caf3f333e812 100644 --- a/pkgs/by-name/sn/snx-rs/package.nix +++ b/pkgs/by-name/sn/snx-rs/package.nix @@ -1,4 +1,4 @@ -{ fetchFromGitHub, rustPlatform, lib, pkg-config, openssl, glib, atk, gtk3, libsoup, webkitgtk_4_1 }: +{ fetchFromGitHub, rustPlatform, lib, pkg-config, openssl, glib, atk, gtk3, libsoup_3, webkitgtk_4_1 }: rustPlatform.buildRustPackage { pname = "snx-rs"; version = "2.2.3"; @@ -11,7 +11,7 @@ rustPlatform.buildRustPackage { }; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ openssl glib atk gtk3 libsoup webkitgtk_4_1 ]; + buildInputs = [ openssl glib atk gtk3 libsoup_3 webkitgtk_4_1 ]; checkFlags = [ "--skip=platform::linux::net::tests::test_default_ip" From a5c8eba19573bce7a4945e39e942323527a27629 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Mon, 2 Dec 2024 00:48:57 +0100 Subject: [PATCH 71/84] spacedrive: Use libsoup 3.0 WebKitGTK 4.1 ABI requires libsoup 3.0. It probably only worked because `webkitgtk_4_1` propagates `libsoup_3` and we were lucky that that version got picked up. --- pkgs/by-name/sp/spacedrive/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/sp/spacedrive/package.nix b/pkgs/by-name/sp/spacedrive/package.nix index db17baa6534b..fb1e74801f9c 100644 --- a/pkgs/by-name/sp/spacedrive/package.nix +++ b/pkgs/by-name/sp/spacedrive/package.nix @@ -10,7 +10,7 @@ gdk-pixbuf, glib, gst_all_1, - libsoup, + libsoup_3, webkitgtk_4_1, xdotool, }: @@ -106,7 +106,7 @@ else buildInputs = [ xdotool glib - libsoup + libsoup_3 webkitgtk_4_1 gdk-pixbuf gst_all_1.gst-plugins-ugly From 6d753d5c11f92e948c68262e84c68b9dce68191f Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Mon, 2 Dec 2024 00:49:08 +0100 Subject: [PATCH 72/84] overlayed: Use libsoup 3.0 WebKitGTK 4.1 ABI requires libsoup 3.0. It probably only worked because `webkitgtk_4_1` propagates `libsoup_3` and we were lucky that that version got picked up. --- pkgs/by-name/ov/overlayed/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ov/overlayed/package.nix b/pkgs/by-name/ov/overlayed/package.nix index 05cf017825a7..be11066b305e 100644 --- a/pkgs/by-name/ov/overlayed/package.nix +++ b/pkgs/by-name/ov/overlayed/package.nix @@ -4,7 +4,7 @@ callPackage, pkg-config, openssl, - libsoup, + libsoup_3, webkitgtk_4_1, fetchFromGitHub, libayatana-appindicator, @@ -35,7 +35,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ openssl webkitgtk_4_1 - libsoup + libsoup_3 ]; env = { From c430f93990443d9819bd7c75ca7bc5fda44d002b Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sun, 1 Dec 2024 22:42:17 +0100 Subject: [PATCH 73/84] nghttp2: Use libsoup_3 in passthru.tests libsoup 2.4 is actually not using this library, only libsoup_3 is. --- pkgs/by-name/ng/nghttp2/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ng/nghttp2/package.nix b/pkgs/by-name/ng/nghttp2/package.nix index 64e1e255c30b..f17bd6487ddd 100644 --- a/pkgs/by-name/ng/nghttp2/package.nix +++ b/pkgs/by-name/ng/nghttp2/package.nix @@ -18,7 +18,7 @@ # downstream dependencies, for testing , curl -, libsoup +, libsoup_3 }: # Note: this package is used for bootstrapping fetchurl, and thus cannot use fetchpatch! @@ -88,7 +88,7 @@ stdenv.mkDerivation rec { ''; passthru.tests = { - inherit curl libsoup; + inherit curl libsoup_3; }; meta = with lib; { From dab3496fa266e098d512accda47f2a80de40be73 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Mon, 2 Dec 2024 00:57:46 +0100 Subject: [PATCH 74/84] gnome2: Remove rest of the aliases No-one should be using gnome2 nowadays. --- pkgs/desktops/gnome-2/default.nix | 45 +++++++++++++++++-------------- 1 file changed, 25 insertions(+), 20 deletions(-) diff --git a/pkgs/desktops/gnome-2/default.nix b/pkgs/desktops/gnome-2/default.nix index 67af761d3a38..b2316891f942 100644 --- a/pkgs/desktops/gnome-2/default.nix +++ b/pkgs/desktops/gnome-2/default.nix @@ -32,27 +32,32 @@ lib.makeScope pkgs.newScope (self: with self; { }; } // lib.optionalAttrs config.allowAliases { - inherit (pkgs) - # GTK Libs - glib glibmm atk atkmm cairo pango pangomm gtkmm2 libcanberra-gtk2 + # added 2024-12-02 + glib = throw "gnome2.glib has been removed, please use top-level glib"; + glibmm = throw "gnome2.glibmm has been removed, please use top-level glibmm"; + atk = throw "gnome2.atk has been removed, please use top-level atk"; + atkmm = throw "gnome2.atkmm has been removed, please use top-level atkmm"; + cairo = throw "gnome2.cairo has been removed, please use top-level cairo"; + pango = throw "gnome2.pango has been removed, please use top-level pango"; + pangomm = throw "gnome2.pangomm has been removed, please use top-level pangomm"; + gtkmm2 = throw "gnome2.gtkmm2 has been removed, please use top-level gtkmm2"; + libcanberra-gtk2 = throw "gnome2.libcanberra-gtk2 has been removed, please use top-level libcanberra-gtk2"; + libsoup = throw "gnome2.libsoup has been removed, please use top-level libsoup"; + libwnck2 = throw "gnome2.libwnck2 has been removed, please use top-level libwnck2"; + gtk-doc = throw "gnome2.gtk-doc has been removed, please use top-level gtk-doc"; + gnome-doc-utils = throw "gnome2.gnome-doc-utils has been removed, please use top-level gnome-doc-utils"; + gvfs = throw "gnome2.gvfs has been removed, please use top-level gvfs"; + gtk = throw "gnome2.gtk has been removed, please use top-level gtk2"; + gtkmm = throw "gnome2.gtkmm has been removed, please use top-level gtkmm2"; + gtkdoc = throw "gnome2.gtkdoc has been removed, please use top-level gtk-doc"; + startup_notification = throw "gnome2.startup_notification has been removed, please use top-level libstartup_notification"; + startupnotification = throw "gnome2.startupnotification has been removed, please use top-level libstartup_notification"; + gnomedocutils = throw "gnome2.gnomedocutils has been removed, please use top-level gnome-doc-utils"; + gnome-icon-theme = throw "gnome2.gnome-icon-theme has been removed, please use top-level gnome-icon-theme"; + gnome_icon_theme = throw "gnome2.gnome_icon_theme has been removed, please use top-level gnome-icon-theme"; + gnomeicontheme = throw "gnome2.gnomeicontheme has been removed, please use top-level gnome-icon-theme"; + gnome_common = throw "gnome2.gnome_common has been removed, please use top-level gnome-common"; - # Included for backwards compatibility - libsoup libwnck2 gtk-doc gnome-doc-utils - - gvfs # added 2019-09-03 - ; - - gtk = pkgs.gtk2; - gtkmm = pkgs.gtkmm2; - - gtkdoc = pkgs.gtk-doc; - startup_notification = pkgs.libstartup_notification; - startupnotification = pkgs.libstartup_notification; - gnomedocutils = pkgs.gnome-doc-utils; - gnome-icon-theme = pkgs.gnome-icon-theme; - gnome_icon_theme = self.gnome-icon-theme; - gnomeicontheme = self.gnome-icon-theme; - gnome_common = gnome-common; gnome_python = throw "gnome2.gnome_python has been removed"; # 2023-01-14 gnome_python_desktop = throw "gnome2.gnome_python_desktop has been removed"; # 2023-01-14 gnome_vfs = throw "gnome2.gnome_vfs has been removed"; # 2024-06-27 From 9f377dfe6999e83b856df7040a947bf4dddf2683 Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Wed, 4 Dec 2024 12:33:15 +0100 Subject: [PATCH 75/84] haskellPackages.cabal2nix-unstable: 2024-10-17 -> 2024-12-04 This emits versioned libsoup_* attributes in hackage-packages.nix and (unrelatedly) adds support for opencascade-*, thus closes #359831. --- pkgs/development/haskell-modules/cabal2nix-unstable.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/haskell-modules/cabal2nix-unstable.nix b/pkgs/development/haskell-modules/cabal2nix-unstable.nix index 3e925417d644..41c4a36ec2ee 100644 --- a/pkgs/development/haskell-modules/cabal2nix-unstable.nix +++ b/pkgs/development/haskell-modules/cabal2nix-unstable.nix @@ -8,10 +8,10 @@ }: mkDerivation { pname = "cabal2nix"; - version = "unstable-2024-10-17"; + version = "unstable-2024-12-04"; src = fetchzip { - url = "https://github.com/NixOS/cabal2nix/archive/b8eb82f8bc907b42dfb463cab62e49fbe2fff997.tar.gz"; - sha256 = "1fxqigr002ssgz1l62rc7k04q4q0hwcl2wqy7l2shylxqf7yfcd6"; + url = "https://github.com/NixOS/cabal2nix/archive/af1bc25377f7a44e008def494bda77a83578d9be.tar.gz"; + sha256 = "0jjsy77vm88x81a5pwq5nhgnbiywjza8qyjsr2kclsdh860m3hmp"; }; postUnpack = "sourceRoot+=/cabal2nix; echo source root reset to $sourceRoot"; isLibrary = true; From 064ee2cb49669ddf6aa88c91cc84eb328159244a Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sun, 1 Dec 2024 23:27:07 +0100 Subject: [PATCH 76/84] libsoup_2_4: Rename from libsoup The 2.4 ABI branch has not been supported by upstream for a while now but people still keep accidentally adding it to new packages. --- pkgs/applications/audio/pragha/default.nix | 4 +- .../graphics/inkscape/default.nix | 4 +- .../networking/browsers/surf/default.nix | 4 +- .../instant-messengers/dino/default.nix | 6 +-- .../remote/citrix-workspace/generic.nix | 4 +- pkgs/applications/office/grisbi/default.nix | 4 +- pkgs/by-name/al/alcom/package.nix | 4 +- pkgs/by-name/an/ansel/package.nix | 4 +- pkgs/by-name/ar/ario/package.nix | 4 +- pkgs/by-name/aw/aws-workspaces/package.nix | 4 +- pkgs/by-name/ca/cargo-tauri_1/package.nix | 4 +- .../ca/catppuccinifier-gui/package.nix | 4 +- pkgs/by-name/da/darktable/package.nix | 4 +- pkgs/by-name/de/desktop-postflop/package.nix | 4 +- pkgs/by-name/dl/dleyna-renderer/package.nix | 4 +- pkgs/by-name/dl/dleyna-server/package.nix | 4 +- pkgs/by-name/en/en-croissant/package.nix | 4 +- pkgs/by-name/fo/fondo/package.nix | 4 +- pkgs/by-name/ga/gamehub/package.nix | 4 +- pkgs/by-name/ge/geocode-glib/package.nix | 6 +-- pkgs/by-name/gf/gfbgraph/package.nix | 4 +- pkgs/by-name/gi/gitbutler/package.nix | 4 +- pkgs/by-name/gn/gnome-recipes/package.nix | 4 +- pkgs/by-name/gp/gpauth/package.nix | 4 +- pkgs/by-name/gt/gthumb/package.nix | 4 +- pkgs/by-name/ha/hardinfo/package.nix | 4 +- pkgs/by-name/hq/hqplayerd/rygel.nix | 4 +- pkgs/by-name/in/insulator2/package.nix | 4 +- pkgs/by-name/in/intune-portal/package.nix | 4 +- pkgs/by-name/li/libchamplain/package.nix | 4 +- pkgs/by-name/li/libepc/package.nix | 4 +- pkgs/by-name/li/libgdata/package.nix | 4 +- .../by-name/li/libhttpseverywhere/package.nix | 4 +- .../li/libxplayer-plparser/package.nix | 4 +- pkgs/by-name/li/libzapojit/package.nix | 4 +- pkgs/by-name/ma/markets/package.nix | 4 +- pkgs/by-name/me/meteo/package.nix | 4 +- pkgs/by-name/mi/midori-unwrapped/package.nix | 4 +- pkgs/by-name/mo/mouse-actions-gui/package.nix | 4 +- pkgs/by-name/os/osm-gps-map/package.nix | 4 +- pkgs/by-name/os/ostree/package.nix | 4 +- pkgs/by-name/po/pot/package.nix | 4 +- pkgs/by-name/sp/spice-up/package.nix | 4 +- pkgs/by-name/sq/squirreldisk/package.nix | 4 +- pkgs/by-name/ta/taxi/package.nix | 4 +- pkgs/by-name/te/telepathy-gabble/package.nix | 4 +- pkgs/by-name/ti/timezonemap/package.nix | 4 +- pkgs/by-name/tr/treedome/package.nix | 4 +- pkgs/by-name/tu/tuner/package.nix | 4 +- pkgs/by-name/uh/uhttpmock/package.nix | 4 +- pkgs/by-name/va/valum/package.nix | 4 +- pkgs/by-name/vi/vimb-unwrapped/package.nix | 4 +- pkgs/by-name/xp/xplorer/package.nix | 4 +- pkgs/desktops/gnome-2/default.nix | 2 +- pkgs/desktops/mate/libmateweather/default.nix | 4 +- .../pantheon/apps/elementary-code/default.nix | 4 +- .../applications-menu/default.nix | 4 +- .../wingpanel-indicators/datetime/default.nix | 4 +- .../xfce4-weather-plugin/default.nix | 4 +- .../haskell-modules/hackage-packages.nix | 41 ++++++------------- .../libraries/gsignond/plugins/lastfm.nix | 4 +- .../libraries/gsignond/plugins/oauth.nix | 4 +- pkgs/development/libraries/gssdp/default.nix | 4 +- pkgs/development/libraries/gupnp/default.nix | 4 +- .../development/libraries/libgrss/default.nix | 4 +- .../development/libraries/librest/default.nix | 4 +- pkgs/development/tools/devpod/default.nix | 4 +- .../tools/flatpak-builder/default.nix | 4 +- pkgs/games/heroic/fhsenv.nix | 2 +- .../networking/networkmanager/default.nix | 4 +- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 5 ++- .../top-level/pkg-config/pkg-config-data.json | 2 +- 73 files changed, 156 insertions(+), 169 deletions(-) diff --git a/pkgs/applications/audio/pragha/default.nix b/pkgs/applications/audio/pragha/default.nix index 00c442e7f58c..8cb57f200d2e 100644 --- a/pkgs/applications/audio/pragha/default.nix +++ b/pkgs/applications/audio/pragha/default.nix @@ -22,7 +22,7 @@ , libcdio-paranoia, withCD ? true , keybinder3, withKeybinder ? false , libnotify, withLibnotify ? false -, libsoup, withLibsoup ? false +, libsoup_2_4, withLibsoup ? false , libgudev, withGudev ? false # experimental , libmtp, withMtp ? false # experimental , xfce, withXfce4ui ? false @@ -73,7 +73,7 @@ mkDerivation rec { ++ lib.optional withLibnotify libnotify ++ lib.optional withLastfm liblastfmSF ++ lib.optional withGlyr glyr - ++ lib.optional withLibsoup libsoup + ++ lib.optional withLibsoup libsoup_2_4 ++ lib.optional withMtp libmtp ++ lib.optional withXfce4ui xfce.libxfce4ui ++ lib.optional withTotemPlParser totem-pl-parser diff --git a/pkgs/applications/graphics/inkscape/default.nix b/pkgs/applications/graphics/inkscape/default.nix index 62f485ff916e..d80b7e820261 100644 --- a/pkgs/applications/graphics/inkscape/default.nix +++ b/pkgs/applications/graphics/inkscape/default.nix @@ -27,7 +27,7 @@ , librevenge , librsvg , libsigcxx -, libsoup +, libsoup_2_4 , libvisio , libwpg , libXft @@ -155,7 +155,7 @@ stdenv.mkDerivation rec { librevenge librsvg # for loading icons libsigcxx - libsoup + libsoup_2_4 libvisio libwpg libXft diff --git a/pkgs/applications/networking/browsers/surf/default.nix b/pkgs/applications/networking/browsers/surf/default.nix index 990036a8045e..3e98ff068c97 100644 --- a/pkgs/applications/networking/browsers/surf/default.nix +++ b/pkgs/applications/networking/browsers/surf/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchgit , pkg-config, wrapGAppsHook3 -, glib, gcr, glib-networking, gsettings-desktop-schemas, gtk, libsoup, webkitgtk_4_0 +, glib, gcr, glib-networking, gsettings-desktop-schemas, gtk, libsoup_2_4, webkitgtk_4_0 , xorg, dmenu, findutils, gnused, coreutils, gst_all_1 , patches ? null }: @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { glib-networking gsettings-desktop-schemas gtk - libsoup + libsoup_2_4 webkitgtk_4_0 ] ++ (with gst_all_1; [ # Audio & video support for webkitgtk WebView diff --git a/pkgs/applications/networking/instant-messengers/dino/default.nix b/pkgs/applications/networking/instant-messengers/dino/default.nix index dd5f8f54c745..147db575ae63 100644 --- a/pkgs/applications/networking/instant-messengers/dino/default.nix +++ b/pkgs/applications/networking/instant-messengers/dino/default.nix @@ -3,7 +3,7 @@ , vala, cmake, ninja, wrapGAppsHook4, pkg-config, gettext , gobject-introspection, glib, gdk-pixbuf, gtk4, glib-networking , libadwaita -, libnotify, libsoup, libgee +, libnotify, libsoup_2_4, libgee , libsignal-protocol-c , libgcrypt , sqlite @@ -62,7 +62,7 @@ stdenv.mkDerivation (finalAttrs: { libnotify gpgme libgcrypt - libsoup + libsoup_2_4 pcre2 icu libsignal-protocol-c @@ -90,7 +90,7 @@ stdenv.mkDerivation (finalAttrs: { "-DXGETTEXT_EXECUTABLE=${lib.getBin buildPackages.gettext}/bin/xgettext" "-DMSGFMT_EXECUTABLE=${lib.getBin buildPackages.gettext}/bin/msgfmt" "-DGLIB_COMPILE_RESOURCES_EXECUTABLE=${lib.getDev buildPackages.glib}/bin/glib-compile-resources" - "-DSOUP_VERSION=${lib.versions.major libsoup.version}" + "-DSOUP_VERSION=${lib.versions.major libsoup_2_4.version}" ]; # Undefined symbols for architecture arm64: "_gpg_strerror" diff --git a/pkgs/applications/networking/remote/citrix-workspace/generic.nix b/pkgs/applications/networking/remote/citrix-workspace/generic.nix index 015a723d116a..fc39b4ce622f 100644 --- a/pkgs/applications/networking/remote/citrix-workspace/generic.nix +++ b/pkgs/applications/networking/remote/citrix-workspace/generic.nix @@ -1,6 +1,6 @@ { lib, stdenv, requireFile, makeWrapper, autoPatchelfHook, wrapGAppsHook3, which, more , file, atk, alsa-lib, cairo, fontconfig, gdk-pixbuf, glib, webkitgtk_4_0, gtk2-x11, gtk3 -, heimdal, krb5, libsoup, libvorbis, speex, openssl, zlib, xorg, pango, gtk2 +, heimdal, krb5, libsoup_2_4, libvorbis, speex, openssl, zlib, xorg, pango, gtk2 , gnome2, mesa, nss, nspr, gtk_engines, freetype, dconf, libpng12, libxml2 , libjpeg, libredirect, tzdata, cacert, systemd, libcxx, symlinkJoin , libpulseaudio, pcsclite, glib-networking, llvmPackages_12, opencv4 @@ -103,7 +103,7 @@ stdenv.mkDerivation rec { libpng12 libpulseaudio libsecret - libsoup + libsoup_2_4 libvorbis libxml2 llvmPackages_12.libunwind diff --git a/pkgs/applications/office/grisbi/default.nix b/pkgs/applications/office/grisbi/default.nix index 911ed9715320..16c2652be526 100644 --- a/pkgs/applications/office/grisbi/default.nix +++ b/pkgs/applications/office/grisbi/default.nix @@ -6,7 +6,7 @@ , libofx , intltool , wrapGAppsHook3 -, libsoup +, libsoup_2_4 , adwaita-icon-theme }: @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { gtk libgsf libofx - libsoup + libsoup_2_4 adwaita-icon-theme ]; diff --git a/pkgs/by-name/al/alcom/package.nix b/pkgs/by-name/al/alcom/package.nix index f61070487d0d..4c8351d0a650 100644 --- a/pkgs/by-name/al/alcom/package.nix +++ b/pkgs/by-name/al/alcom/package.nix @@ -8,7 +8,7 @@ glib-networking, google-fonts, lib, - libsoup, + libsoup_2_4, nodejs, npmHooks, openssl, @@ -70,7 +70,7 @@ rustPlatform.buildRustPackage { [ openssl ] ++ lib.optionals stdenv.hostPlatform.isLinux [ glib-networking - libsoup + libsoup_2_4 webkitgtk_4_0 ] ++ dotnetSdk.packages diff --git a/pkgs/by-name/an/ansel/package.nix b/pkgs/by-name/an/ansel/package.nix index 67ee8d878706..f8a33a0c4041 100644 --- a/pkgs/by-name/an/ansel/package.nix +++ b/pkgs/by-name/an/ansel/package.nix @@ -44,7 +44,7 @@ , isocodes , libpsl , libepoxy -, libsoup +, libsoup_2_4 , exiv2 , libXtst , libthai @@ -138,7 +138,7 @@ stdenv.mkDerivation { libsecret libselinux libsepol - libsoup + libsoup_2_4 libsysprof-capture libthai libwebp diff --git a/pkgs/by-name/ar/ario/package.nix b/pkgs/by-name/ar/ario/package.nix index 2231031d0481..cf4065a8e9d1 100644 --- a/pkgs/by-name/ar/ario/package.nix +++ b/pkgs/by-name/ar/ario/package.nix @@ -10,7 +10,7 @@ , gettext , gtk3 , libmpdclient -, libsoup +, libsoup_2_4 , libxml2 , taglib , wrapGAppsHook3 @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { dbus-glib gtk3 libmpdclient - libsoup + libsoup_2_4 libxml2 taglib ]; diff --git a/pkgs/by-name/aw/aws-workspaces/package.nix b/pkgs/by-name/aw/aws-workspaces/package.nix index 9598f6118cb1..5dad38307896 100644 --- a/pkgs/by-name/aw/aws-workspaces/package.nix +++ b/pkgs/by-name/aw/aws-workspaces/package.nix @@ -14,7 +14,7 @@ , webkitgtk_4_0 , librsvg , gdk-pixbuf -, libsoup +, libsoup_2_4 , glib-networking , graphicsmagick_q16 , libva @@ -57,7 +57,7 @@ stdenv.mkDerivation (finalAttrs: { webkitgtk_4_0 librsvg gdk-pixbuf - libsoup + libsoup_2_4 glib-networking graphicsmagick_q16 hiredis diff --git a/pkgs/by-name/ca/cargo-tauri_1/package.nix b/pkgs/by-name/ca/cargo-tauri_1/package.nix index 7ee93d6642cc..3ec0a69ddcbd 100644 --- a/pkgs/by-name/ca/cargo-tauri_1/package.nix +++ b/pkgs/by-name/ca/cargo-tauri_1/package.nix @@ -6,7 +6,7 @@ cargo-tauri, cargo-tauri_1, gtk3, - libsoup, + libsoup_2_4, openssl, webkitgtk_4_0, }: @@ -40,7 +40,7 @@ cargo-tauri.overrideAttrs ( [ openssl ] ++ lib.optionals stdenv.hostPlatform.isLinux [ gtk3 - libsoup + libsoup_2_4 webkitgtk_4_0 ]; diff --git a/pkgs/by-name/ca/catppuccinifier-gui/package.nix b/pkgs/by-name/ca/catppuccinifier-gui/package.nix index 101ba9bb74ce..7c3c44b13791 100644 --- a/pkgs/by-name/ca/catppuccinifier-gui/package.nix +++ b/pkgs/by-name/ca/catppuccinifier-gui/package.nix @@ -8,7 +8,7 @@ cairo, stdenv, librsvg, - libsoup, + libsoup_2_4, fetchzip, openssl_3, webkitgtk_4_0, @@ -43,7 +43,7 @@ stdenv.mkDerivation { gtk3 cairo gdk-pixbuf - libsoup + libsoup_2_4 glib dbus openssl_3 diff --git a/pkgs/by-name/da/darktable/package.nix b/pkgs/by-name/da/darktable/package.nix index e3a32dba4658..ee1a83dd1da9 100644 --- a/pkgs/by-name/da/darktable/package.nix +++ b/pkgs/by-name/da/darktable/package.nix @@ -1,7 +1,7 @@ { lib , stdenv , fetchurl -, libsoup +, libsoup_2_4 , graphicsmagick , json-glib , wrapGAppsHook3 @@ -86,7 +86,7 @@ stdenv.mkDerivation rec { openexr_3 sqlite libxslt - libsoup + libsoup_2_4 graphicsmagick json-glib openjpeg diff --git a/pkgs/by-name/de/desktop-postflop/package.nix b/pkgs/by-name/de/desktop-postflop/package.nix index 0eb643a44b04..98136e89ea97 100644 --- a/pkgs/by-name/de/desktop-postflop/package.nix +++ b/pkgs/by-name/de/desktop-postflop/package.nix @@ -6,7 +6,7 @@ , makeDesktopItem , pkg-config , gtk3 -, libsoup +, libsoup_2_4 , webkitgtk_4_0 }: @@ -57,7 +57,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ gtk3 - libsoup + libsoup_2_4 webkitgtk_4_0 ]; diff --git a/pkgs/by-name/dl/dleyna-renderer/package.nix b/pkgs/by-name/dl/dleyna-renderer/package.nix index 61574df27c19..cefe7e90fd0f 100644 --- a/pkgs/by-name/dl/dleyna-renderer/package.nix +++ b/pkgs/by-name/dl/dleyna-renderer/package.nix @@ -11,7 +11,7 @@ , gupnp , gupnp-av , gupnp-dlna -, libsoup +, libsoup_2_4 , makeWrapper , docbook-xsl-nons , libxslt @@ -57,7 +57,7 @@ stdenv.mkDerivation rec { gupnp gupnp-av gupnp-dlna - libsoup + libsoup_2_4 ]; preFixup = '' diff --git a/pkgs/by-name/dl/dleyna-server/package.nix b/pkgs/by-name/dl/dleyna-server/package.nix index cec03d84c649..ff24f5bf7c56 100644 --- a/pkgs/by-name/dl/dleyna-server/package.nix +++ b/pkgs/by-name/dl/dleyna-server/package.nix @@ -12,7 +12,7 @@ , gupnp , gupnp-av , gupnp-dlna -, libsoup +, libsoup_2_4 }: stdenv.mkDerivation rec { @@ -51,7 +51,7 @@ stdenv.mkDerivation rec { gupnp gupnp-av gupnp-dlna - libsoup + libsoup_2_4 ]; preFixup = '' diff --git a/pkgs/by-name/en/en-croissant/package.nix b/pkgs/by-name/en/en-croissant/package.nix index 62acfc4a55bc..6b8ea3e50f11 100644 --- a/pkgs/by-name/en/en-croissant/package.nix +++ b/pkgs/by-name/en/en-croissant/package.nix @@ -12,7 +12,7 @@ makeBinaryWrapper, openssl, - libsoup, + libsoup_2_4, webkitgtk_4_0, gst_all_1, apple-sdk_11, @@ -54,7 +54,7 @@ rustPlatform.buildRustPackage rec { buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ openssl - libsoup + libsoup_2_4 webkitgtk_4_0 gst_all_1.gstreamer gst_all_1.gst-plugins-base diff --git a/pkgs/by-name/fo/fondo/package.nix b/pkgs/by-name/fo/fondo/package.nix index 16fcd734286a..daaeb2b74f9b 100644 --- a/pkgs/by-name/fo/fondo/package.nix +++ b/pkgs/by-name/fo/fondo/package.nix @@ -13,7 +13,7 @@ , gtk3 , libgee , libhandy -, libsoup +, libsoup_2_4 , json-glib , glib-networking , desktop-file-utils @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { json-glib libgee libhandy - libsoup + libsoup_2_4 pantheon.granite ]; diff --git a/pkgs/by-name/ga/gamehub/package.nix b/pkgs/by-name/ga/gamehub/package.nix index 4367de30f5d9..731a8678f2cf 100644 --- a/pkgs/by-name/ga/gamehub/package.nix +++ b/pkgs/by-name/ga/gamehub/package.nix @@ -10,7 +10,7 @@ , gtk3 , glib-networking , libgee -, libsoup +, libsoup_2_4 , json-glib , sqlite , webkitgtk_4_0 @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { json-glib libgee libmanette - libsoup + libsoup_2_4 libXtst sqlite webkitgtk_4_0 diff --git a/pkgs/by-name/ge/geocode-glib/package.nix b/pkgs/by-name/ge/geocode-glib/package.nix index c33b2cd6d391..b459ad08f662 100644 --- a/pkgs/by-name/ge/geocode-glib/package.nix +++ b/pkgs/by-name/ge/geocode-glib/package.nix @@ -10,7 +10,7 @@ , docbook-xsl-nons , gobject-introspection , gnome -, libsoup +, libsoup_2_4 , json-glib , glib , nixosTests @@ -45,12 +45,12 @@ stdenv.mkDerivation rec { buildInputs = [ glib - libsoup + libsoup_2_4 json-glib ]; mesonFlags = [ - "-Dsoup2=${lib.boolToString (lib.versionOlder libsoup.version "2.99")}" + "-Dsoup2=${lib.boolToString (lib.versionOlder libsoup_2_4.version "2.99")}" "-Dinstalled_test_prefix=${placeholder "installedTests"}" ]; diff --git a/pkgs/by-name/gf/gfbgraph/package.nix b/pkgs/by-name/gf/gfbgraph/package.nix index b099a2dd10e3..2affe005284c 100644 --- a/pkgs/by-name/gf/gfbgraph/package.nix +++ b/pkgs/by-name/gf/gfbgraph/package.nix @@ -6,7 +6,7 @@ , librest , gnome-online-accounts , gnome -, libsoup +, libsoup_2_4 , json-glib , gobject-introspection , gtk-doc @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { ]; propagatedBuildInputs = [ - libsoup + libsoup_2_4 json-glib librest ]; diff --git a/pkgs/by-name/gi/gitbutler/package.nix b/pkgs/by-name/gi/gitbutler/package.nix index c3ee127b2bd9..e6abb70723ce 100644 --- a/pkgs/by-name/gi/gitbutler/package.nix +++ b/pkgs/by-name/gi/gitbutler/package.nix @@ -15,7 +15,7 @@ jq, nodejs, pkg-config, - libsoup, + libsoup_2_4, moreutils, openssl, rust, @@ -70,7 +70,7 @@ rustPlatform.buildRustPackage rec { [ openssl ] ++ lib.optionals stdenv.hostPlatform.isLinux [ glib-networking - libsoup + libsoup_2_4 webkitgtk_4_0 ] ++ lib.optionals stdenv.hostPlatform.isDarwin ( diff --git a/pkgs/by-name/gn/gnome-recipes/package.nix b/pkgs/by-name/gn/gnome-recipes/package.nix index ecc6413fe0f1..09a38f2cc506 100644 --- a/pkgs/by-name/gn/gnome-recipes/package.nix +++ b/pkgs/by-name/gn/gnome-recipes/package.nix @@ -11,7 +11,7 @@ , wrapGAppsHook3 , gtk3 , glib -, libsoup +, libsoup_2_4 , gnome-online-accounts , librest , json-glib @@ -48,7 +48,7 @@ stdenv.mkDerivation rec { buildInputs = [ gtk3 glib - libsoup + libsoup_2_4 gnome-online-accounts librest json-glib diff --git a/pkgs/by-name/gp/gpauth/package.nix b/pkgs/by-name/gp/gpauth/package.nix index a98459bbc0d1..5fb94061db92 100644 --- a/pkgs/by-name/gp/gpauth/package.nix +++ b/pkgs/by-name/gp/gpauth/package.nix @@ -2,7 +2,7 @@ rustPlatform, lib, fetchFromGitHub, - libsoup, + libsoup_2_4, openssl, pkg-config, perl, @@ -28,7 +28,7 @@ rustPlatform.buildRustPackage rec { pkg-config ]; buildInputs = [ - libsoup + libsoup_2_4 openssl webkitgtk_4_0 ]; diff --git a/pkgs/by-name/gt/gthumb/package.nix b/pkgs/by-name/gt/gthumb/package.nix index f2666b3ee107..4424c109711b 100644 --- a/pkgs/by-name/gt/gthumb/package.nix +++ b/pkgs/by-name/gt/gthumb/package.nix @@ -12,7 +12,7 @@ , libtiff , gst_all_1 , libraw -, libsoup +, libsoup_2_4 , libsecret , glib , gtk3 @@ -75,7 +75,7 @@ stdenv.mkDerivation rec { libraw librsvg libsecret - libsoup + libsoup_2_4 libtiff libwebp libX11 diff --git a/pkgs/by-name/ha/hardinfo/package.nix b/pkgs/by-name/ha/hardinfo/package.nix index 462ef09aca04..808a36a015ec 100644 --- a/pkgs/by-name/ha/hardinfo/package.nix +++ b/pkgs/by-name/ha/hardinfo/package.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, which, pkg-config, gtk2, pcre, glib, libxml2 -, libsoup ? null +, libsoup_2_4 ? null }: stdenv.mkDerivation rec { @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { # Not adding 'hostname' command, the build shouldn't depend on what the build # host is called. nativeBuildInputs = [ pkg-config ]; - buildInputs = [ which gtk2 pcre glib libxml2 libsoup ]; + buildInputs = [ which gtk2 pcre glib libxml2 libsoup_2_4 ]; # Fixes '#error You must compile this program without "-O"' hardeningDisable = [ "all" ]; diff --git a/pkgs/by-name/hq/hqplayerd/rygel.nix b/pkgs/by-name/hq/hqplayerd/rygel.nix index a76680dfff8b..bf360c3f8cc1 100644 --- a/pkgs/by-name/hq/hqplayerd/rygel.nix +++ b/pkgs/by-name/hq/hqplayerd/rygel.nix @@ -16,7 +16,7 @@ , gupnp-dlna , gst_all_1 , libgee -, libsoup +, libsoup_2_4 , gtk3 , libmediaart , sqlite @@ -61,7 +61,7 @@ stdenv.mkDerivation rec { gupnp-av gupnp-dlna libgee - libsoup + libsoup_2_4 gtk3 libmediaart sqlite diff --git a/pkgs/by-name/in/insulator2/package.nix b/pkgs/by-name/in/insulator2/package.nix index 876f89b4ca1a..ad02d51aecdf 100644 --- a/pkgs/by-name/in/insulator2/package.nix +++ b/pkgs/by-name/in/insulator2/package.nix @@ -6,7 +6,7 @@ , openssl , pkg-config , freetype -, libsoup +, libsoup_2_4 , gtk3 , webkitgtk_4_0 , perl @@ -85,7 +85,7 @@ stdenv.mkDerivation rec { dbus openssl.out freetype - libsoup + libsoup_2_4 gtk3 webkitgtk_4_0 ]; diff --git a/pkgs/by-name/in/intune-portal/package.nix b/pkgs/by-name/in/intune-portal/package.nix index dbd3e3393529..009be9ce46de 100644 --- a/pkgs/by-name/in/intune-portal/package.nix +++ b/pkgs/by-name/in/intune-portal/package.nix @@ -8,7 +8,7 @@ , openssl , libsecret , webkitgtk_4_0 -, libsoup +, libsoup_2_4 , gtk3 , atk , pango @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { openssl libsecret webkitgtk_4_0 - libsoup + libsoup_2_4 gtk3 atk glib diff --git a/pkgs/by-name/li/libchamplain/package.nix b/pkgs/by-name/li/libchamplain/package.nix index f49d12e639db..fc228f4d6a94 100644 --- a/pkgs/by-name/li/libchamplain/package.nix +++ b/pkgs/by-name/li/libchamplain/package.nix @@ -14,7 +14,7 @@ , sqlite , gnome , clutter-gtk -, libsoup +, libsoup_2_4 , libsoup_3 , gobject-introspection /*, libmemphis */ , withLibsoup3 ? false @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { buildInputs = [ sqlite - (if withLibsoup3 then libsoup_3 else libsoup) + (if withLibsoup3 then libsoup_3 else libsoup_2_4) ]; propagatedBuildInputs = [ diff --git a/pkgs/by-name/li/libepc/package.nix b/pkgs/by-name/li/libepc/package.nix index 11cc35b2e509..3387e20ce699 100644 --- a/pkgs/by-name/li/libepc/package.nix +++ b/pkgs/by-name/li/libepc/package.nix @@ -10,7 +10,7 @@ , avahi , gnutls , libuuid -, libsoup +, libsoup_2_4 , gtk3 , gnome }: @@ -48,7 +48,7 @@ stdenv.mkDerivation (finalAttrs: { propagatedBuildInputs = [ avahi gnutls - libsoup + libsoup_2_4 ]; enableParallelBuilding = true; diff --git a/pkgs/by-name/li/libgdata/package.nix b/pkgs/by-name/li/libgdata/package.nix index 3f7242aedd33..ed706ee9b78c 100644 --- a/pkgs/by-name/li/libgdata/package.nix +++ b/pkgs/by-name/li/libgdata/package.nix @@ -16,7 +16,7 @@ , p11-kit , openssl , uhttpmock -, libsoup +, libsoup_2_4 }: stdenv.mkDerivation rec { @@ -52,7 +52,7 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ glib - libsoup + libsoup_2_4 libxml2 gnome-online-accounts json-glib diff --git a/pkgs/by-name/li/libhttpseverywhere/package.nix b/pkgs/by-name/li/libhttpseverywhere/package.nix index 80bc73e9a043..50072b6cbef3 100644 --- a/pkgs/by-name/li/libhttpseverywhere/package.nix +++ b/pkgs/by-name/li/libhttpseverywhere/package.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, pkg-config, meson, ninja, makeFontsConf, vala, fetchpatch -, gnome, libgee, glib, json-glib, libarchive, libsoup, gobject-introspection }: +, gnome, libgee, glib, json-glib, libarchive, libsoup_2_4, gobject-introspection }: let pname = "libhttpseverywhere"; @@ -13,7 +13,7 @@ in stdenv.mkDerivation rec { }; nativeBuildInputs = [ vala gobject-introspection meson ninja pkg-config ]; - buildInputs = [ glib libgee json-glib libsoup libarchive ]; + buildInputs = [ glib libgee json-glib libsoup_2_4 libarchive ]; patches = [ # Fixes build with vala >=0.42 diff --git a/pkgs/by-name/li/libxplayer-plparser/package.nix b/pkgs/by-name/li/libxplayer-plparser/package.nix index 9a1ef21c014e..51358b45bbda 100644 --- a/pkgs/by-name/li/libxplayer-plparser/package.nix +++ b/pkgs/by-name/li/libxplayer-plparser/package.nix @@ -6,7 +6,7 @@ , gobject-introspection , gmime3 , libxml2 -, libsoup +, libsoup_2_4 , pkg-config }: @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { buildInputs = [ gmime3 libxml2 - libsoup + libsoup_2_4 ]; meta = with lib; { diff --git a/pkgs/by-name/li/libzapojit/package.nix b/pkgs/by-name/li/libzapojit/package.nix index cb7038d5355c..5de315b79457 100644 --- a/pkgs/by-name/li/libzapojit/package.nix +++ b/pkgs/by-name/li/libzapojit/package.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkg-config, glib, intltool, json-glib, librest, libsoup, gnome, gnome-online-accounts, gobject-introspection }: +{ lib, stdenv, fetchurl, pkg-config, glib, intltool, json-glib, librest, libsoup_2_4, gnome, gnome-online-accounts, gobject-introspection }: stdenv.mkDerivation rec { pname = "libzapojit"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkg-config intltool gobject-introspection ]; - propagatedBuildInputs = [ glib json-glib librest libsoup gnome-online-accounts ]; # zapojit-0.0.pc + propagatedBuildInputs = [ glib json-glib librest libsoup_2_4 gnome-online-accounts ]; # zapojit-0.0.pc passthru = { updateScript = gnome.updateScript { diff --git a/pkgs/by-name/ma/markets/package.nix b/pkgs/by-name/ma/markets/package.nix index e24e902abc03..5365dea34609 100644 --- a/pkgs/by-name/ma/markets/package.nix +++ b/pkgs/by-name/ma/markets/package.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchFromGitHub , desktop-file-utils, glib, gtk3, meson, ninja, pkg-config, python3, vala , wrapGAppsHook3 -, glib-networking, gobject-introspection, json-glib, libgee, libhandy, libsoup +, glib-networking, gobject-introspection, json-glib, libgee, libhandy, libsoup_2_4 }: stdenv.mkDerivation rec { @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { ]; buildInputs = [ glib glib-networking gtk3 json-glib libgee libhandy - libsoup + libsoup_2_4 ]; postPatch = '' diff --git a/pkgs/by-name/me/meteo/package.nix b/pkgs/by-name/me/meteo/package.nix index e62d4edfe97f..226c8078c64e 100644 --- a/pkgs/by-name/me/meteo/package.nix +++ b/pkgs/by-name/me/meteo/package.nix @@ -15,7 +15,7 @@ , gtk3 , json-glib , libappindicator -, libsoup +, libsoup_2_4 , webkitgtk_4_0 }: @@ -47,7 +47,7 @@ stdenv.mkDerivation rec { gtk3 json-glib libappindicator - libsoup + libsoup_2_4 webkitgtk_4_0 ]; diff --git a/pkgs/by-name/mi/midori-unwrapped/package.nix b/pkgs/by-name/mi/midori-unwrapped/package.nix index 3a2a67035328..74f25b636df0 100644 --- a/pkgs/by-name/mi/midori-unwrapped/package.nix +++ b/pkgs/by-name/mi/midori-unwrapped/package.nix @@ -12,7 +12,7 @@ , webkitgtk_4_0 , sqlite , gsettings-desktop-schemas -, libsoup +, libsoup_2_4 , glib-networking , json-glib , libarchive @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - (libsoup.override { gnomeSupport = true; }) + (libsoup_2_4.override { gnomeSupport = true; }) gcr glib-networking gsettings-desktop-schemas diff --git a/pkgs/by-name/mo/mouse-actions-gui/package.nix b/pkgs/by-name/mo/mouse-actions-gui/package.nix index 7fae4355255b..f0ea612c309b 100644 --- a/pkgs/by-name/mo/mouse-actions-gui/package.nix +++ b/pkgs/by-name/mo/mouse-actions-gui/package.nix @@ -14,7 +14,7 @@ libXtst, libevdev, gtk3, - libsoup, + libsoup_2_4, webkitgtk_4_0, }: @@ -46,7 +46,7 @@ rustPlatform.buildRustPackage rec { # Tauri deps gtk3 - libsoup + libsoup_2_4 webkitgtk_4_0 ]; diff --git a/pkgs/by-name/os/osm-gps-map/package.nix b/pkgs/by-name/os/osm-gps-map/package.nix index 0be196597c90..5beaf910e425 100644 --- a/pkgs/by-name/os/osm-gps-map/package.nix +++ b/pkgs/by-name/os/osm-gps-map/package.nix @@ -1,4 +1,4 @@ -{ cairo, fetchzip, glib, libsoup, gnome-common, gtk3, gobject-introspection, pkg-config, lib, stdenv }: +{ cairo, fetchzip, glib, libsoup_2_4, gnome-common, gtk3, gobject-introspection, pkg-config, lib, stdenv }: stdenv.mkDerivation rec { pname = "osm-gps-map"; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { buildInputs = [ cairo glib gtk3 - libsoup + libsoup_2_4 ]; meta = with lib; { diff --git a/pkgs/by-name/os/ostree/package.nix b/pkgs/by-name/os/ostree/package.nix index fd09015f67c7..dff3820b4112 100644 --- a/pkgs/by-name/os/ostree/package.nix +++ b/pkgs/by-name/os/ostree/package.nix @@ -12,7 +12,7 @@ , systemd , xz , e2fsprogs -, libsoup +, libsoup_2_4 , glib-networking , wrapGAppsNoGuiHook , gpgme @@ -72,7 +72,7 @@ in stdenv.mkDerivation rec { glib systemd e2fsprogs - libsoup + libsoup_2_4 glib-networking gpgme fuse3 diff --git a/pkgs/by-name/po/pot/package.nix b/pkgs/by-name/po/pot/package.nix index 15331dfcef9d..4285db9048c2 100644 --- a/pkgs/by-name/po/pot/package.nix +++ b/pkgs/by-name/po/pot/package.nix @@ -15,7 +15,7 @@ libayatana-appindicator, gtk3, webkitgtk_4_0, - libsoup, + libsoup_2_4, openssl, xdotool, }: @@ -69,7 +69,7 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ gtk3 - libsoup + libsoup_2_4 libayatana-appindicator openssl webkitgtk_4_0 diff --git a/pkgs/by-name/sp/spice-up/package.nix b/pkgs/by-name/sp/spice-up/package.nix index f8a7f3a7c268..ca99f88fa57b 100644 --- a/pkgs/by-name/sp/spice-up/package.nix +++ b/pkgs/by-name/sp/spice-up/package.nix @@ -14,7 +14,7 @@ , libevdev , libgee , libgudev -, libsoup +, libsoup_2_4 , pantheon }: @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { libevdev libgee libgudev - libsoup + libsoup_2_4 pantheon.granite ]; diff --git a/pkgs/by-name/sq/squirreldisk/package.nix b/pkgs/by-name/sq/squirreldisk/package.nix index 4ed964773063..d0ea01ba160f 100644 --- a/pkgs/by-name/sq/squirreldisk/package.nix +++ b/pkgs/by-name/sq/squirreldisk/package.nix @@ -2,7 +2,7 @@ dbus, openssl, freetype, - libsoup, + libsoup_2_4, gtk3, webkitgtk_4_0, pkg-config, @@ -66,7 +66,7 @@ in ''; nativeBuildInputs = [pkg-config wrapGAppsHook3 copyDesktopItems]; - buildInputs = [dbus openssl freetype libsoup gtk3 webkitgtk_4_0]; + buildInputs = [dbus openssl freetype libsoup_2_4 gtk3 webkitgtk_4_0]; # Disable checkPhase, since the project doesn't contain tests doCheck = false; diff --git a/pkgs/by-name/ta/taxi/package.nix b/pkgs/by-name/ta/taxi/package.nix index 9552afd1a635..2b39d517560a 100644 --- a/pkgs/by-name/ta/taxi/package.nix +++ b/pkgs/by-name/ta/taxi/package.nix @@ -6,7 +6,7 @@ , libgee , libhandy , libsecret -, libsoup +, libsoup_2_4 , meson , ninja , nix-update-script @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { libgee libhandy libsecret - libsoup + libsoup_2_4 pantheon.granite ]; diff --git a/pkgs/by-name/te/telepathy-gabble/package.nix b/pkgs/by-name/te/telepathy-gabble/package.nix index dc4b11caf0b9..d2e2676af5ad 100644 --- a/pkgs/by-name/te/telepathy-gabble/package.nix +++ b/pkgs/by-name/te/telepathy-gabble/package.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, pkg-config, libxslt, telepathy-glib, python3, libxml2, dbus-glib, dbus -, sqlite, libsoup, libnice, gnutls +, sqlite, libsoup_2_4, libnice, gnutls , fetchpatch }: @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { ]; nativeBuildInputs = [ pkg-config libxslt python3 ]; - buildInputs = [ libxml2 dbus-glib sqlite libsoup libnice telepathy-glib gnutls ]; + buildInputs = [ libxml2 dbus-glib sqlite libsoup_2_4 libnice telepathy-glib gnutls ]; nativeCheckInputs = [ dbus ]; diff --git a/pkgs/by-name/ti/timezonemap/package.nix b/pkgs/by-name/ti/timezonemap/package.nix index f2ceb056f25a..de7915b5f67b 100644 --- a/pkgs/by-name/ti/timezonemap/package.nix +++ b/pkgs/by-name/ti/timezonemap/package.nix @@ -9,7 +9,7 @@ , file , gobject-introspection , json-glib -, libsoup +, libsoup_2_4 }: stdenv.mkDerivation rec { @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { gtk3 glib json-glib - libsoup + libsoup_2_4 ]; configureFlags = [ diff --git a/pkgs/by-name/tr/treedome/package.nix b/pkgs/by-name/tr/treedome/package.nix index bd355787d487..64b086fd1733 100644 --- a/pkgs/by-name/tr/treedome/package.nix +++ b/pkgs/by-name/tr/treedome/package.nix @@ -7,7 +7,7 @@ , freetype , gsettings-desktop-schemas , gtk3 -, libsoup +, libsoup_2_4 , stdenv , yarnConfigHook , yarnBuildHook @@ -95,7 +95,7 @@ rustPlatform.buildRustPackage { dbus openssl freetype - libsoup + libsoup_2_4 gtk3 webkitgtk_4_0 gsettings-desktop-schemas diff --git a/pkgs/by-name/tu/tuner/package.nix b/pkgs/by-name/tu/tuner/package.nix index 8637340f3826..e4834143db8c 100644 --- a/pkgs/by-name/tu/tuner/package.nix +++ b/pkgs/by-name/tu/tuner/package.nix @@ -9,7 +9,7 @@ , itstool , wrapGAppsHook3 , desktop-file-utils -, libsoup +, libsoup_2_4 , json-glib , geoclue2 , geocode-glib @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - libsoup + libsoup_2_4 json-glib geoclue2 geocode-glib diff --git a/pkgs/by-name/uh/uhttpmock/package.nix b/pkgs/by-name/uh/uhttpmock/package.nix index 710979057d43..6fcee7fb8d53 100644 --- a/pkgs/by-name/uh/uhttpmock/package.nix +++ b/pkgs/by-name/uh/uhttpmock/package.nix @@ -10,7 +10,7 @@ , gtk-doc , docbook-xsl-nons , glib -, libsoup +, libsoup_2_4 }: stdenv.mkDerivation rec { @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { buildInputs = [ glib - libsoup + libsoup_2_4 ]; meta = with lib; { diff --git a/pkgs/by-name/va/valum/package.nix b/pkgs/by-name/va/valum/package.nix index caf29a2cc027..2602324e8923 100644 --- a/pkgs/by-name/va/valum/package.nix +++ b/pkgs/by-name/va/valum/package.nix @@ -1,5 +1,5 @@ { lib, stdenv, meson, ninja, pkg-config, fetchFromGitHub, glib, vala, ctpl -, libgee, libsoup, fcgi }: +, libgee, libsoup_2_4, fcgi }: stdenv.mkDerivation rec { pname = "valum"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ meson ninja pkg-config ]; - buildInputs = [ glib vala ctpl libgee libsoup fcgi ]; + buildInputs = [ glib vala ctpl libgee libsoup_2_4 fcgi ]; meta = with lib; { homepage = "https://github.com/valum-framework/valum"; diff --git a/pkgs/by-name/vi/vimb-unwrapped/package.nix b/pkgs/by-name/vi/vimb-unwrapped/package.nix index e02e07419ea1..0a629030f210 100644 --- a/pkgs/by-name/vi/vimb-unwrapped/package.nix +++ b/pkgs/by-name/vi/vimb-unwrapped/package.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, pkg-config, libsoup, webkitgtk_4_0, gtk3, glib-networking +{ lib, stdenv, fetchFromGitHub, pkg-config, libsoup_2_4, webkitgtk_4_0, gtk3, glib-networking , gsettings-desktop-schemas, wrapGAppsHook3 }: @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ wrapGAppsHook3 pkg-config ]; - buildInputs = [ gtk3 libsoup webkitgtk_4_0 glib-networking gsettings-desktop-schemas ]; + buildInputs = [ gtk3 libsoup_2_4 webkitgtk_4_0 glib-networking gsettings-desktop-schemas ]; passthru = { inherit gtk3; diff --git a/pkgs/by-name/xp/xplorer/package.nix b/pkgs/by-name/xp/xplorer/package.nix index 6af5e5da6cf1..018b5bd3060d 100644 --- a/pkgs/by-name/xp/xplorer/package.nix +++ b/pkgs/by-name/xp/xplorer/package.nix @@ -5,7 +5,7 @@ , fetchYarnDeps , freetype , gtk3 -, libsoup +, libsoup_2_4 , stdenvNoCC , yarnConfigHook , yarnBuildHook @@ -74,7 +74,7 @@ rustPlatform.buildRustPackage { ''; nativeBuildInputs = [ cmake pkg-config ]; - buildInputs = [ dbus openssl freetype libsoup gtk3 webkitgtk_4_0 ]; + buildInputs = [ dbus openssl freetype libsoup_2_4 gtk3 webkitgtk_4_0 ]; checkFlags = [ # tries to mutate the parent directory diff --git a/pkgs/desktops/gnome-2/default.nix b/pkgs/desktops/gnome-2/default.nix index b2316891f942..061e0306b9d5 100644 --- a/pkgs/desktops/gnome-2/default.nix +++ b/pkgs/desktops/gnome-2/default.nix @@ -42,7 +42,7 @@ lib.makeScope pkgs.newScope (self: with self; { pangomm = throw "gnome2.pangomm has been removed, please use top-level pangomm"; gtkmm2 = throw "gnome2.gtkmm2 has been removed, please use top-level gtkmm2"; libcanberra-gtk2 = throw "gnome2.libcanberra-gtk2 has been removed, please use top-level libcanberra-gtk2"; - libsoup = throw "gnome2.libsoup has been removed, please use top-level libsoup"; + libsoup = throw "gnome2.libsoup has been removed, please use top-level libsoup_2_4"; libwnck2 = throw "gnome2.libwnck2 has been removed, please use top-level libwnck2"; gtk-doc = throw "gnome2.gtk-doc has been removed, please use top-level gtk-doc"; gnome-doc-utils = throw "gnome2.gnome-doc-utils has been removed, please use top-level gnome-doc-utils"; diff --git a/pkgs/desktops/mate/libmateweather/default.nix b/pkgs/desktops/mate/libmateweather/default.nix index 4c003c4a9873..68cf463f7594 100644 --- a/pkgs/desktops/mate/libmateweather/default.nix +++ b/pkgs/desktops/mate/libmateweather/default.nix @@ -7,7 +7,7 @@ , glib-networking , libxml2 , gtk3 -, libsoup +, libsoup_2_4 , tzdata , mateUpdateScript }: @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - libsoup + libsoup_2_4 tzdata ]; diff --git a/pkgs/desktops/pantheon/apps/elementary-code/default.nix b/pkgs/desktops/pantheon/apps/elementary-code/default.nix index 5cab3288bd35..29404706ac67 100644 --- a/pkgs/desktops/pantheon/apps/elementary-code/default.nix +++ b/pkgs/desktops/pantheon/apps/elementary-code/default.nix @@ -19,7 +19,7 @@ , libgit2-glib , libhandy , libpeas -, libsoup +, libsoup_2_4 , vte , ctags }: @@ -56,7 +56,7 @@ stdenv.mkDerivation rec { libgit2-glib libhandy libpeas - libsoup + libsoup_2_4 vte ]; diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/applications-menu/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/applications-menu/default.nix index 12746579c499..c2b6f314f838 100644 --- a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/applications-menu/default.nix +++ b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/applications-menu/default.nix @@ -17,7 +17,7 @@ , elementary-dock , bamf , switchboard-with-plugs -, libsoup +, libsoup_2_4 , wingpanel , zeitgeist , bc @@ -67,7 +67,7 @@ stdenv.mkDerivation rec { json-glib libgee libhandy - libsoup + libsoup_2_4 switchboard-with-plugs wingpanel zeitgeist diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/datetime/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/datetime/default.nix index a413498447ba..bd87eef9115d 100644 --- a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/datetime/default.nix +++ b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/datetime/default.nix @@ -15,7 +15,7 @@ , libgee , libhandy , libxml2 -, libsoup +, libsoup_2_4 , elementary-calendar }: @@ -52,7 +52,7 @@ stdenv.mkDerivation rec { libgee libhandy libical - libsoup + libsoup_2_4 wingpanel ]; diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-weather-plugin/default.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-weather-plugin/default.nix index db7614394cb6..9d8d80fed106 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-weather-plugin/default.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-weather-plugin/default.nix @@ -7,7 +7,7 @@ , gtk3 , json_c , libxml2 -, libsoup +, libsoup_2_4 , upower , libxfce4ui , libxfce4util @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { gtk3 json_c libxml2 - libsoup + libsoup_2_4 upower libxfce4ui libxfce4util diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index d51851b2c471..e63f422c123a 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -124461,7 +124461,7 @@ self: { "gi-soup" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gi-gio , gi-glib, gi-gobject, haskell-gi, haskell-gi-base - , haskell-gi-overloading, libsoup, text, transformers + , haskell-gi-overloading, libsoup_2_4, text, transformers }: mkDerivation { pname = "gi-soup"; @@ -124474,15 +124474,15 @@ self: { base bytestring containers gi-gio gi-glib gi-gobject haskell-gi haskell-gi-base haskell-gi-overloading text transformers ]; - libraryPkgconfigDepends = [ libsoup ]; + libraryPkgconfigDepends = [ libsoup_2_4 ]; description = "Libsoup bindings"; license = lib.licenses.lgpl21Only; - }) {inherit (pkgs) libsoup;}; + }) {inherit (pkgs) libsoup_2_4;}; "gi-soup_3_0_3" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gi-gio , gi-glib, gi-gobject, haskell-gi, haskell-gi-base - , haskell-gi-overloading, libsoup, text, transformers + , haskell-gi-overloading, libsoup_3, text, transformers }: mkDerivation { pname = "gi-soup"; @@ -124495,11 +124495,11 @@ self: { base bytestring containers gi-gio gi-glib gi-gobject haskell-gi haskell-gi-base haskell-gi-overloading text transformers ]; - libraryPkgconfigDepends = [ libsoup ]; + libraryPkgconfigDepends = [ libsoup_3 ]; description = "Libsoup bindings"; license = lib.licenses.lgpl21Only; hydraPlatforms = lib.platforms.none; - }) {inherit (pkgs) libsoup;}; + }) {inherit (pkgs) libsoup_3;}; "gi-vips" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gi-glib @@ -227267,33 +227267,18 @@ self: { }) {}; "opencascade-hs" = callPackage - ({ mkDerivation, base, resourcet, TKBO, TKBRep, TKDEGLTF, TKDEOBJ - , TKDESTEP, TKDESTL, TKernel, TKFillet, TKG2d, TKG3d, TKGeomBase - , TKLCAF, TKMath, TKMesh, TKOffset, TKPrim, TKRWMesh, TKService - , TKShHealing, TKStd, TKTopAlgo, TKV3d, TKXCAF, TKXSBase - }: + ({ mkDerivation, base, opencascade-occt, resourcet }: mkDerivation { pname = "opencascade-hs"; version = "0.4.0.0"; sha256 = "1dhasjjhcg54qihcihid69z70l75dn7xsbsd765lsgzc35m1qbrl"; libraryHaskellDepends = [ base resourcet ]; - librarySystemDepends = [ - TKBO TKBRep TKDEGLTF TKDEOBJ TKDESTEP TKDESTL TKernel TKFillet - TKG2d TKG3d TKGeomBase TKLCAF TKMath TKMesh TKOffset TKPrim - TKRWMesh TKService TKShHealing TKStd TKTopAlgo TKV3d TKXCAF - TKXSBase - ]; + librarySystemDepends = [ opencascade-occt ]; description = "Thin Wrapper for the OpenCASCADE CAD Kernel"; license = lib.licenses.lgpl21Only; hydraPlatforms = lib.platforms.none; broken = true; - }) {TKBO = null; TKBRep = null; TKDEGLTF = null; TKDEOBJ = null; - TKDESTEP = null; TKDESTL = null; TKFillet = null; TKG2d = null; - TKG3d = null; TKGeomBase = null; TKLCAF = null; TKMath = null; - TKMesh = null; TKOffset = null; TKPrim = null; TKRWMesh = null; - TKService = null; TKShHealing = null; TKStd = null; - TKTopAlgo = null; TKV3d = null; TKXCAF = null; TKXSBase = null; - TKernel = null;}; + }) {inherit (pkgs) opencascade-occt;}; "opencc" = callPackage ({ mkDerivation, base, bytestring, mtl, opencc, text, transformers @@ -289360,8 +289345,8 @@ self: { "spike" = callPackage ({ mkDerivation, base, containers, directory, filepath, glib - , global-variables, gtk, libsoup, mtl, process, random, rosezipper - , stm, webkit + , global-variables, gtk, libsoup_2_4, mtl, process, random + , rosezipper, stm, webkit }: mkDerivation { pname = "spike"; @@ -289373,12 +289358,12 @@ self: { base containers directory filepath glib global-variables gtk mtl process random rosezipper stm webkit ]; - executablePkgconfigDepends = [ libsoup ]; + executablePkgconfigDepends = [ libsoup_2_4 ]; description = "Experimental web browser"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; mainProgram = "spike"; - }) {inherit (pkgs) libsoup;}; + }) {inherit (pkgs) libsoup_2_4;}; "spine" = callPackage ({ mkDerivation, base }: diff --git a/pkgs/development/libraries/gsignond/plugins/lastfm.nix b/pkgs/development/libraries/gsignond/plugins/lastfm.nix index 7f58b4d11ce3..8ba7c0483dc6 100644 --- a/pkgs/development/libraries/gsignond/plugins/lastfm.nix +++ b/pkgs/development/libraries/gsignond/plugins/lastfm.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitLab, pkg-config, meson, ninja, vala, glib, gsignond, json-glib, libsoup, gobject-introspection }: +{ lib, stdenv, fetchFromGitLab, pkg-config, meson, ninja, vala, glib, gsignond, json-glib, libsoup_2_4, gobject-introspection }: stdenv.mkDerivation { pname = "gsignond-plugin-lastfm"; @@ -23,7 +23,7 @@ stdenv.mkDerivation { glib gsignond json-glib - libsoup + libsoup_2_4 ]; PKG_CONFIG_GSIGNOND_GPLUGINSDIR = "${placeholder "out"}/lib/gsignond/gplugins"; diff --git a/pkgs/development/libraries/gsignond/plugins/oauth.nix b/pkgs/development/libraries/gsignond/plugins/oauth.nix index 06999b225de1..0261c39a8740 100644 --- a/pkgs/development/libraries/gsignond/plugins/oauth.nix +++ b/pkgs/development/libraries/gsignond/plugins/oauth.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitLab, pkg-config, meson, ninja, glib, gsignond, check -, json-glib, libsoup, gnutls, gtk-doc, docbook_xml_dtd_43, docbook_xml_dtd_45 +, json-glib, libsoup_2_4, gnutls, gtk-doc, docbook_xml_dtd_43, docbook_xml_dtd_45 , docbook_xsl, glibcLocales, gobject-introspection }: stdenv.mkDerivation { @@ -31,7 +31,7 @@ stdenv.mkDerivation { gnutls gsignond json-glib - libsoup + libsoup_2_4 ]; LC_ALL = "en_US.UTF-8"; diff --git a/pkgs/development/libraries/gssdp/default.nix b/pkgs/development/libraries/gssdp/default.nix index a838efc15a70..d3ecb8913947 100644 --- a/pkgs/development/libraries/gssdp/default.nix +++ b/pkgs/development/libraries/gssdp/default.nix @@ -9,7 +9,7 @@ , vala , gi-docgen , python3 -, libsoup +, libsoup_2_4 , glib , gnome , gssdp-tools @@ -56,7 +56,7 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - libsoup + libsoup_2_4 ]; propagatedBuildInputs = [ diff --git a/pkgs/development/libraries/gupnp/default.nix b/pkgs/development/libraries/gupnp/default.nix index 5fa0df314274..4835047a3edd 100644 --- a/pkgs/development/libraries/gupnp/default.nix +++ b/pkgs/development/libraries/gupnp/default.nix @@ -13,7 +13,7 @@ , docbook_xml_dtd_45 , glib , gssdp -, libsoup +, libsoup_2_4 , libxml2 , libuuid , gnome @@ -75,7 +75,7 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ glib gssdp - libsoup + libsoup_2_4 libxml2 ]; diff --git a/pkgs/development/libraries/libgrss/default.nix b/pkgs/development/libraries/libgrss/default.nix index c6de97101be8..d2ac5a83602a 100644 --- a/pkgs/development/libraries/libgrss/default.nix +++ b/pkgs/development/libraries/libgrss/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, fetchpatch, pkg-config, vala, gobject-introspection, gtk-doc -, docbook_xsl, docbook_xml_dtd_412, glib, libxml2, libsoup, gnome, buildPackages +, docbook_xsl, docbook_xml_dtd_412, glib, libxml2, libsoup_2_4, gnome, buildPackages , Foundation, AppKit }: @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { buildInputs = [ glib libxml2 - libsoup + libsoup_2_4 ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ Foundation AppKit diff --git a/pkgs/development/libraries/librest/default.nix b/pkgs/development/libraries/librest/default.nix index de0ff52f1e1b..22e530959105 100644 --- a/pkgs/development/libraries/librest/default.nix +++ b/pkgs/development/libraries/librest/default.nix @@ -3,7 +3,7 @@ , fetchurl , pkg-config , glib -, libsoup +, libsoup_2_4 , libxml2 , gobject-introspection , gtk-doc @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ glib - libsoup + libsoup_2_4 libxml2 ]; diff --git a/pkgs/development/tools/devpod/default.nix b/pkgs/development/tools/devpod/default.nix index 2236d27be2b3..4d4efc7b3608 100644 --- a/pkgs/development/tools/devpod/default.nix +++ b/pkgs/development/tools/devpod/default.nix @@ -9,7 +9,7 @@ , installShellFiles , jq , libayatana-appindicator -, libsoup +, libsoup_2_4 , makeDesktopItem , mkYarnPackage , openssl @@ -141,7 +141,7 @@ rec { ]; buildInputs = [ - libsoup + libsoup_2_4 openssl ] ++ lib.optionals stdenv.hostPlatform.isLinux [ gtk3 diff --git a/pkgs/development/tools/flatpak-builder/default.nix b/pkgs/development/tools/flatpak-builder/default.nix index 8d01cbeb5db8..ae3c3ce32192 100644 --- a/pkgs/development/tools/flatpak-builder/default.nix +++ b/pkgs/development/tools/flatpak-builder/default.nix @@ -32,7 +32,7 @@ , gnutar , json-glib , libcap -, libsoup +, libsoup_2_4 , libyaml , ostree , patch @@ -104,7 +104,7 @@ stdenv.mkDerivation (finalAttrs: { glib json-glib libcap - libsoup + libsoup_2_4 libxml2 libyaml ostree diff --git a/pkgs/games/heroic/fhsenv.nix b/pkgs/games/heroic/fhsenv.nix index 9f3cdb067fde..f5b746938845 100644 --- a/pkgs/games/heroic/fhsenv.nix +++ b/pkgs/games/heroic/fhsenv.nix @@ -112,7 +112,7 @@ buildFHSEnv { libpulseaudio libselinux libsndfile - libsoup + libsoup_2_4 libtheora libtiff libunwind diff --git a/pkgs/tools/networking/networkmanager/default.nix b/pkgs/tools/networking/networkmanager/default.nix index fbc7ec0857b5..fa91b2c64dca 100644 --- a/pkgs/tools/networking/networkmanager/default.nix +++ b/pkgs/tools/networking/networkmanager/default.nix @@ -27,7 +27,7 @@ , openresolv , libndp , newt -, libsoup +, libsoup_2_4 , ethtool , gnused , iputils @@ -152,7 +152,7 @@ stdenv.mkDerivation rec { modemmanager readline newt - libsoup + libsoup_2_4 jansson dbus # used to get directory paths with pkg-config during configuration ]; diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 924424ebad10..4ed11f53442c 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -660,6 +660,7 @@ mapAliases { librewolf-wayland = librewolf; # Added 2022-11-15 libseat = throw "'libseat' has been renamed to/replaced by 'seatd'"; # Converted to throw 2024-10-17 libsForQt515 = libsForQt5; # Added 2022-11-24 + libsoup = lib.warnOnInstantiate "‘libsoup’ has been renamed to ‘libsoup_2_4’" libsoup_2_4; # Added 2024-12-02 libstdcxx5 = throw "libstdcxx5 is severly outdated and has been removed"; # Added 2024-11-24 libtensorflow-bin = libtensorflow; # Added 2022-09-25 libtorrentRasterbar = throw "'libtorrentRasterbar' has been renamed to/replaced by 'libtorrent-rasterbar'"; # Converted to throw 2024-10-17 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4549a4d068ec..3e234d8ca810 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9105,7 +9105,7 @@ with pkgs; geoclue2-with-demo-agent = geoclue2.override { withDemoAgent = true; }; geocode-glib_2 = geocode-glib.override { - libsoup = libsoup_3; + libsoup_2_4 = libsoup_3; }; geoipWithDatabase = makeOverridable (callPackage ../development/libraries/geoip) { @@ -10006,7 +10006,7 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Carbon AudioToolbox; }; - libsoup = callPackage ../development/libraries/libsoup { }; + libsoup_2_4 = callPackage ../development/libraries/libsoup { }; libsoup_3 = callPackage ../development/libraries/libsoup/3.x.nix { }; @@ -11035,6 +11035,7 @@ with pkgs; webkitgtk_4_0 = callPackage ../development/libraries/webkitgtk { harfbuzz = harfbuzzFull; + libsoup = libsoup_2_4; inherit (gst_all_1) gst-plugins-base gst-plugins-bad; inherit (darwin) apple_sdk; }; diff --git a/pkgs/top-level/pkg-config/pkg-config-data.json b/pkgs/top-level/pkg-config/pkg-config-data.json index 4c2286a47e90..60981baa69cf 100644 --- a/pkgs/top-level/pkg-config/pkg-config-data.json +++ b/pkgs/top-level/pkg-config/pkg-config-data.json @@ -578,7 +578,7 @@ }, "libsoup-gnome-2.4": { "attrPath": [ - "libsoup" + "libsoup_2_4" ] }, "libssh2": { From f2fc2601242588251a46f414dcecbdd812495b17 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sun, 8 Dec 2024 01:02:05 +0100 Subject: [PATCH 77/84] gnome2.libgnomecanvas: Fix eval with allowed aliases --- pkgs/desktops/gnome-2/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome-2/default.nix b/pkgs/desktops/gnome-2/default.nix index 061e0306b9d5..83a163f4e36c 100644 --- a/pkgs/desktops/gnome-2/default.nix +++ b/pkgs/desktops/gnome-2/default.nix @@ -31,7 +31,7 @@ lib.makeScope pkgs.newScope (self: with self; { autoreconfHook = pkgs.autoreconfHook269; }; -} // lib.optionalAttrs config.allowAliases { +}) // lib.optionalAttrs config.allowAliases { # added 2024-12-02 glib = throw "gnome2.glib has been removed, please use top-level glib"; glibmm = throw "gnome2.glibmm has been removed, please use top-level glibmm"; @@ -74,4 +74,4 @@ lib.makeScope pkgs.newScope (self: with self; { libgnomeui = throw "gnome2.libgnomeui has been removed"; # 2024-06-27 libgtkhtml = throw "gnome2.libgtkhtml has been removed"; # 2023-01-15 python_rsvg = throw "gnome2.python_rsvg has been removed"; # 2023-01-14 -}) +} From ba0f0606c7f5c41541de5621d6cc4047f0e82d79 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 8 Dec 2024 00:37:30 +0000 Subject: [PATCH 78/84] libgedit-gfls: 0.2.0 -> 0.2.1 --- pkgs/by-name/li/libgedit-gfls/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/li/libgedit-gfls/package.nix b/pkgs/by-name/li/libgedit-gfls/package.nix index 2d919479bc6f..ee6ce5df0eaf 100644 --- a/pkgs/by-name/li/libgedit-gfls/package.nix +++ b/pkgs/by-name/li/libgedit-gfls/package.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "libgedit-gfls"; - version = "0.2.0"; + version = "0.2.1"; outputs = [ "out" "dev" "devdoc" ]; @@ -24,7 +24,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "gedit"; repo = "libgedit-gfls"; rev = finalAttrs.version; - hash = "sha256-oxsqggn4O4SwGEas840qE103hKU4f+GP+ItOtD3M+ac="; + hash = "sha256-kMkqEly8RDc5eKqUupQD4tkVIXxL1rt4e/OCAPoutIg="; }; nativeBuildInputs = [ From a5de36518f1537a3c5c4839cc107b7e67872117b Mon Sep 17 00:00:00 2001 From: Majiir Paktu Date: Tue, 3 Oct 2023 21:09:52 -0400 Subject: [PATCH 79/84] nixos/wireguard-networkd: init Adds a networkd backend for the networking.wireguard options. --- nixos/modules/module-list.nix | 1 + .../networking/wireguard-networkd.nix | 207 ++++++++++++++++++ .../modules/services/networking/wireguard.nix | 71 ++++-- nixos/tests/wireguard/default.nix | 3 + nixos/tests/wireguard/dynamic-refresh.nix | 102 +++++++++ nixos/tests/wireguard/networkd.nix | 89 ++++++++ 6 files changed, 456 insertions(+), 17 deletions(-) create mode 100644 nixos/modules/services/networking/wireguard-networkd.nix create mode 100644 nixos/tests/wireguard/dynamic-refresh.nix create mode 100644 nixos/tests/wireguard/networkd.nix diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index afed4b049ebd..1508806e5860 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -1286,6 +1286,7 @@ ./services/networking/wg-quick.nix ./services/networking/wgautomesh.nix ./services/networking/wireguard.nix + ./services/networking/wireguard-networkd.nix ./services/networking/wpa_supplicant.nix ./services/networking/wstunnel.nix ./services/networking/x2goserver.nix diff --git a/nixos/modules/services/networking/wireguard-networkd.nix b/nixos/modules/services/networking/wireguard-networkd.nix new file mode 100644 index 000000000000..711f6e6808c2 --- /dev/null +++ b/nixos/modules/services/networking/wireguard-networkd.nix @@ -0,0 +1,207 @@ +{ + config, + lib, + pkgs, + ... +}: + +let + inherit (lib) types; + inherit (lib.attrsets) + filterAttrs + mapAttrs + mapAttrs' + mapAttrsToList + nameValuePair + ; + inherit (lib.lists) concatMap concatLists; + inherit (lib.modules) mkIf; + inherit (lib.options) literalExpression mkOption; + inherit (lib.strings) hasInfix; + inherit (lib.trivial) flip; + + removeNulls = filterAttrs (_: v: v != null); + + generateNetdev = + name: interface: + nameValuePair "40-${name}" { + netdevConfig = removeNulls { + Kind = "wireguard"; + Name = name; + MTUBytes = interface.mtu; + }; + wireguardConfig = removeNulls { + PrivateKeyFile = interface.privateKeyFile; + ListenPort = interface.listenPort; + FirewallMark = interface.fwMark; + RouteTable = if interface.allowedIPsAsRoutes then interface.table else null; + RouteMetric = interface.metric; + }; + wireguardPeers = map generateWireguardPeer interface.peers; + }; + + generateWireguardPeer = + peer: + removeNulls { + PublicKey = peer.publicKey; + PresharedKeyFile = peer.presharedKeyFile; + AllowedIPs = peer.allowedIPs; + Endpoint = peer.endpoint; + PersistentKeepalive = peer.persistentKeepalive; + }; + + generateNetwork = name: interface: { + matchConfig.Name = name; + address = interface.ips; + }; + + cfg = config.networking.wireguard; + + refreshEnabledInterfaces = filterAttrs ( + name: interface: interface.dynamicEndpointRefreshSeconds != 0 + ) cfg.interfaces; + + generateRefreshTimer = + name: interface: + nameValuePair "wireguard-dynamic-refresh-${name}" { + partOf = [ "wireguard-dynamic-refresh-${name}.service" ]; + wantedBy = [ "timers.target" ]; + description = "Wireguard dynamic endpoint refresh (${name}) timer"; + timerConfig.OnBootSec = interface.dynamicEndpointRefreshSeconds; + timerConfig.OnUnitInactiveSec = interface.dynamicEndpointRefreshSeconds; + }; + + generateRefreshService = + name: interface: + nameValuePair "wireguard-dynamic-refresh-${name}" { + description = "Wireguard dynamic endpoint refresh (${name})"; + after = [ "network-online.target" ]; + wants = [ "network-online.target" ]; + path = with pkgs; [ + iproute2 + systemd + ]; + # networkd doesn't provide a mechanism for refreshing endpoints. + # See: https://github.com/systemd/systemd/issues/9911 + # This hack does the job but takes down the whole interface to do it. + script = '' + ip link delete ${name} + networkctl reload + ''; + }; + +in +{ + meta.maintainers = [ lib.maintainers.majiir ]; + + options.networking.wireguard = { + useNetworkd = mkOption { + default = config.networking.useNetworkd; + defaultText = literalExpression "config.networking.useNetworkd"; + type = types.bool; + description = '' + Whether to use networkd as the network configuration backend for + Wireguard instead of the legacy script-based system. + + ::: {.warning} + Some options have slightly different behavior with the networkd and + script-based backends. Check the documentation for each Wireguard + option you use before enabling this option. + ::: + ''; + }; + }; + + config = mkIf (cfg.enable && cfg.useNetworkd) { + + # TODO: Some of these options may be possible to support in networkd. + # + # privateKey and presharedKey are trivial to support, but we deliberately + # don't in order to discourage putting secrets in the /nix store. + # + # generatePrivateKeyFile can be supported if we can order a service before + # networkd configures interfaces. There is also a systemd feature request + # for key generation: https://github.com/systemd/systemd/issues/14282 + # + # preSetup, postSetup, preShutdown and postShutdown may be possible, but + # networkd is not likely to support script hooks like this directly. See: + # https://github.com/systemd/systemd/issues/11629 + # + # socketNamespace and interfaceNamespace can be implemented once networkd + # supports setting a netdev's namespace. See: + # https://github.com/systemd/systemd/issues/11629 + # https://github.com/systemd/systemd/pull/14915 + + assertions = concatLists ( + flip mapAttrsToList cfg.interfaces ( + name: interface: + [ + # Interface assertions + { + assertion = interface.privateKey == null; + message = "networking.wireguard.interfaces.${name}.privateKey cannot be used with networkd. Use privateKeyFile instead."; + } + { + assertion = !interface.generatePrivateKeyFile; + message = "networking.wireguard.interfaces.${name}.generatePrivateKeyFile cannot be used with networkd."; + } + { + assertion = interface.preSetup == ""; + message = "networking.wireguard.interfaces.${name}.preSetup cannot be used with networkd."; + } + { + assertion = interface.postSetup == ""; + message = "networking.wireguard.interfaces.${name}.postSetup cannot be used with networkd."; + } + { + assertion = interface.preShutdown == ""; + message = "networking.wireguard.interfaces.${name}.preShutdown cannot be used with networkd."; + } + { + assertion = interface.postShutdown == ""; + message = "networking.wireguard.interfaces.${name}.postShutdown cannot be used with networkd."; + } + { + assertion = interface.socketNamespace == null; + message = "networking.wireguard.interfaces.${name}.socketNamespace cannot be used with networkd."; + } + { + assertion = interface.interfaceNamespace == null; + message = "networking.wireguard.interfaces.${name}.interfaceNamespace cannot be used with networkd."; + } + ] + ++ flip concatMap interface.ips (ip: [ + # IP assertions + { + assertion = hasInfix "/" ip; + message = "networking.wireguard.interfaces.${name}.ips value \"${ip}\" requires a subnet (e.g. 192.0.2.1/32) with networkd."; + } + ]) + ++ flip concatMap interface.peers (peer: [ + # Peer assertions + { + assertion = peer.presharedKey == null; + message = "networking.wireguard.interfaces.${name}.peers[].presharedKey cannot be used with networkd. Use presharedKeyFile instead."; + } + { + assertion = peer.dynamicEndpointRefreshSeconds == null; + message = "networking.wireguard.interfaces.${name}.peers[].dynamicEndpointRefreshSeconds cannot be used with networkd. Use networking.wireguard.interfaces.${name}.dynamicEndpointRefreshSeconds instead."; + } + { + assertion = peer.dynamicEndpointRefreshRestartSeconds == null; + message = "networking.wireguard.interfaces.${name}.peers[].dynamicEndpointRefreshRestartSeconds cannot be used with networkd."; + } + ]) + ) + ); + + systemd.network = { + enable = true; + netdevs = mapAttrs' generateNetdev cfg.interfaces; + networks = mapAttrs generateNetwork cfg.interfaces; + }; + + systemd.timers = mapAttrs' generateRefreshTimer refreshEnabledInterfaces; + systemd.services = mapAttrs' generateRefreshService refreshEnabledInterfaces; + }; +} diff --git a/nixos/modules/services/networking/wireguard.nix b/nixos/modules/services/networking/wireguard.nix index 08e5494b63df..613c1ae7d769 100644 --- a/nixos/modules/services/networking/wireguard.nix +++ b/nixos/modules/services/networking/wireguard.nix @@ -49,6 +49,9 @@ let default = null; description = '' Private key file as generated by {command}`wg genkey`. + + When {option}`networking.wireguard.useNetworkd` is enabled, this file + must be readable by the `systemd-network` user. ''; }; @@ -182,6 +185,28 @@ let Set the metric of routes related to this Wireguard interface. ''; }; + + dynamicEndpointRefreshSeconds = mkOption { + default = 0; + example = 300; + type = with types; int; + description = '' + Periodically refresh the endpoint hostname or address for all peers. + Allows WireGuard to notice DNS and IPv4/IPv6 connectivity changes. + This option can be set or overridden for individual peers. + + Setting this to `0` disables periodic refresh. + + ::: {.warning} + When {option}`networking.wireguard.useNetworkd` is enabled, this + option deletes the Wireguard interface and brings it back up by + reconfiguring the network with `networkctl reload` on every refresh. + This could have adverse effects on your network and cause brief + connectivity blips. See [systemd/systemd#9911](https://github.com/systemd/systemd/issues/9911) + for an upstream feature request that can make this less hacky. + ::: + ''; + }; }; }; @@ -234,6 +259,9 @@ let Optional, and may be omitted. This option adds an additional layer of symmetric-key cryptography to be mixed into the already existing public-key cryptography, for post-quantum resistance. + + When {option}`networking.wireguard.useNetworkd` is enabled, this file + must be readable by the `systemd-network` user. ''; }; @@ -269,15 +297,21 @@ let }; dynamicEndpointRefreshSeconds = mkOption { - default = 0; + default = null; + defaultText = literalExpression "config.networking.wireguard.interfaces..dynamicEndpointRefreshSeconds"; example = 5; - type = with types; int; + type = with types; nullOr int; description = '' Periodically re-execute the `wg` utility every this many seconds in order to let WireGuard notice DNS / hostname changes. Setting this to `0` disables periodic reexecution. + + ::: {.note} + This peer-level setting is not available when {option}`networking.wireguard.useNetworkd` + is enabled. The interface-level setting may be used instead. + ::: ''; }; @@ -349,6 +383,11 @@ let in "wireguard-${interfaceName}-peer-${peerName}${refreshSuffix}"; + dynamicRefreshSeconds = interfaceCfg: peer: + if peer.dynamicEndpointRefreshSeconds != null + then peer.dynamicEndpointRefreshSeconds + else interfaceCfg.dynamicEndpointRefreshSeconds; + generatePeerUnit = { interfaceName, interfaceCfg, peer }: let psk = @@ -359,7 +398,8 @@ let dst = interfaceCfg.interfaceNamespace; ip = nsWrap "ip" src dst; wg = nsWrap "wg" src dst; - dynamicRefreshEnabled = peer.dynamicEndpointRefreshSeconds != 0; + dynamicEndpointRefreshSeconds = dynamicRefreshSeconds interfaceCfg peer; + dynamicRefreshEnabled = dynamicEndpointRefreshSeconds != 0; # We generate a different name (a `-refresh` suffix) when `dynamicEndpointRefreshSeconds` # to avoid that the same service switches `Type` (`oneshot` vs `simple`), # with the intent to make scripting more obvious. @@ -395,7 +435,7 @@ let Restart = "always"; RestartSec = if null != peer.dynamicEndpointRefreshRestartSeconds then peer.dynamicEndpointRefreshRestartSeconds - else peer.dynamicEndpointRefreshSeconds; + else dynamicEndpointRefreshSeconds; }; unitConfig = lib.optionalAttrs dynamicRefreshEnabled { StartLimitIntervalSec = 0; @@ -419,13 +459,13 @@ let ${wg_setup} ${route_setup} - ${optionalString (peer.dynamicEndpointRefreshSeconds != 0) '' + ${optionalString (dynamicEndpointRefreshSeconds != 0) '' # Re-execute 'wg' periodically to notice DNS / hostname changes. # Note this will not time out on transient DNS failures such as DNS names # because we have set 'WG_ENDPOINT_RESOLUTION_RETRIES=infinity'. # Also note that 'wg' limits its maximum retry delay to 20 seconds as of writing. while ${wg_setup}; do - sleep "${toString peer.dynamicEndpointRefreshSeconds}"; + sleep "${toString dynamicEndpointRefreshSeconds}"; done ''} ''; @@ -445,7 +485,7 @@ let # the target is required to start new peer units when they are added generateInterfaceTarget = name: values: let - mkPeerUnit = peer: (peerUnitServiceName name peer.name (peer.dynamicEndpointRefreshSeconds != 0)) + ".service"; + mkPeerUnit = peer: (peerUnitServiceName name peer.name (dynamicRefreshSeconds values peer != 0)) + ".service"; in nameValuePair "wireguard-${name}" rec { @@ -530,9 +570,10 @@ in description = '' Whether to enable WireGuard. - Please note that {option}`systemd.network.netdevs` has more features - and is better maintained. When building new things, it is advised to - use that instead. + ::: {.note} + By default, this module is powered by a script-based backend. You can + enable the networkd backend with {option}`networking.wireguard.useNetworkd`. + ::: ''; type = types.bool; # 2019-05-25: Backwards compatibility. @@ -544,10 +585,6 @@ in interfaces = mkOption { description = '' WireGuard interfaces. - - Please note that {option}`systemd.network.netdevs` has more features - and is better maintained. When building new things, it is advised to - use that instead. ''; default = {}; example = { @@ -597,13 +634,13 @@ in boot.kernelModules = [ "wireguard" ]; environment.systemPackages = [ pkgs.wireguard-tools ]; - systemd.services = + systemd.services = mkIf (!cfg.useNetworkd) ( (mapAttrs' generateInterfaceUnit cfg.interfaces) // (listToAttrs (map generatePeerUnit all_peers)) // (mapAttrs' generateKeyServiceUnit - (filterAttrs (name: value: value.generatePrivateKeyFile) cfg.interfaces)); + (filterAttrs (name: value: value.generatePrivateKeyFile) cfg.interfaces))); - systemd.targets = mapAttrs' generateInterfaceTarget cfg.interfaces; + systemd.targets = mkIf (!cfg.useNetworkd) (mapAttrs' generateInterfaceTarget cfg.interfaces); } ); diff --git a/nixos/tests/wireguard/default.nix b/nixos/tests/wireguard/default.nix index fc22f06b778b..16393f533bc7 100644 --- a/nixos/tests/wireguard/default.nix +++ b/nixos/tests/wireguard/default.nix @@ -11,9 +11,12 @@ let tests = let callTest = p: args: import p ({ inherit system pkgs; } // args); in { basic = callTest ./basic.nix; namespaces = callTest ./namespaces.nix; + networkd = callTest ./networkd.nix; wg-quick = callTest ./wg-quick.nix; wg-quick-nftables = args: callTest ./wg-quick.nix ({ nftables = true; } // args); generated = callTest ./generated.nix; + dynamic-refresh = callTest ./dynamic-refresh.nix; + dynamic-refresh-networkd = args: callTest ./dynamic-refresh.nix ({ useNetworkd = true; } // args); }; in diff --git a/nixos/tests/wireguard/dynamic-refresh.nix b/nixos/tests/wireguard/dynamic-refresh.nix new file mode 100644 index 000000000000..e0af6bc025aa --- /dev/null +++ b/nixos/tests/wireguard/dynamic-refresh.nix @@ -0,0 +1,102 @@ +import ../make-test-python.nix ( + { + pkgs, + lib, + kernelPackages ? null, + useNetworkd ? false, + ... + }: + let + wg-snakeoil-keys = import ./snakeoil-keys.nix; + in + { + name = "wireguard-dynamic-refresh"; + meta = with lib.maintainers; { + maintainers = [ majiir ]; + }; + + nodes = { + server = { + virtualisation.vlans = [ + 1 + 2 + ]; + boot = lib.mkIf (kernelPackages != null) { inherit kernelPackages; }; + networking.firewall.allowedUDPPorts = [ 23542 ]; + networking.useDHCP = false; + networking.wireguard.useNetworkd = useNetworkd; + networking.wireguard.interfaces.wg0 = { + ips = [ "10.23.42.1/32" ]; + listenPort = 23542; + + # !!! Don't do this with real keys. The /nix store is world-readable! + privateKeyFile = toString (pkgs.writeText "privateKey" wg-snakeoil-keys.peer0.privateKey); + + peers = lib.singleton { + allowedIPs = [ "10.23.42.2/32" ]; + + inherit (wg-snakeoil-keys.peer1) publicKey; + }; + }; + }; + + client = + { nodes, ... }: + { + virtualisation.vlans = [ + 1 + 2 + ]; + boot = lib.mkIf (kernelPackages != null) { inherit kernelPackages; }; + networking.useDHCP = false; + networking.wireguard.useNetworkd = useNetworkd; + networking.wireguard.interfaces.wg0 = { + ips = [ "10.23.42.2/32" ]; + + # !!! Don't do this with real keys. The /nix store is world-readable! + privateKeyFile = toString (pkgs.writeText "privateKey" wg-snakeoil-keys.peer1.privateKey); + + dynamicEndpointRefreshSeconds = 2; + + peers = lib.singleton { + allowedIPs = [ + "0.0.0.0/0" + "::/0" + ]; + endpoint = "server:23542"; + + inherit (wg-snakeoil-keys.peer0) publicKey; + }; + }; + + specialisation.update-hosts.configuration = { + networking.extraHosts = + let + testCfg = nodes.server.virtualisation.test; + in + lib.mkForce "192.168.2.${toString testCfg.nodeNumber} ${testCfg.nodeName}"; + }; + }; + }; + + testScript = + { nodes, ... }: + '' + start_all() + + server.wait_for_unit("network-online.target") + client.wait_for_unit("network-online.target") + + client.succeed("ping -n -w 1 -c 1 10.23.42.1") + + client.succeed("ip link set down eth1") + + client.fail("ping -n -w 1 -c 1 10.23.42.1") + + with client.nested("update hosts file"): + client.succeed("${nodes.client.system.build.toplevel}/specialisation/update-hosts/bin/switch-to-configuration test") + + client.succeed("sleep 5 && ping -n -w 1 -c 1 10.23.42.1") + ''; + } +) diff --git a/nixos/tests/wireguard/networkd.nix b/nixos/tests/wireguard/networkd.nix new file mode 100644 index 000000000000..beaba5a4343a --- /dev/null +++ b/nixos/tests/wireguard/networkd.nix @@ -0,0 +1,89 @@ +import ../make-test-python.nix ( + { + pkgs, + lib, + kernelPackages ? null, + ... + }: + let + wg-snakeoil-keys = import ./snakeoil-keys.nix; + peer = (import ./make-peer.nix) { inherit lib; }; + in + { + name = "wireguard-networkd"; + meta = with pkgs.lib.maintainers; { + maintainers = [ majiir ]; + }; + + nodes = { + peer0 = peer { + ip4 = "192.168.0.1"; + ip6 = "fd00::1"; + extraConfig = { + boot = lib.mkIf (kernelPackages != null) { inherit kernelPackages; }; + networking.firewall.allowedUDPPorts = [ 23542 ]; + networking.wireguard.useNetworkd = true; + networking.wireguard.interfaces.wg0 = { + ips = [ + "10.23.42.1/32" + "fc00::1/128" + ]; + listenPort = 23542; + + # !!! Don't do this with real keys. The /nix store is world-readable! + privateKeyFile = toString (pkgs.writeText "privateKey" wg-snakeoil-keys.peer0.privateKey); + + peers = lib.singleton { + allowedIPs = [ + "10.23.42.2/32" + "fc00::2/128" + ]; + + inherit (wg-snakeoil-keys.peer1) publicKey; + }; + }; + }; + }; + + peer1 = peer { + ip4 = "192.168.0.2"; + ip6 = "fd00::2"; + extraConfig = { + boot = lib.mkIf (kernelPackages != null) { inherit kernelPackages; }; + networking.wireguard.useNetworkd = true; + networking.wireguard.interfaces.wg0 = { + ips = [ + "10.23.42.2/32" + "fc00::2/128" + ]; + listenPort = 23542; + + # !!! Don't do this with real keys. The /nix store is world-readable! + privateKeyFile = toString (pkgs.writeText "privateKey" wg-snakeoil-keys.peer1.privateKey); + + peers = lib.singleton { + allowedIPs = [ + "0.0.0.0/0" + "::/0" + ]; + endpoint = "192.168.0.1:23542"; + persistentKeepalive = 25; + + inherit (wg-snakeoil-keys.peer0) publicKey; + }; + }; + }; + }; + }; + + testScript = '' + start_all() + + peer0.wait_for_unit("systemd-networkd-wait-online.service") + peer1.wait_for_unit("systemd-networkd-wait-online.service") + + peer1.succeed("ping -c5 fc00::1") + peer1.succeed("ping -c5 10.23.42.1") + ''; + } +) From b7390e3686c472e5ea66d53c535891daeccb0676 Mon Sep 17 00:00:00 2001 From: Majiir Paktu Date: Sat, 7 Dec 2024 10:31:48 -0500 Subject: [PATCH 80/84] nixos/wireguard-networkd: add release notes entry --- nixos/doc/manual/release-notes/rl-2505.section.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/nixos/doc/manual/release-notes/rl-2505.section.md b/nixos/doc/manual/release-notes/rl-2505.section.md index 89e43abc584c..7577258aeeb3 100644 --- a/nixos/doc/manual/release-notes/rl-2505.section.md +++ b/nixos/doc/manual/release-notes/rl-2505.section.md @@ -97,6 +97,8 @@ - Cinnamon has been updated to 6.4. +- `networking.wireguard` now has an optional networkd backend. It is enabled by default when `networking.useNetworkd` is enabled, and it can be enabled alongside scripted networking with `networking.wireguard.useNetworkd`. Some `networking.wireguard` options have slightly different behavior with the networkd and script-based backends, documented in each option. Before upgrading, make sure the `privateKeyFile` and `presharedKeyFile` paths are readable by the `systemd-network` user if using the networkd backend. + - `services.avahi.ipv6` now defaults to true. - `bind.cacheNetworks` now only controls access for recursive queries, where it previously controlled access for all queries. From ff40568ea586ac094ccd153935d7cd59b7e7805b Mon Sep 17 00:00:00 2001 From: Sefa Eyeoglu Date: Sun, 8 Dec 2024 02:38:42 +0100 Subject: [PATCH 81/84] sops: 3.9.1 -> 3.9.2 (#361229) Signed-off-by: Sefa Eyeoglu --- pkgs/by-name/so/sops/package.nix | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/pkgs/by-name/so/sops/package.nix b/pkgs/by-name/so/sops/package.nix index 05fa66c2d7a2..65d84c62740c 100644 --- a/pkgs/by-name/so/sops/package.nix +++ b/pkgs/by-name/so/sops/package.nix @@ -1,23 +1,28 @@ { lib, - buildGoModule, + buildGo122Module, fetchFromGitHub, installShellFiles, nix-update-script, }: -buildGoModule rec { +buildGo122Module rec { pname = "sops"; - version = "3.9.1"; + version = "3.9.2"; src = fetchFromGitHub { owner = "getsops"; repo = pname; - rev = "v${version}"; - hash = "sha256-j16hSTi7fwlMu8hwHqCR0lW22VSf0swIVTF81iUYl2k="; + rev = "refs/tags/v${version}"; + hash = "sha256-v35LRFYdnWigWYlDhrOgSOcCI7SUqJbJHaZvlQ6PC4I="; }; - vendorHash = "sha256-40YESkLSKL/zFBI7ccz0ilrl9ATr74YpvRNrOpzJDew="; + vendorHash = "sha256-dnhrZPXZWeU98+dEaFLIdtcLWgIrh47l+WAxe+F+0/I="; + + postPatch = '' + substituteInPlace go.mod \ + --replace-fail "go 1.22" "go 1.22.7" + ''; subPackages = [ "cmd/sops" ]; From 9d312eed679ade604b4d6aa9b32ad8c2712ba3ba Mon Sep 17 00:00:00 2001 From: Sefa Eyeoglu Date: Sun, 8 Dec 2024 02:42:13 +0100 Subject: [PATCH 82/84] vokoscreen-ng: 4.2.0 -> 4.3.0 (#360742) * vokoscreen-ng: 4.2.0 -> 4.3.0 Signed-off-by: Sefa Eyeoglu * vokoscreen-ng: improve installPhase Signed-off-by: Sefa Eyeoglu * vokoscreen-ng: move to by-name Signed-off-by: Sefa Eyeoglu * vokoscreen-ng: nixfmt Signed-off-by: Sefa Eyeoglu --------- Signed-off-by: Sefa Eyeoglu --- .../vo/vokoscreen-ng/package.nix} | 66 ++++++++++--------- pkgs/top-level/all-packages.nix | 4 -- 2 files changed, 35 insertions(+), 35 deletions(-) rename pkgs/{applications/video/vokoscreen-ng/default.nix => by-name/vo/vokoscreen-ng/package.nix} (51%) diff --git a/pkgs/applications/video/vokoscreen-ng/default.nix b/pkgs/by-name/vo/vokoscreen-ng/package.nix similarity index 51% rename from pkgs/applications/video/vokoscreen-ng/default.nix rename to pkgs/by-name/vo/vokoscreen-ng/package.nix index 29b6c2c712d3..5471c64543d6 100644 --- a/pkgs/applications/video/vokoscreen-ng/default.nix +++ b/pkgs/by-name/vo/vokoscreen-ng/package.nix @@ -1,34 +1,35 @@ -{ fetchFromGitHub -, gst_all_1 -, gst-plugins-bad -, gst-plugins-base -, gst-plugins-good -, gst-plugins-ugly -, gstreamer -, lib -, libX11 -, pipewire -, pkg-config -, pulseaudio -, qt6 -, stdenv -, wayland +{ + fetchFromGitHub, + gst_all_1, + lib, + libX11, + pipewire, + pkg-config, + pulseaudio, + qt6, + stdenv, + wayland, }: stdenv.mkDerivation rec { pname = "vokoscreen-ng"; - version = "4.2.0"; + version = "4.3.0"; src = fetchFromGitHub { owner = "vkohaupt"; repo = "vokoscreenNG"; - rev = version; - hash = "sha256-PLgKOdSx0Kdobex5KaeCxWcindHEN9p4+xaVN/gr7Pk="; + rev = "refs/tags/${version}"; + hash = "sha256-efgvq/jl/ecjtINy5BdqtYRp2gxEvOsMzQVyCZ3ig+Q="; }; qmakeFlags = [ "src/vokoscreenNG.pro" ]; - nativeBuildInputs = [ qt6.qttools pkg-config qt6.qmake qt6.wrapQtAppsHook ]; + nativeBuildInputs = [ + qt6.qttools + pkg-config + qt6.qmake + qt6.wrapQtAppsHook + ]; buildInputs = [ gst_all_1.gstreamer libX11 @@ -43,29 +44,32 @@ stdenv.mkDerivation rec { gst_all_1.gst-plugins-ugly ]; - postPatch = '' - substituteInPlace src/vokoscreenNG.pro \ - --replace lrelease-qt5 lrelease - ''; - + # TODO: translations don't get built by the qmake project preBuild = '' lrelease src/language/*.ts ''; - postInstall = '' - mkdir -p $out/bin $out/share/applications $out/share/icons - cp ./vokoscreenNG $out/bin/ - cp ./src/applications/vokoscreenNG.desktop $out/share/applications/ - cp ./src/applications/vokoscreenNG.png $out/share/icons/ + # upstream doesn't provide an install target + installPhase = '' + runHook preInstall + + install -Dm755 -t $out/bin vokoscreenNG + install -Dm644 -t $out/share/applications src/applications/vokoscreenNG.desktop + install -Dm644 -t $out/share/icons src/applications/vokoscreenNG.png + qtWrapperArgs+=(--prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "$GST_PLUGIN_SYSTEM_PATH_1_0") - wrapQtApp $out/bin/vokoscreenNG + + runHook postInstall ''; meta = with lib; { description = "User friendly Open Source screencaster for Linux and Windows"; license = licenses.gpl2Plus; homepage = "https://github.com/vkohaupt/vokoscreenNG"; - maintainers = with maintainers; [ shamilton dietmarw ]; + maintainers = with maintainers; [ + shamilton + dietmarw + ]; platforms = platforms.linux; mainProgram = "vokoscreenNG"; }; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3e234d8ca810..0f7be7bef4ff 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -18523,10 +18523,6 @@ with pkgs; ffmpeg = ffmpeg-full; }; - vokoscreen-ng = libsForQt5.callPackage ../applications/video/vokoscreen-ng { - inherit (gst_all_1) gstreamer gst-plugins-base gst-plugins-good gst-plugins-bad gst-plugins-ugly; - }; - wacomtablet = libsForQt5.callPackage ../tools/misc/wacomtablet { }; wamr = darwin.apple_sdk_11_0.callPackage ../development/interpreters/wamr { }; From fd9961b8a49069aac934726b9c61cd68c87dd468 Mon Sep 17 00:00:00 2001 From: uku Date: Sun, 8 Dec 2024 03:44:37 +0100 Subject: [PATCH 83/84] reposilitePlugins: init at 3.5.19 (#355505) --- pkgs/by-name/re/reposilite/plugins.nix | 49 ++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 51 insertions(+) create mode 100644 pkgs/by-name/re/reposilite/plugins.nix diff --git a/pkgs/by-name/re/reposilite/plugins.nix b/pkgs/by-name/re/reposilite/plugins.nix new file mode 100644 index 000000000000..28ecae2264f4 --- /dev/null +++ b/pkgs/by-name/re/reposilite/plugins.nix @@ -0,0 +1,49 @@ +{ + generateSplicesForMkScope, + makeScopeWithSplicing', +}: +makeScopeWithSplicing' { + otherSplices = generateSplicesForMkScope; + f = + self: + { + fetchPlugin = self.callPackage ( + { + lib, + fetchurl, + reposilite, + }: + lib.makeOverridable ( + { name, hash }: + let + inherit (reposilite) version; + + fancyName = lib.concatStrings [ + (lib.toUpper (builtins.substring 0 1 name)) + (builtins.substring 1 ((builtins.stringLength name) - 1) name) + ]; + in + fetchurl { + url = "https://maven.reposilite.com/releases/com/reposilite/plugin/${name}-plugin/${version}/${name}-plugin-${version}-all.jar"; + inherit version hash; + + meta = { + description = "${fancyName} plugin for Reposilite."; + homepage = "https://github.com/dzikoysk/reposilite"; + sourceProvenance = with lib.sourceTypes; [ binaryBytecode ]; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ uku3lig ]; + inherit (reposilite.meta) platforms; + }; + } + ) + ) { }; + } + // builtins.mapAttrs (name: hash: self.fetchPlugin { inherit name hash; }) { + checksum = "sha256-ocvjjcrZW8I7hMdWiUn36XEbx3TqNYi0okemo9zWelA="; + groovy = "sha256-2NSTaivUAUMnAPHNqTNHWGqA8AF8jU9CE2ab9VGIFLo="; + migration = "sha256-+BfbLEy2gc81HVCyI2JREIIYMirKwPV48shMBAMbWlU="; + prometheus = "sha256-aukYUIS6S37ut9h+gO/JLrBUX/6RND5BhLqsrArxSUo="; + swagger = "sha256-zD2ihVEfQeH3S1df3o2gF19kGIODW2yIRWCGbk4npJY="; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0f7be7bef4ff..6d37335290d1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10687,6 +10687,8 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Security; }; + reposilitePlugins = recurseIntoAttrs (callPackage ../by-name/re/reposilite/plugins.nix {}); + rhino = callPackage ../development/libraries/java/rhino { javac = jdk8; jvm = jre8; From 51fe9136d9d08c2380142e11ebbb0cb195487006 Mon Sep 17 00:00:00 2001 From: Aaron Jheng Date: Sun, 8 Dec 2024 11:16:42 +0800 Subject: [PATCH 84/84] iproute2mac: rename from darwin.iproute2mac --- .../default.nix => by-name/ip/iproute2mac/package.nix} | 0 pkgs/top-level/darwin-aliases.nix | 1 + pkgs/top-level/darwin-packages.nix | 2 -- 3 files changed, 1 insertion(+), 2 deletions(-) rename pkgs/{os-specific/darwin/iproute2mac/default.nix => by-name/ip/iproute2mac/package.nix} (100%) diff --git a/pkgs/os-specific/darwin/iproute2mac/default.nix b/pkgs/by-name/ip/iproute2mac/package.nix similarity index 100% rename from pkgs/os-specific/darwin/iproute2mac/default.nix rename to pkgs/by-name/ip/iproute2mac/package.nix diff --git a/pkgs/top-level/darwin-aliases.nix b/pkgs/top-level/darwin-aliases.nix index 3bd8248805d2..20e1d681a29b 100644 --- a/pkgs/top-level/darwin-aliases.nix +++ b/pkgs/top-level/darwin-aliases.nix @@ -67,6 +67,7 @@ mapAliases ({ insert_dylib = throw "'darwin.insert_dylib' has been renamed to 'insert-dylib'"; # added 2024-04-04 ios-deploy = throw "'darwin.ios-deploy' has been renamed to 'ios-deploy'"; # added 2024-11-28 + iproute2mac = lib.warnOnInstantiate "darwin.iproute2mac has been renamed to iproute2mac" pkgs.iproute2mac; # added 2024-12-08 ### L ### diff --git a/pkgs/top-level/darwin-packages.nix b/pkgs/top-level/darwin-packages.nix index 89e10d8b0ab0..b7c8644495a1 100644 --- a/pkgs/top-level/darwin-packages.nix +++ b/pkgs/top-level/darwin-packages.nix @@ -202,8 +202,6 @@ impure-cmds // apple-source-packages // apple-source-headers // stubs // { inherit (pkgs.llvmPackages) clang-unwrapped; }; - iproute2mac = callPackage ../os-specific/darwin/iproute2mac { }; - lsusb = callPackage ../os-specific/darwin/lsusb { }; openwith = callPackage ../os-specific/darwin/openwith { };