From 67e4741194dfe6f6680c21ed028d40fdbdaa2806 Mon Sep 17 00:00:00 2001 From: GetPsyched Date: Sat, 27 Jul 2024 12:22:16 +0530 Subject: [PATCH 01/68] python3Packages.discordpy: add getpsyched as maintainer --- pkgs/development/python-modules/discordpy/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/discordpy/default.nix b/pkgs/development/python-modules/discordpy/default.nix index 023b14113622..155d5613ebfd 100644 --- a/pkgs/development/python-modules/discordpy/default.nix +++ b/pkgs/development/python-modules/discordpy/default.nix @@ -62,6 +62,6 @@ buildPythonPackage rec { homepage = "https://discordpy.rtfd.org/"; changelog = "https://github.com/Rapptz/discord.py/blob/v${version}/docs/whats_new.rst"; license = licenses.mit; - maintainers = [ ]; + maintainers = with maintainers; [ getpsyched ]; }; } From 5b72cfbb3df20a2c7775e8b819452cb814ee423a Mon Sep 17 00:00:00 2001 From: GetPsyched Date: Fri, 9 Aug 2024 12:27:25 +0530 Subject: [PATCH 02/68] python3Packages.discord.py: refactor - Make consistent with newer Python package and nixpkgs rules - Move general postPatch to lib.optionalString withVoice - Align imports in pythonImportsCheck with upstream packages --- .../python-modules/discordpy/default.nix | 56 +++++++++---------- 1 file changed, 25 insertions(+), 31 deletions(-) diff --git a/pkgs/development/python-modules/discordpy/default.nix b/pkgs/development/python-modules/discordpy/default.nix index 155d5613ebfd..73d8cdc7abd4 100644 --- a/pkgs/development/python-modules/discordpy/default.nix +++ b/pkgs/development/python-modules/discordpy/default.nix @@ -6,62 +6,56 @@ fetchFromGitHub, libopus, pynacl, - pythonOlder, withVoice ? true, ffmpeg, + setuptools, }: -buildPythonPackage rec { +let pname = "discord.py"; version = "2.4.0"; - format = "setuptools"; - - disabled = pythonOlder "3.8"; +in +buildPythonPackage { + inherit pname version; + pyproject = true; src = fetchFromGitHub { owner = "Rapptz"; - repo = pname; + repo = "discord.py"; rev = "refs/tags/v${version}"; hash = "sha256-GIwXx7bRCH2+G3zlilJ/Tb8el50SDbxGGX2/1bqL3+U="; }; - propagatedBuildInputs = - [ aiohttp ] - ++ lib.optionals withVoice [ - libopus - pynacl - ffmpeg - ]; + build-system = [ setuptools ]; - patchPhase = - '' - substituteInPlace "discord/opus.py" \ - --replace "ctypes.util.find_library('opus')" "'${libopus}/lib/libopus${stdenv.hostPlatform.extensions.sharedLibrary}'" - '' - + lib.optionalString withVoice '' - substituteInPlace "discord/player.py" \ - --replace "executable='ffmpeg'" "executable='${ffmpeg}/bin/ffmpeg'" - ''; + dependencies = [ aiohttp ] ++ lib.optionals withVoice [ pynacl ]; + + patchPhase = lib.optionalString withVoice '' + substituteInPlace "discord/opus.py" \ + --replace-fail "ctypes.util.find_library('opus')" "'${libopus}/lib/libopus${stdenv.hostPlatform.extensions.sharedLibrary}'" + + substituteInPlace "discord/player.py" \ + --replace-fail "executable: str = 'ffmpeg'" "executable: str = '${lib.getExe ffmpeg}'" + ''; # Only have integration tests with discord doCheck = false; pythonImportsCheck = [ "discord" - "discord.file" - "discord.member" - "discord.user" - "discord.state" - "discord.guild" + "discord.types" + "discord.ui" "discord.webhook" - "discord.ext.commands.bot" + "discord.app_commands" + "discord.ext.commands" + "discord.ext.tasks" ]; - meta = with lib; { + meta = { description = "Python wrapper for the Discord API"; homepage = "https://discordpy.rtfd.org/"; changelog = "https://github.com/Rapptz/discord.py/blob/v${version}/docs/whats_new.rst"; - license = licenses.mit; - maintainers = with maintainers; [ getpsyched ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ getpsyched ]; }; } From 812603129177b051617eb943b95085c568844723 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 17 Aug 2024 06:19:20 +0000 Subject: [PATCH 03/68] esbuild: 0.23.0 -> 0.23.1 --- pkgs/development/tools/esbuild/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/esbuild/default.nix b/pkgs/development/tools/esbuild/default.nix index 60aec66919d1..98f3a4f221e6 100644 --- a/pkgs/development/tools/esbuild/default.nix +++ b/pkgs/development/tools/esbuild/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "esbuild"; - version = "0.23.0"; + version = "0.23.1"; src = fetchFromGitHub { owner = "evanw"; repo = "esbuild"; rev = "v${version}"; - hash = "sha256-AH4Y5ELPicAdJZY5CBf2byOxTzOyQFRh4XoqRUQiAQw="; + hash = "sha256-2E5FkUnU/8tf+eDd+KIEcc0HlnpYYn5QMPq/w2sa914="; }; vendorHash = "sha256-+BfxCyg0KkDQpHt/wycy/8CTG6YBA/VJvJFhhzUnSiQ="; From 3a1427563a4da776d2e7e4580cc265effc4fd81e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 22 Aug 2024 19:40:56 +0000 Subject: [PATCH 04/68] nwjs-ffmpeg-prebuilt: 0.90.0 -> 0.91.0 --- pkgs/by-name/nw/nwjs-ffmpeg-prebuilt/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/nw/nwjs-ffmpeg-prebuilt/package.nix b/pkgs/by-name/nw/nwjs-ffmpeg-prebuilt/package.nix index 094008cb1008..e0d721fd352e 100644 --- a/pkgs/by-name/nw/nwjs-ffmpeg-prebuilt/package.nix +++ b/pkgs/by-name/nw/nwjs-ffmpeg-prebuilt/package.nix @@ -7,7 +7,7 @@ let bits = if stdenv.is64bit then "x64" else "ia32"; - version = "0.90.0"; + version = "0.91.0"; in stdenv.mkDerivation { pname = "nwjs-ffmpeg-prebuilt"; @@ -16,8 +16,8 @@ stdenv.mkDerivation { src = let hashes = { - "x64" = "sha256-AAKV896AuOm9dMV98tkEdHIpdUOSBx1QKyPR01VpqSw="; - "ia32" = "sha256-AAKV896AuOm9dMV98tkEdHIpdUOSBx1QKyPR01VpqSw="; + "x64" = "sha256-C6ZOY+oFyWYqLvpYmM9KnQ3B7y0JAXp4SbeNBYvcUe0="; + "ia32" = "sha256-C6ZOY+oFyWYqLvpYmM9KnQ3B7y0JAXp4SbeNBYvcUe0="; }; in fetchurl { From 3501da99986c8cd1ba2342c49cae9bb81b70e8e7 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 25 Aug 2024 09:51:18 +0000 Subject: [PATCH 05/68] srgn: 0.12.0 -> 0.13.1 --- pkgs/by-name/sr/srgn/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/sr/srgn/package.nix b/pkgs/by-name/sr/srgn/package.nix index 696bd36ddd8e..f50519eca3ef 100644 --- a/pkgs/by-name/sr/srgn/package.nix +++ b/pkgs/by-name/sr/srgn/package.nix @@ -5,16 +5,16 @@ }: rustPlatform.buildRustPackage rec { pname = "srgn"; - version = "0.12.0"; + version = "0.13.1"; src = fetchFromGitHub { owner = "alexpovel"; repo = "srgn"; rev = "srgn-v${version}"; - hash = "sha256-d53aSo1gzINC8WdMzjCHzU/8+9kvrrGglV4WsiCt+rM="; + hash = "sha256-KG5y5V+IWIAlFULnJEomNF2Q/jyKHSSJ6o83J6vlP8w="; }; - cargoHash = "sha256-jy7KHcdkI+T8GbT6gH9ppJhQvhv/NPe+jRWKuybtQC4="; + cargoHash = "sha256-Xxdsf2YaJ7IDccn6+fCoMZFXquY/4Ha+ymQSWLIhrWs="; nativeBuildInputs = [ installShellFiles ]; From c780b33c0f955fc64ab697d2246db7121cc60702 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 26 Aug 2024 15:36:25 +0000 Subject: [PATCH 06/68] python312Packages.sphinxcontrib-confluencebuilder: 2.6.1 -> 2.7.1 --- .../sphinxcontrib-confluencebuilder/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/sphinxcontrib-confluencebuilder/default.nix b/pkgs/development/python-modules/sphinxcontrib-confluencebuilder/default.nix index 1710b5212fd9..afbe62d9c989 100644 --- a/pkgs/development/python-modules/sphinxcontrib-confluencebuilder/default.nix +++ b/pkgs/development/python-modules/sphinxcontrib-confluencebuilder/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "sphinxcontrib-confluencebuilder"; - version = "2.6.1"; + version = "2.7.1"; pyproject = true; disabled = pythonOlder "3.8"; @@ -20,7 +20,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "sphinxcontrib_confluencebuilder"; inherit version; - hash = "sha256-9ymYfxL50ZDGlLzo2LXiBnuo2svWxnl37H/c6ENACjA="; + hash = "sha256-Tj9m0TcPkg+FIWwYixahpox27Yn+0tXPppwb5EwmBk0="; }; build-system = [ flit-core ]; From 6b407a0fba5118049b527579cc6f9bcef7057a7f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 27 Aug 2024 18:02:28 +0000 Subject: [PATCH 07/68] python312Packages.pulumi-aws: 6.49.1 -> 6.50.1 --- pkgs/development/python-modules/pulumi-aws/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pulumi-aws/default.nix b/pkgs/development/python-modules/pulumi-aws/default.nix index f5f31cd83ffb..9783c6a38de1 100644 --- a/pkgs/development/python-modules/pulumi-aws/default.nix +++ b/pkgs/development/python-modules/pulumi-aws/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "pulumi-aws"; # Version is independant of pulumi's. - version = "6.49.1"; + version = "6.50.1"; pyproject = true; build-system = [ setuptools ]; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "pulumi"; repo = "pulumi-aws"; rev = "refs/tags/v${version}"; - hash = "sha256-THgLOVCr+LWNO1SCGUrh8L/I75d2RSNw84FcovCSsBM="; + hash = "sha256-n+uqEgo71wdfZT1Pu+I8gckAebrTPUd8qNmzFcG6xHY="; }; sourceRoot = "${src.name}/sdk/python"; From 90b7e23ea292b6a4ebbfe1b0c85a0f6878e04551 Mon Sep 17 00:00:00 2001 From: Thomas Gerbet Date: Sat, 31 Aug 2024 00:33:29 +0200 Subject: [PATCH 08/68] vivaldi: 6.8.3381.57 -> 6.9.3447.37 Changes: https://vivaldi.com/blog/vivaldi-on-desktop-6-9/ --- pkgs/applications/networking/browsers/vivaldi/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/browsers/vivaldi/default.nix b/pkgs/applications/networking/browsers/vivaldi/default.nix index d4ffaedcb09e..7563f184d2a7 100644 --- a/pkgs/applications/networking/browsers/vivaldi/default.nix +++ b/pkgs/applications/networking/browsers/vivaldi/default.nix @@ -24,7 +24,7 @@ let vivaldiName = if isSnapshot then "vivaldi-snapshot" else "vivaldi"; in stdenv.mkDerivation rec { pname = "vivaldi"; - version = "6.8.3381.57"; + version = "6.9.3447.37"; suffix = { aarch64-linux = "arm64"; @@ -34,8 +34,8 @@ in stdenv.mkDerivation rec { src = fetchurl { url = "https://downloads.vivaldi.com/${branch}/vivaldi-${branch}_${version}-1_${suffix}.deb"; hash = { - aarch64-linux = "sha256-Tehc9T9+7NHaMYu7l7qB/09ips41rTx1VDCalUyO6Nw="; - x86_64-linux = "sha256-PC5fzMRIC2bW8xmPCG2nNIwwz0wha6+VDLAV1ihbQkM="; + aarch64-linux = "sha256-kYTnWad/jrJt9z+AhjXzHYxVSIwIIO3RKD7szuPEg2s="; + x86_64-linux = "sha256-+h7SHci8gZ+epKFHD0PiXyME2xT+loD2KXpJGFCfIFg="; }.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); }; From df3fe1dd131d549b390e1ccfc9399cf2c3c38560 Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Fri, 30 Aug 2024 22:14:03 -0400 Subject: [PATCH 09/68] python312Packages.trimesh: 4.4.7 -> 4.4.8 Changelog: https://github.com/mikedh/trimesh/releases/tag/4.4.8 --- pkgs/development/python-modules/trimesh/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/trimesh/default.nix b/pkgs/development/python-modules/trimesh/default.nix index f0788b6e146e..63f753014f7d 100644 --- a/pkgs/development/python-modules/trimesh/default.nix +++ b/pkgs/development/python-modules/trimesh/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "trimesh"; - version = "4.4.7"; + version = "4.4.8"; pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-5mGccMmQBtQfF1vV4bosjD39sAwrQdZQWZF5QuL2lxo="; + hash = "sha256-6MHTYDLH3pozGpAUfTsZtpTd28RMgAL0ESlAGjnsH84="; }; build-system = [ setuptools ]; From 4fd2357f088c7683f3672363cf070001eb2eded1 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 1 Sep 2024 00:01:35 +0000 Subject: [PATCH 10/68] python312Packages.raylib-python-cffi: 5.0.0.2 -> 5.0.0.3 --- .../development/python-modules/raylib-python-cffi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/raylib-python-cffi/default.nix b/pkgs/development/python-modules/raylib-python-cffi/default.nix index f1d46c1822d1..386dafa78dac 100644 --- a/pkgs/development/python-modules/raylib-python-cffi/default.nix +++ b/pkgs/development/python-modules/raylib-python-cffi/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "raylib-python-cffi"; - version = "5.0.0.2"; + version = "5.0.0.3"; pyproject = true; src = fetchFromGitHub { owner = "electronstudio"; repo = "raylib-python-cffi"; rev = "refs/tags/v${version}"; - hash = "sha256-DlnZRJZ0ZnkLii09grA/lGsJHPUYrbaJ55BVWJ8JzfM="; + hash = "sha256-R/w39zYkoOF5JqHDyqVIdON9yXFo2PeosyEQZOd4aYo="; }; build-system = [ setuptools ]; From 21604f73f238d1cccb128d6e9d7a851cebebc7cd Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 1 Sep 2024 16:20:56 +0000 Subject: [PATCH 11/68] python312Packages.pyheif: 0.7.1 -> 0.8.0 --- pkgs/development/python-modules/pyheif/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyheif/default.nix b/pkgs/development/python-modules/pyheif/default.nix index dc6b6e1ea5af..7b425671e85f 100644 --- a/pkgs/development/python-modules/pyheif/default.nix +++ b/pkgs/development/python-modules/pyheif/default.nix @@ -8,12 +8,12 @@ buildPythonPackage rec { pname = "pyheif"; - version = "0.7.1"; + version = "0.8.0"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-hqXFF0N51xRrXtGmiJL69yaKE1+39QOaARv7em6QMgA="; + hash = "sha256-6bTBHrrUgvwloIBM4pW0S2YMv3gpoij1awcfMl+eDeQ="; }; propagatedBuildInputs = [ From 2a303421ed3827b795845400a298434a56d53a4a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 4 Sep 2024 02:51:14 +0000 Subject: [PATCH 12/68] gitlab-timelogs: 0.3.0 -> 0.4.0 --- pkgs/by-name/gi/gitlab-timelogs/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/gi/gitlab-timelogs/package.nix b/pkgs/by-name/gi/gitlab-timelogs/package.nix index 4a7778ab95bc..23c03763e314 100644 --- a/pkgs/by-name/gi/gitlab-timelogs/package.nix +++ b/pkgs/by-name/gi/gitlab-timelogs/package.nix @@ -11,11 +11,11 @@ rustPlatform.buildRustPackage rec { pname = "gitlab-timelogs"; - version = "0.3.0"; + version = "0.4.0"; src = fetchCrate { inherit pname version; - hash = "sha256-n+Jvm4RqHkXIeQcY55iOEBgwvbr77vLMhqxXgdau5MQ="; + hash = "sha256-EWFzMNuNquHR0grmmi14vuraIwvrmkw88QAYkvbO2QM="; }; nativeBuildInputs = [ pkg-config ]; @@ -27,7 +27,7 @@ rustPlatform.buildRustPackage rec { iconv ]; - cargoHash = "sha256-REE7DWY0l4TTDTwWFWVr3Zk/oLQlOjrbFEWSFUlBEig="; + cargoHash = "sha256-IXiIrX+nR7uB7UYqdVgKR+IHJlRl0i0cklwITGF5jAg="; meta = { description = " CLI utility to support you with your time logs in GitLab"; From 71d02375b59d2d0db3d9948b20d1d33975ae16c0 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 4 Sep 2024 11:05:21 +0000 Subject: [PATCH 13/68] libzim: 9.2.2 -> 9.2.3 --- pkgs/development/libraries/libzim/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libzim/default.nix b/pkgs/development/libraries/libzim/default.nix index bf3a640bd821..83a225576e06 100644 --- a/pkgs/development/libraries/libzim/default.nix +++ b/pkgs/development/libraries/libzim/default.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation rec { pname = "libzim"; - version = "9.2.2"; + version = "9.2.3"; src = fetchFromGitHub { owner = "openzim"; repo = "libzim"; rev = "refs/tags/${version}"; - hash = "sha256-V81TzoYUFiI+07ooDQtG7ahxQFEh/6Y8IgoceHMSgOk="; + hash = "sha256-z22+cDlFQtLMLFh5+7Nt9LsGFyBPi3HeZhYb0LK86Oc="; }; nativeBuildInputs = [ From 21ea50b59e90faf147cecb8127dd7d950ccac067 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 4 Sep 2024 18:46:08 +0000 Subject: [PATCH 14/68] octavePackages.fuzzy-logic-toolkit: 0.6.0 -> 0.6.1 --- .../octave-modules/fuzzy-logic-toolkit/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/octave-modules/fuzzy-logic-toolkit/default.nix b/pkgs/development/octave-modules/fuzzy-logic-toolkit/default.nix index 05f15cfb1519..5d6a188bd77d 100644 --- a/pkgs/development/octave-modules/fuzzy-logic-toolkit/default.nix +++ b/pkgs/development/octave-modules/fuzzy-logic-toolkit/default.nix @@ -5,13 +5,13 @@ buildOctavePackage rec { pname = "fuzzy-logic-toolkit"; - version = "0.6.0"; + version = "0.6.1"; src = fetchFromGitHub { owner = "lmarkowsky"; repo = "fuzzy-logic-toolkit"; rev = "refs/tags/${version}"; - sha256 = "sha256-veU+3DPFJ2IeGw5PkpxGO8Oo9qEyR890hs4IAzbfxls="; + sha256 = "sha256-lnYzX4rq3j7rrbD8m0EnrWpbMJD6tqtMVCYu4mlLFCM="; }; meta = with lib; { From b18224e6f772e35c052a88144eba02815699587d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 4 Sep 2024 22:48:07 +0000 Subject: [PATCH 15/68] turso-cli: 0.97.0 -> 0.97.1 --- pkgs/development/tools/turso-cli/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/turso-cli/default.nix b/pkgs/development/tools/turso-cli/default.nix index d715b34661f7..e87cd2c9e210 100644 --- a/pkgs/development/tools/turso-cli/default.nix +++ b/pkgs/development/tools/turso-cli/default.nix @@ -8,16 +8,16 @@ }: buildGoModule rec { pname = "turso-cli"; - version = "0.97.0"; + version = "0.97.1"; src = fetchFromGitHub { owner = "tursodatabase"; repo = "turso-cli"; rev = "v${version}"; - hash = "sha256-m/0LfUs9oMWSjRPkVSPyHsFw8U1Fk2SXjqfOrLYsZlI="; + hash = "sha256-sS9H9mdbjV2EEsMKikQKND+gPeghH5cqRxhHcbjr7ok="; }; - vendorHash = "sha256-c8dX60GPZSNMoCaF51jLWJK+aNDmw6TdzlBYS+vSuEY="; + vendorHash = "sha256-tBO21IgUczwMgrEyV7scV3YTY898lYHASaLeXqvBopU="; nativeBuildInputs = [ installShellFiles ]; From 92b0bf00bea6a110b1172ab8c6edf88af5786471 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 4 Sep 2024 23:58:19 +0000 Subject: [PATCH 16/68] handheld-daemon: 3.3.11 -> 3.3.12 --- pkgs/by-name/ha/handheld-daemon/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ha/handheld-daemon/package.nix b/pkgs/by-name/ha/handheld-daemon/package.nix index 565732418ebd..5b09c6aaa239 100644 --- a/pkgs/by-name/ha/handheld-daemon/package.nix +++ b/pkgs/by-name/ha/handheld-daemon/package.nix @@ -8,14 +8,14 @@ }: python3.pkgs.buildPythonApplication rec { pname = "handheld-daemon"; - version = "3.3.11"; + version = "3.3.12"; pyproject = true; src = fetchFromGitHub { owner = "hhd-dev"; repo = "hhd"; rev = "refs/tags/v${version}"; - hash = "sha256-vjJY9YrULRHEgVIgzwLS5gKfQnbHFKXigU+rlm+BiJQ="; + hash = "sha256-3ne9e1rYjWe8opwOvtP5NJMNbTloWg1kj+JzckpeW1M="; }; propagatedBuildInputs = with python3.pkgs; [ From 5dcf16e3e3ef48e0155eed2c4bd432a2c6911647 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 4 Sep 2024 23:58:39 +0000 Subject: [PATCH 17/68] marimo: 0.8.7 -> 0.8.11 --- pkgs/development/python-modules/marimo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/marimo/default.nix b/pkgs/development/python-modules/marimo/default.nix index 626f358bbc84..1e7ee2d4cd07 100644 --- a/pkgs/development/python-modules/marimo/default.nix +++ b/pkgs/development/python-modules/marimo/default.nix @@ -24,14 +24,14 @@ buildPythonPackage rec { pname = "marimo"; - version = "0.8.7"; + version = "0.8.11"; pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-gxfb5MYPbl8KnvIL+93CyYLOaJ6UflqaikXLAWCS55g="; + hash = "sha256-JHlzyQS7zleHUF6NW8oQ2fULdGuI+Y+vuWfiUO/YCm8="; }; build-system = [ setuptools ]; From 6a8ed16680c57a7c1a94eb3f843ec5dfd397e027 Mon Sep 17 00:00:00 2001 From: natsukium Date: Thu, 5 Sep 2024 10:07:25 +0900 Subject: [PATCH 18/68] python312Packages.pyheif: refactor and enable tests --- .../python-modules/pyheif/default.nix | 31 ++++++++++++++----- 1 file changed, 23 insertions(+), 8 deletions(-) diff --git a/pkgs/development/python-modules/pyheif/default.nix b/pkgs/development/python-modules/pyheif/default.nix index 7b425671e85f..1771bf1ea7f9 100644 --- a/pkgs/development/python-modules/pyheif/default.nix +++ b/pkgs/development/python-modules/pyheif/default.nix @@ -1,24 +1,39 @@ { lib, buildPythonPackage, - fetchPypi, + fetchFromGitHub, + setuptools, cffi, libheif, + piexif, + pillow, + pytestCheckHook, }: buildPythonPackage rec { pname = "pyheif"; version = "0.8.0"; - format = "setuptools"; + pyproject = true; - src = fetchPypi { - inherit pname version; - hash = "sha256-6bTBHrrUgvwloIBM4pW0S2YMv3gpoij1awcfMl+eDeQ="; + src = fetchFromGitHub { + owner = "carsales"; + repo = "pyheif"; + rev = "refs/tags/release-${version}"; + hash = "sha256-7De8ekDceSkUcOgK7ppKad5W5qE0yxdS4kbgYVjxTGg="; }; - propagatedBuildInputs = [ - cffi - libheif + build-system = [ setuptools ]; + + buildInputs = [ libheif ]; + + dependencies = [ cffi ]; + + pythonImportsCheck = [ "pyheif" ]; + + nativeCheckInputs = [ + piexif + pillow + pytestCheckHook ]; meta = with lib; { From 7d34caec6c31436278777248ee1dfa90a067144d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 5 Sep 2024 01:58:44 +0000 Subject: [PATCH 19/68] pulldown-cmark: 0.12.0 -> 0.12.1 --- pkgs/tools/typesetting/pulldown-cmark/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/typesetting/pulldown-cmark/default.nix b/pkgs/tools/typesetting/pulldown-cmark/default.nix index 6b38bf5d4a8d..be71ffd8bd75 100644 --- a/pkgs/tools/typesetting/pulldown-cmark/default.nix +++ b/pkgs/tools/typesetting/pulldown-cmark/default.nix @@ -5,14 +5,14 @@ rustPlatform.buildRustPackage rec { pname = "pulldown-cmark"; - version = "0.12.0"; + version = "0.12.1"; src = fetchCrate { inherit pname version; - hash = "sha256-LBaWfcTA5qxhrEUG0FeusGZBgvRjuQS0/1pqeKQQWbk="; + hash = "sha256-PfkmzmK98Mzay6P48NTEJhtpuoCiTb3JqUIYObcS41k="; }; - cargoHash = "sha256-UPv7F/itmISaUikR6jdAj3FvTF56VqwdMvD3L3WruA4="; + cargoHash = "sha256-BhlKFisM1ho7xcwBnjtODQdacE/B9UoqYXj3dIAeTXE="; meta = { description = "Pull parser for CommonMark written in Rust"; From 59dbee2d85c227f980ccc4d3fd990bfa545c9c85 Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Thu, 5 Sep 2024 09:27:53 +0200 Subject: [PATCH 20/68] python312Packages.trimesh: 4.4.8 -> 4.4.9 Changelog: https://github.com/mikedh/trimesh/releases/tag/4.4.9 --- pkgs/development/python-modules/trimesh/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/trimesh/default.nix b/pkgs/development/python-modules/trimesh/default.nix index 63f753014f7d..272a5d535a31 100644 --- a/pkgs/development/python-modules/trimesh/default.nix +++ b/pkgs/development/python-modules/trimesh/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "trimesh"; - version = "4.4.8"; + version = "4.4.9"; pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-6MHTYDLH3pozGpAUfTsZtpTd28RMgAL0ESlAGjnsH84="; + hash = "sha256-6fVMtO9w+dtJRGytOEW3qAQ/x9YtkZKyQXQfP7DYE6w="; }; build-system = [ setuptools ]; From e806b2ec65f5c8869bac50f78d7ea4e0104b805a Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Thu, 5 Sep 2024 12:54:47 +0200 Subject: [PATCH 21/68] python312Packages.amaranth: 0.5.1 -> 0.5.2 --- pkgs/development/python-modules/amaranth/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/amaranth/default.nix b/pkgs/development/python-modules/amaranth/default.nix index 24707baa4cdf..bac25d70f040 100644 --- a/pkgs/development/python-modules/amaranth/default.nix +++ b/pkgs/development/python-modules/amaranth/default.nix @@ -21,14 +21,14 @@ buildPythonPackage rec { pname = "amaranth"; format = "pyproject"; - version = "0.5.1"; + version = "0.5.2"; disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "amaranth-lang"; repo = "amaranth"; rev = "refs/tags/v${version}"; - hash = "sha256-76wuxWz6RikFFJH+5kte57GcVhusJKtcMo5M/2U+Cl8="; + hash = "sha256-pf9X1B60FgqTbSw7D80ERHp4GCvCe5lqrlS96xPXLNo="; }; nativeBuildInputs = [ From 288c1b49af4bc3ef3cdcfe2edd22406f5c05a8c2 Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Thu, 5 Sep 2024 11:14:58 +0200 Subject: [PATCH 22/68] dolphin-emu: 2407 -> 2409 Diff: https://github.com/dolphin-emu/dolphin/compare/refs/tags/2407...2409 --- pkgs/applications/emulators/dolphin-emu/default.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/emulators/dolphin-emu/default.nix b/pkgs/applications/emulators/dolphin-emu/default.nix index 3ba6288a9887..123ca313ec85 100644 --- a/pkgs/applications/emulators/dolphin-emu/default.nix +++ b/pkgs/applications/emulators/dolphin-emu/default.nix @@ -50,17 +50,18 @@ , moltenvk , OpenGL , VideoToolbox +, xcbuild }: stdenv.mkDerivation (finalAttrs: { pname = "dolphin-emu"; - version = "2407"; + version = "2409"; src = fetchFromGitHub { owner = "dolphin-emu"; repo = "dolphin"; rev = "refs/tags/${finalAttrs.version}"; - hash = "sha256-8W4KyIj+rhDkWnQogjpzlEJVo3HJenfpWKimSyMGN7c="; + hash = "sha256-x4ZtV/5bwUjcmdYneG7n7uFVyPmYj0sD8TXEqsqbUFU="; fetchSubmodules = true; }; @@ -70,6 +71,8 @@ stdenv.mkDerivation (finalAttrs: { cmake pkg-config wrapQtAppsHook + ] ++ lib.optionals stdenv.isDarwin [ + xcbuild # for plutil ]; buildInputs = [ From e15a8972864d48442ae298646f74da3a2e019c68 Mon Sep 17 00:00:00 2001 From: Raphael Robatsch Date: Thu, 5 Sep 2024 20:06:59 +0200 Subject: [PATCH 23/68] mbedtls: 3.6.0 -> 3.6.1 Changelog: https://github.com/Mbed-TLS/mbedtls/releases/tag/mbedtls-3.6.1 Fixes CVE-2024-45157, CVE-2024-45158, CVE-2024-45159 --- pkgs/development/libraries/mbedtls/3.nix | 18 +++--------------- 1 file changed, 3 insertions(+), 15 deletions(-) diff --git a/pkgs/development/libraries/mbedtls/3.nix b/pkgs/development/libraries/mbedtls/3.nix index d672e218f577..f8f53522db13 100644 --- a/pkgs/development/libraries/mbedtls/3.nix +++ b/pkgs/development/libraries/mbedtls/3.nix @@ -1,18 +1,6 @@ -{ callPackage -, fetchpatch -}: +{ callPackage }: callPackage ./generic.nix { - version = "3.6.0"; - hash = "sha256-tCwAKoTvY8VCjcTPNwS3DeitflhpKHLr6ygHZDbR6wQ="; - - patches = [ - # https://github.com/Mbed-TLS/mbedtls/pull/9000 - # Remove at next version update - (fetchpatch { - name = "fix-darwin-memcpy-error.patch"; - url = "https://github.com/Mbed-TLS/mbedtls/commit/b32d7ae0fee2f906be59780b42a0cd4468a39bd1.patch"; - hash = "sha256-BTkJs9NEkCl+/Q8EwB/LW9uwF95jQOKWmoCK4B/7/sU="; - }) - ]; + version = "3.6.1"; + hash = "sha256-SVWz2uOvGIplnBr4g6nwfxKMWVpzdZjusseAhw6GOJ8="; } From 3d78efe428947e7c807547674957e7529fd6f0a4 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 5 Sep 2024 23:13:54 +0000 Subject: [PATCH 24/68] nile: 1.1.1-unstable-2024-08-07 -> 1.1.1-unstable-2024-09-05 --- pkgs/games/nile/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/games/nile/default.nix b/pkgs/games/nile/default.nix index ae368b696e60..d5c64f8a696b 100644 --- a/pkgs/games/nile/default.nix +++ b/pkgs/games/nile/default.nix @@ -15,14 +15,14 @@ buildPythonApplication rec { pname = "nile"; - version = "1.1.1-unstable-2024-08-07"; + version = "1.1.1-unstable-2024-09-05"; format = "pyproject"; src = fetchFromGitHub { owner = "imLinguin"; repo = "nile"; - rev = "9ce614f82a550a714ae55c4365658dba7bb1bb15"; - hash = "sha256-7EzU8aUYiYe1eXFs6nE1qchlMzIKh2U09uIGmiN32xM="; + rev = "aefa5dd9c3a5146669da22317c8e0e3c12665f64"; + hash = "sha256-wZdiUJH4sGYJqJ7Ssjl+30MiUbXupLzbSpiOU1M/3Fg="; }; disabled = pythonOlder "3.8"; From 2fca23b99ef3e532bef6d9aa3b0ad63fdab6866c Mon Sep 17 00:00:00 2001 From: Lin Date: Thu, 5 Sep 2024 21:35:44 -0300 Subject: [PATCH 25/68] electron-mail 5.2.2 -> 5.2.3 --- .../networking/mailreaders/electron-mail/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/mailreaders/electron-mail/default.nix b/pkgs/applications/networking/mailreaders/electron-mail/default.nix index d7c971c66a5d..22e7200277f9 100644 --- a/pkgs/applications/networking/mailreaders/electron-mail/default.nix +++ b/pkgs/applications/networking/mailreaders/electron-mail/default.nix @@ -7,11 +7,11 @@ let pname = "electron-mail"; - version = "5.2.2"; + version = "5.2.3"; src = fetchurl { url = "https://github.com/vladimiry/ElectronMail/releases/download/v${version}/electron-mail-${version}-linux-x86_64.AppImage"; - sha256 = "sha256-bGqTPP+djpr+RFS6X7jUlSbxl7UDUaZLWQ3D/R76zEI="; + sha256 = "sha256-ajekPPRgprYNWE2osAXe46qVjnxXzkXa+MkWiNYJ5Fc="; }; appimageContents = appimageTools.extract { inherit pname version src; }; From dbe7e4419c729c2ac67a8267a99e9c8540253751 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 6 Sep 2024 01:03:25 +0000 Subject: [PATCH 26/68] helm-ls: 0.0.22 -> 0.1.0 --- pkgs/development/tools/language-servers/helm-ls/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/language-servers/helm-ls/default.nix b/pkgs/development/tools/language-servers/helm-ls/default.nix index f34d3a8ba732..df72b7dfb615 100644 --- a/pkgs/development/tools/language-servers/helm-ls/default.nix +++ b/pkgs/development/tools/language-servers/helm-ls/default.nix @@ -8,13 +8,13 @@ buildGoModule rec { pname = "helm-ls"; - version = "0.0.22"; + version = "0.1.0"; src = fetchFromGitHub { owner = "mrjosh"; repo = "helm-ls"; rev = "v${version}"; - hash = "sha256-h3ppVj+Y1jtvsZLWzZxmFmmxr0My9Nd4zQBqeDSX0ZI="; + hash = "sha256-EuZbbeRssacrctIbxBbd2GOh8zgFi2OBRregfC88se0="; }; vendorHash = "sha256-AWKCE2BZGVYcr6Pe8URQo11Xnr3sfgWWkm9v7vvILOo="; From 1603245c313a7649475d36da4407090820cd4efb Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 6 Sep 2024 03:13:55 +0000 Subject: [PATCH 27/68] quill-log: 6.1.2 -> 7.0.0 --- pkgs/by-name/qu/quill-log/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/qu/quill-log/package.nix b/pkgs/by-name/qu/quill-log/package.nix index 22d042828ec7..b75caea66099 100644 --- a/pkgs/by-name/qu/quill-log/package.nix +++ b/pkgs/by-name/qu/quill-log/package.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "quill-log"; - version = "6.1.2"; + version = "7.0.0"; src = fetchFromGitHub { owner = "odygrd"; repo = "quill"; rev = "v${version}"; - hash = "sha256-hnSdyaVOPppa6KCgD6NoD4PKn0jI4iGGPg3Tnx0KX3w="; + hash = "sha256-lNbr8oPyD/IOP+R2QKTYm9eF3jpYBCXeCtK25ibXtnM="; }; nativeBuildInputs = [ cmake ]; From f5a53c02c0e5ed552d5331690d27eb0a3dcef311 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 6 Sep 2024 04:16:39 +0000 Subject: [PATCH 28/68] asm-lsp: 0.7.4 -> 0.9.0 --- pkgs/by-name/as/asm-lsp/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/as/asm-lsp/package.nix b/pkgs/by-name/as/asm-lsp/package.nix index 0f5be37795a5..377abd03d3b0 100644 --- a/pkgs/by-name/as/asm-lsp/package.nix +++ b/pkgs/by-name/as/asm-lsp/package.nix @@ -6,7 +6,7 @@ }: let pname = "asm-lsp"; - version = "0.7.4"; + version = "0.9.0"; in rustPlatform.buildRustPackage { inherit pname version; @@ -15,7 +15,7 @@ rustPlatform.buildRustPackage { owner = "bergercookie"; repo = "asm-lsp"; rev = "v${version}"; - hash = "sha256-tgwiCAlHuFdeMr1GA4vPg8i94zfRj+uyPMAXYh+Smo4="; + hash = "sha256-0GB3tXZuCu3syh+RG+eXoliZVHMPOhYC3RchSSx4u5w="; }; nativeBuildInputs = [ @@ -26,7 +26,7 @@ rustPlatform.buildRustPackage { openssl ]; - cargoHash = "sha256-UBYD0rs7bEtVZatu/kRgyCwKHvcgYJWRgyfBi3ooPGQ="; + cargoHash = "sha256-AtCnYOOtViMpg+rz8miuBZg1pENBPaf9kamSPaVUyiw="; # tests expect ~/.cache/asm-lsp to be writable preCheck = '' From a1452a97701fb582019c72a8c213b6cc12c0e5dd Mon Sep 17 00:00:00 2001 From: Raphael Robatsch Date: Thu, 5 Sep 2024 20:07:48 +0200 Subject: [PATCH 29/68] mbedtls_2: 2.28.8 -> 2.28.9 Changelog: https://github.com/Mbed-TLS/mbedtls/releases/tag/mbedtls-2.28.9 Fixes CVE-2024-45157 --- pkgs/development/libraries/mbedtls/2.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/mbedtls/2.nix b/pkgs/development/libraries/mbedtls/2.nix index 42fb6edae78f..1d0291552713 100644 --- a/pkgs/development/libraries/mbedtls/2.nix +++ b/pkgs/development/libraries/mbedtls/2.nix @@ -1,6 +1,6 @@ { callPackage }: callPackage ./generic.nix { - version = "2.28.8"; - hash = "sha256-A1DYZrvJ8SRujroVwqPfcTOSgLnT5xRat/RVdq2fL/o="; + version = "2.28.9"; + hash = "sha256-/Bm05CvS9t7WSh4qoMconCaD7frlmA/H9YDyJOuGuFE="; } From 28cd3a0d7e4412e337632c1d6666d8de01cf7183 Mon Sep 17 00:00:00 2001 From: Jonas Heinrich Date: Fri, 6 Sep 2024 14:18:29 +0200 Subject: [PATCH 30/68] php.packages.composer: 2.7.7 -> 2.7.9 --- pkgs/development/php-packages/composer/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/php-packages/composer/default.nix b/pkgs/development/php-packages/composer/default.nix index 150d069ca67c..f8838ba83475 100644 --- a/pkgs/development/php-packages/composer/default.nix +++ b/pkgs/development/php-packages/composer/default.nix @@ -15,13 +15,13 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "composer"; - version = "2.7.7"; + version = "2.7.9"; # Hash used by ../../../build-support/php/pkgs/composer-phar.nix to # use together with the version from this package to keep the # bootstrap phar file up-to-date together with the end user composer # package. - passthru.pharHash = "sha256-qrlAzVPShaVMUEZYIKIID8txgqS6Hl95Wr+xBBSktL4="; + passthru.pharHash = "sha256-tt5eZcGZ2AuhGJf74TZOBj6FjUg/aoGhdsTWDysdY0c="; composer = callPackage ../../../build-support/php/pkgs/composer-phar.nix { inherit (finalAttrs) version; @@ -32,7 +32,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { owner = "composer"; repo = "composer"; rev = finalAttrs.version; - hash = "sha256-N8el4oyz3ZGIXN2qmpf6Df0SIjuc1GjyuMuQCcR/xN4="; + hash = "sha256-aVD3hB7a/Ji1sEsfo0EQ7SDBqjVg6+FRi1dpO94VtZs="; }; nativeBuildInputs = [ makeBinaryWrapper ]; @@ -86,7 +86,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { outputHashMode = "recursive"; outputHashAlgo = "sha256"; - outputHash = "sha256-AsuiTDXJs7jN4N/dJr10BT2PH0f6K2CWDvI8zQW5L9c="; + outputHash = "sha256-iNx7AXNsfiDeEaGYKVi+kzzPpMeg+R18WYquful5E0o="; }; installPhase = '' From 836658e7210e6277b8091e86ca65c6a756e6881e Mon Sep 17 00:00:00 2001 From: Adam Stephens Date: Fri, 6 Sep 2024 09:57:17 -0400 Subject: [PATCH 31/68] beam-packages: add nodocs target for building ex_doc on 27+ --- .../interpreters/erlang/generic-builder.nix | 14 +++++++------- pkgs/top-level/all-packages.nix | 6 ++++++ pkgs/top-level/beam-packages.nix | 7 ++++--- 3 files changed, 17 insertions(+), 10 deletions(-) diff --git a/pkgs/development/interpreters/erlang/generic-builder.nix b/pkgs/development/interpreters/erlang/generic-builder.nix index ff8aadf90980..b5502a036247 100644 --- a/pkgs/development/interpreters/erlang/generic-builder.nix +++ b/pkgs/development/interpreters/erlang/generic-builder.nix @@ -19,11 +19,11 @@ , libGLU ? null , wxGTK ? null , xorg ? null -, exdoc ? null +, ex_doc ? null , parallelBuild ? false , systemd , wxSupport ? true -, exdocSupport ? false +, ex_docSupport ? false , systemdSupport ? lib.meta.availableOn stdenv.hostPlatform systemd # systemd support in epmd # updateScript deps , writeScript @@ -64,7 +64,7 @@ , installPhase ? "" , preInstall ? "" , postInstall ? "" -, installTargets ? [ "install" "install-docs" ] +, installTargets ? if ((lib.versionOlder version "27.0") || ex_docSupport) then [ "install" "install-docs" ] else [ "install" ] , checkPhase ? "" , preCheck ? "" , postCheck ? "" @@ -80,7 +80,7 @@ else libGL != null && libGLU != null && wxGTK != null && xorg != null); assert odbcSupport -> unixODBC != null; assert javacSupport -> openjdk11 != null; -assert exdocSupport -> exdoc != null; +assert ex_docSupport -> ex_doc != null; let inherit (lib) optional optionals optionalAttrs optionalString; @@ -122,15 +122,15 @@ stdenv.mkDerivation ({ ''; # For OTP 27+ we need ex_doc to build the documentation - # When exdocSupport is enabled, grab the raw ex_doc executable from the exdoc + # When ex_docSupport is enabled, grab the raw ex_doc executable from the ex_doc # derivation. Next, patch the first line to use the escript that will be # built during the build phase of this derivation. Finally, building the # documentation requires the erlang-logo.png asset. preConfigure = '' ./otp_build autoconf - '' + optionalString exdocSupport '' + '' + optionalString ex_docSupport '' mkdir -p $out/bin - cp ${exdoc}/bin/.ex_doc-wrapped $out/bin/ex_doc + cp ${ex_doc}/bin/.ex_doc-wrapped $out/bin/ex_doc sed -i "1 s:^.*$:#!$out/bin/escript:" $out/bin/ex_doc export EX_DOC=$out/bin/ex_doc diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e69ca4d78f5b..b70715f5f36e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16529,6 +16529,12 @@ with pkgs; wxSupport = false; systemdSupport = false; }; + beam_nodocs = callPackage ./beam-packages.nix { + beam = beam_nodocs; + wxSupport = false; + systemdSupport = false; + ex_docSupport = false; + }; inherit (beam.interpreters) erlang erlang_27 erlang_26 erlang_25 erlang_24 diff --git a/pkgs/top-level/beam-packages.nix b/pkgs/top-level/beam-packages.nix index 45900c8b06e2..6da5b2218d5e 100644 --- a/pkgs/top-level/beam-packages.nix +++ b/pkgs/top-level/beam-packages.nix @@ -1,9 +1,11 @@ { lib , beam +, beam_nodocs , callPackage , wxGTK32 , buildPackages , stdenv +, ex_docSupport ? true , wxSupport ? true , systemd , systemdSupport ? lib.meta.availableOn stdenv.hostPlatform systemd @@ -30,9 +32,8 @@ in wxGTK = wxGTK32; parallelBuild = true; autoconf = buildPackages.autoconf269; - exdocSupport = true; - exdoc = self.packages.erlang_26.ex_doc; - inherit wxSupport systemdSupport; + inherit (beam_nodocs.packages.erlang_27) ex_doc; + inherit ex_docSupport wxSupport systemdSupport; }; erlang_26 = self.beamLib.callErlang ../development/interpreters/erlang/26.nix { From 0b3130d0641c9eceb3f75049548eec569e7bc050 Mon Sep 17 00:00:00 2001 From: Andrew Marshall Date: Fri, 6 Sep 2024 09:37:37 -0400 Subject: [PATCH 32/68] blender: fix runtime crash by adding missing wayland-scanner Without this, it crashes on launch or render when using (at least) Nvidia GPUs. Blender build needs this, but currently only warns during build. See also: https://github.com/NixOS/nixpkgs/pull/214906 https://github.com/NixOS/nixpkgs/issues/340080 --- pkgs/applications/misc/blender/default.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/misc/blender/default.nix b/pkgs/applications/misc/blender/default.nix index 25e9388307b6..53833059106b 100644 --- a/pkgs/applications/misc/blender/default.nix +++ b/pkgs/applications/misc/blender/default.nix @@ -77,6 +77,7 @@ tbb, wayland, wayland-protocols, + wayland-scanner, waylandSupport ? stdenv.isLinux, zlib, zstd, @@ -223,7 +224,10 @@ stdenv.mkDerivation (finalAttrs: { addDriverRunpath cudaPackages.cuda_nvcc ] - ++ lib.optionals waylandSupport [ pkg-config ]; + ++ lib.optionals waylandSupport [ + pkg-config + wayland-scanner + ]; buildInputs = [ From 1b93140f681d9ac3aa0021e562132b22b6a2e51f Mon Sep 17 00:00:00 2001 From: Andrew Marshall Date: Fri, 6 Sep 2024 09:53:23 -0400 Subject: [PATCH 33/68] blender: formatting --- pkgs/applications/misc/blender/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/misc/blender/default.nix b/pkgs/applications/misc/blender/default.nix index 53833059106b..7a5a2eefc96a 100644 --- a/pkgs/applications/misc/blender/default.nix +++ b/pkgs/applications/misc/blender/default.nix @@ -150,6 +150,7 @@ stdenv.mkDerivation (finalAttrs: { cmakeFlags = [ + "-DMaterialX_DIR=${python3Packages.materialx}/lib/cmake/MaterialX" "-DPYTHON_INCLUDE_DIR=${python3}/include/${python3.libPrefix}" "-DPYTHON_LIBPATH=${python3}/lib" "-DPYTHON_LIBRARY=${python3.libPrefix}" @@ -162,7 +163,6 @@ stdenv.mkDerivation (finalAttrs: { "-DWITH_FFTW3=ON" "-DWITH_IMAGE_OPENJPEG=ON" "-DWITH_INSTALL_PORTABLE=OFF" - "-DMaterialX_DIR=${python3Packages.materialx}/lib/cmake/MaterialX" "-DWITH_MOD_OCEANSIM=ON" "-DWITH_OPENCOLLADA=${if colladaSupport then "ON" else "OFF"}" "-DWITH_OPENCOLORIO=ON" From 72ac9a149a3aa99ddb121c31adb84eb8297abf5d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gutyina=20Gerg=C5=91?= Date: Tue, 3 Sep 2024 14:55:06 +0200 Subject: [PATCH 34/68] bruno: 1.25.0 -> 1.28.0 --- pkgs/by-name/br/bruno/package.nix | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/pkgs/by-name/br/bruno/package.nix b/pkgs/by-name/br/bruno/package.nix index e49ed0b4d2c7..848f5406c1d2 100644 --- a/pkgs/by-name/br/bruno/package.nix +++ b/pkgs/by-name/br/bruno/package.nix @@ -26,20 +26,20 @@ let in buildNpmPackage' rec { pname = "bruno"; - version = "1.25.0"; + version = "1.28.0"; src = fetchFromGitHub { owner = "usebruno"; repo = "bruno"; rev = "v${version}"; - hash = "sha256-TXEe0ICrkljxfnvW1wv/e1BB7J6p/KW3JklCvYyjqSs="; + hash = "sha256-SLND+eEEMFVHE5XPt2EKkJ+BjENqvUSrWkqnC6ghUBI="; postFetch = '' ${lib.getExe npm-lockfile-fix} $out/package-lock.json ''; }; - npmDepsHash = "sha256-/1/QPKjSgJJDtmUipgbiVR+Buea9cXO+HvICfKVX/2g="; + npmDepsHash = "sha256-RFn7Bbx1xMm4gt++lhPflXjEfTIgmls2TkrJ8Ta2qpI="; npmFlags = [ "--legacy-peer-deps" ]; nativeBuildInputs = @@ -79,16 +79,13 @@ buildNpmPackage' rec { --replace-fail 'if [ "$1" == "snap" ]; then' 'exit 0; if [ "$1" == "snap" ]; then' ''; - ELECTRON_SKIP_BINARY_DOWNLOAD = 1; - - # remove giflib dependency - npmRebuildFlags = [ "--ignore-scripts" ]; - preBuild = '' - substituteInPlace node_modules/canvas/binding.gyp \ - --replace-fail "'with_gif%': ' Date: Fri, 6 Sep 2024 16:11:11 +0200 Subject: [PATCH 35/68] maintainers: add deekahy MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-Authored-By: éclairevoyant <848000+eclairevoyant@users.noreply.github.com> --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 1932b01c3aa3..94e88dc9b387 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -4851,6 +4851,12 @@ name = "David Morgan"; keys = [ { fingerprint = "9B43 6B14 77A8 79C2 6CDB 6604 C171 2510 02C2 00F2"; } ]; }; + deekahy = { + email = "Lennart.Diego.Kahn@gmail.com"; + github = "deekahy"; + githubId = 97156953; + name = "Lennart Diego Kahn"; + }; deemp = { email = "deempleton@gmail.com"; github = "deemp"; From 77e5223ffa4a3f4f91a17c3023ad56d477a4b291 Mon Sep 17 00:00:00 2001 From: Deekahy Date: Fri, 6 Sep 2024 21:55:52 +0200 Subject: [PATCH 36/68] copycat: init at 001 --- pkgs/by-name/co/copycat/package.nix | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) create mode 100644 pkgs/by-name/co/copycat/package.nix diff --git a/pkgs/by-name/co/copycat/package.nix b/pkgs/by-name/co/copycat/package.nix new file mode 100644 index 000000000000..59b36bda1974 --- /dev/null +++ b/pkgs/by-name/co/copycat/package.nix @@ -0,0 +1,27 @@ +{ + lib, + rustPlatform, + fetchFromGitHub, +}: + +rustPlatform.buildRustPackage rec { + pname = "ccat"; + version = "001"; + + src = fetchFromGitHub { + owner = "DeeKahy"; + repo = "CopyCat"; + rev = "refs/tags/${version}"; + hash = "sha256-zllxQifRMNEMa3RO5WKrwGAUf1xQg6YrQBzIHzy43F0="; + }; + + cargoHash = "sha256-LYVhvq5l+PCZXW+elWi3zZFxLekgPn+plo4dybbLK9g="; + + meta = { + description = "Utility to copy project tree contents to clipboard"; + homepage = "https://github.com/DeeKahy/CopyCat"; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.deekahy ]; + mainProgram = "ccat"; + }; +} From 10c750a9184687673ec60a7d602ba7d5ab9a628c Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Fri, 6 Sep 2024 11:52:11 +0200 Subject: [PATCH 37/68] python3Packages.langchain-core: 0.2.37 -> 0.2.38 Diff: https://github.com/langchain-ai/langchain/compare/refs/tags/langchain-core==0.2.37...0.2.38 Changelog: https://github.com/langchain-ai/langchain/releases/tag/v0.2.38 --- .../python-modules/langchain-core/default.nix | 31 ++++++++++++------- 1 file changed, 19 insertions(+), 12 deletions(-) diff --git a/pkgs/development/python-modules/langchain-core/default.nix b/pkgs/development/python-modules/langchain-core/default.nix index 2ade17e754a7..4fa5de47893e 100644 --- a/pkgs/development/python-modules/langchain-core/default.nix +++ b/pkgs/development/python-modules/langchain-core/default.nix @@ -3,38 +3,45 @@ stdenv, buildPythonPackage, fetchFromGitHub, + + # build-system + poetry-core, + + # dependencies + jsonpatch, + langsmith, + packaging, + pyyaml, + tenacity, + + # optional-dependencies + pydantic, + + # tests freezegun, grandalf, httpx, - jsonpatch, - langsmith, numpy, - packaging, - poetry-core, - pydantic, pytest-asyncio, pytest-mock, pytest-xdist, pytestCheckHook, - pythonOlder, - pyyaml, syrupy, - tenacity, + + # passthru writeScript, }: buildPythonPackage rec { pname = "langchain-core"; - version = "0.2.37"; + version = "0.2.38"; pyproject = true; - disabled = pythonOlder "3.8"; - src = fetchFromGitHub { owner = "langchain-ai"; repo = "langchain"; rev = "refs/tags/langchain-core==${version}"; - hash = "sha256-An2ApN0pgCrQjqu9XPFfPyPvWx0+6JnUkGPrcD0/3kg="; + hash = "sha256-3nRirzQe5KCVoeJ29fYelYuOD6r4adJof4NXreyfrzY="; }; sourceRoot = "${src.name}/libs/core"; From 8234d8906931f8150038bb72d1682e5c791eaafe Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Fri, 6 Sep 2024 12:03:30 +0200 Subject: [PATCH 38/68] python312Packages.langchain-text-splitters: 0.2.2 -> 0.2.4 Diff: https://github.com/langchain-ai/langchain/compare/refs/tags/langchain-text-splitters==0.2.2...0.2.4 Changelog: https://github.com/langchain-ai/langchain/releases/tag/langchain-text-splitters==0.2.4 --- .../langchain-text-splitters/default.nix | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/langchain-text-splitters/default.nix b/pkgs/development/python-modules/langchain-text-splitters/default.nix index d35c78c22ced..5832e387e303 100644 --- a/pkgs/development/python-modules/langchain-text-splitters/default.nix +++ b/pkgs/development/python-modules/langchain-text-splitters/default.nix @@ -2,25 +2,28 @@ lib, buildPythonPackage, fetchFromGitHub, + + # build-system poetry-core, + + # dependencies langchain-core, + + # tests pytest-asyncio, pytestCheckHook, - pythonOlder, }: buildPythonPackage rec { pname = "langchain-text-splitters"; - version = "0.2.2"; + version = "0.2.4"; pyproject = true; - disabled = pythonOlder "3.9"; - src = fetchFromGitHub { owner = "langchain-ai"; repo = "langchain"; rev = "refs/tags/langchain-text-splitters==${version}"; - hash = "sha256-SixF3ZkN+gjQ4KYLhGoezdQAOQ1AlGEC6IBzHePF6/o="; + hash = "sha256-8n5eImRXOG/3tN/59Gd2/GpoGpt7P2ABj0T4pJi6xrk="; }; sourceRoot = "${src.name}/libs/text-splitters"; From 83350e5b17abd94748c6b0843cb3333200ac0f9c Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Fri, 6 Sep 2024 12:09:33 +0200 Subject: [PATCH 39/68] python312Packages.langchain: 0.2.15 -> 0.2.16 Diff: https://github.com/langchain-ai/langchain/compare/refs/tags/langchain==0.2.15...0.2.16 Changelog: https://github.com/langchain-ai/langchain/releases/tag/v0.2.16 --- .../python-modules/langchain/default.nix | 42 +++++++++++-------- 1 file changed, 25 insertions(+), 17 deletions(-) diff --git a/pkgs/development/python-modules/langchain/default.nix b/pkgs/development/python-modules/langchain/default.nix index 4add263f110f..59f0c09ec10c 100644 --- a/pkgs/development/python-modules/langchain/default.nix +++ b/pkgs/development/python-modules/langchain/default.nix @@ -1,46 +1,54 @@ { lib, - aiohttp, - async-timeout, - bash, buildPythonPackage, fetchFromGitHub, - freezegun, + pythonOlder, + + # build-system + poetry-core, + + # buildInputs + bash, + + # dependencies + aiohttp, langchain-core, langchain-text-splitters, langsmith, - lark, - numpy, - pandas, - poetry-core, pydantic, + pyyaml, + requests, + sqlalchemy, + tenacity, + async-timeout, + + # optional-dependencies + numpy, + + # tests + freezegun, + lark, + pandas, pytest-asyncio, pytest-mock, pytest-socket, pytestCheckHook, - pythonOlder, - pyyaml, requests-mock, - requests, responses, - sqlalchemy, syrupy, - tenacity, toml, }: buildPythonPackage rec { pname = "langchain"; - version = "0.2.15"; + version = "0.2.16"; pyproject = true; - disabled = pythonOlder "3.8"; - src = fetchFromGitHub { owner = "langchain-ai"; repo = "langchain"; rev = "refs/tags/langchain==${version}"; - hash = "sha256-8F6ntFstCTQjQNbE9oiYbpZ7kZ1grcnV3FHAfhFnAzA="; + hash = "sha256-8n5eImRXOG/3tN/59Gd2/GpoGpt7P2ABj0T4pJi6xrk="; }; sourceRoot = "${src.name}/libs/langchain"; From 2a1f0c8718b2220367517e7081c8d881cd7bef3d Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Fri, 6 Sep 2024 12:14:06 +0200 Subject: [PATCH 40/68] python312Packages.langchain-community: 0.2.15 -> 0.2.16 Diff: https://github.com/langchain-ai/langchain/compare/refs/tags/langchain-community==0.2.15...0.2.16 Changelog: https://github.com/langchain-ai/langchain/releases/tag/langchain-community==0.2.16 --- .../langchain-community/default.nix | 33 +++++++++++-------- 1 file changed, 19 insertions(+), 14 deletions(-) diff --git a/pkgs/development/python-modules/langchain-community/default.nix b/pkgs/development/python-modules/langchain-community/default.nix index 6bbcd117e480..ba7b07d1aea6 100644 --- a/pkgs/development/python-modules/langchain-community/default.nix +++ b/pkgs/development/python-modules/langchain-community/default.nix @@ -2,44 +2,49 @@ lib, buildPythonPackage, fetchFromGitHub, + + # build-system poetry-core, - pythonOlder, + + # dependencies aiohttp, dataclasses-json, - langchain, langchain-core, - langchain-standard-tests, + langchain, langsmith, - httpx, - lark, + pyyaml, + requests, + sqlalchemy, + tenacity, + + # optional-dependencies + typer, numpy, + + # tests + httpx, + langchain-standard-tests, + lark, pandas, pytest-asyncio, pytest-mock, pytestCheckHook, - pyyaml, - requests, requests-mock, responses, - sqlalchemy, syrupy, - tenacity, toml, - typer, }: buildPythonPackage rec { pname = "langchain-community"; - version = "0.2.15"; + version = "0.2.16"; pyproject = true; - disabled = pythonOlder "3.8"; - src = fetchFromGitHub { owner = "langchain-ai"; repo = "langchain"; rev = "refs/tags/langchain-community==${version}"; - hash = "sha256-R1C+tEXCLqYHzQ2zrYaYa6cqJn/UWZEHBMC+WjbdQaQ="; + hash = "sha256-0FKbx/ZPX7sioof5pMdqpnVWc46+eOiTIseyxwYK49E="; }; sourceRoot = "${src.name}/libs/community"; From 1da41e937ed4ba686209e979d585c6db388cfeee Mon Sep 17 00:00:00 2001 From: Will Fancher Date: Fri, 6 Sep 2024 14:51:34 -0400 Subject: [PATCH 41/68] nixos/tests/zfs: Fix samba freeform settings --- nixos/tests/zfs.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/nixos/tests/zfs.nix b/nixos/tests/zfs.nix index 851fced2c5e1..a996f85cd98c 100644 --- a/nixos/tests/zfs.nix +++ b/nixos/tests/zfs.nix @@ -45,13 +45,13 @@ let specialisation.samba.configuration = { services.samba = { enable = true; - extraConfig = '' - registry shares = yes - usershare path = ${usersharePath} - usershare allow guests = yes - usershare max shares = 100 - usershare owner only = no - ''; + settings.global = { + "registry shares" = true; + "usershare path" = "${usersharePath}"; + "usershare allow guests" = true; + "usershare max shares" = "100"; + "usershare owner only" = false; + }; }; systemd.services.samba-smbd.serviceConfig.ExecStartPre = "${pkgs.coreutils}/bin/mkdir -m +t -p ${usersharePath}"; From 9bd0b5ac05203d6efc2655532c75ede921b1d797 Mon Sep 17 00:00:00 2001 From: Will Fancher Date: Fri, 6 Sep 2024 16:07:34 -0400 Subject: [PATCH 42/68] nixos/tests/zfs: Fix flake build --- nixos/tests/zfs.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/tests/zfs.nix b/nixos/tests/zfs.nix index a996f85cd98c..877749a8048b 100644 --- a/nixos/tests/zfs.nix +++ b/nixos/tests/zfs.nix @@ -213,8 +213,8 @@ in { enableSystemdStage1 = true; }; - installerBoot = (import ./installer.nix { }).separateBootZfs; - installer = (import ./installer.nix { }).zfsroot; + installerBoot = (import ./installer.nix { inherit system; }).separateBootZfs; + installer = (import ./installer.nix { inherit system; }).zfsroot; expand-partitions = makeTest { name = "multi-disk-zfs"; From cf572e0f31924d72264e85365c318758b81f7b73 Mon Sep 17 00:00:00 2001 From: Will Fancher Date: Fri, 6 Sep 2024 15:41:31 -0400 Subject: [PATCH 43/68] zfs: Fix bash completions with 2.1 --- pkgs/os-specific/linux/zfs/generic.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/os-specific/linux/zfs/generic.nix b/pkgs/os-specific/linux/zfs/generic.nix index aacebdc00138..d9cba044d501 100644 --- a/pkgs/os-specific/linux/zfs/generic.nix +++ b/pkgs/os-specific/linux/zfs/generic.nix @@ -182,10 +182,11 @@ let # Remove tests because they add a runtime dependency on gcc rm -rf $out/share/zfs/zfs-tests - # Add Bash completions. - install -v -m444 -D -t $out/share/bash-completion/completions contrib/bash_completion.d/zfs - '' + optionalString (lib.versionOlder version "2.2.6") '' - (cd $out/share/bash-completion/completions; ln -s zfs zpool) + ${optionalString (lib.versionOlder version "2.2") '' + # Add Bash completions. + install -v -m444 -D -t $out/share/bash-completion/completions contrib/bash_completion.d/zfs + (cd $out/share/bash-completion/completions; ln -s zfs zpool) + ''} ''; postFixup = let From 4146b447a7f7d26d275abc809c7030077832a83c Mon Sep 17 00:00:00 2001 From: Mikael Fangel <34864484+MikaelFangel@users.noreply.github.com> Date: Fri, 6 Sep 2024 22:28:38 +0200 Subject: [PATCH 44/68] vscode-extensions.asvetliakov.vscode-neovim: 1.18.7 -> 1.18.10 --- pkgs/applications/editors/vscode/extensions/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index 503488538005..0ee3acd7f5f5 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -406,8 +406,8 @@ let mktplcRef = { name = "vscode-neovim"; publisher = "asvetliakov"; - version = "1.18.7"; - hash = "sha256-ltgygZBWLG79FNxKqloOm8NNSDBbXU2bNkmd+9ksuOg="; + version = "1.18.10"; + hash = "sha256-0Bb1DFuVjpAaMGK6o8+yIprVZgEf64itSh87H3jL7R8="; }; meta = { changelog = "https://marketplace.visualstudio.com/items/asvetliakov.vscode-neovim/changelog"; From b4fa3c33779dc2767f2bb1233795c677f388b716 Mon Sep 17 00:00:00 2001 From: Mikael Fangel <34864484+MikaelFangel@users.noreply.github.com> Date: Fri, 6 Sep 2024 22:31:05 +0200 Subject: [PATCH 45/68] fantomas: 6.3.11 -> 6.3.12 --- pkgs/by-name/fa/fantomas/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/fa/fantomas/package.nix b/pkgs/by-name/fa/fantomas/package.nix index fb74ecc0be9f..5687e0299942 100644 --- a/pkgs/by-name/fa/fantomas/package.nix +++ b/pkgs/by-name/fa/fantomas/package.nix @@ -2,9 +2,9 @@ buildDotnetGlobalTool { pname = "fantomas"; - version = "6.3.11"; + version = "6.3.12"; - nugetHash = "sha256-11bHGEAZTNtdp2pTg5zqLrQiyI/j/AT7GGL/2CR4+dw="; + nugetHash = "sha256-LFZn2cO72FlsmLI0vTLz52Bn4XBeGILTOr8rz/EuXeg="; meta = with lib; { description = "F# source code formatter"; From a9c24b56315cbfb5e379661682d26bd6dd417c00 Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Fri, 6 Sep 2024 16:05:34 -0400 Subject: [PATCH 46/68] telegram-desktop: 5.4.1 -> 5.5.0 Diff: https://github.com/telegramdesktop/tdesktop/compare/v5.4.1...v5.5.0 Changelog: https://github.com/telegramdesktop/tdesktop/releases/tag/v5.5.0 --- .../instant-messengers/telegram/telegram-desktop/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/default.nix b/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/default.nix index 4dfe20e94892..ee99f8ade3c3 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/default.nix @@ -63,14 +63,14 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "telegram-desktop"; - version = "5.4.1"; + version = "5.5.0"; src = fetchFromGitHub { owner = "telegramdesktop"; repo = "tdesktop"; rev = "v${finalAttrs.version}"; fetchSubmodules = true; - hash = "sha256-AWu0LH6DH/omcIsgIBHQIg1uCKN9Ly6EVj4U9QxoSlg="; + hash = "sha256-0AsdbrW9Kq/Pjd1LBih6GDulFSuF3dWFBfOQ0aAjHtg="; }; patches = [ From f8cc3b23852d3f09ccadfe45ead4d3834a401db7 Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Fri, 6 Sep 2024 16:38:54 -0400 Subject: [PATCH 47/68] telegram-desktop: 5.5.0 -> 5.5.1 Diff: https://github.com/telegramdesktop/tdesktop/compare/v5.5.0...v5.5.1 Changelog: https://github.com/telegramdesktop/tdesktop/releases/tag/v5.5.1 --- .../instant-messengers/telegram/telegram-desktop/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/default.nix b/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/default.nix index ee99f8ade3c3..5cf73100ab56 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/default.nix @@ -63,14 +63,14 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "telegram-desktop"; - version = "5.5.0"; + version = "5.5.1"; src = fetchFromGitHub { owner = "telegramdesktop"; repo = "tdesktop"; rev = "v${finalAttrs.version}"; fetchSubmodules = true; - hash = "sha256-0AsdbrW9Kq/Pjd1LBih6GDulFSuF3dWFBfOQ0aAjHtg="; + hash = "sha256-PTa79SbSsOyWlZJ0ad4w6YIiChLzqaSZGRmzyq5qVK0="; }; patches = [ From 6faf3cb673a94547992441a3dde9a8f5ab3547c0 Mon Sep 17 00:00:00 2001 From: Andrew Marshall Date: Fri, 6 Sep 2024 09:57:05 -0400 Subject: [PATCH 48/68] blender: build with strict options to prevent unexpected missing libs MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Blender build will, by default, warn for most missing libs and silently disable the feature. This can cause unexpected behavior, so instead flip its option to turn those warnings into errors. This, for example, would have caught at build time (rather than runtime) the previously-missing wayland-scanner dependency that caused crashes. As a result, adjust existing build config to reflect reality and fix the “new” errors. --- pkgs/applications/misc/blender/default.nix | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/blender/default.nix b/pkgs/applications/misc/blender/default.nix index 7a5a2eefc96a..09762d8eddac 100644 --- a/pkgs/applications/misc/blender/default.nix +++ b/pkgs/applications/misc/blender/default.nix @@ -158,20 +158,28 @@ stdenv.mkDerivation (finalAttrs: { "-DPYTHON_NUMPY_PATH=${python3Packages.numpy}/${python3.sitePackages}" "-DPYTHON_VERSION=${python3.pythonVersion}" "-DWITH_ALEMBIC=ON" + "-DWITH_BUILDINFO=OFF" "-DWITH_CODEC_FFMPEG=ON" "-DWITH_CODEC_SNDFILE=ON" + "-DWITH_CPU_CHECK=OFF" + "-DWITH_CYCLES_DEVICE_OPTIX=${if cudaSupport then "ON" else "OFF"}" + "-DWITH_CYCLES_OSL=OFF" "-DWITH_FFTW3=ON" "-DWITH_IMAGE_OPENJPEG=ON" "-DWITH_INSTALL_PORTABLE=OFF" + "-DWITH_JACK=${if jackaudioSupport then "ON" else "OFF"}" + "-DWITH_LIBS_PRECOMPILED=OFF" "-DWITH_MOD_OCEANSIM=ON" "-DWITH_OPENCOLLADA=${if colladaSupport then "ON" else "OFF"}" "-DWITH_OPENCOLORIO=ON" "-DWITH_OPENSUBDIV=ON" "-DWITH_OPENVDB=ON" + "-DWITH_PULSEAUDIO=OFF" "-DWITH_PYTHON_INSTALL=OFF" "-DWITH_PYTHON_INSTALL_NUMPY=OFF" "-DWITH_PYTHON_INSTALL_REQUESTS=OFF" "-DWITH_SDL=OFF" + "-DWITH_STRICT_BUILD_OPTIONS=ON" "-DWITH_TBB=ON" "-DWITH_USD=ON" @@ -190,16 +198,13 @@ stdenv.mkDerivation (finalAttrs: { ] ++ lib.optionals stdenv.isDarwin [ "-DLIBDIR=/does-not-exist" - "-DWITH_CYCLES_OSL=OFF" # causes segfault on aarch64-darwin "-DSSE2NEON_INCLUDE_DIR=${sse2neon}/lib" "-DWITH_USD=OFF" # currently fails on darwin ] ++ lib.optional stdenv.cc.isClang "-DPYTHON_LINKFLAGS=" # Clang doesn't support "-export-dynamic" - ++ lib.optional jackaudioSupport "-DWITH_JACK=ON" ++ lib.optionals cudaSupport [ "-DOPTIX_ROOT_DIR=${optix}" "-DWITH_CYCLES_CUDA_BINARIES=ON" - "-DWITH_CYCLES_DEVICE_OPTIX=ON" ]; preConfigure = '' From 9535187fd1c79744ab028dee190d4ec2de392042 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Fri, 6 Sep 2024 11:25:20 +0200 Subject: [PATCH 49/68] python312Packages.langgraph: 0.2.4 -> 0.2.19 Diff: https://github.com/langchain-ai/langgraph/compare/refs/tags/0.2.4...0.2.19 Changelog: https://github.com/langchain-ai/langgraph/releases/tag/0.2.19 --- .../python-modules/langgraph/default.nix | 34 +++++++++++++------ 1 file changed, 23 insertions(+), 11 deletions(-) diff --git a/pkgs/development/python-modules/langgraph/default.nix b/pkgs/development/python-modules/langgraph/default.nix index 712e90a602c1..cb442e8919f4 100644 --- a/pkgs/development/python-modules/langgraph/default.nix +++ b/pkgs/development/python-modules/langgraph/default.nix @@ -1,43 +1,48 @@ { lib, buildPythonPackage, + fetchFromGitHub, + + # build-system + poetry-core, + + # dependencies + langchain-core, + langgraph-checkpoint, + + # tests aiosqlite, dataclasses-json, - fetchFromGitHub, grandalf, httpx, - langchain-core, - langgraph-sdk, - langgraph-checkpoint, langgraph-checkpoint-postgres, langgraph-checkpoint-sqlite, - psycopg, langsmith, - poetry-core, + psycopg, pydantic, pytest-asyncio, pytest-mock, pytest-repeat, pytest-xdist, pytestCheckHook, - pythonOlder, syrupy, postgresql, postgresqlTestHook, + + # passthru + langgraph-sdk, }: buildPythonPackage rec { pname = "langgraph"; - version = "0.2.4"; + version = "0.2.19"; pyproject = true; - disabled = pythonOlder "3.9"; - src = fetchFromGitHub { owner = "langchain-ai"; repo = "langgraph"; rev = "refs/tags/${version}"; - hash = "sha256-jUBaWXrHCXAph8EGEJnH7lbKIyjQ8oPt4eDMyIkbURo="; + hash = "sha256-qJIZAHftIKyWK0A/MjilalmmB8b8E7JtLnFn156hE08="; }; postgresqlTestSetupPost = '' @@ -65,6 +70,7 @@ buildPythonPackage rec { langgraph-checkpoint-sqlite langsmith psycopg + psycopg.pool pydantic pytest-asyncio pytest-mock @@ -93,6 +99,12 @@ buildPythonPackage rec { "test_remove_message_via_state_update" ]; + disabledTestPaths = [ + # psycopg.errors.InsufficientPrivilege: permission denied to create database + "tests/test_pregel_async.py" + "tests/test_pregel.py" + ]; + passthru = { updateScript = langgraph-sdk.updateScript; }; From 2cc431f39b796d1a3df23c531512af94d87eda6b Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Fri, 6 Sep 2024 11:32:38 +0200 Subject: [PATCH 50/68] python3Packages.langgraph-sdk: 0.1.26 -> 0.1.30 Diff: https://github.com/langchain-ai/langgraph/compare/refs/tags/sdk==0.1.26...sdk==0.1.30 Changelog: https://github.com/langchain-ai/langgraph/releases/tag/sdk==0.1.30 --- .../python-modules/langgraph-sdk/default.nix | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/langgraph-sdk/default.nix b/pkgs/development/python-modules/langgraph-sdk/default.nix index d002f958fb40..528e29c6bf3b 100644 --- a/pkgs/development/python-modules/langgraph-sdk/default.nix +++ b/pkgs/development/python-modules/langgraph-sdk/default.nix @@ -2,26 +2,29 @@ lib, buildPythonPackage, fetchFromGitHub, + + # build-system + poetry-core, + + # dependencies httpx, httpx-sse, orjson, - poetry-core, - pythonOlder, + + # passthru writeScript, }: buildPythonPackage rec { pname = "langgraph-sdk"; - version = "0.1.26"; + version = "0.1.30"; pyproject = true; - disabled = pythonOlder "3.9"; - src = fetchFromGitHub { owner = "langchain-ai"; repo = "langgraph"; rev = "refs/tags/sdk==${version}"; - hash = "sha256-o7JrB2WSWfPm927tDRMcjzx+6Io6Q+Yjp4XPVs2+F4o="; + hash = "sha256-gI12XuxFplqIKVlVjeO60YxT7WG/SSsZ0aWfjg5bHIs="; }; sourceRoot = "${src.name}/libs/sdk-py"; From 6014ff8ef4453e0414399f96b8a0764df9bb32ad Mon Sep 17 00:00:00 2001 From: Kieeps Date: Thu, 5 Sep 2024 14:13:52 +0200 Subject: [PATCH 51/68] teleport_16: 16.1.4 -> 16.2.0 --- pkgs/servers/teleport/16/Cargo.lock | 1062 ++++++++++++++++---------- pkgs/servers/teleport/16/default.nix | 19 +- 2 files changed, 687 insertions(+), 394 deletions(-) diff --git a/pkgs/servers/teleport/16/Cargo.lock b/pkgs/servers/teleport/16/Cargo.lock index 45249a280c20..8aa4042cfe85 100644 --- a/pkgs/servers/teleport/16/Cargo.lock +++ b/pkgs/servers/teleport/16/Cargo.lock @@ -17,6 +17,16 @@ version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" +[[package]] +name = "aead" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d122413f284cf2d62fb1b7db97e02edb8cda96d769b16e443a4f6195e35662b0" +dependencies = [ + "crypto-common", + "generic-array", +] + [[package]] name = "aes" version = "0.8.4" @@ -28,6 +38,29 @@ dependencies = [ "cpufeatures", ] +[[package]] +name = "aes-gcm" +version = "0.10.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "831010a0f742e1209b3bcea8fab6a8e149051ba6099432c8cb2cc117dec3ead1" +dependencies = [ + "aead", + "aes", + "cipher", + "ctr", + "ghash", + "subtle", +] + +[[package]] +name = "aes-kw" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "69fa2b352dcefb5f7f3a5fb840e02665d311d878955380515e4fd50095dd3d8c" +dependencies = [ + "aes", +] + [[package]] name = "aho-corasick" version = "1.1.3" @@ -163,23 +196,39 @@ dependencies = [ "critical-section", ] -[[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.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0" +[[package]] +name = "aws-lc-rs" +version = "1.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4ae74d9bd0a7530e8afd1770739ad34b36838829d6ad61818f9230f683f5ad77" +dependencies = [ + "aws-lc-sys", + "mirai-annotations", + "paste", + "zeroize", +] + +[[package]] +name = "aws-lc-sys" +version = "0.20.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0f0e249228c6ad2d240c2dc94b714d711629d52bad946075d8e9b2f5391f0703" +dependencies = [ + "bindgen 0.69.4", + "cc", + "cmake", + "dunce", + "fs_extra", + "libc", + "paste", +] + [[package]] name = "backtrace" version = "0.3.73" @@ -207,6 +256,12 @@ version = "0.21.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567" +[[package]] +name = "base64" +version = "0.22.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6" + [[package]] name = "base64ct" version = "1.6.0" @@ -233,6 +288,29 @@ dependencies = [ "syn 2.0.68", ] +[[package]] +name = "bindgen" +version = "0.69.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a00dc851838a2120612785d195287475a3ac45514741da670b735818822129a0" +dependencies = [ + "bitflags 2.6.0", + "cexpr", + "clang-sys", + "itertools", + "lazy_static", + "lazycell", + "log", + "prettyplease", + "proc-macro2", + "quote", + "regex", + "rustc-hash", + "shlex", + "syn 2.0.68", + "which", +] + [[package]] name = "bit_field" version = "0.10.2" @@ -298,7 +376,7 @@ name = "boring-sys" version = "4.7.0" source = "git+https://github.com/gravitational/boring?rev=99897308abb5976ea05625b8314c24b16eebb01b#99897308abb5976ea05625b8314c24b16eebb01b" dependencies = [ - "bindgen", + "bindgen 0.68.1", "cmake", "fs_extra", "fslock", @@ -318,9 +396,9 @@ checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" [[package]] name = "bytes" -version = "1.6.0" +version = "1.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "514de17de45fdb8dc022b1a7975556c53c86f9f0aa5f534b98977b171857c2c9" +checksum = "8318a53db07bb3f8dca91a600466bdb3f2eaadeedfdbcf02e1accbad9271ba50" [[package]] name = "cbc" @@ -333,19 +411,19 @@ dependencies = [ [[package]] name = "cbindgen" -version = "0.26.0" +version = "0.27.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da6bc11b07529f16944307272d5bd9b22530bc7d05751717c9d416586cedab49" +checksum = "3fce8dd7fcfcbf3a0a87d8f515194b49d6135acab73e18bd380d1d93bb1a15eb" dependencies = [ "clap", "heck", - "indexmap 1.9.3", + "indexmap", "log", "proc-macro2", "quote", "serde", "serde_json", - "syn 1.0.109", + "syn 2.0.68", "tempfile", "toml", ] @@ -355,6 +433,11 @@ name = "cc" version = "1.0.101" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ac367972e516d45567c7eafc73d24e1c193dcf200a8d94e9db7b3d38b349572d" +dependencies = [ + "jobserver", + "libc", + "once_cell", +] [[package]] name = "cexpr" @@ -400,27 +483,30 @@ dependencies = [ [[package]] name = "clap" -version = "3.2.25" +version = "4.5.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ea181bf566f71cb9a5d17a59e1871af638180a18fb0035c92ae62b705207123" +checksum = "0fbb260a053428790f3de475e304ff84cdbc4face759ea7a3e64c1edd938a7fc" dependencies = [ - "atty", - "bitflags 1.3.2", + "clap_builder", +] + +[[package]] +name = "clap_builder" +version = "4.5.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "64b17d7ea74e9f833c7dbf2cbe4fb12ff26783eda4782a8975b72f895c9b4d99" +dependencies = [ + "anstream", + "anstyle", "clap_lex", - "indexmap 1.9.3", "strsim", - "termcolor", - "textwrap", ] [[package]] name = "clap_lex" -version = "0.2.4" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2850f2f5a82cbf437dd5af4d49848fbdfc27c157c3d010345776f952765261c5" -dependencies = [ - "os_str_bytes", -] +checksum = "1462739cb27611015575c0c11df5df7601141071f07518d56fcc1be504cbec97" [[package]] name = "cmake" @@ -512,19 +598,29 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3" dependencies = [ "generic-array", + "rand_core", "typenum", ] [[package]] name = "crypto-mac" -version = "0.11.1" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1d1a86f49236c215f271d40892d5fc950490551400b02ef360692c29815c714" +checksum = "25fab6889090c8133f3deb8f73ba3c65a7f456f66436fc012a1b1e272b1e103e" dependencies = [ "generic-array", "subtle", ] +[[package]] +name = "ctr" +version = "0.9.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0369ee1ad671834580515889b80f2ea915f23b8be8d0daa4bbaf2ac5c7590835" +dependencies = [ + "cipher", +] + [[package]] name = "curve25519-dalek" version = "4.1.3" @@ -639,6 +735,12 @@ dependencies = [ "syn 2.0.68", ] +[[package]] +name = "dunce" +version = "1.0.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "92773504d58c093f6de2459af4af33faa518c13451eb8f2b5698ed3d36e7c813" + [[package]] name = "ecdsa" version = "0.16.9" @@ -678,6 +780,12 @@ dependencies = [ "zeroize", ] +[[package]] +name = "either" +version = "1.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "60b1af1c220855b6ceac025d3f6ecdd2b7c4894bfe9cd9bda4fbb4bc7c0d4cf0" + [[package]] name = "elliptic-curve" version = "0.13.8" @@ -699,15 +807,6 @@ dependencies = [ "zeroize", ] -[[package]] -name = "encoding_rs" -version = "0.8.34" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b45de904aa0b010bce2ab45264d0631681847fa7b6f2eaa7dab7619943bc4f59" -dependencies = [ - "cfg-if", -] - [[package]] name = "env_filter" version = "0.1.0" @@ -720,9 +819,9 @@ dependencies = [ [[package]] name = "env_logger" -version = "0.11.3" +version = "0.11.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38b35839ba51819680ba087cd351788c9a3c476841207e0b8cee0b04722343b9" +checksum = "e13fa619b91fb2381732789fc5de83b45675e882f66623b7d8cb4f643017018d" dependencies = [ "anstream", "anstyle", @@ -952,6 +1051,16 @@ dependencies = [ "wasm-bindgen", ] +[[package]] +name = "ghash" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f0d8a4362ccb29cb0b265253fb0a2728f592895ee6854fd9bc13f2ffda266ff1" +dependencies = [ + "opaque-debug", + "polyval", +] + [[package]] name = "gimli" version = "0.29.0" @@ -975,25 +1084,6 @@ dependencies = [ "subtle", ] -[[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", - "indexmap 2.2.6", - "slab", - "tokio", - "tokio-util", - "tracing", -] - [[package]] name = "hash32" version = "0.2.1" @@ -1003,12 +1093,6 @@ dependencies = [ "byteorder", ] -[[package]] -name = "hashbrown" -version = "0.12.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" - [[package]] name = "hashbrown" version = "0.14.5" @@ -1034,21 +1118,18 @@ 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.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024" +[[package]] +name = "hex" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" + [[package]] name = "hkdf" version = "0.12.4" @@ -1068,10 +1149,19 @@ dependencies = [ ] [[package]] -name = "http" -version = "0.2.12" +name = "home" +version = "0.5.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "601cbb57e577e2f5ef5be8e7b83f0f63994f25aa94d673e54a92d5c516d101f1" +checksum = "e3d1354bf6b7235cb4a0576c2619fd4ed18183f689b12b006a0ee7329eeff9a5" +dependencies = [ + "windows-sys 0.52.0", +] + +[[package]] +name = "http" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "21b9ddb458710bc376481b842f5da65cdf31522de232c1ca8146abce2a358258" dependencies = [ "bytes", "fnv", @@ -1080,12 +1170,24 @@ dependencies = [ [[package]] name = "http-body" -version = "0.4.6" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ceab25649e9960c0311ea418d17bee82c0dcec1bd053b5f9a66e265a693bed2" +checksum = "1efedce1fb8e6913f23e0c92de8e62cd5b772a67e7b3946df930a62566c93184" dependencies = [ "bytes", "http", +] + +[[package]] +name = "http-body-util" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "793429d76616a256bcb62c2a2ec2bed781c8307e797e2598c50010f2bee2544f" +dependencies = [ + "bytes", + "futures-util", + "http", + "http-body", "pin-project-lite", ] @@ -1095,12 +1197,6 @@ version = "1.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0fcc0b4a115bf80b728eb8ea024ad5bd707b615bfed49e0665b6e0f86fd082d9" -[[package]] -name = "httpdate" -version = "1.0.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "df3b46402a9d5adb4c86a0cf463f42e19994e3ee891101b1841f30a545cb49a9" - [[package]] name = "humantime" version = "2.1.0" @@ -1109,40 +1205,58 @@ checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" [[package]] name = "hyper" -version = "0.14.29" +version = "1.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f361cde2f109281a220d4307746cdfd5ee3f410da58a70377762396775634b33" +checksum = "50dfd22e0e76d0f662d429a5f80fcaf3855009297eab6a0a9f8543834744ba05" dependencies = [ "bytes", "futures-channel", - "futures-core", "futures-util", - "h2", "http", "http-body", "httparse", - "httpdate", "itoa", "pin-project-lite", - "socket2", + "smallvec", "tokio", - "tower-service", - "tracing", "want", ] [[package]] name = "hyper-rustls" -version = "0.24.2" +version = "0.27.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec3efd23720e2049821a693cbc7e65ea87c72f1c58ff2f9522ff332b1491e590" +checksum = "5ee4be2c948921a1a5320b629c4193916ed787a7f7f293fd3f7f5a6c9de74155" dependencies = [ "futures-util", "http", "hyper", + "hyper-util", "rustls", + "rustls-pki-types", "tokio", "tokio-rustls", + "tower-service", +] + +[[package]] +name = "hyper-util" +version = "0.1.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cde7055719c54e36e95e8719f95883f22072a48ede39db7fc17a4e1d5281e9b9" +dependencies = [ + "bytes", + "futures-channel", + "futures-util", + "http", + "http-body", + "hyper", + "pin-project-lite", + "socket2", + "tokio", + "tower", + "tower-service", + "tracing", ] [[package]] @@ -1155,16 +1269,6 @@ dependencies = [ "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", -] - [[package]] name = "indexmap" version = "2.2.6" @@ -1172,7 +1276,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "168fb715dda47215e360912c096649d23d58bf392ac62f73919e831745e40f26" dependencies = [ "equivalent", - "hashbrown 0.14.5", + "hashbrown", ] [[package]] @@ -1222,7 +1326,7 @@ dependencies = [ [[package]] name = "ironrdp-async" version = "0.1.0" -source = "git+https://github.com/Devolutions/IronRDP?rev=dfbe947e5b9bd2da06f1e14620ee4d68bca4252f#dfbe947e5b9bd2da06f1e14620ee4d68bca4252f" +source = "git+https://github.com/Devolutions/IronRDP?rev=92efe2adf7402c15fe6cf2da0d3f8ff8ebd767c3#92efe2adf7402c15fe6cf2da0d3f8ff8ebd767c3" dependencies = [ "bytes", "ironrdp-connector", @@ -1233,7 +1337,7 @@ dependencies = [ [[package]] name = "ironrdp-cliprdr" version = "0.1.0" -source = "git+https://github.com/Devolutions/IronRDP?rev=dfbe947e5b9bd2da06f1e14620ee4d68bca4252f#dfbe947e5b9bd2da06f1e14620ee4d68bca4252f" +source = "git+https://github.com/Devolutions/IronRDP?rev=92efe2adf7402c15fe6cf2da0d3f8ff8ebd767c3#92efe2adf7402c15fe6cf2da0d3f8ff8ebd767c3" dependencies = [ "bitflags 2.6.0", "ironrdp-pdu", @@ -1245,13 +1349,16 @@ dependencies = [ [[package]] name = "ironrdp-connector" version = "0.1.0" -source = "git+https://github.com/Devolutions/IronRDP?rev=dfbe947e5b9bd2da06f1e14620ee4d68bca4252f#dfbe947e5b9bd2da06f1e14620ee4d68bca4252f" +source = "git+https://github.com/Devolutions/IronRDP?rev=92efe2adf7402c15fe6cf2da0d3f8ff8ebd767c3#92efe2adf7402c15fe6cf2da0d3f8ff8ebd767c3" dependencies = [ "ironrdp-error", "ironrdp-pdu", "ironrdp-svc", + "picky", + "picky-asn1-der 0.5.0", + "picky-asn1-x509 0.13.0", "rand_core", - "sspi 0.11.1", + "sspi", "tracing", "url", "winapi", @@ -1260,7 +1367,7 @@ dependencies = [ [[package]] name = "ironrdp-displaycontrol" version = "0.1.0" -source = "git+https://github.com/Devolutions/IronRDP?rev=dfbe947e5b9bd2da06f1e14620ee4d68bca4252f#dfbe947e5b9bd2da06f1e14620ee4d68bca4252f" +source = "git+https://github.com/Devolutions/IronRDP?rev=92efe2adf7402c15fe6cf2da0d3f8ff8ebd767c3#92efe2adf7402c15fe6cf2da0d3f8ff8ebd767c3" dependencies = [ "ironrdp-dvc", "ironrdp-pdu", @@ -1271,7 +1378,7 @@ dependencies = [ [[package]] name = "ironrdp-dvc" version = "0.1.0" -source = "git+https://github.com/Devolutions/IronRDP?rev=dfbe947e5b9bd2da06f1e14620ee4d68bca4252f#dfbe947e5b9bd2da06f1e14620ee4d68bca4252f" +source = "git+https://github.com/Devolutions/IronRDP?rev=92efe2adf7402c15fe6cf2da0d3f8ff8ebd767c3#92efe2adf7402c15fe6cf2da0d3f8ff8ebd767c3" dependencies = [ "ironrdp-pdu", "ironrdp-svc", @@ -1282,12 +1389,12 @@ dependencies = [ [[package]] name = "ironrdp-error" version = "0.1.0" -source = "git+https://github.com/Devolutions/IronRDP?rev=dfbe947e5b9bd2da06f1e14620ee4d68bca4252f#dfbe947e5b9bd2da06f1e14620ee4d68bca4252f" +source = "git+https://github.com/Devolutions/IronRDP?rev=92efe2adf7402c15fe6cf2da0d3f8ff8ebd767c3#92efe2adf7402c15fe6cf2da0d3f8ff8ebd767c3" [[package]] name = "ironrdp-graphics" version = "0.1.0" -source = "git+https://github.com/Devolutions/IronRDP?rev=dfbe947e5b9bd2da06f1e14620ee4d68bca4252f#dfbe947e5b9bd2da06f1e14620ee4d68bca4252f" +source = "git+https://github.com/Devolutions/IronRDP?rev=92efe2adf7402c15fe6cf2da0d3f8ff8ebd767c3#92efe2adf7402c15fe6cf2da0d3f8ff8ebd767c3" dependencies = [ "bit_field", "bitflags 2.6.0", @@ -1304,7 +1411,7 @@ dependencies = [ [[package]] name = "ironrdp-pdu" version = "0.1.0" -source = "git+https://github.com/Devolutions/IronRDP?rev=dfbe947e5b9bd2da06f1e14620ee4d68bca4252f#dfbe947e5b9bd2da06f1e14620ee4d68bca4252f" +source = "git+https://github.com/Devolutions/IronRDP?rev=92efe2adf7402c15fe6cf2da0d3f8ff8ebd767c3#92efe2adf7402c15fe6cf2da0d3f8ff8ebd767c3" dependencies = [ "bit_field", "bitflags 2.6.0", @@ -1326,7 +1433,7 @@ dependencies = [ [[package]] name = "ironrdp-rdpdr" version = "0.1.0" -source = "git+https://github.com/Devolutions/IronRDP?rev=dfbe947e5b9bd2da06f1e14620ee4d68bca4252f#dfbe947e5b9bd2da06f1e14620ee4d68bca4252f" +source = "git+https://github.com/Devolutions/IronRDP?rev=92efe2adf7402c15fe6cf2da0d3f8ff8ebd767c3#92efe2adf7402c15fe6cf2da0d3f8ff8ebd767c3" dependencies = [ "bitflags 2.6.0", "ironrdp-error", @@ -1338,16 +1445,18 @@ dependencies = [ [[package]] name = "ironrdp-rdpsnd" version = "0.1.0" -source = "git+https://github.com/Devolutions/IronRDP?rev=dfbe947e5b9bd2da06f1e14620ee4d68bca4252f#dfbe947e5b9bd2da06f1e14620ee4d68bca4252f" +source = "git+https://github.com/Devolutions/IronRDP?rev=92efe2adf7402c15fe6cf2da0d3f8ff8ebd767c3#92efe2adf7402c15fe6cf2da0d3f8ff8ebd767c3" dependencies = [ + "bitflags 2.6.0", "ironrdp-pdu", "ironrdp-svc", + "tracing", ] [[package]] name = "ironrdp-session" version = "0.1.0" -source = "git+https://github.com/Devolutions/IronRDP?rev=dfbe947e5b9bd2da06f1e14620ee4d68bca4252f#dfbe947e5b9bd2da06f1e14620ee4d68bca4252f" +source = "git+https://github.com/Devolutions/IronRDP?rev=92efe2adf7402c15fe6cf2da0d3f8ff8ebd767c3#92efe2adf7402c15fe6cf2da0d3f8ff8ebd767c3" dependencies = [ "ironrdp-connector", "ironrdp-displaycontrol", @@ -1362,7 +1471,7 @@ dependencies = [ [[package]] name = "ironrdp-svc" version = "0.1.0" -source = "git+https://github.com/Devolutions/IronRDP?rev=dfbe947e5b9bd2da06f1e14620ee4d68bca4252f#dfbe947e5b9bd2da06f1e14620ee4d68bca4252f" +source = "git+https://github.com/Devolutions/IronRDP?rev=92efe2adf7402c15fe6cf2da0d3f8ff8ebd767c3#92efe2adf7402c15fe6cf2da0d3f8ff8ebd767c3" dependencies = [ "bitflags 2.6.0", "ironrdp-pdu", @@ -1371,7 +1480,7 @@ dependencies = [ [[package]] name = "ironrdp-tls" version = "0.1.0" -source = "git+https://github.com/Devolutions/IronRDP?rev=dfbe947e5b9bd2da06f1e14620ee4d68bca4252f#dfbe947e5b9bd2da06f1e14620ee4d68bca4252f" +source = "git+https://github.com/Devolutions/IronRDP?rev=92efe2adf7402c15fe6cf2da0d3f8ff8ebd767c3#92efe2adf7402c15fe6cf2da0d3f8ff8ebd767c3" dependencies = [ "tokio", "tokio-rustls", @@ -1381,7 +1490,7 @@ dependencies = [ [[package]] name = "ironrdp-tokio" version = "0.1.0" -source = "git+https://github.com/Devolutions/IronRDP?rev=dfbe947e5b9bd2da06f1e14620ee4d68bca4252f#dfbe947e5b9bd2da06f1e14620ee4d68bca4252f" +source = "git+https://github.com/Devolutions/IronRDP?rev=92efe2adf7402c15fe6cf2da0d3f8ff8ebd767c3#92efe2adf7402c15fe6cf2da0d3f8ff8ebd767c3" dependencies = [ "bytes", "ironrdp-async", @@ -1413,6 +1522,15 @@ dependencies = [ "untrusted", ] +[[package]] +name = "itertools" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ba291022dbbd398a455acf126c1e341954079855bc60dfdda641363bd6922569" +dependencies = [ + "either", +] + [[package]] name = "itoa" version = "1.0.11" @@ -1420,10 +1538,19 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b" [[package]] -name = "js-sys" -version = "0.3.69" +name = "jobserver" +version = "0.1.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "29c15563dc2726973df627357ce0c9ddddbea194836909d655df6a75d2cf296d" +checksum = "48d1dbcbbeb6a7fec7e059840aa538bd62aaccf972c7346c4d9d2059312853d0" +dependencies = [ + "libc", +] + +[[package]] +name = "js-sys" +version = "0.3.70" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1868808506b929d7b0cfa8f75951347aa71bb21144b7791bae35d9bccfcfe37a" dependencies = [ "wasm-bindgen", ] @@ -1465,7 +1592,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e310b3a6b5907f99202fcdb4960ff45b93735d7c7d96b760fcff8db2dc0e103d" dependencies = [ "cfg-if", - "windows-targets 0.52.5", + "windows-targets 0.52.6", ] [[package]] @@ -1492,9 +1619,9 @@ dependencies = [ [[package]] name = "log" -version = "0.4.21" +version = "0.4.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90ed8c1e510134f979dbc4f070f87d4313098b704861a105fe34231c70a3901c" +checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24" [[package]] name = "md-5" @@ -1544,15 +1671,22 @@ dependencies = [ [[package]] name = "mio" -version = "0.8.11" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4a650543ca06a924e8b371db273b2756685faae30f8487da1b56505a8f78b0c" +checksum = "4569e456d394deccd22ce1c1913e6ea0e54519f577285001215d33557431afe4" dependencies = [ + "hermit-abi", "libc", "wasi", - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] +[[package]] +name = "mirai-annotations" +version = "1.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c9be0862c1b3f26a88803c4a49de6889c10e608b3ee9344e6ef5b45fb37ad3d1" + [[package]] name = "nom" version = "7.1.3" @@ -1648,16 +1782,6 @@ dependencies = [ "libm", ] -[[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.9", - "libc", -] - [[package]] name = "object" version = "0.36.0" @@ -1682,18 +1806,18 @@ version = "1.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" +[[package]] +name = "opaque-debug" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c08d65885ee38876c4f86fa503fb49d7b507c2b62552df7c70b2fce627e06381" + [[package]] name = "openssl-probe" version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" -[[package]] -name = "os_str_bytes" -version = "6.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2355d85b9a3786f481747ced0e0ff2ba35213a1f9bd406ed906554d7af805a1" - [[package]] name = "overload" version = "0.1.1" @@ -1724,6 +1848,20 @@ dependencies = [ "sha2", ] +[[package]] +name = "p521" +version = "0.13.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0fc9e2161f1f215afdfce23677034ae137bbd45016a880c2eb3ba8eb95f085b2" +dependencies = [ + "base16ct", + "ecdsa", + "elliptic-curve", + "primeorder", + "rand_core", + "sha2", +] + [[package]] name = "parking_lot" version = "0.11.2" @@ -1737,9 +1875,9 @@ dependencies = [ [[package]] name = "parking_lot" -version = "0.12.2" +version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e4af0ca4f6caed20e900d564c242b8e5d4903fdacf31d3daf527b66fe6f42fb" +checksum = "f1bf18183cf54e8d6059647fc3063646a1801cf30896933ec2311622cc4b9a27" dependencies = [ "lock_api", "parking_lot_core 0.9.10", @@ -1769,9 +1907,15 @@ dependencies = [ "libc", "redox_syscall 0.5.2", "smallvec", - "windows-targets 0.52.5", + "windows-targets 0.52.6", ] +[[package]] +name = "paste" +version = "1.0.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "57c0d7b74b563b49d38dae00a0c37d4d6de9b432382b2892f0574ddcae73fd0a" + [[package]] name = "pbkdf2" version = "0.12.2" @@ -1806,24 +1950,36 @@ checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" [[package]] name = "picky" -version = "7.0.0-rc.8" +version = "7.0.0-rc.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "52cccdaffd2f361b4b4eb70b4249bd71d89bb66cb84b7f76483ecd1640c543ce" +checksum = "fe9b488630f493840c2e6ef270c3619a3dc2ad0953eb978d6e4273a8337fee5e" dependencies = [ - "base64", + "aes", + "aes-gcm", + "aes-kw", + "base64 0.22.1", + "cbc", + "des", "digest", "ed25519-dalek", + "hex", + "hmac", + "http", "md-5", "num-bigint-dig", "p256", "p384", - "picky-asn1", - "picky-asn1-der", - "picky-asn1-x509", + "p521", + "pbkdf2", + "picky-asn1 0.9.0", + "picky-asn1-der 0.5.0", + "picky-asn1-x509 0.13.0", "rand", "rand_core", + "rc2", "rsa", "serde", + "serde_json", "sha1", "sha2", "sha3", @@ -1837,6 +1993,17 @@ name = "picky-asn1" version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "295eea0f33c16be21e2a98b908fdd4d73c04dd48c8480991b76dbcf0cb58b212" +dependencies = [ + "oid", + "serde", + "serde_bytes", +] + +[[package]] +name = "picky-asn1" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "360019b238b11b8c0e88cd9db3a6677f1af122e3422d0a26a2b576f084d9be36" dependencies = [ "oid", "serde", @@ -1851,7 +2018,18 @@ version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5df7873a9e36d42dadb393bea5e211fe83d793c172afad5fb4ec846ec582793f" dependencies = [ - "picky-asn1", + "picky-asn1 0.8.0", + "serde", + "serde_bytes", +] + +[[package]] +name = "picky-asn1-der" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "04784987e157b5a8f832ce68b3364915dc6ef4bed94a6e10e241fa1bae3db2e3" +dependencies = [ + "picky-asn1 0.9.0", "serde", "serde_bytes", ] @@ -1862,11 +2040,24 @@ version = "0.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2c5f20f71a68499ff32310f418a6fad8816eac1a2859ed3f0c5c741389dd6208" dependencies = [ - "base64", + "base64 0.21.7", + "oid", + "picky-asn1 0.8.0", + "picky-asn1-der 0.4.1", + "serde", +] + +[[package]] +name = "picky-asn1-x509" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f3384ff768b1c4a04532916be77935f634a4738d3b2138da98798e90352fadf4" +dependencies = [ + "base64 0.22.1", "num-bigint-dig", "oid", - "picky-asn1", - "picky-asn1-der", + "picky-asn1 0.9.0", + "picky-asn1-der 0.5.0", "serde", "widestring", "zeroize", @@ -1874,9 +2065,9 @@ dependencies = [ [[package]] name = "picky-krb" -version = "0.8.0" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f71cf61ebe6e657a81bcac31f9d61d52c23a1fd517b0dad77b915a7d3d15d2e8" +checksum = "e2213fd3942a9d3366b3e108b6d02db2227c80937a55f79a71e1719ab075bb77" dependencies = [ "aes", "byteorder", @@ -1887,9 +2078,9 @@ dependencies = [ "num-bigint-dig", "oid", "pbkdf2", - "picky-asn1", - "picky-asn1-der", - "picky-asn1-x509", + "picky-asn1 0.9.0", + "picky-asn1-der 0.5.0", + "picky-asn1-x509 0.13.0", "rand", "serde", "sha1", @@ -1897,6 +2088,26 @@ dependencies = [ "uuid", ] +[[package]] +name = "pin-project" +version = "1.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b6bf43b791c5b9e34c3d182969b4abb522f9343702850a2e57f460d00d09b4b3" +dependencies = [ + "pin-project-internal", +] + +[[package]] +name = "pin-project-internal" +version = "1.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.68", +] + [[package]] name = "pin-project-lite" version = "0.2.14" @@ -1936,6 +2147,18 @@ version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec" +[[package]] +name = "polyval" +version = "0.6.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9d1fe60d06143b2430aa532c94cfe9e29783047f06c0d7fd359a9a51b729fa25" +dependencies = [ + "cfg-if", + "cpufeatures", + "opaque-debug", + "universal-hash", +] + [[package]] name = "portpicker" version = "0.1.1" @@ -1957,6 +2180,16 @@ version = "0.2.17" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" +[[package]] +name = "prettyplease" +version = "0.2.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5f12335488a2f3b0a83b14edad48dca9879ce89b2edd10e80237e4e852dd645e" +dependencies = [ + "proc-macro2", + "syn 2.0.68", +] + [[package]] name = "primeorder" version = "0.13.6" @@ -2020,6 +2253,15 @@ dependencies = [ "getrandom", ] +[[package]] +name = "rc2" +version = "0.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "62c64daa8e9438b84aaae55010a93f396f8e60e3911590fcba770d04643fc1dd" +dependencies = [ + "cipher", +] + [[package]] name = "rdp-client" version = "0.1.0" @@ -2044,15 +2286,21 @@ dependencies = [ "iso7816", "iso7816-tlv", "log", - "parking_lot 0.12.2", + "parking_lot 0.12.3", + "picky", + "picky-asn1-der 0.4.1", + "picky-asn1-x509 0.12.0", "rand", "rand_chacha", + "reqwest", "rsa", - "sspi 0.10.1", + "rustls", + "sspi", "static_init", "tempfile", "tokio", "tokio-boring", + "url", "utf16string", "uuid", ] @@ -2106,20 +2354,21 @@ checksum = "7a66a03ae7c801facd77a29370b4faec201768915ac14a721ba36f20bc9c209b" [[package]] name = "reqwest" -version = "0.11.27" +version = "0.12.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd67538700a17451e7cba03ac727fb961abb7607553461627b97de0b89cf4a62" +checksum = "f8f4955649ef5c38cc7f9e8aa41761d48fb9677197daea9984dc54f56aad5e63" dependencies = [ - "base64", + "base64 0.22.1", "bytes", - "encoding_rs", + "futures-channel", "futures-core", "futures-util", - "h2", "http", "http-body", + "http-body-util", "hyper", "hyper-rustls", + "hyper-util", "ipnet", "js-sys", "log", @@ -2128,13 +2377,12 @@ dependencies = [ "percent-encoding", "pin-project-lite", "rustls", - "rustls-native-certs", "rustls-pemfile", + "rustls-pki-types", "serde", "serde_json", "serde_urlencoded", "sync_wrapper", - "system-configuration", "tokio", "tokio-rustls", "tower-service", @@ -2142,8 +2390,7 @@ dependencies = [ "wasm-bindgen", "wasm-bindgen-futures", "web-sys", - "webpki-roots", - "winreg 0.50.0", + "windows-registry", ] [[package]] @@ -2185,6 +2432,7 @@ dependencies = [ "pkcs1", "pkcs8", "rand_core", + "sha1", "signature", "spki", "subtle", @@ -2236,44 +2484,58 @@ dependencies = [ [[package]] name = "rustls" -version = "0.21.12" +version = "0.23.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f56a14d1f48b391359b22f731fd4bd7e43c97f3c50eee276f3aa09c94784d3e" +checksum = "c58f8c84392efc0a126acce10fa59ff7b3d2ac06ab451a33f2741989b806b044" dependencies = [ + "aws-lc-rs", "log", + "once_cell", "ring", + "rustls-pki-types", "rustls-webpki", - "sct", + "subtle", + "zeroize", ] [[package]] name = "rustls-native-certs" -version = "0.6.3" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a9aace74cb666635c918e9c12bc0d348266037aa8eb599b5cba565709a8dff00" +checksum = "04182dffc9091a404e0fc069ea5cd60e5b866c3adf881eff99a32d048242dffa" dependencies = [ "openssl-probe", "rustls-pemfile", + "rustls-pki-types", "schannel", "security-framework", ] [[package]] name = "rustls-pemfile" -version = "1.0.4" +version = "2.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1c74cae0a4cf6ccbbf5f359f08efdf8ee7e1dc532573bf0db71968cb56b1448c" +checksum = "196fe16b00e106300d3e45ecfcb764fa292a535d7326a29a5875c579c7417425" dependencies = [ - "base64", + "base64 0.22.1", + "rustls-pki-types", ] [[package]] -name = "rustls-webpki" -version = "0.101.7" +name = "rustls-pki-types" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b6275d1ee7a1cd780b64aca7726599a1dbc893b1e64144529e55c3c2f745765" +checksum = "fc0a2ce646f8655401bb81e7927b812614bd5d91dbc968696be50603510fcaf0" + +[[package]] +name = "rustls-webpki" +version = "0.102.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e6b52d4fda176fd835fdc55a835d4a89b8499cad995885a21149d5ad62f852e" dependencies = [ + "aws-lc-rs", "ring", + "rustls-pki-types", "untrusted", ] @@ -2298,16 +2560,6 @@ version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" -[[package]] -name = "sct" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da046153aa2352493d6cb7da4b6e5c0c057d8a1d0a9aa8560baffdd945acd414" -dependencies = [ - "ring", - "untrusted", -] - [[package]] name = "sec1" version = "0.7.3" @@ -2391,6 +2643,15 @@ dependencies = [ "serde", ] +[[package]] +name = "serde_spanned" +version = "0.6.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eb5b1b31579f3811bf615c144393417496f152e12ac8b7663bf664f4a815306d" +dependencies = [ + "serde", +] + [[package]] name = "serde_urlencoded" version = "0.7.1" @@ -2515,8 +2776,9 @@ dependencies = [ [[package]] name = "sspi" -version = "0.10.1" -source = "git+https://github.com/Devolutions/sspi-rs?rev=d54bdfcafa0e10d9d78224ebacc4f2a0992a6b79#d54bdfcafa0e10d9d78224ebacc4f2a0992a6b79" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1734839082c6d33f8368b40a40d0d5cc1ed10fbde00dc8a404f64e70272ed3f6" dependencies = [ "async-dnssd", "async-recursion", @@ -2534,13 +2796,16 @@ dependencies = [ "num-traits", "oid", "picky", - "picky-asn1", - "picky-asn1-der", - "picky-asn1-x509", + "picky-asn1 0.9.0", + "picky-asn1-der 0.5.0", + "picky-asn1-x509 0.13.0", "picky-krb", "portpicker", "rand", "reqwest", + "rsa", + "rustls", + "rustls-native-certs", "serde", "serde_derive", "sha1", @@ -2550,53 +2815,9 @@ dependencies = [ "tracing", "url", "uuid", - "winapi", "windows", - "windows-sys 0.48.0", - "winreg 0.51.0", - "zeroize", -] - -[[package]] -name = "sspi" -version = "0.11.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "18d31fab47d9290be28a8d027c8428756826f1d4fe1e5ba0f51d24f52c568e21" -dependencies = [ - "async-dnssd", - "async-recursion", - "bitflags 2.6.0", - "byteorder", - "cfg-if", - "crypto-mac", - "futures", - "hmac", - "lazy_static", - "md-5", - "md4", - "num-bigint-dig", - "num-derive", - "num-traits", - "oid", - "picky", - "picky-asn1", - "picky-asn1-der", - "picky-asn1-x509", - "picky-krb", - "rand", - "serde", - "serde_derive", - "sha1", - "sha2", - "time", - "tokio", - "tracing", - "url", - "uuid", - "winapi", - "windows", - "windows-sys 0.48.0", - "winreg 0.51.0", + "windows-sys 0.52.0", + "winreg", "zeroize", ] @@ -2636,15 +2857,15 @@ dependencies = [ [[package]] name = "strsim" -version = "0.10.0" +version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" +checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f" [[package]] name = "subtle" -version = "2.4.1" +version = "2.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6bdef32e8150c2a081110b42772ffe7d7c9032b606bc226c8260fd97e0976601" +checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292" [[package]] name = "syn" @@ -2670,9 +2891,12 @@ dependencies = [ [[package]] name = "sync_wrapper" -version = "0.1.2" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2047c6ded9c721764247e62cd3b03c09ffc529b2ba5b10ec482ae507a4a70160" +checksum = "a7065abeca94b6a8a577f9bd45aa0867a2238b74e8eb67cf10d492bc39351394" +dependencies = [ + "futures-core", +] [[package]] name = "synstructure" @@ -2685,27 +2909,6 @@ dependencies = [ "syn 2.0.68", ] -[[package]] -name = "system-configuration" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba3a3adc5c275d719af8cb4272ea1c4a6d668a777f37e115f6d11ddbc1c8e0e7" -dependencies = [ - "bitflags 1.3.2", - "core-foundation", - "system-configuration-sys", -] - -[[package]] -name = "system-configuration-sys" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a75fb188eb626b924683e3b95e3a48e63551fcfb51949de2f06a9d91dbee93c9" -dependencies = [ - "core-foundation-sys", - "libc", -] - [[package]] name = "tap" version = "1.0.1" @@ -2714,31 +2917,17 @@ checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369" [[package]] name = "tempfile" -version = "3.10.1" +version = "3.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85b77fafb263dd9d05cbeac119526425676db3784113aa9295c88498cbf8bff1" +checksum = "04cbcdd0c794ebb0d4cf35e88edd2f7d2c4c3e9a5a6dab322839b321c6a87a64" dependencies = [ "cfg-if", "fastrand", + "once_cell", "rustix", - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] -[[package]] -name = "termcolor" -version = "1.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06794f8f6c5c898b3275aebefa6b8a1cb24cd2c6c79397ab15774837a0bc5755" -dependencies = [ - "winapi-util", -] - -[[package]] -name = "textwrap" -version = "0.16.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23d434d3f8967a09480fb04132ebe0a3e088c173e6d0ee7897abbdf4eab0f8b9" - [[package]] name = "thiserror" version = "1.0.61" @@ -2839,21 +3028,20 @@ dependencies = [ [[package]] name = "tokio" -version = "1.38.0" +version = "1.39.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba4f4a02a7a80d6f274636f0aa95c7e383b912d41fe721a31f29e29698585a4a" +checksum = "9babc99b9923bfa4804bd74722ff02c0381021eafa4db9949217e3be8e84fff5" dependencies = [ "backtrace", "bytes", "libc", "mio", - "num_cpus", - "parking_lot 0.12.2", + "parking_lot 0.12.3", "pin-project-lite", "signal-hook-registry", "socket2", "tokio-macros", - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] @@ -2869,9 +3057,9 @@ dependencies = [ [[package]] name = "tokio-macros" -version = "2.3.0" +version = "2.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f5ae998a069d4b5aba8ee9dad856af7d520c3699e6159b185c2acd48155d39a" +checksum = "693d596312e88961bc67d7f1f97af8a70227d9f90c31bba5806eec004978d752" dependencies = [ "proc-macro2", "quote", @@ -2880,36 +3068,70 @@ dependencies = [ [[package]] name = "tokio-rustls" -version = "0.24.1" +version = "0.26.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c28327cf380ac148141087fbfb9de9d7bd4e84ab5d2c28fbc911d753de8a7081" +checksum = "0c7bc40d0e5a97695bb96e27995cd3a08538541b0a846f65bba7a359f36700d4" dependencies = [ "rustls", - "tokio", -] - -[[package]] -name = "tokio-util" -version = "0.7.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9cf6b47b3771c49ac75ad09a6162f53ad4b8088b76ac60e8ec1455b31a189fe1" -dependencies = [ - "bytes", - "futures-core", - "futures-sink", - "pin-project-lite", + "rustls-pki-types", "tokio", ] [[package]] name = "toml" -version = "0.5.11" +version = "0.8.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4f7f0dd8d50a853a531c426359045b1998f04219d88799810762cd4ad314234" +checksum = "a1ed1f98e3fdc28d6d910e6737ae6ab1a93bf1985935a1193e68f93eeb68d24e" +dependencies = [ + "serde", + "serde_spanned", + "toml_datetime", + "toml_edit", +] + +[[package]] +name = "toml_datetime" +version = "0.6.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0dd7358ecb8fc2f8d014bf86f6f638ce72ba252a2c3a2572f2a795f1d23efb41" dependencies = [ "serde", ] +[[package]] +name = "toml_edit" +version = "0.22.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "583c44c02ad26b0c3f3066fe629275e50627026c51ac2e595cca4c230ce1ce1d" +dependencies = [ + "indexmap", + "serde", + "serde_spanned", + "toml_datetime", + "winnow", +] + +[[package]] +name = "tower" +version = "0.4.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b8fa9be0de6cf49e536ce1851f987bd21a43b771b09473c3549a6c853db37c1c" +dependencies = [ + "futures-core", + "futures-util", + "pin-project", + "pin-project-lite", + "tokio", + "tower-layer", + "tower-service", +] + +[[package]] +name = "tower-layer" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "121c2a6cda46980bb0fcd1647ffaf6cd3fc79a013de288782836f6df9c48780e" + [[package]] name = "tower-service" version = "0.3.2" @@ -3021,6 +3243,16 @@ dependencies = [ "tinyvec", ] +[[package]] +name = "universal-hash" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fc1de2c688dc15305988b563c3854064043356019f97a4b46276fe734c4f07ea" +dependencies = [ + "crypto-common", + "subtle", +] + [[package]] name = "untrusted" version = "0.9.0" @@ -3055,9 +3287,9 @@ checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821" [[package]] name = "uuid" -version = "1.9.1" +version = "1.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5de17fd2f7da591098415cff336e12965a28061ddace43b59cb3c430179c9439" +checksum = "81dfa00651efa65069b0b6b651f4aaa31ba9e3c3ce0137aaad053604ee7e0314" dependencies = [ "getrandom", "serde", @@ -3092,19 +3324,20 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] name = "wasm-bindgen" -version = "0.2.92" +version = "0.2.93" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4be2531df63900aeb2bca0daaaddec08491ee64ceecbee5076636a3b026795a8" +checksum = "a82edfc16a6c469f5f44dc7b571814045d60404b55a0ee849f9bcfa2e63dd9b5" dependencies = [ "cfg-if", + "once_cell", "wasm-bindgen-macro", ] [[package]] name = "wasm-bindgen-backend" -version = "0.2.92" +version = "0.2.93" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "614d787b966d3989fa7bb98a654e369c762374fd3213d212cfc0251257e747da" +checksum = "9de396da306523044d3302746f1208fa71d7532227f15e347e2d93e4145dd77b" dependencies = [ "bumpalo", "log", @@ -3129,9 +3362,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.92" +version = "0.2.93" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1f8823de937b71b9460c0c34e25f3da88250760bec0ebac694b49997550d726" +checksum = "585c4c91a46b072c92e908d99cb1dcdf95c5218eeb6f3bf1efa991ee7a68cccf" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -3139,9 +3372,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.92" +version = "0.2.93" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7" +checksum = "afc340c74d9005395cf9dd098506f7f44e38f2b4a21c6aaacf9a105ea5e1e836" dependencies = [ "proc-macro2", "quote", @@ -3152,25 +3385,31 @@ dependencies = [ [[package]] name = "wasm-bindgen-shared" -version = "0.2.92" +version = "0.2.93" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af190c94f2773fdb3729c55b007a722abb5384da03bc0986df4c289bf5567e96" +checksum = "c62a0a307cb4a311d3a07867860911ca130c3494e8c2719593806c08bc5d0484" [[package]] name = "web-sys" -version = "0.3.69" +version = "0.3.70" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77afa9a11836342370f4817622a2f0f418b134426d91a82dfb48f532d2ec13ef" +checksum = "26fdeaafd9bd129f65e7c031593c24d62186301e0c72c8978fa1678be7d532c0" dependencies = [ "js-sys", "wasm-bindgen", ] [[package]] -name = "webpki-roots" -version = "0.25.4" +name = "which" +version = "4.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f20c57d8d7db6d3b86154206ae5d8fba62dd39573114de97c2cb0578251f8e1" +checksum = "87ba24419a2078cd2b0f2ede2691b6c66d8e47836da3b6db8265ebad47afbfc7" +dependencies = [ + "either", + "home", + "once_cell", + "rustix", +] [[package]] name = "widestring" @@ -3194,15 +3433,6 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" -[[package]] -name = "winapi-util" -version = "0.1.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d4cc384e1e73b93bafa6fb4f1df8c41695c8a91cf9c4c64358067d15a7b6c6b" -dependencies = [ - "windows-sys 0.52.0", -] - [[package]] name = "winapi-x86_64-pc-windows-gnu" version = "0.4.0" @@ -3211,21 +3441,77 @@ checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" [[package]] name = "windows" -version = "0.51.1" +version = "0.58.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca229916c5ee38c2f2bc1e9d8f04df975b4bd93f9955dc69fabb5d91270045c9" +checksum = "dd04d41d93c4992d421894c18c8b43496aa748dd4c081bac0dc93eb0489272b6" dependencies = [ "windows-core", - "windows-targets 0.48.5", + "windows-targets 0.52.6", ] [[package]] name = "windows-core" -version = "0.51.1" +version = "0.58.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1f8cf84f35d2db49a46868f947758c7a1138116f7fac3bc844f43ade1292e64" +checksum = "6ba6d44ec8c2591c134257ce647b7ea6b20335bf6379a27dac5f1641fcf59f99" dependencies = [ - "windows-targets 0.48.5", + "windows-implement", + "windows-interface", + "windows-result", + "windows-strings", + "windows-targets 0.52.6", +] + +[[package]] +name = "windows-implement" +version = "0.58.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2bbd5b46c938e506ecbce286b6628a02171d56153ba733b6c741fc627ec9579b" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.68", +] + +[[package]] +name = "windows-interface" +version = "0.58.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "053c4c462dc91d3b1504c6fe5a726dd15e216ba718e84a0e46a88fbe5ded3515" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.68", +] + +[[package]] +name = "windows-registry" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e400001bb720a623c1c69032f8e3e4cf09984deec740f007dd2b03ec864804b0" +dependencies = [ + "windows-result", + "windows-strings", + "windows-targets 0.52.6", +] + +[[package]] +name = "windows-result" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1d1043d8214f791817bab27572aaa8af63732e11bf84aa21a45a78d6c317ae0e" +dependencies = [ + "windows-targets 0.52.6", +] + +[[package]] +name = "windows-strings" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4cd9b125c486025df0eabcb585e62173c6c9eddcec5d117d3b6e8c30e2ee4d10" +dependencies = [ + "windows-result", + "windows-targets 0.52.6", ] [[package]] @@ -3243,7 +3529,16 @@ version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" dependencies = [ - "windows-targets 0.52.5", + "windows-targets 0.52.6", +] + +[[package]] +name = "windows-sys" +version = "0.59.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b" +dependencies = [ + "windows-targets 0.52.6", ] [[package]] @@ -3263,18 +3558,18 @@ dependencies = [ [[package]] name = "windows-targets" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f0713a46559409d202e70e28227288446bf7841d3211583a4b53e3f6d96e7eb" +checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973" dependencies = [ - "windows_aarch64_gnullvm 0.52.5", - "windows_aarch64_msvc 0.52.5", - "windows_i686_gnu 0.52.5", + "windows_aarch64_gnullvm 0.52.6", + "windows_aarch64_msvc 0.52.6", + "windows_i686_gnu 0.52.6", "windows_i686_gnullvm", - "windows_i686_msvc 0.52.5", - "windows_x86_64_gnu 0.52.5", - "windows_x86_64_gnullvm 0.52.5", - "windows_x86_64_msvc 0.52.5", + "windows_i686_msvc 0.52.6", + "windows_x86_64_gnu 0.52.6", + "windows_x86_64_gnullvm 0.52.6", + "windows_x86_64_msvc 0.52.6", ] [[package]] @@ -3285,9 +3580,9 @@ checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" [[package]] name = "windows_aarch64_gnullvm" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7088eed71e8b8dda258ecc8bac5fb1153c5cffaf2578fc8ff5d61e23578d3263" +checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3" [[package]] name = "windows_aarch64_msvc" @@ -3297,9 +3592,9 @@ checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" [[package]] name = "windows_aarch64_msvc" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9985fd1504e250c615ca5f281c3f7a6da76213ebd5ccc9561496568a2752afb6" +checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469" [[package]] name = "windows_i686_gnu" @@ -3309,15 +3604,15 @@ checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" [[package]] name = "windows_i686_gnu" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "88ba073cf16d5372720ec942a8ccbf61626074c6d4dd2e745299726ce8b89670" +checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b" [[package]] name = "windows_i686_gnullvm" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87f4261229030a858f36b459e748ae97545d6f1ec60e5e0d6a3d32e0dc232ee9" +checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66" [[package]] name = "windows_i686_msvc" @@ -3327,9 +3622,9 @@ checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" [[package]] name = "windows_i686_msvc" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db3c2bf3d13d5b658be73463284eaf12830ac9a26a90c717b7f771dfe97487bf" +checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66" [[package]] name = "windows_x86_64_gnu" @@ -3339,9 +3634,9 @@ checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" [[package]] name = "windows_x86_64_gnu" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e4246f76bdeff09eb48875a0fd3e2af6aada79d409d33011886d3e1581517d9" +checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78" [[package]] name = "windows_x86_64_gnullvm" @@ -3351,9 +3646,9 @@ checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" [[package]] name = "windows_x86_64_gnullvm" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "852298e482cd67c356ddd9570386e2862b5673c85bd5f88df9ab6802b334c596" +checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d" [[package]] name = "windows_x86_64_msvc" @@ -3363,25 +3658,24 @@ checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" [[package]] name = "windows_x86_64_msvc" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bec47e5bfd1bff0eeaf6d8b485cc1074891a197ab4225d504cb7a1ab88b02bf0" +checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" [[package]] -name = "winreg" -version = "0.50.0" +name = "winnow" +version = "0.6.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "524e57b2c537c0f9b1e69f1965311ec12182b4122e45035b1508cd24d2adadb1" +checksum = "68a9bda4691f099d435ad181000724da8e5899daa10713c2d432552b9ccd3a6f" dependencies = [ - "cfg-if", - "windows-sys 0.48.0", + "memchr", ] [[package]] name = "winreg" -version = "0.51.0" +version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "937f3df7948156640f46aacef17a70db0de5917bda9c92b0f751f3a955b588fc" +checksum = "a277a57398d4bfa075df44f501a17cfdf8542d224f0d36095a2adc7aee4ef0a5" dependencies = [ "cfg-if", "windows-sys 0.48.0", diff --git a/pkgs/servers/teleport/16/default.nix b/pkgs/servers/teleport/16/default.nix index 8aec5a6dfe03..1b8d89fb0fe0 100644 --- a/pkgs/servers/teleport/16/default.nix +++ b/pkgs/servers/teleport/16/default.nix @@ -1,22 +1,21 @@ { wasm-bindgen-cli, ... }@args: import ../generic.nix (args // { - version = "16.1.4"; - hash = "sha256-WgMQzS7nwIwPojcf9HTLajLd0WV+RYEbyp/aWr9XFWc="; - vendorHash = "sha256-8WN4hVueA2o2bHhhxLGPYxPX+1qky8QHGTRqhEGNh9s="; + version = "16.2.0"; + hash = "sha256-3LLoO7SNJfEfDEU7JnAhmAOIdRO+TkgiJKjT8sqzelo="; + vendorHash = "sha256-iyYfht0aB9Vv2hsaqrieFHXbDhlotKQYfLn4JFqpve8="; pnpmHash = "sha256-phDrOSFQsgA+I4PDK9LJasUBXBO8EkVtQIMx9M4v8u0="; cargoLock = { lockFile = ./Cargo.lock; outputHashes = { - "boring-4.7.0" = "sha256-ACzw4Bfo6OUrwvi3h21tvx5CpdQaWCEIDkslzjzy9o8="; - "ironrdp-async-0.1.0" = "sha256-nE5O/wRJ3vJqJG5zdYmpVkhx6JC6Yb92pR4EKSWSdkA="; - "sspi-0.10.1" = "sha256-fkclC/plTh2d8zcmqthYmr5yXqbPTeFxI1VuaPX5vxk="; - }; + "boring-4.7.0" = "sha256-ACzw4Bfo6OUrwvi3h21tvx5CpdQaWCEIDkslzjzy9o8="; + "ironrdp-async-0.1.0" = "sha256-DOwDHavDaEda+JK9M6kbvseoXe2LxJg3MLTY/Nu+PN0="; + }; }; # wasm-bindgen-cli version must match the version of wasm-bindgen in Cargo.lock wasm-bindgen-cli = wasm-bindgen-cli.override { - version = "0.2.92"; - hash = "sha256-1VwY8vQy7soKEgbki4LD+v259751kKxSxmo/gqE6yV0="; - cargoHash = "sha256-aACJ+lYNEU8FFBs158G1/JG8sc6Rq080PeKCMnwdpH0="; + version = "0.2.93"; + hash = "sha256-DDdu5mM3gneraM85pAepBXWn3TMofarVR4NbjMdz3r0="; + cargoHash = "sha256-birrg+XABBHHKJxfTKAMSlmTVYLmnmqMDfRnmG6g/YQ="; }; }) From 79b2e91635ef29197884ecd398e4e756c4e2d297 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Fri, 6 Sep 2024 16:38:12 -0700 Subject: [PATCH 52/68] python312Packages.hass-client: init at 1.2.0 --- .../python-modules/hass-client/default.nix | 56 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 58 insertions(+) create mode 100644 pkgs/development/python-modules/hass-client/default.nix diff --git a/pkgs/development/python-modules/hass-client/default.nix b/pkgs/development/python-modules/hass-client/default.nix new file mode 100644 index 000000000000..29b1a94965c2 --- /dev/null +++ b/pkgs/development/python-modules/hass-client/default.nix @@ -0,0 +1,56 @@ +{ + aiodns, + aiohttp, + brotli, + buildPythonPackage, + faust-cchardet, + fetchFromGitHub, + lib, + orjson, + setuptools, +}: + +buildPythonPackage rec { + pname = "hass-client"; + version = "1.2.0"; + pyproject = true; + + src = fetchFromGitHub { + owner = "music-assistant"; + repo = "python-hass-client"; + rev = "refs/tags/${version}"; + hash = "sha256-FA3acaXLWcBMDsabLPxVk6EArSxcTAnmFeO1ixTXB1Q="; + }; + + build-system = [ + setuptools + ]; + + dependencies = [ + aiohttp + ]; + + optional-dependencies = { + speedups = [ + aiodns + brotli + faust-cchardet + orjson + ]; + }; + + pythonImportsCheck = [ + "hass_client" + ]; + + # upstream has no tests + doCheck = false; + + meta = { + changelog = "https://github.com/music-assistant/python-hass-client/releases/tag/${version}"; + description = "Basic client for connecting to Home Assistant over websockets and REST"; + homepage = "https://github.com/music-assistant/python-hass-client"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ dotlambda ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 792c1de8f33a..a1567654feaf 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5523,6 +5523,8 @@ self: super: with self; { hap-python = callPackage ../development/python-modules/hap-python { }; + hass-client = callPackage ../development/python-modules/hass-client { }; + hass-nabucasa = callPackage ../development/python-modules/hass-nabucasa { }; hass-splunk = callPackage ../development/python-modules/hass-splunk { }; From 55d27ddb65bcf625a2ca31e255db050b670ef60b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Fri, 6 Sep 2024 16:38:57 -0700 Subject: [PATCH 53/68] music-assistant: support hass provider --- pkgs/by-name/mu/music-assistant/providers.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/mu/music-assistant/providers.nix b/pkgs/by-name/mu/music-assistant/providers.nix index 3fa13fe8b57c..0495e794b714 100644 --- a/pkgs/by-name/mu/music-assistant/providers.nix +++ b/pkgs/by-name/mu/music-assistant/providers.nix @@ -27,8 +27,9 @@ fully_kiosk = ps: with ps; [ python-fullykiosk ]; - hass = [ - ]; # missing hass-client + hass = ps: with ps; [ + hass-client + ]; hass_players = [ ]; jellyfin = ps: with ps; [ From dbfd8f178c8af227de664990ac219be51311021b Mon Sep 17 00:00:00 2001 From: Philip Taron Date: Fri, 6 Sep 2024 16:59:10 -0700 Subject: [PATCH 54/68] Revert "qrtool: switch to GitLab source" This reverts commit 24bf96e2570aa8e9d67a85bc6fd46fd48c1ca287, as @sorairolake has GitHub access again. --- pkgs/by-name/qr/qrtool/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/qr/qrtool/package.nix b/pkgs/by-name/qr/qrtool/package.nix index 8748c58c376b..4fb17b7ca8dc 100644 --- a/pkgs/by-name/qr/qrtool/package.nix +++ b/pkgs/by-name/qr/qrtool/package.nix @@ -1,7 +1,7 @@ { lib, stdenv, - fetchFromGitLab, + fetchFromGitHub, rustPlatform, asciidoctor, installShellFiles, @@ -11,11 +11,11 @@ rustPlatform.buildRustPackage rec { pname = "qrtool"; version = "0.11.4"; - src = fetchFromGitLab { + src = fetchFromGitHub { owner = "sorairolake"; repo = "qrtool"; rev = "v${version}"; - hash = "sha256-lD/xi2k5baZGUUixy/032jTBevr0uQIT/JmX+d+kPyA="; + sha256 = "sha256-lD/xi2k5baZGUUixy/032jTBevr0uQIT/JmX+d+kPyA="; }; cargoHash = "sha256-lR/LusIgdA+G7YeSLHjxdcC96tOSqSyalVamS42ORs0="; From 399f8f171002150c70cc94970544083a9a774e10 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 7 Sep 2024 03:45:51 +0200 Subject: [PATCH 55/68] python312Packages.aioazuredevops: 2.2.0 -> 2.2.1 https://github.com/timmo001/aioazuredevops/releases/tag/2.2.1 --- .../python-modules/aioazuredevops/default.nix | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aioazuredevops/default.nix b/pkgs/development/python-modules/aioazuredevops/default.nix index 9ecfe8e17ec2..70be2375adf9 100644 --- a/pkgs/development/python-modules/aioazuredevops/default.nix +++ b/pkgs/development/python-modules/aioazuredevops/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { pname = "aioazuredevops"; - version = "2.2.0"; + version = "2.2.1"; pyproject = true; disabled = pythonOlder "3.12"; @@ -31,7 +31,7 @@ buildPythonPackage rec { owner = "timmo001"; repo = "aioazuredevops"; rev = "refs/tags/${version}"; - hash = "sha256-1v58I9WOyyrp9n+qdvVeMZ3EObqP/06XCOZYS0nEvPU="; + hash = "sha256-RZBiFPzYtEoc51T3irVHL9xVlZgACyM2lu1TkMoatqU="; }; postPatch = '' @@ -58,6 +58,15 @@ buildPythonPackage rec { syrupy ]; + disabledTests = [ + # https://github.com/timmo001/aioazuredevops/issues/44 + "test_get_project" + "test_get_builds" + "test_get_build" + ]; + + pytestFlagsArray = [ "--snapshot-update" ]; + pythonImportsCheck = [ "aioazuredevops" ]; meta = with lib; { From 0f8a12ee9297fcedc187e58f9df9cbac026113a7 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 7 Sep 2024 03:48:25 +0200 Subject: [PATCH 56/68] python312Packages.aiorussound: 2.3.2 -> 3.0.5 https://github.com/noahhusby/aiorussound/releases/tag/3.0.5 --- .../python-modules/aiorussound/default.nix | 25 +++++++++++++++---- 1 file changed, 20 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/aiorussound/default.nix b/pkgs/development/python-modules/aiorussound/default.nix index a71111fccc89..248511f4a36d 100644 --- a/pkgs/development/python-modules/aiorussound/default.nix +++ b/pkgs/development/python-modules/aiorussound/default.nix @@ -4,28 +4,43 @@ fetchFromGitHub, # build-system - setuptools, + poetry-core, + + # dependencies + mashumaro, + orjson, + + # tests + pytestCheckHook, }: buildPythonPackage rec { pname = "aiorussound"; - version = "2.3.2"; + version = "3.0.5"; pyproject = true; src = fetchFromGitHub { owner = "noahhusby"; repo = "aiorussound"; rev = "refs/tags/${version}"; - hash = "sha256-lQDHwm6dpernRYktu6eqV8uP7FHHHAU28viLg0q58+8="; + hash = "sha256-tv/Box8YqmFXvnezp44lKrPscK9K24+mXBv9aZw/3M4="; }; - build-system = [ setuptools ]; + build-system = [ poetry-core ]; - doCheck = false; # no tests + dependencies = [ + mashumaro + orjson + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; pythonImportsCheck = [ "aiorussound" ]; meta = with lib; { + changelog = "https://github.com/noahhusby/aiorussound/releases/tag/${version}"; description = "Async python package for interfacing with Russound RIO hardware"; homepage = "https://github.com/noahhusby/aiorussound"; license = licenses.mit; From 15b7698cf7d5b4ee7b614f49370cf7f42ca3ad87 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 7 Sep 2024 11:51:29 +1000 Subject: [PATCH 57/68] python312Packages.pyatv: 0.15.0 -> 0.15.1 (#340167) https://github.com/postlund/pyatv/blob/v0.15.1/CHANGES.md --- pkgs/development/python-modules/pyatv/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyatv/default.nix b/pkgs/development/python-modules/pyatv/default.nix index eea3e1c69702..bf3fe63b474b 100644 --- a/pkgs/development/python-modules/pyatv/default.nix +++ b/pkgs/development/python-modules/pyatv/default.nix @@ -30,7 +30,7 @@ buildPythonPackage rec { pname = "pyatv"; - version = "0.15.0"; + version = "0.15.1"; pyproject = true; disabled = pythonOlder "3.8"; @@ -39,7 +39,7 @@ buildPythonPackage rec { owner = "postlund"; repo = "pyatv"; rev = "refs/tags/v${version}"; - hash = "sha256-59XDh+TA4UYzfLJtbTiMC6Wz7EvUW22ONM4JQw5t/5o="; + hash = "sha256-8ODhDuc4jaLtrLZYd1yJlpYygO6KaguyR/yLWb/rMR4="; }; postPatch = '' From 68b67cf3c6ad832a5b8a7ceefa8464e943558eab Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 7 Sep 2024 11:51:57 +1000 Subject: [PATCH 58/68] python312Packages.pypck: 0.7.21 -> 0.7.22 (#340181) https://github.com/alengwenus/pypck/releases/tag/0.7.22 --- pkgs/development/python-modules/pypck/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pypck/default.nix b/pkgs/development/python-modules/pypck/default.nix index 1dea0e3ee957..1dd639d8721b 100644 --- a/pkgs/development/python-modules/pypck/default.nix +++ b/pkgs/development/python-modules/pypck/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "pypck"; - version = "0.7.21"; + version = "0.7.22"; pyproject = true; disabled = pythonOlder "3.9"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "alengwenus"; repo = "pypck"; rev = "refs/tags/${version}"; - hash = "sha256-6Ng+Jw5ZDtkKOftFVhy1uOjzcmeKI5VqWzPn3EkKfGI="; + hash = "sha256-rtlcsmjvhC232yjt258ne51tL//eKsCKYYc/yHG7HUU="; }; postPatch = '' From cd006f904d7994dedd4c0d5fdbb996444402ff47 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 7 Sep 2024 11:52:51 +1000 Subject: [PATCH 59/68] python312Packages.sfrbox-api: 0.0.9 -> 0.0.10 (#340134) https://github.com/hacf-fr/sfrbox-api/releases/tag/v0.0.10 --- .../python-modules/sfrbox-api/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/sfrbox-api/default.nix b/pkgs/development/python-modules/sfrbox-api/default.nix index 25722095f432..9ed70a0cb090 100644 --- a/pkgs/development/python-modules/sfrbox-api/default.nix +++ b/pkgs/development/python-modules/sfrbox-api/default.nix @@ -15,16 +15,16 @@ buildPythonPackage rec { pname = "sfrbox-api"; - version = "0.0.9"; + version = "0.0.10"; pyproject = true; - disabled = pythonOlder "3.8"; + disabled = pythonOlder "3.9"; src = fetchFromGitHub { owner = "hacf-fr"; repo = "sfrbox-api"; rev = "refs/tags/v${version}"; - hash = "sha256-rMfX9vA8IuWxXvVs4WYNHO6neeoie/3gABwhXyJoAF8="; + hash = "sha256-xvtusgqCseXAmiPQBFFZnRS9KmuhzHhZUAj5aaqyFrE="; }; pythonRelaxDeps = [ @@ -32,9 +32,9 @@ buildPythonPackage rec { "pydantic" ]; - nativeBuildInputs = [ poetry-core ]; + build-system = [ poetry-core ]; - propagatedBuildInputs = [ + dependencies = [ defusedxml httpx pydantic @@ -54,10 +54,10 @@ buildPythonPackage rec { meta = with lib; { description = "Module for the SFR Box API"; - mainProgram = "sfrbox-api"; homepage = "https://github.com/hacf-fr/sfrbox-api"; changelog = "https://github.com/hacf-fr/sfrbox-api/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ fab ]; + mainProgram = "sfrbox-api"; }; } From be32790365c16942054d684461b6df1e9bb7ea3b Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 7 Sep 2024 03:53:45 +0200 Subject: [PATCH 60/68] home-assistant: 2024.9.0 -> 2024.9.1 https://github.com/home-assistant/core/releases/tag/2024.9.1 --- pkgs/servers/home-assistant/component-packages.nix | 2 +- pkgs/servers/home-assistant/default.nix | 6 +++--- pkgs/servers/home-assistant/frontend.nix | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index 7b0894c2d3a9..860dadafe331 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -2,7 +2,7 @@ # Do not edit! { - version = "2024.9.0"; + version = "2024.9.1"; components = { "3_day_blinds" = ps: with ps; [ ]; diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index 1d146f0a8218..926594103e00 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -414,7 +414,7 @@ let extraBuildInputs = extraPackages python.pkgs; # Don't forget to run update-component-packages.py after updating - hassVersion = "2024.9.0"; + hassVersion = "2024.9.1"; in python.pkgs.buildPythonApplication rec { pname = "homeassistant"; @@ -432,13 +432,13 @@ in python.pkgs.buildPythonApplication rec { owner = "home-assistant"; repo = "core"; rev = "refs/tags/${version}"; - hash = "sha256-tzEiT+1NvwmH/j1FnmUcanwjSGS8+M/FJ2wZY7qAdYk="; + hash = "sha256-jwkLlmwP9rxwGFVagVyVrO6scOMzuva1Pz706nb3Ato="; }; # Secondary source is pypi sdist for translations sdist = fetchPypi { inherit pname version; - hash = "sha256-KTseRVRn3O75Sjot4f7fgKioKKEY33eXHcFufsPKLak="; + hash = "sha256-0+tXKnkcpjISqapvFh7nPKfPxJrSACuxulejk4pCPUQ="; }; build-system = with python.pkgs; [ diff --git a/pkgs/servers/home-assistant/frontend.nix b/pkgs/servers/home-assistant/frontend.nix index ab59b8107de2..e01f3c8972f8 100644 --- a/pkgs/servers/home-assistant/frontend.nix +++ b/pkgs/servers/home-assistant/frontend.nix @@ -4,7 +4,7 @@ buildPythonPackage rec { # the frontend version corresponding to a specific home-assistant version can be found here # https://github.com/home-assistant/home-assistant/blob/master/homeassistant/components/frontend/manifest.json pname = "home-assistant-frontend"; - version = "20240904.0"; + version = "20240906.0"; format = "wheel"; src = fetchPypi { @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "home_assistant_frontend"; dist = "py3"; python = "py3"; - hash = "sha256-UauRL6AbyQgk7av1AuE49nlWEkuRRQxQykFHeo3ZpGU="; + hash = "sha256-iWSpwgp5mdAhuZgF+1uNL0aovjM7CZ4SbM0HHQktfAk="; }; # there is nothing to strip in this package From 1232792e1b327f53c607202358dc0ed3c2324c67 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 7 Sep 2024 04:00:34 +0200 Subject: [PATCH 61/68] python312Packages.homeassistant-stubs: 2024.9.0 -> 2024.9.1 https://github.com/KapJI/homeassistant-stubs/releases/tag/2024.9.1 --- pkgs/servers/home-assistant/stubs.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/home-assistant/stubs.nix b/pkgs/servers/home-assistant/stubs.nix index fe0f8af3de2d..ba463e839dc8 100644 --- a/pkgs/servers/home-assistant/stubs.nix +++ b/pkgs/servers/home-assistant/stubs.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "homeassistant-stubs"; - version = "2024.9.0"; + version = "2024.9.1"; pyproject = true; disabled = python.version != home-assistant.python.version; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "KapJI"; repo = "homeassistant-stubs"; rev = "refs/tags/${version}"; - hash = "sha256-8t8r0CjiMvu73A+NtwF6/KMm+LkvMc/k4d1YPgWzWt8="; + hash = "sha256-snYfeMKZhQWJx3hi7cvY9tswmPxmtiPHz4S8IM31DvU="; }; build-system = [ From 798b763e118feffe45f426174287c372f1dd9cd2 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 7 Sep 2024 04:25:58 +0200 Subject: [PATCH 62/68] python311Packages.aiorussound: disable --- pkgs/development/python-modules/aiorussound/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/python-modules/aiorussound/default.nix b/pkgs/development/python-modules/aiorussound/default.nix index 248511f4a36d..3e700c818985 100644 --- a/pkgs/development/python-modules/aiorussound/default.nix +++ b/pkgs/development/python-modules/aiorussound/default.nix @@ -2,6 +2,7 @@ lib, buildPythonPackage, fetchFromGitHub, + pythonOlder, # build-system poetry-core, @@ -19,6 +20,9 @@ buildPythonPackage rec { version = "3.0.5"; pyproject = true; + # requires newer f-strings introduced in 3.12 + disabled = pythonOlder "3.12"; + src = fetchFromGitHub { owner = "noahhusby"; repo = "aiorussound"; From 1f0f59d5a1b09d97335234c6cb34653971a53fdd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=A9clairevoyant?= <848000+eclairevoyant@users.noreply.github.com> Date: Wed, 7 Aug 2024 06:22:32 -0400 Subject: [PATCH 63/68] rustPlatform.fetchCargoTarball: nixfmt --- .../rust/fetch-cargo-tarball/default.nix | 219 ++++++++++-------- 1 file changed, 123 insertions(+), 96 deletions(-) diff --git a/pkgs/build-support/rust/fetch-cargo-tarball/default.nix b/pkgs/build-support/rust/fetch-cargo-tarball/default.nix index adbfe98d8103..a1fa2f074f84 100644 --- a/pkgs/build-support/rust/fetch-cargo-tarball/default.nix +++ b/pkgs/build-support/rust/fetch-cargo-tarball/default.nix @@ -1,116 +1,143 @@ -{ lib, stdenv, cacert, git, cargo, python3 }: -let cargo-vendor-normalise = stdenv.mkDerivation { - name = "cargo-vendor-normalise"; - src = ./cargo-vendor-normalise.py; - nativeBuildInputs = [ python3.pkgs.wrapPython ]; - dontUnpack = true; - installPhase = "install -D $src $out/bin/cargo-vendor-normalise"; - pythonPath = [ python3.pkgs.toml ]; - postFixup = "wrapPythonPrograms"; - doInstallCheck = true; - installCheckPhase = '' - # check that ../fetchcargo-default-config.toml is a fix point - reference=${../fetchcargo-default-config.toml} - < $reference $out/bin/cargo-vendor-normalise > test; - cmp test $reference - ''; - preferLocalBuild = true; -}; +{ + lib, + stdenv, + cacert, + git, + cargo, + python3, +}: +let + cargo-vendor-normalise = stdenv.mkDerivation { + name = "cargo-vendor-normalise"; + src = ./cargo-vendor-normalise.py; + nativeBuildInputs = [ python3.pkgs.wrapPython ]; + dontUnpack = true; + installPhase = "install -D $src $out/bin/cargo-vendor-normalise"; + pythonPath = [ python3.pkgs.toml ]; + postFixup = "wrapPythonPrograms"; + doInstallCheck = true; + installCheckPhase = '' + # check that ../fetchcargo-default-config.toml is a fix point + reference=${../fetchcargo-default-config.toml} + < $reference $out/bin/cargo-vendor-normalise > test; + cmp test $reference + ''; + preferLocalBuild = true; + }; in -{ name ? "cargo-deps" -, src ? null -, srcs ? [] -, patches ? [] -, sourceRoot ? "" -, cargoUpdateHook ? "" -, nativeBuildInputs ? [] -, ... -} @ args: +{ + name ? "cargo-deps", + src ? null, + srcs ? [ ], + patches ? [ ], + sourceRoot ? "", + cargoUpdateHook ? "", + nativeBuildInputs ? [ ], + ... +}@args: -let hash_ = - if args ? hash then - { - outputHashAlgo = if args.hash == "" then "sha256" else null; - outputHash = args.hash; - } - else if args ? sha256 then { outputHashAlgo = "sha256"; outputHash = args.sha256; } - else throw "fetchCargoTarball requires a hash for ${name}"; -in stdenv.mkDerivation ({ - name = "${name}-vendor.tar.gz"; - nativeBuildInputs = [ cacert git cargo-vendor-normalise cargo ] ++ nativeBuildInputs; +let + hash_ = + if args ? hash then + { + outputHashAlgo = if args.hash == "" then "sha256" else null; + outputHash = args.hash; + } + else if args ? sha256 then + { + outputHashAlgo = "sha256"; + outputHash = args.sha256; + } + else + throw "fetchCargoTarball requires a hash for ${name}"; +in +stdenv.mkDerivation ( + { + name = "${name}-vendor.tar.gz"; + nativeBuildInputs = [ + cacert + git + cargo-vendor-normalise + cargo + ] ++ nativeBuildInputs; - buildPhase = '' - runHook preBuild + buildPhase = '' + runHook preBuild - # Ensure deterministic Cargo vendor builds - export SOURCE_DATE_EPOCH=1 + # Ensure deterministic Cargo vendor builds + export SOURCE_DATE_EPOCH=1 - if [[ ! -f Cargo.lock ]]; then - echo - echo "ERROR: The Cargo.lock file doesn't exist" - echo - echo "Cargo.lock is needed to make sure that cargoHash/cargoSha256 doesn't change" - echo "when the registry is updated." - echo + if [[ ! -f Cargo.lock ]]; then + echo + echo "ERROR: The Cargo.lock file doesn't exist" + echo + echo "Cargo.lock is needed to make sure that cargoHash/cargoSha256 doesn't change" + echo "when the registry is updated." + echo - exit 1 - fi + exit 1 + fi - # Keep the original around for copyLockfile - cp Cargo.lock Cargo.lock.orig + # Keep the original around for copyLockfile + cp Cargo.lock Cargo.lock.orig - export CARGO_HOME=$(mktemp -d cargo-home.XXX) - CARGO_CONFIG=$(mktemp cargo-config.XXXX) + export CARGO_HOME=$(mktemp -d cargo-home.XXX) + CARGO_CONFIG=$(mktemp cargo-config.XXXX) - if [[ -n "$NIX_CRATES_INDEX" ]]; then - cat >$CARGO_HOME/config.toml <$CARGO_HOME/config.toml < $CARGO_CONFIG + cargo vendor $name --respect-source-config | cargo-vendor-normalise > $CARGO_CONFIG - # Create an empty vendor directory when there is no dependency to vendor - mkdir -p $name - # Add the Cargo.lock to allow hash invalidation - cp Cargo.lock.orig $name/Cargo.lock + # Create an empty vendor directory when there is no dependency to vendor + mkdir -p $name + # Add the Cargo.lock to allow hash invalidation + cp Cargo.lock.orig $name/Cargo.lock - # Packages with git dependencies generate non-default cargo configs, so - # always install it rather than trying to write a standard default template. - install -D $CARGO_CONFIG $name/.cargo/config; + # Packages with git dependencies generate non-default cargo configs, so + # always install it rather than trying to write a standard default template. + install -D $CARGO_CONFIG $name/.cargo/config; - runHook postBuild - ''; + runHook postBuild + ''; - # Build a reproducible tar, per instructions at https://reproducible-builds.org/docs/archives/ - installPhase = '' - tar --owner=0 --group=0 --numeric-owner --format=gnu \ - --sort=name --mtime="@$SOURCE_DATE_EPOCH" \ - -czf $out $name - ''; + # Build a reproducible tar, per instructions at https://reproducible-builds.org/docs/archives/ + installPhase = '' + tar --owner=0 --group=0 --numeric-owner --format=gnu \ + --sort=name --mtime="@$SOURCE_DATE_EPOCH" \ + -czf $out $name + ''; - inherit (hash_) outputHashAlgo outputHash; + inherit (hash_) outputHashAlgo outputHash; - impureEnvVars = lib.fetchers.proxyImpureEnvVars ++ [ "NIX_CRATES_INDEX" ]; -} // (builtins.removeAttrs args [ - "name" "sha256" "cargoUpdateHook" "nativeBuildInputs" -])) + impureEnvVars = lib.fetchers.proxyImpureEnvVars ++ [ "NIX_CRATES_INDEX" ]; + } + // (builtins.removeAttrs args [ + "name" + "sha256" + "cargoUpdateHook" + "nativeBuildInputs" + ]) +) From 3207bc22374806a175923147df90175f1cc89496 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=A9clairevoyant?= <848000+eclairevoyant@users.noreply.github.com> Date: Wed, 7 Aug 2024 06:59:16 -0400 Subject: [PATCH 64/68] rustPlatform.fetchCargoTarball: support pname, version --- .../rust/fetch-cargo-tarball/default.nix | 27 ++++++++++++++----- 1 file changed, 20 insertions(+), 7 deletions(-) diff --git a/pkgs/build-support/rust/fetch-cargo-tarball/default.nix b/pkgs/build-support/rust/fetch-cargo-tarball/default.nix index a1fa2f074f84..c16f3540e6ae 100644 --- a/pkgs/build-support/rust/fetch-cargo-tarball/default.nix +++ b/pkgs/build-support/rust/fetch-cargo-tarball/default.nix @@ -26,7 +26,9 @@ let }; in { - name ? "cargo-deps", + pname ? null, + version ? null, + name ? if args ? pname && args ? version then "${pname}-${version}" else "cargo-deps", src ? null, srcs ? [ ], patches ? [ ], @@ -36,7 +38,23 @@ in ... }@args: +assert lib.assertMsg ( + (args ? pname || args ? version) -> !(args ? name) +) "Either specify `pname` with `version`, or specify `name` only, not a mix of both."; +assert lib.assertMsg ( + args ? pname == args ? version +) "If `pname` is specified, `version` must be also, and vice versa."; let + # args to remove from the final call to stdenv.mkDerivation, as we've already handled them + removedArgs = [ + "name" + "pname" + "version" + "sha256" + "cargoUpdateHook" + "nativeBuildInputs" + ]; + hash_ = if args ? hash then { @@ -134,10 +152,5 @@ stdenv.mkDerivation ( impureEnvVars = lib.fetchers.proxyImpureEnvVars ++ [ "NIX_CRATES_INDEX" ]; } - // (builtins.removeAttrs args [ - "name" - "sha256" - "cargoUpdateHook" - "nativeBuildInputs" - ]) + // (removeAttrs args removedArgs) ) From 5c38beb516f8da3a823d94b746dd3bf3c6b9bbd7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=A9clairevoyant?= <848000+eclairevoyant@users.noreply.github.com> Date: Fri, 9 Aug 2024 21:18:50 -0400 Subject: [PATCH 65/68] doc/rust: prefer pname+version over name in fetchCargoTarball --- doc/languages-frameworks/rust.section.md | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/doc/languages-frameworks/rust.section.md b/doc/languages-frameworks/rust.section.md index 15f16879a5b4..808936f49e60 100644 --- a/doc/languages-frameworks/rust.section.md +++ b/doc/languages-frameworks/rust.section.md @@ -567,8 +567,7 @@ buildPythonPackage rec { }; cargoDeps = rustPlatform.fetchCargoTarball { - inherit src sourceRoot; - name = "${pname}-${version}"; + inherit pname version src sourceRoot; hash = "sha256-miW//pnOmww2i6SOGbkrAIdc/JMDT4FJLqdMFojZeoY="; }; @@ -611,9 +610,8 @@ buildPythonPackage rec { }; cargoDeps = rustPlatform.fetchCargoTarball { - inherit src; + inherit pname version src; sourceRoot = "${pname}-${version}/${cargoRoot}"; - name = "${pname}-${version}"; hash = "sha256-PS562W4L1NimqDV2H0jl5vYhL08H9est/pbIxSdYVfo="; }; @@ -652,8 +650,7 @@ buildPythonPackage rec { }; cargoDeps = rustPlatform.fetchCargoTarball { - inherit src; - name = "${pname}-${version}"; + inherit pname version src; hash = "sha256-heOBK8qi2nuc/Ib+I/vLzZ1fUUD/G/KTw9d7M4Hz5O0="; }; @@ -697,8 +694,7 @@ stdenv.mkDerivation rec { }; cargoDeps = rustPlatform.fetchCargoTarball { - inherit src; - name = "${pname}-${version}"; + inherit pname version src; hash = "sha256-8fa3fa+sFi5H+49B5sr2vYPkp9C9s6CcE0zv4xB8gww="; }; From 558837126b37b17f5bf062404fc1263852ff1626 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=A9clairevoyant?= <848000+eclairevoyant@users.noreply.github.com> Date: Wed, 7 Aug 2024 07:00:51 -0400 Subject: [PATCH 66/68] mousai: change name -> pname+version in cargoDeps --- pkgs/by-name/mo/mousai/package.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/by-name/mo/mousai/package.nix b/pkgs/by-name/mo/mousai/package.nix index b67ef0d86452..7bdb7dd7ec2c 100644 --- a/pkgs/by-name/mo/mousai/package.nix +++ b/pkgs/by-name/mo/mousai/package.nix @@ -32,8 +32,7 @@ stdenv.mkDerivation rec { }; cargoDeps = rustPlatform.fetchCargoTarball { - inherit src; - name = "${pname}-${version}"; + inherit pname version src; hash = "sha256-FjnRI1vHA9YF/Uw2+hDtMJmeJVa5RcxaYoG4XgXa9Ds="; }; From e273bc80a5225d08fa20c97fc872a2b1449b8feb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=A9clairevoyant?= <848000+eclairevoyant@users.noreply.github.com> Date: Fri, 9 Aug 2024 21:53:11 -0400 Subject: [PATCH 67/68] treewide: remove existing usages of pname+version in fetchCargoTarball This is done because the existing fetchCargoTarball does not support pname or version, resulting in a vendor tarball with the name cargo-deps-vendor.tar.gz. Since adding pname+version support would change the name of the derivation, and therefore its hash, we remove existing usages to avoid treewide breakage. --- pkgs/applications/audio/gnome-podcasts/default.nix | 2 +- pkgs/by-name/ch/chance/package.nix | 2 +- pkgs/by-name/ge/geopard/package.nix | 2 +- pkgs/by-name/ke/key-rack/package.nix | 2 +- pkgs/by-name/su/surrealist/package.nix | 2 +- pkgs/development/libraries/libkrun/default.nix | 2 +- pkgs/development/python-modules/datafusion/default.nix | 2 +- .../python-modules/pdoc-pyo3-sample-library/default.nix | 2 +- pkgs/tools/filesystems/stratisd/default.nix | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/pkgs/applications/audio/gnome-podcasts/default.nix b/pkgs/applications/audio/gnome-podcasts/default.nix index f5e53a1c7c66..de7301e5020c 100644 --- a/pkgs/applications/audio/gnome-podcasts/default.nix +++ b/pkgs/applications/audio/gnome-podcasts/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { }; cargoDeps = rustPlatform.fetchCargoTarball { - inherit pname version src; + inherit src; hash = "sha256-XTfKqKs7874ak7Lzscxw8E2qcnJOWMZaaol8TpIB6Vw="; }; diff --git a/pkgs/by-name/ch/chance/package.nix b/pkgs/by-name/ch/chance/package.nix index 80d50b7eb750..b200b39693f0 100644 --- a/pkgs/by-name/ch/chance/package.nix +++ b/pkgs/by-name/ch/chance/package.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation (finalAttrs: { }; cargoDeps = rustPlatform.fetchCargoTarball { - inherit (finalAttrs) pname version src; + inherit (finalAttrs) src; hash = "sha256-Q4CfDQxlhspjg7Et+0zHwZ/iSnp0CnwwpW/gT7htlL8="; }; diff --git a/pkgs/by-name/ge/geopard/package.nix b/pkgs/by-name/ge/geopard/package.nix index 4562b95d442a..348bd1050042 100644 --- a/pkgs/by-name/ge/geopard/package.nix +++ b/pkgs/by-name/ge/geopard/package.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation (finalAttrs: { }; cargoDeps = rustPlatform.fetchCargoTarball { - inherit (finalAttrs) pname version src; + inherit (finalAttrs) src; hash = "sha256-YVbaXGGwQaqjUkA47ryW1VgJpZTx5ApRGdCcB5aA71M="; }; diff --git a/pkgs/by-name/ke/key-rack/package.nix b/pkgs/by-name/ke/key-rack/package.nix index dfe104303b2c..dcb5ac1c82ff 100644 --- a/pkgs/by-name/ke/key-rack/package.nix +++ b/pkgs/by-name/ke/key-rack/package.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation (finalAttrs: { ''; cargoDeps = rustPlatform.fetchCargoTarball { - inherit (finalAttrs) pname version src; + inherit (finalAttrs) src; hash = "sha256-wCJTm0W+g3+O1t1fR4maqJoxpPM0NeJG7d54MMAH33c="; }; diff --git a/pkgs/by-name/su/surrealist/package.nix b/pkgs/by-name/su/surrealist/package.nix index 2efacf5d195f..ae8b0b7c76ef 100644 --- a/pkgs/by-name/su/surrealist/package.nix +++ b/pkgs/by-name/su/surrealist/package.nix @@ -111,7 +111,7 @@ in stdenv.mkDerivation (finalAttrs: { }; cargoDeps = rustPlatform.fetchCargoTarball { - inherit (finalAttrs) patches src sourceRoot version; + inherit (finalAttrs) patches src sourceRoot; name = "${finalAttrs.pname}-${finalAttrs.version}"; hash = "sha256-LtQS0kH+2P4odV7BJYiH6T51+iZHAM9W9mV96rNfNWs="; }; diff --git a/pkgs/development/libraries/libkrun/default.nix b/pkgs/development/libraries/libkrun/default.nix index b08232605ce7..fbccbdd37fef 100644 --- a/pkgs/development/libraries/libkrun/default.nix +++ b/pkgs/development/libraries/libkrun/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation (finalAttrs: { outputs = [ "out" "dev" ]; cargoDeps = rustPlatform.fetchCargoTarball { - inherit (finalAttrs) pname version src; + inherit (finalAttrs) src; hash = "sha256-33s62iOWYh1a8ETY/fbPRxvnj8dR4/UfG8mjFyWwz5k="; }; diff --git a/pkgs/development/python-modules/datafusion/default.nix b/pkgs/development/python-modules/datafusion/default.nix index 1b968fe50007..6343937d0d1e 100644 --- a/pkgs/development/python-modules/datafusion/default.nix +++ b/pkgs/development/python-modules/datafusion/default.nix @@ -46,7 +46,7 @@ buildPythonPackage rec { cargoDeps = rustPlatform.fetchCargoTarball { name = "datafusion-cargo-deps"; - inherit src pname version; + inherit src; hash = "sha256-M2ZNAFWdsnN9C4+YbqFxZVH9fHR10Bimf1Xzrd9oy9E="; }; diff --git a/pkgs/development/python-modules/pdoc-pyo3-sample-library/default.nix b/pkgs/development/python-modules/pdoc-pyo3-sample-library/default.nix index cf53273f73bb..3a653ec5f49a 100644 --- a/pkgs/development/python-modules/pdoc-pyo3-sample-library/default.nix +++ b/pkgs/development/python-modules/pdoc-pyo3-sample-library/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { }; cargoDeps = rustPlatform.fetchCargoTarball { - inherit pname version src; + inherit src; hash = "sha256-KrEBr998AV/bKcIoq0tX72/QwPD9bQplrS0Zw+JiSMQ="; }; diff --git a/pkgs/tools/filesystems/stratisd/default.nix b/pkgs/tools/filesystems/stratisd/default.nix index 0c837e14cc44..d6f532643d00 100644 --- a/pkgs/tools/filesystems/stratisd/default.nix +++ b/pkgs/tools/filesystems/stratisd/default.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { }; cargoDeps = rustPlatform.fetchCargoTarball { - inherit pname version src; + inherit src; hash = "sha256-1KzOKo5Q1uBqO3aCBYUJJxla4873AzrwoFPaNpKKFJU="; }; From 71f01ce1fc07d33493f1f9522f70574fd2d10b1f Mon Sep 17 00:00:00 2001 From: Johannes Kirschbauer Date: Sat, 7 Sep 2024 07:59:02 +0200 Subject: [PATCH 68/68] Doc/importNpmLock: general improvements (#340019) Co-authored-by: Valentin Gagarin --- .../javascript.section.md | 53 +++++++++++++++++-- 1 file changed, 49 insertions(+), 4 deletions(-) diff --git a/doc/languages-frameworks/javascript.section.md b/doc/languages-frameworks/javascript.section.md index ef8b7a60e245..2996686cde40 100644 --- a/doc/languages-frameworks/javascript.section.md +++ b/doc/languages-frameworks/javascript.section.md @@ -258,26 +258,39 @@ It returns a derivation with all `package-lock.json` dependencies downloaded int #### importNpmLock {#javascript-buildNpmPackage-importNpmLock} -`importNpmLock` is a Nix function that requires the following optional arguments: +This function replaces the npm dependency references in `package.json` and `package-lock.json` with paths to the Nix store. +How each dependency is fetched can be customized with the `fetcherOpts` argument. -- `npmRoot`: Path to package directory containing the source tree +This is a simpler and more convenient alternative to [`fetchNpmDeps`](#javascript-buildNpmPackage-fetchNpmDeps) for managing npm dependencies in Nixpkgs. +There is no need to specify a `hash`, since it relies entirely on the integrity hashes already present in the `package-lock.json` file. + +##### Inputs {#javascript-buildNpmPackage-inputs} + +- `npmRoot`: Path to package directory containing the source tree. + If this is omitted, the `package` and `packageLock` arguments must be specified instead. - `package`: Parsed contents of `package.json` - `packageLock`: Parsed contents of `package-lock.json` - `pname`: Package name - `version`: Package version +- `fetcherOpts`: An attribute set of arguments forwarded to the underlying fetcher. It returns a derivation with a patched `package.json` & `package-lock.json` with all dependencies resolved to Nix store paths. -This function is analogous to using `fetchNpmDeps`, but instead of specifying `hash` it uses metadata from `package.json` & `package-lock.json`. +:::{.note} +`npmHooks.npmConfigHook` cannot be used with `importNpmLock`. +Use `importNpmLock.npmConfigHook` instead. +::: -Note that `npmHooks.npmConfigHook` cannot be used with `importNpmLock`. You will instead need to use `importNpmLock.npmConfigHook`: +:::{.example} +##### `pkgs.importNpmLock` usage example {#javascript-buildNpmPackage-example} ```nix { buildNpmPackage, importNpmLock }: buildNpmPackage { pname = "hello"; version = "0.1.0"; + src = ./.; npmDeps = importNpmLock { npmRoot = ./.; @@ -286,6 +299,38 @@ buildNpmPackage { npmConfigHook = importNpmLock.npmConfigHook; } ``` +::: + +:::{.example} +##### `pkgs.importNpmLock` usage example with `fetcherOpts` {#javascript-buildNpmPackage-example-fetcherOpts} + +`importNpmLock` uses the following fetchers: + +- `pkgs.fetchurl` for `http(s)` dependencies +- `builtins.fetchGit` for `git` dependencies + +It is possible to provide additional arguments to individual fetchers as needed: + +```nix +{ buildNpmPackage, importNpmLock }: + +buildNpmPackage { + pname = "hello"; + version = "0.1.0"; + src = ./.; + + npmDeps = importNpmLock { + npmRoot = ./.; + fetcherOpts = { + # Pass 'curlOptsList' to 'pkgs.fetchurl' while fetching 'axios' + { "node_modules/axios" = { curlOptsList = [ "--verbose" ]; }; } + }; + }; + + npmConfigHook = importNpmLock.npmConfigHook; +} +``` +::: #### importNpmLock.buildNodeModules {#javascript-buildNpmPackage-importNpmLock.buildNodeModules}