From def1da0b7f305d2afa7e9b9074c7c5c8bb068861 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 18 Jul 2024 05:40:51 +0000 Subject: [PATCH 01/43] hareThirdParty.hare-ev: 0-unstable-2024-07-07 -> 0-unstable-2024-07-11 --- pkgs/development/hare-third-party/hare-ev/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/hare-third-party/hare-ev/default.nix b/pkgs/development/hare-third-party/hare-ev/default.nix index bbbe79e76ff0..5d2102a04d12 100644 --- a/pkgs/development/hare-third-party/hare-ev/default.nix +++ b/pkgs/development/hare-third-party/hare-ev/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation { pname = "hare-ev"; - version = "0-unstable-2024-07-07"; + version = "0-unstable-2024-07-11"; src = fetchFromSourcehut { owner = "~sircmpwn"; repo = "hare-ev"; - rev = "aa01cdd0ba226ed9a4c5e6031e6aa7158aa05c9a"; - hash = "sha256-xq6d2+BbHk2iLg50mtqXqhkky/P9GeRAulSD7ouMnrA="; + rev = "ed023beb4b4db88e22f608aa001682ac18cad230"; + hash = "sha256-bZWVrxk3CMAHRnizRAqgT5wmRQaQ/Ua3AIAR5HZxMbE="; }; nativeCheckInputs = [ hareHook ]; From c032450a0ce9ef63601cf360e72c679b65adf871 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 23 Jul 2024 18:13:12 +0000 Subject: [PATCH 02/43] cirrus-cli: 0.120.3 -> 0.121.0 --- .../tools/continuous-integration/cirrus-cli/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/continuous-integration/cirrus-cli/default.nix b/pkgs/development/tools/continuous-integration/cirrus-cli/default.nix index 3f584030603c..e6a18cfc8744 100644 --- a/pkgs/development/tools/continuous-integration/cirrus-cli/default.nix +++ b/pkgs/development/tools/continuous-integration/cirrus-cli/default.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "cirrus-cli"; - version = "0.120.3"; + version = "0.121.0"; src = fetchFromGitHub { owner = "cirruslabs"; repo = pname; rev = "v${version}"; - hash = "sha256-xuNX2/OjgB2gIqK0wEj2s0867YBKXaz8fvDLJ/pd8U8="; + hash = "sha256-ec7HUYeBgoAtTxHIlW3dgC38z15pplWL/RhcZyxmIsE="; }; vendorHash = "sha256-R5H48idKHTTECEffpQIZgj9xMlHgHCL5OFbe3ZAda/o="; From 3ca692c54468825f32d031d076cdf4bd4cf7aa5a Mon Sep 17 00:00:00 2001 From: Tristan Ross Date: Fri, 26 Jul 2024 15:42:50 -0700 Subject: [PATCH 03/43] xorg.libXt: fix cpp usage under llvm --- pkgs/servers/x11/xorg/overrides.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix index f1e63de72bd5..31ee5d6f1cea 100644 --- a/pkgs/servers/x11/xorg/overrides.nix +++ b/pkgs/servers/x11/xorg/overrides.nix @@ -255,7 +255,8 @@ self: super: sed 's,^as_dummy.*,as_dummy="\$PATH",' -i configure ''; configureFlags = attrs.configureFlags or [] - ++ malloc0ReturnsNullCrossFlag; + ++ malloc0ReturnsNullCrossFlag + ++ lib.optional (stdenv.targetPlatform.useLLVM or false) "ac_cv_path_RAWCPP=cpp"; propagatedBuildInputs = attrs.propagatedBuildInputs or [] ++ [ xorg.libSM ]; depsBuildBuild = [ buildPackages.stdenv.cc ]; CPP = if stdenv.isDarwin then "clang -E -" else "${stdenv.cc.targetPrefix}cc -E -"; From 183218bf50c37f7c5469cc31da1856df53f0d97f Mon Sep 17 00:00:00 2001 From: Tristan Ross Date: Fri, 26 Jul 2024 19:45:21 -0700 Subject: [PATCH 04/43] pythonPackages.mako: disable test_future_import test under llvm --- .../python-modules/mako/default.nix | 22 +++++++++++-------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/pkgs/development/python-modules/mako/default.nix b/pkgs/development/python-modules/mako/default.nix index 2e31d43b92b7..5e58f90b58d8 100644 --- a/pkgs/development/python-modules/mako/default.nix +++ b/pkgs/development/python-modules/mako/default.nix @@ -1,4 +1,5 @@ { + stdenv, lib, buildPythonPackage, pythonOlder, @@ -49,15 +50,18 @@ buildPythonPackage rec { pytestCheckHook ] ++ lib.flatten (lib.attrValues passthru.optional-dependencies); - disabledTests = lib.optionals isPyPy [ - # https://github.com/sqlalchemy/mako/issues/315 - "test_alternating_file_names" - # https://github.com/sqlalchemy/mako/issues/238 - "test_file_success" - "test_stdin_success" - # fails on pypy2.7 - "test_bytestring_passthru" - ]; + disabledTests = + lib.optionals isPyPy [ + # https://github.com/sqlalchemy/mako/issues/315 + "test_alternating_file_names" + # https://github.com/sqlalchemy/mako/issues/238 + "test_file_success" + "test_stdin_success" + # fails on pypy2.7 + "test_bytestring_passthru" + ] + # https://github.com/sqlalchemy/mako/issues/408 + ++ lib.optional (stdenv.targetPlatform.useLLVM or false) "test_future_import"; meta = with lib; { description = "Super-fast templating language"; From 5d1917eb29e6a17e23d472c8efd931b8153e8d8a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 27 Jul 2024 20:03:56 +0000 Subject: [PATCH 05/43] hcloud: 1.44.2 -> 1.46.0 --- pkgs/development/tools/hcloud/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/hcloud/default.nix b/pkgs/development/tools/hcloud/default.nix index 2cf429e6a09d..66dfe5e70e83 100644 --- a/pkgs/development/tools/hcloud/default.nix +++ b/pkgs/development/tools/hcloud/default.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "hcloud"; - version = "1.44.2"; + version = "1.46.0"; src = fetchFromGitHub { owner = "hetznercloud"; repo = "cli"; rev = "refs/tags/v${version}"; - hash = "sha256-ZslnJr5VJ6eHjBm1azaANGj9hHXKo+sRJXmW4xjRMhg="; + hash = "sha256-xW0M4ppbW6yD5+JpJZnDVf2mPiBzNFotP1IPTbnJoC4="; }; - vendorHash = "sha256-pDBuuHuG2Xk1R3BP1Ds2uY5I7brXWg1ULKQgmuuQVP4="; + vendorHash = "sha256-XocfpUmq/w/gqhCaT4Y33uQaggx3Bm16QuG/bGdxmg4="; ldflags = [ "-s" From b11f469249bbb656a5c9570943c0ef19f901a807 Mon Sep 17 00:00:00 2001 From: Tristan Ross Date: Fri, 26 Jul 2024 21:22:22 -0700 Subject: [PATCH 06/43] llvmPackages.clang: set CLANG_DEFAULT_CXX_STDLIB for pkgsLLVM --- pkgs/development/compilers/llvm/common/clang/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/compilers/llvm/common/clang/default.nix b/pkgs/development/compilers/llvm/common/clang/default.nix index 922eb8657cee..dde531adf44e 100644 --- a/pkgs/development/compilers/llvm/common/clang/default.nix +++ b/pkgs/development/compilers/llvm/common/clang/default.nix @@ -69,7 +69,7 @@ let # `clang-pseudo-gen`: https://github.com/llvm/llvm-project/commit/cd2292ef824591cc34cc299910a3098545c840c7 "-DCLANG_TIDY_CONFUSABLE_CHARS_GEN=${buildLlvmTools.libclang.dev}/bin/clang-tidy-confusable-chars-gen" "-DCLANG_PSEUDO_GEN=${buildLlvmTools.libclang.dev}/bin/clang-pseudo-gen" - ]); + ]) ++ lib.optional (stdenv.targetPlatform.useLLVM or false) "-DCLANG_DEFAULT_CXX_STDLIB=ON"; postPatch = '' # Make sure clang passes the correct location of libLTO to ld64 From 019d0919383f5b28f0339020bb85fb291000bf54 Mon Sep 17 00:00:00 2001 From: Tristan Ross Date: Fri, 26 Jul 2024 21:11:17 -0700 Subject: [PATCH 07/43] llvmPackages.clangUseLLVM: add --undefined-version by default Majority of packages with a version script have broken version scripts, this will likely result in us adding this flag to many packages. To keep things simple, just add it as a default. --- pkgs/development/compilers/llvm/common/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/development/compilers/llvm/common/default.nix b/pkgs/development/compilers/llvm/common/default.nix index b84fcab17f1b..3bd40e556746 100644 --- a/pkgs/development/compilers/llvm/common/default.nix +++ b/pkgs/development/compilers/llvm/common/default.nix @@ -439,7 +439,8 @@ let ++ lib.optional stdenv.targetPlatform.isWasm "-fno-exceptions"; nixSupport.cc-ldflags = lib.optionals ( !stdenv.targetPlatform.isWasm && !stdenv.targetPlatform.isFreeBSD - ) [ "-L${targetLlvmLibraries.libunwind}/lib" ]; + ) [ "-L${targetLlvmLibraries.libunwind}/lib" ] + ++ lib.optional (lib.versionAtLeast metadata.release_version "17") "--undefined-version"; } ); @@ -619,6 +620,7 @@ let compiler-rt-no-libc = callPackage ./compiler-rt { patches = compiler-rtPatches; + doFakeLibgcc = stdenv.hostPlatform.useLLVM or false; stdenv = if stdenv.hostPlatform.useLLVM or false then overrideCC stdenv buildLlvmTools.clangNoCompilerRt From fc7a83f8b62e90de5679e993d4d49ca014ea013d Mon Sep 17 00:00:00 2001 From: DCsunset Date: Thu, 1 Aug 2024 18:49:43 -0400 Subject: [PATCH 08/43] step-cli: format package.nix with nixfmt --- pkgs/by-name/st/step-cli/package.nix | 61 ++++++++++++++-------------- 1 file changed, 31 insertions(+), 30 deletions(-) diff --git a/pkgs/by-name/st/step-cli/package.nix b/pkgs/by-name/st/step-cli/package.nix index d0d4aacce489..ce3793463590 100644 --- a/pkgs/by-name/st/step-cli/package.nix +++ b/pkgs/by-name/st/step-cli/package.nix @@ -2,40 +2,41 @@ lib, buildGoModule, fetchFromGitHub, -}: let +}: +let version = "0.27.2"; in - buildGoModule { - pname = "step-cli"; - inherit version; +buildGoModule { + pname = "step-cli"; + inherit version; - src = fetchFromGitHub { - owner = "smallstep"; - repo = "cli"; - rev = "refs/tags/v${version}"; - hash = "sha256-9w7rUtlLa1kl9oVboWZWj4eoZh+pPdGsEEQDWYdEMns="; - }; + src = fetchFromGitHub { + owner = "smallstep"; + repo = "cli"; + rev = "refs/tags/v${version}"; + hash = "sha256-9w7rUtlLa1kl9oVboWZWj4eoZh+pPdGsEEQDWYdEMns="; + }; - ldflags = [ - "-w" - "-s" - "-X=main.Version=${version}" - ]; + ldflags = [ + "-w" + "-s" + "-X=main.Version=${version}" + ]; - preCheck = '' - # Tries to connect to smallstep.com - rm command/certificate/remote_test.go - ''; + preCheck = '' + # Tries to connect to smallstep.com + rm command/certificate/remote_test.go + ''; - vendorHash = "sha256-GD9TAvWqE3nvgVpoy/4CkkdVxliNMy+GNBXJtGSNVqo="; + vendorHash = "sha256-GD9TAvWqE3nvgVpoy/4CkkdVxliNMy+GNBXJtGSNVqo="; - meta = { - description = "Zero trust swiss army knife for working with X509, OAuth, JWT, OATH OTP, etc"; - homepage = "https://smallstep.com/cli/"; - changelog = "https://github.com/smallstep/cli/blob/v${version}/CHANGELOG.md"; - license = lib.licenses.asl20; - maintainers = with lib.maintainers; [isabelroses]; - platforms = lib.platforms.linux ++ lib.platforms.darwin; - mainProgram = "step"; - }; - } + meta = { + description = "Zero trust swiss army knife for working with X509, OAuth, JWT, OATH OTP, etc"; + homepage = "https://smallstep.com/cli/"; + changelog = "https://github.com/smallstep/cli/blob/v${version}/CHANGELOG.md"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ isabelroses ]; + platforms = lib.platforms.linux ++ lib.platforms.darwin; + mainProgram = "step"; + }; +} From 5e1a7105f53fe14eeeb983ec85928691b164cf2d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 2 Aug 2024 02:16:14 +0000 Subject: [PATCH 09/43] laurel: 0.6.2 -> 0.6.3 --- pkgs/servers/monitoring/laurel/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/monitoring/laurel/default.nix b/pkgs/servers/monitoring/laurel/default.nix index c96de249f5e5..56bbfc09cb52 100644 --- a/pkgs/servers/monitoring/laurel/default.nix +++ b/pkgs/servers/monitoring/laurel/default.nix @@ -6,16 +6,16 @@ rustPlatform.buildRustPackage rec { pname = "laurel"; - version = "0.6.2"; + version = "0.6.3"; src = fetchFromGitHub { owner = "threathunters-io"; repo = "laurel"; rev = "refs/tags/v${version}"; - hash = "sha256-1V5VonSH631bS5sIYkHC3lk4yumDCJ+LZHE00Kbx+J8="; + hash = "sha256-vasu4ffSdiyeXGV8JUZYL3I/04UvZ/mOImdE45la9y8="; }; - cargoHash = "sha256-GhgGMETOOPjG6ANwwavI5lhMmByq73KDHvcO5pnADHE="; + cargoHash = "sha256-uQs+BUBWdbSoE3UqrSjqImVm5uwYf7XiTFtGG1BcFZI="; nativeBuildInputs = [ rustPlatform.bindgenHook ]; buildInputs = [ acl ]; From c7733a3ad267022886538ff6890ad614e572da2f Mon Sep 17 00:00:00 2001 From: danielalvsaaker <30574112+danielalvsaaker@users.noreply.github.com> Date: Fri, 2 Aug 2024 08:27:00 +0200 Subject: [PATCH 10/43] fractal: 7 -> 8 --- .../instant-messengers/fractal/Cargo.lock | 2315 ++++++----------- .../instant-messengers/fractal/default.nix | 10 +- 2 files changed, 824 insertions(+), 1501 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/fractal/Cargo.lock b/pkgs/applications/networking/instant-messengers/fractal/Cargo.lock index 336cfeb7c00a..9be63cae42a0 100644 --- a/pkgs/applications/networking/instant-messengers/fractal/Cargo.lock +++ b/pkgs/applications/networking/instant-messengers/fractal/Cargo.lock @@ -4,21 +4,21 @@ version = 3 [[package]] name = "accessory" -version = "1.3.0" +version = "1.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "850bb534b9dc04744fbbb71d30ad6d25a7e4cf6dc33e223c81ef3a92ebab4e0b" +checksum = "87537f9ae7cfa78d5b8ebd1a1db25959f5e737126be4d8eb44a5452fc4b63cde" dependencies = [ "macroific", "proc-macro2", "quote", - "syn 2.0.58", + "syn 2.0.71", ] [[package]] name = "addr2line" -version = "0.21.0" +version = "0.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a30b2e23b9e17a9f90641c7ab1549cd9b44f296d3ccbf309d2863cfe398a0cb" +checksum = "6e4503c46a5c0c7844e948c9a4d6acd9f50cccb4de1c48eb9e291ea17470c678" dependencies = [ "gimli", ] @@ -79,22 +79,9 @@ checksum = "4aa90d7ce82d4be67b64039a3d588d38dbcc6736577de4a847025ce5b0c468d1" [[package]] name = "allocator-api2" -version = "0.2.16" +version = "0.2.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0942ffc6dcaadf03badf6e6a2d0228460359d5e34b57ccdc720b7382dfbd5ec5" - -[[package]] -name = "ammonia" -version = "3.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "64e6d1c7838db705c9b756557ee27c384ce695a1c51a6fe528784cb1c6840170" -dependencies = [ - "html5ever", - "maplit", - "once_cell", - "tendril", - "url", -] +checksum = "5c6cb57a04249c6480766f7f7cef5467412af1490f8d1e243141daddada3264f" [[package]] name = "android-tzdata" @@ -123,9 +110,9 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.82" +version = "1.0.86" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f538837af36e6f6a9be0faa67f9a314f8119e4e4b5867c6ab40ed60360142519" +checksum = "b3d1d046238990b9cf5bcde22a3fb3584ee5cf65fb2765f454ed428c7a0063da" [[package]] name = "anymap2" @@ -144,7 +131,7 @@ dependencies = [ "proc-macro-error", "proc-macro2", "quote", - "syn 2.0.58", + "syn 2.0.71", ] [[package]] @@ -161,7 +148,7 @@ checksum = "0ae92a5119aa49cdbcf6b9f893fe4e1d98b04ccbf82ee0584ad948a44a734dea" dependencies = [ "proc-macro2", "quote", - "syn 2.0.58", + "syn 2.0.71", ] [[package]] @@ -187,9 +174,9 @@ checksum = "f38fa22307249f86fb7fad906fcae77f2564caeb56d7209103c551cd1cf4798f" [[package]] name = "ashpd" -version = "0.8.1" +version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd884d7c72877a94102c3715f3b1cd09ff4fac28221add3e57cfbe25c236d093" +checksum = "bfe7e0dd0ac5a401dc116ed9f9119cf9decc625600474cb41f0fc0a0050abc9a" dependencies = [ "enumflags2", "futures-channel", @@ -212,34 +199,33 @@ checksum = "5f093eed78becd229346bf859eec0aa4dd7ddde0757287b2b4107a1f09c80002" [[package]] name = "async-broadcast" -version = "0.7.0" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "258b52a1aa741b9f09783b2d86cf0aeeb617bbf847f6933340a39644227acbdb" +checksum = "20cd0e2e25ea8e5f7e9df04578dc6cf5c83577fd09b1a46aaf5c85e1c33f2a7e" dependencies = [ - "event-listener 5.3.0", - "event-listener-strategy 0.5.1", + "event-listener", + "event-listener-strategy", "futures-core", "pin-project-lite", ] [[package]] name = "async-channel" -version = "2.2.0" +version = "2.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f28243a43d821d11341ab73c80bed182dc015c514b951616cf79bd4af39af0c3" +checksum = "89b47800b0be77592da0afd425cc03468052844aff33b84e33cc696f64e77b6a" dependencies = [ "concurrent-queue", - "event-listener 5.3.0", - "event-listener-strategy 0.5.1", + "event-listener-strategy", "futures-core", "pin-project-lite", ] [[package]] name = "async-compression" -version = "0.4.8" +version = "0.4.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "07dbbf24db18d609b1462965249abdf49129ccad073ec257da372adc83259c60" +checksum = "cd066d0b4ef8ecb03a55319dc13aa6910616d0f44008a045bb1835af830abff5" dependencies = [ "flate2", "futures-core", @@ -250,11 +236,11 @@ dependencies = [ [[package]] name = "async-io" -version = "2.3.2" +version = "2.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dcccb0f599cfa2f8ace422d3555572f47424da5648a4382a9dd0310ff8210884" +checksum = "0d6baa8f0178795da0e71bc42c9e5d13261aac7ee549853162e66a241ba17964" dependencies = [ - "async-lock 3.3.0", + "async-lock", "cfg-if", "concurrent-queue", "futures-io", @@ -269,21 +255,12 @@ dependencies = [ [[package]] name = "async-lock" -version = "2.8.0" +version = "3.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "287272293e9d8c41773cec55e365490fe034813a2f172f502d6ddcf75b2f582b" +checksum = "ff6e472cdea888a4bd64f342f09b3f50e1886d32afe8df3d663c01140b811b18" dependencies = [ - "event-listener 2.5.3", -] - -[[package]] -name = "async-lock" -version = "3.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d034b430882f8381900d3fe6f0aaa3ad94f2cb4ac519b429692a1bc2dda4ae7b" -dependencies = [ - "event-listener 4.0.3", - "event-listener-strategy 0.4.0", + "event-listener", + "event-listener-strategy", "pin-project-lite", ] @@ -295,18 +272,18 @@ checksum = "9338790e78aa95a416786ec8389546c4b6a1dfc3dc36071ed9518a9413a542eb" [[package]] name = "async-process" -version = "2.2.0" +version = "2.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d999d925640d51b662b7b4e404224dd81de70f4aa4a199383c2c5e5b86885fa3" +checksum = "f7eda79bbd84e29c2b308d1dc099d7de8dcc7035e48f4bf5dc4a531a44ff5e2a" dependencies = [ "async-channel", "async-io", - "async-lock 3.3.0", + "async-lock", "async-signal", "async-task", "blocking", "cfg-if", - "event-listener 5.3.0", + "event-listener", "futures-lite", "rustix", "tracing", @@ -315,13 +292,13 @@ dependencies = [ [[package]] name = "async-recursion" -version = "1.1.0" +version = "1.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30c5ef0ede93efbf733c1a727f3b6b5a1060bbedd5600183e66f6e4be4af0ec5" +checksum = "3b43422f69d8ff38f95f1b2bb76517c91589a924d1559a0e935d7c8ce0274c11" dependencies = [ "proc-macro2", "quote", - "syn 2.0.58", + "syn 2.0.71", ] [[package]] @@ -336,12 +313,12 @@ dependencies = [ [[package]] name = "async-signal" -version = "0.2.5" +version = "0.2.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e47d90f65a225c4527103a8d747001fc56e375203592b25ad103e1ca13124c5" +checksum = "dfb3634b73397aa844481f814fad23bbf07fdb0eabec10f2eb95e58944b1ec32" dependencies = [ "async-io", - "async-lock 2.8.0", + "async-lock", "atomic-waker", "cfg-if", "futures-core", @@ -349,7 +326,7 @@ dependencies = [ "rustix", "signal-hook-registry", "slab", - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] @@ -371,24 +348,24 @@ checksum = "16e62a023e7c117e27523144c5d2459f4397fcc3cab0085af8e2224f643a0193" dependencies = [ "proc-macro2", "quote", - "syn 2.0.58", + "syn 2.0.71", ] [[package]] name = "async-task" -version = "4.7.0" +version = "4.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fbb36e985947064623dbd357f727af08ffd077f93d696782f3c56365fa2e2799" +checksum = "8b75356056920673b02621b35afd0f7dda9306d03c79a30f5c56c44cf256e3de" [[package]] name = "async-trait" -version = "0.1.79" +version = "0.1.81" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a507401cad91ec6a857ed5513a2073c82a9b9048762b885bb98655b306964681" +checksum = "6e0c28dcc82d7c8ead5cb13beb15405b57b8546e93215673ff8ca0349a028107" dependencies = [ "proc-macro2", "quote", - "syn 2.0.58", + "syn 2.0.71", ] [[package]] @@ -411,9 +388,9 @@ checksum = "41e67cd8309bbd06cd603a9e693a784ac2e5d1e955f11286e355089fcab3047c" [[package]] name = "autocfg" -version = "1.2.0" +version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1fdabc7756949593fe60f30ec81974b613357de856987752631dea1e3394c80" +checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0" [[package]] name = "av1-grain" @@ -438,6 +415,61 @@ dependencies = [ "arrayvec", ] +[[package]] +name = "axum" +version = "0.7.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3a6c9af12842a67734c9a2e355436e5d03b22383ed60cf13cd0c18fbfe3dcbcf" +dependencies = [ + "async-trait", + "axum-core", + "bytes", + "futures-util", + "http", + "http-body", + "http-body-util", + "hyper", + "hyper-util", + "itoa", + "matchit", + "memchr", + "mime", + "percent-encoding", + "pin-project-lite", + "rustversion", + "serde", + "serde_json", + "serde_path_to_error", + "serde_urlencoded", + "sync_wrapper 1.0.1", + "tokio", + "tower", + "tower-layer", + "tower-service", + "tracing", +] + +[[package]] +name = "axum-core" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a15c63fd72d41492dc4f497196f5da1fb04fb7529e631d73630d1b491e47a2e3" +dependencies = [ + "async-trait", + "bytes", + "futures-util", + "http", + "http-body", + "http-body-util", + "mime", + "pin-project-lite", + "rustversion", + "sync_wrapper 0.1.2", + "tower-layer", + "tower-service", + "tracing", +] + [[package]] name = "backoff" version = "0.4.0" @@ -454,9 +486,9 @@ dependencies = [ [[package]] name = "backtrace" -version = "0.3.71" +version = "0.3.73" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26b05800d2e817c8b3b4b54abd461726265fa9789ae34330622f2db9ee696f9d" +checksum = "5cc23269a4f8976d0a4d2e7109211a419fe30e8d88d677cd60b6bc79c5732e0a" dependencies = [ "addr2line", "cc", @@ -467,23 +499,11 @@ dependencies = [ "rustc-demangle", ] -[[package]] -name = "base16ct" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c7f02d4ea65f2c1853089ffd8d2787bdbc63de2f0d29dedbcf8ccdfa0ccd4cf" - [[package]] name = "base64" -version = "0.21.7" +version = "0.22.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567" - -[[package]] -name = "base64" -version = "0.22.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9475866fec1451be56a3c2400fd081ff546538961565ccb5b7142cbd22bc7a51" +checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6" [[package]] name = "base64ct" @@ -498,7 +518,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a00dc851838a2120612785d195287475a3ac45514741da670b735818822129a0" dependencies = [ "annotate-snippets", - "bitflags 2.5.0", + "bitflags 2.6.0", "cexpr", "clang-sys", "itertools 0.12.1", @@ -509,7 +529,7 @@ dependencies = [ "regex", "rustc-hash", "shlex", - "syn 2.0.58", + "syn 2.0.71", ] [[package]] @@ -526,9 +546,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "bitflags" -version = "2.5.0" +version = "2.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1" +checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de" dependencies = [ "serde", ] @@ -541,15 +561,15 @@ checksum = "a1d084b0137aaa901caf9f1e8b21daa6aa24d41cd806e111335541eff9683bd6" [[package]] name = "bitstream-io" -version = "2.2.0" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06c9989a51171e2e81038ab168b6ae22886fe9ded214430dbb4f41c28cf176da" +checksum = "3dcde5f311c85b8ca30c2e4198d4326bc342c76541590106f5fa4a50946ea499" [[package]] name = "blake3" -version = "1.5.1" +version = "1.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30cca6d3674597c30ddf2c587bf8d9d65c9a84d2326d941cc79c9842dfe0ef52" +checksum = "e9ec96fe9a81b5e365f9db71fe00edc4fe4ca2cc7dcb7861f0603012a7caa210" dependencies = [ "arrayref", "arrayvec", @@ -584,18 +604,15 @@ dependencies = [ [[package]] name = "blocking" -version = "1.5.1" +version = "1.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a37913e8dc4ddcc604f0c6d3bf2887c995153af3611de9e23c352b44c1b9118" +checksum = "703f41c54fc768e63e091340b424302bb1c29ef4aa0c7f10fe849dfb114d29ea" dependencies = [ "async-channel", - "async-lock 3.3.0", "async-task", - "fastrand", "futures-io", "futures-lite", "piper", - "tracing", ] [[package]] @@ -609,9 +626,9 @@ dependencies = [ [[package]] name = "built" -version = "0.7.2" +version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41bfbdb21256b87a8b5e80fab81a8eed158178e812fd7ba451907518b2742f16" +checksum = "236e6289eda5a812bc6b53c3b024039382a2895fbbeef2d748b2931546d392c4" [[package]] name = "bumpalo" @@ -621,9 +638,9 @@ checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c" [[package]] name = "bytemuck" -version = "1.15.0" +version = "1.16.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d6d68c57235a3a081186990eca2867354726650f42f7516ca50c28d6281fd15" +checksum = "b236fc92302c97ed75b38da1f4917b5cdda4984745740f153a5d3059e48d725e" [[package]] name = "byteorder" @@ -632,10 +649,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" [[package]] -name = "bytes" -version = "1.6.0" +name = "byteorder-lite" +version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "514de17de45fdb8dc022b1a7975556c53c86f9f0aa5f534b98977b171857c2c9" +checksum = "8f1fe948ff07f4bd06c30984e69f5b4899c516a3ef74f34df92a2df2ab535495" + +[[package]] +name = "bytes" +version = "1.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a12916984aab3fa6e39d655a33e09c0071eb36d6ab3aea5c2d78551f1df6d952" [[package]] name = "bytesize" @@ -645,11 +668,11 @@ checksum = "a3e368af43e418a04d52505cf3dbc23dda4e3407ae2fa99fd0e4f308ce546acc" [[package]] name = "cairo-rs" -version = "0.19.4" +version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2ac2a4d0e69036cf0062976f6efcba1aaee3e448594e6514bb2ddf87acce562" +checksum = "797fd5a634dcb0ad0d7d583df794deb0a236d88e759cd34b7da20198c6c9d145" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "cairo-sys-rs", "glib", "libc", @@ -658,13 +681,13 @@ dependencies = [ [[package]] name = "cairo-sys-rs" -version = "0.19.2" +version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd3bb3119664efbd78b5e6c93957447944f16bdbced84c17a9f41c7829b81e64" +checksum = "428290f914b9b86089f60f5d8a9f6e440508e1bcff23b25afd51502b0a2da88f" dependencies = [ "glib-sys", "libc", - "system-deps", + "system-deps 7.0.1", ] [[package]] @@ -678,9 +701,9 @@ dependencies = [ [[package]] name = "cc" -version = "1.0.92" +version = "1.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2678b2e3449475e95b0aa6f9b506a28e61b3dc8996592b983695e8ebb58a8b41" +checksum = "324c74f2155653c90b04f25b2a47a8a631360cb908f92a772695f430c7e31052" dependencies = [ "jobserver", "libc", @@ -711,23 +734,11 @@ version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" -[[package]] -name = "cfg-vis" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3a2c3bf5fc10fe2ca157564fbe08a4cb2b0a7d2ff3fe2f9683e65d5e7c7859c" -dependencies = [ - "proc-macro-crate 1.3.1", - "proc-macro2", - "quote", - "syn 1.0.109", -] - [[package]] name = "cfg_aliases" -version = "0.1.1" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd16c4719339c4530435d38e511904438d07cce7950afa3718a84ac36c10e89e" +checksum = "613afe47fcd5fac7ccf1db93babcb082c5994d996f20b8b159f2ad1658eb5724" [[package]] name = "chacha20" @@ -755,17 +766,16 @@ dependencies = [ [[package]] name = "chrono" -version = "0.4.37" +version = "0.4.38" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a0d04d43504c61aa6c7531f1871dd0d418d91130162063b789da00fd7057a5e" +checksum = "a21f936df1771bf62b77f047b726c4625ff2e8aa607c01ec06e5a05bd8463401" dependencies = [ "android-tzdata", "iana-time-zone", "js-sys", "num-traits", - "serde", "wasm-bindgen", - "windows-targets 0.52.4", + "windows-targets 0.52.6", ] [[package]] @@ -781,9 +791,9 @@ dependencies = [ [[package]] name = "clang-sys" -version = "1.7.0" +version = "1.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67523a3b4be3ce1989d607a828d036249522dd9c1c8de7f4dd2dae43a37369d1" +checksum = "0b023947811758c97c59bf9d1c188fd619ad4718dcaa767947df1cadb14f39f4" dependencies = [ "glob", "libc", @@ -798,9 +808,9 @@ checksum = "3d7b894f5411737b7867f4827955924d7c254fc9f4d91a6aad6b097804b1018b" [[package]] name = "concurrent-queue" -version = "2.4.0" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d16048cd947b08fa32c24458a22f5dc5e835264f689f4f5653210c69fd107363" +checksum = "4ca0197aee26d1ae37445ee532fefce43251d24cc7c166799f4d46817f1d3973" dependencies = [ "crossbeam-utils", ] @@ -868,22 +878,13 @@ dependencies = [ [[package]] name = "crc32fast" -version = "1.4.0" +version = "1.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b3855a8a784b474f333699ef2bbca9db2c4a1f6d9088a90a2d25b1eb53111eaa" +checksum = "a97769d94ddab943e4510d138150169a2758b5ef3eb191a9ee688de3e23ef7b3" dependencies = [ "cfg-if", ] -[[package]] -name = "crossbeam-channel" -version = "0.5.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab3db02a9c5b5121e1e42fbdb1aeb65f5e02624cc58c43f2884c6ccac0b82f95" -dependencies = [ - "crossbeam-utils", -] - [[package]] name = "crossbeam-deque" version = "0.8.5" @@ -905,9 +906,9 @@ dependencies = [ [[package]] name = "crossbeam-utils" -version = "0.8.19" +version = "0.8.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "248e3bacc7dc6baa3b21e405ee045c3047101a49145e7e9eca583ab4c2ca5345" +checksum = "22ec99545bb0ed0ea7bb9b8e1e9122ea386ff8a48c0922e43f36d45ab09e0e80" [[package]] name = "crunchy" @@ -915,18 +916,6 @@ version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7" -[[package]] -name = "crypto-bigint" -version = "0.5.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0dc92fb57ca44df6db8059111ab3af99a63d5d0f8375d9972e319a379c6bab76" -dependencies = [ - "generic-array", - "rand_core", - "subtle", - "zeroize", -] - [[package]] name = "crypto-common" version = "0.1.6" @@ -949,16 +938,15 @@ dependencies = [ [[package]] name = "curve25519-dalek" -version = "4.1.2" +version = "4.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0a677b8922c94e01bdbb12126b0bc852f00447528dee1782229af9c720c3f348" +checksum = "97fb8b7c4503de7d6ae7b42ab72a5a59857b4c937ec27a3d4539dba95b5ab2be" dependencies = [ "cfg-if", "cpufeatures", "curve25519-dalek-derive", "digest", "fiat-crypto", - "platforms", "rustc_version", "serde", "subtle", @@ -973,14 +961,14 @@ checksum = "f46882e17999c6cc590af592290432be3bce0428cb0d5f8b6715e4dc7b383eb3" dependencies = [ "proc-macro2", "quote", - "syn 2.0.58", + "syn 2.0.71", ] [[package]] name = "darling" -version = "0.20.8" +version = "0.20.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "54e36fcd13ed84ffdfda6f5be89b31287cbb80c439841fe69e04841435464391" +checksum = "6f63b86c8a8826a49b8c21f08a2d07338eec8d900540f8630dc76284be802989" dependencies = [ "darling_core", "darling_macro", @@ -988,34 +976,34 @@ dependencies = [ [[package]] name = "darling_core" -version = "0.20.8" +version = "0.20.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c2cf1c23a687a1feeb728783b993c4e1ad83d99f351801977dd809b48d0a70f" +checksum = "95133861a8032aaea082871032f5815eb9e98cef03fa916ab4500513994df9e5" dependencies = [ "fnv", "ident_case", "proc-macro2", "quote", "strsim", - "syn 2.0.58", + "syn 2.0.71", ] [[package]] name = "darling_macro" -version = "0.20.8" +version = "0.20.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a668eda54683121533a393014d8692171709ff57a7d61f187b6e782719f8933f" +checksum = "d336a2a514f6ccccaa3e09b02d41d35330c07ddf03a62165fcec10bb561c7806" dependencies = [ "darling_core", "quote", - "syn 2.0.58", + "syn 2.0.71", ] [[package]] -name = "data-encoding" -version = "2.5.0" +name = "date_header" +version = "1.0.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e962a19be5cfc3f3bf6dd8f61eb50107f356ad6270fbb3ed41476571db78be5" +checksum = "0c03c416ed1a30fbb027ef484ba6ab6f80e1eada675e1a2b92fd673c045a1f1d" [[package]] name = "deadpool" @@ -1031,9 +1019,9 @@ dependencies = [ [[package]] name = "deadpool-runtime" -version = "0.1.3" +version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "63dfa964fe2a66f3fde91fc70b267fe193d822c7e603e2a675a49a7f46ad3f49" +checksum = "092966b41edc516079bdf31ec78a2e0588d1d0c08f78b91d8307215928642b2b" dependencies = [ "tokio", ] @@ -1051,9 +1039,9 @@ dependencies = [ [[package]] name = "deadpool-sync" -version = "0.1.2" +version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8db70494c13cae4ce67b4b4dafdaf828cf0df7237ab5b9e2fcabee4965d0a0a" +checksum = "524bc3df0d57e98ecd022e21ba31166c2625e7d3e5bcc4510efaeeab4abcab04" dependencies = [ "deadpool-runtime", ] @@ -1067,7 +1055,7 @@ dependencies = [ "macroific", "proc-macro2", "quote", - "syn 2.0.58", + "syn 2.0.71", ] [[package]] @@ -1079,19 +1067,18 @@ dependencies = [ "const-oid", "der_derive", "flagset", - "pem-rfc7468", "zeroize", ] [[package]] name = "der_derive" -version = "0.7.2" +version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5fe87ce4529967e0ba1dcf8450bab64d97dfd5010a6256187ffe2e43e6f0e049" +checksum = "8034092389675178f570469e6c3b0465d3d30b4505c294a6550db47f3c17ad18" dependencies = [ "proc-macro2", "quote", - "syn 2.0.58", + "syn 2.0.71", ] [[package]] @@ -1101,18 +1088,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b42b6fa04a440b495c8b04d0e71b707c585f83cb9cb28cf8cd0d976c315e31b4" dependencies = [ "powerfmt", - "serde", -] - -[[package]] -name = "derivative" -version = "2.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fcc3dd5e9e9c0b295d6e1e4d811fb6f157d5ffd784b8d202fc62eac8035a770b" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", ] [[package]] @@ -1133,7 +1108,7 @@ dependencies = [ "darling", "proc-macro2", "quote", - "syn 2.0.58", + "syn 2.0.71", ] [[package]] @@ -1143,7 +1118,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "206868b8242f27cecce124c19fd88157fbd0dd334df2587f36417bafbc85097b" dependencies = [ "derive_builder_core", - "syn 2.0.58", + "syn 2.0.71", ] [[package]] @@ -1153,48 +1128,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292" dependencies = [ "block-buffer", - "const-oid", "crypto-common", "subtle", ] -[[package]] -name = "displaydoc" -version = "0.2.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "487585f4d0c6655fe74905e2504d8ad6908e4db67f744eb140876906c2f3175d" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.58", -] - [[package]] name = "djb_hash" version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e8cf7d61e627a3b49af8f24f47e57f3788cdd7a0e4f17cd79fda5ada87f08578" -[[package]] -name = "dyn-clone" -version = "1.0.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d6ef0072f8a535281e4876be788938b528e9a1d43900b82c2569af7da799125" - -[[package]] -name = "ecdsa" -version = "0.16.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee27f32b5c5292967d2d4a9d7f1e0b0aed2c15daded5a60300e4abb9d8020bca" -dependencies = [ - "der", - "digest", - "elliptic-curve", - "rfc6979", - "signature", - "spki", -] - [[package]] name = "ed25519" version = "2.2.3" @@ -1223,39 +1166,9 @@ dependencies = [ [[package]] name = "either" -version = "1.10.0" +version = "1.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "11157ac094ffbdde99aa67b23417ebdd801842852b500e395a45a9c0aac03e4a" - -[[package]] -name = "elliptic-curve" -version = "0.13.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5e6043086bf7973472e0c7dff2142ea0b680d30e18d9cc40f267efbf222bd47" -dependencies = [ - "base16ct", - "crypto-bigint", - "digest", - "ff", - "generic-array", - "group", - "hkdf", - "pem-rfc7468", - "pkcs8", - "rand_core", - "sec1", - "subtle", - "zeroize", -] - -[[package]] -name = "encoding_rs" -version = "0.8.34" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b45de904aa0b010bce2ab45264d0631681847fa7b6f2eaa7dab7619943bc4f59" -dependencies = [ - "cfg-if", -] +checksum = "60b1af1c220855b6ceac025d3f6ecdd2b7c4894bfe9cd9bda4fbb4bc7c0d4cf0" [[package]] name = "endi" @@ -1265,9 +1178,9 @@ checksum = "a3d8a32ae18130a3c84dd492d4215c3d913c3b07c6b63c2eb3eb7ff1101ab7bf" [[package]] name = "enumflags2" -version = "0.7.9" +version = "0.7.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3278c9d5fb675e0a51dabcf4c0d355f692b064171535ba72361be1528a9d8e8d" +checksum = "d232db7f5956f3f14313dc2f87985c58bd2c695ce124c8cdd984e08e15ac133d" dependencies = [ "enumflags2_derive", "serde", @@ -1275,13 +1188,13 @@ dependencies = [ [[package]] name = "enumflags2_derive" -version = "0.7.9" +version = "0.7.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c785274071b1b420972453b306eeca06acf4633829db4223b58a2a8c5953bc4" +checksum = "de0d48a183585823424a4ce1aa132d174a6a81bd540895822eb4c8373a8e49e8" dependencies = [ "proc-macro2", "quote", - "syn 2.0.58", + "syn 2.0.71", ] [[package]] @@ -1292,9 +1205,9 @@ checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" [[package]] name = "errno" -version = "0.3.8" +version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a258e46cdc063eb8519c00b9fc845fc47bcfca4130e2f08e88665ceda8474245" +checksum = "534c5cf6194dfab3db3242765c03bbe257cf92f22b38f6bc0c58d59108a820ba" dependencies = [ "libc", "windows-sys 0.52.0", @@ -1302,26 +1215,9 @@ dependencies = [ [[package]] name = "event-listener" -version = "2.5.3" +version = "5.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0" - -[[package]] -name = "event-listener" -version = "4.0.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67b215c49b2b248c855fb73579eb1f4f26c38ffdc12973e20e07b91d78d5646e" -dependencies = [ - "concurrent-queue", - "parking", - "pin-project-lite", -] - -[[package]] -name = "event-listener" -version = "5.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d9944b8ca13534cdfb2800775f8dd4902ff3fc75a50101466decadfdf322a24" +checksum = "6032be9bd27023a771701cc49f9f053c751055f71efb2e0ae5c15809093675ba" dependencies = [ "concurrent-queue", "parking", @@ -1330,21 +1226,11 @@ dependencies = [ [[package]] name = "event-listener-strategy" -version = "0.4.0" +version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "958e4d70b6d5e81971bebec42271ec641e7ff4e170a6fa605f2b8a8b65cb97d3" +checksum = "0f214dc438f977e6d4e3500aaa277f5ad94ca83fbbd9b1a15713ce2344ccc5a1" dependencies = [ - "event-listener 4.0.3", - "pin-project-lite", -] - -[[package]] -name = "event-listener-strategy" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "332f51cb23d20b0de8458b86580878211da09bcd4503cb579c225b3d124cabb3" -dependencies = [ - "event-listener 5.3.0", + "event-listener", "pin-project-lite", ] @@ -1366,9 +1252,9 @@ dependencies = [ [[package]] name = "eyeball" -version = "0.8.7" +version = "0.8.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "42482893d982111055ce4b24234d6250396d3785767c6b04cedd84612a0b80fb" +checksum = "d93bd0ebf93d61d6332d3c09a96e97975968a44e19a64c947bde06e6baff383f" dependencies = [ "futures-core", "readlock", @@ -1377,9 +1263,9 @@ dependencies = [ [[package]] name = "eyeball-im" -version = "0.4.2" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "021fab29d9670be5867b16d56a95c29a12c3c1bb654e7d589010a028716d625d" +checksum = "2ae8c5165c9770f3ec7cccce12f4c5d70f01fa8bf84cf30cfbfd5a1c6f8901d5" dependencies = [ "futures-core", "imbl", @@ -1390,9 +1276,9 @@ dependencies = [ [[package]] name = "eyeball-im-util" -version = "0.5.3" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0fea22ab33f31f2fac1a3a81b9024b461e28518f3262fecb6156943221e9960" +checksum = "32b6b037e2cdce928a432ecc2880c944e5436d8a38c827974b882ad373f60037" dependencies = [ "arrayvec", "eyeball-im", @@ -1423,14 +1309,14 @@ dependencies = [ "macroific", "proc-macro2", "quote", - "syn 2.0.58", + "syn 2.0.71", ] [[package]] name = "fastrand" -version = "2.0.2" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "658bd65b1cf4c852a3cc96f18a8ce7b5640f6b703f905c7d74532294c2a63984" +checksum = "9fc0510504f03c51ada170672ac806f1f105a88aa97a5281117e1ddc3368e51a" [[package]] name = "fdeflate" @@ -1441,21 +1327,11 @@ dependencies = [ "simd-adler32", ] -[[package]] -name = "ff" -version = "0.13.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ded41244b729663b1e574f1b4fb731469f69f79c17667b5d776b16cda0479449" -dependencies = [ - "rand_core", - "subtle", -] - [[package]] name = "fiat-crypto" -version = "0.2.7" +version = "0.2.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c007b1ae3abe1cb6f85a16305acd418b7ca6343b953633fee2b76d8f108b830f" +checksum = "28dea519a9695b9977216879a3ebfddf92f1c08c05d984f8996aecd6ecdc811d" [[package]] name = "field-offset" @@ -1469,15 +1345,15 @@ dependencies = [ [[package]] name = "flagset" -version = "0.4.5" +version = "0.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cdeb3aa5e95cf9aabc17f060cfa0ced7b83f042390760ca53bf09df9968acaa1" +checksum = "b3ea1ec5f8307826a5b71094dd91fc04d4ae75d5709b20ad351c7fb4815c86ec" [[package]] name = "flate2" -version = "1.0.28" +version = "1.0.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46303f565772937ffe1d394a4fac6f411c6013172fadde9dcdb1e147a086940e" +checksum = "5f54427cfd1c7829e2a139fcefea601bf088ebca651d2bf53ebc600eac295dae" dependencies = [ "crc32fast", "miniz_oxide", @@ -1489,7 +1365,7 @@ version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "55ac459de2512911e4b674ce33cf20befaba382d05b62b008afc1c8b57cbf181" dependencies = [ - "spin 0.9.8", + "spin", ] [[package]] @@ -1524,11 +1400,10 @@ dependencies = [ [[package]] name = "fractal" -version = "7.0.0" +version = "8.0.0" dependencies = [ "ashpd", "djb_hash", - "eyeball-im", "futures-channel", "futures-util", "geo-uri", @@ -1540,20 +1415,18 @@ dependencies = [ "gstreamer-play", "gstreamer-video", "gtk4", - "html-escape", - "html2pango", - "html5gum", "image", - "indexmap 2.2.6", + "indexmap", "libadwaita", "libshumate", + "linkify", "matrix-sdk", "matrix-sdk-ui", "mime", "mime_guess", "once_cell", "oo7", - "pulldown-cmark 0.10.2", + "pulldown-cmark", "qrcode", "rand", "regex", @@ -1566,7 +1439,9 @@ dependencies = [ "sourceview5", "strum", "thiserror", + "tld", "tokio", + "tokio-stream", "tracing", "tracing-subscriber", "url", @@ -1651,7 +1526,7 @@ checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" dependencies = [ "proc-macro2", "quote", - "syn 2.0.58", + "syn 2.0.71", ] [[package]] @@ -1723,9 +1598,9 @@ checksum = "af6a86e750338603ea2c14b1c0bfe58cd61f87ca67a0021d9334996024608e12" [[package]] name = "gdk-pixbuf" -version = "0.19.2" +version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f6a23f8a0b5090494fd04924662d463f8386cc678dd3915015a838c1a3679b92" +checksum = "28bb53ecb56857c683c9ec859908e076dd3969c7d67598bd8b1ce095d211304a" dependencies = [ "gdk-pixbuf-sys", "gio", @@ -1735,22 +1610,22 @@ dependencies = [ [[package]] name = "gdk-pixbuf-sys" -version = "0.19.0" +version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3dcbd04c1b2c4834cc008b4828bc917d062483b88d26effde6342e5622028f96" +checksum = "9f6681a0c1330d1d3968bec1529f7172d62819ef0bdbb0d18022320654158b03" dependencies = [ "gio-sys", "glib-sys", "gobject-sys", "libc", - "system-deps", + "system-deps 7.0.1", ] [[package]] name = "gdk4" -version = "0.8.1" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9100b25604183f2fd97f55ef087fae96ab4934d7215118a35303e422688e6e4b" +checksum = "4b7d7237c1487ed4b300aac7744efcbf1319e12d60d7afcd6f505414bd5b5dea" dependencies = [ "cairo-rs", "gdk-pixbuf", @@ -1763,9 +1638,9 @@ dependencies = [ [[package]] name = "gdk4-sys" -version = "0.8.1" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d0b76874c40bb8d1c7d03a7231e23ac75fa577a456cd53af32ec17ec8f121626" +checksum = "a67576c8ec012156d7f680e201a807b4432a77babb3157e0555e990ab6bcd878" dependencies = [ "cairo-sys-rs", "gdk-pixbuf-sys", @@ -1775,14 +1650,14 @@ dependencies = [ "libc", "pango-sys", "pkg-config", - "system-deps", + "system-deps 7.0.1", ] [[package]] name = "gdk4-win32" -version = "0.8.1" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab6181b6e5c91ee292dca0032b00d48dee8e61358253742c9752537a88486b3f" +checksum = "05afbcc8165b10f9143d2c4e4a589fce3a5071c6b20d75dd40704266d6eb4bb4" dependencies = [ "gdk4", "gdk4-win32-sys", @@ -1793,14 +1668,14 @@ dependencies = [ [[package]] name = "gdk4-win32-sys" -version = "0.8.1" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "efa8530d6619cf43f007f3efd993a356e1ca4e643c4d0bd2a99832a08af2e402" +checksum = "198c0604ceb45732c76b1fdb696d92b99400ea3a1c549fc5e40f4d79f8033205" dependencies = [ "gdk4-sys", "glib-sys", "libc", - "system-deps", + "system-deps 7.0.1", ] [[package]] @@ -1811,7 +1686,6 @@ checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a" dependencies = [ "typenum", "version_check", - "zeroize", ] [[package]] @@ -1835,9 +1709,9 @@ dependencies = [ [[package]] name = "getrandom" -version = "0.2.14" +version = "0.2.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94b22e06ecb0110981051723910cbf0b5f5e09a2062dd7663334ee79a9d1286c" +checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7" dependencies = [ "cfg-if", "js-sys", @@ -1878,15 +1752,15 @@ dependencies = [ [[package]] name = "gimli" -version = "0.28.1" +version = "0.29.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4271d37baee1b8c7e4b708028c57d816cf9d2434acb33a549475f78c181f6253" +checksum = "40ecd4077b5ae9fd2e9e169b102c6c330d0605168eb0e8bf79952b256dbefffd" [[package]] name = "gio" -version = "0.19.4" +version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f91a0518c2ec539f099d3f945ab2d6a83ec372a9ef40a21906343b191182845" +checksum = "398e3da68749fdc32783cbf7521ec3f65c9cf946db8c7774f8460af49e52c6e2" dependencies = [ "futures-channel", "futures-core", @@ -1902,24 +1776,24 @@ dependencies = [ [[package]] name = "gio-sys" -version = "0.19.0" +version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bcf8e1d9219bb294636753d307b030c1e8a032062cba74f493c431a5c8b81ce4" +checksum = "e4feb96b31c32730ea3e1e89aecd2e4e37ecb1c473ad8f685e3430a159419f63" dependencies = [ "glib-sys", "gobject-sys", "libc", - "system-deps", + "system-deps 7.0.1", "windows-sys 0.52.0", ] [[package]] name = "glib" -version = "0.19.4" +version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae1407b2ce171e654720be10d57d4054d3ff2f10a13d5b37e6819b41439832f7" +checksum = "fee90a615ce05be7a32932cfb8adf2c4bbb4700e80d37713c981fb24c0c56238" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "futures-channel", "futures-core", "futures-executor", @@ -1937,25 +1811,25 @@ dependencies = [ [[package]] name = "glib-macros" -version = "0.19.4" +version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d8bba315e8ce8aa59631545358450f4962557e89b5f7db7442e7153b47037f71" +checksum = "4da558d8177c0c8c54368818b508a4244e1286fce2858cef4e547023f0cfa5ef" dependencies = [ - "heck 0.5.0", - "proc-macro-crate 3.1.0", + "heck", + "proc-macro-crate", "proc-macro2", "quote", - "syn 2.0.58", + "syn 2.0.71", ] [[package]] name = "glib-sys" -version = "0.19.0" +version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "630f097773d7c7a0bb3258df4e8157b47dc98bbfa0e60ad9ab56174813feced4" +checksum = "4958c26e5a01c9af00dea669a97369eccbec29a8e6d125c24ea2d85ee7467b60" dependencies = [ "libc", - "system-deps", + "system-deps 7.0.1", ] [[package]] @@ -1991,20 +1865,20 @@ dependencies = [ [[package]] name = "gobject-sys" -version = "0.19.0" +version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c85e2b1080b9418dd0c58b498da3a5c826030343e0ef07bde6a955d28de54979" +checksum = "c6908864f5ffff15b56df7e90346863904f49b949337ed0456b9287af61903b8" dependencies = [ "glib-sys", "libc", - "system-deps", + "system-deps 7.0.1", ] [[package]] name = "graphene-rs" -version = "0.19.2" +version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "99e4d388e96c5f29e2b2f67045d229ddf826d0a8d6d282f94ed3b34452222c91" +checksum = "630e940ad5824f90221d6579043a9cd1f8bec86b4a17faaf7827d58eb16e8c1f" dependencies = [ "glib", "graphene-sys", @@ -2013,32 +1887,33 @@ dependencies = [ [[package]] name = "graphene-sys" -version = "0.19.0" +version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "236ed66cc9b18d8adf233716f75de803d0bf6fc806f60d14d948974a12e240d0" +checksum = "6fb8fade7b754982f47ebbed241fd2680816fdd4598321784da10b9e1168836a" dependencies = [ "glib-sys", "libc", "pkg-config", - "system-deps", + "system-deps 7.0.1", ] [[package]] -name = "group" -version = "0.13.0" +name = "growable-bloom-filter" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0f9ef7462f7c099f518d754361858f86d8a07af53ba9af0fe635bbccb151a63" +checksum = "c669fa03050eb3445343f215d62fc1ab831e8098bc9a55f26e9724faff11075c" dependencies = [ - "ff", - "rand_core", - "subtle", + "serde", + "serde_bytes", + "serde_derive", + "xxhash-rust", ] [[package]] name = "gsk4" -version = "0.8.1" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c65036fc8f99579e8cb37b12487969b707ab23ec8ab953682ff347cbd15d396e" +checksum = "1f3cf2091e1af185b347b3450817d93dea6fe435df7abd4c2cd7fb5bcb4cfda8" dependencies = [ "cairo-rs", "gdk4", @@ -2051,9 +1926,9 @@ dependencies = [ [[package]] name = "gsk4-sys" -version = "0.8.1" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd24c814379f9c3199dc53e52253ee8d0f657eae389ab282c330505289d24738" +checksum = "6aa69614a26d8760c186c3690f1b0fbb917572ca23ef83137445770ceddf8cde" dependencies = [ "cairo-sys-rs", "gdk4-sys", @@ -2062,14 +1937,14 @@ dependencies = [ "graphene-sys", "libc", "pango-sys", - "system-deps", + "system-deps 7.0.1", ] [[package]] name = "gst-plugin-gtk4" -version = "0.12.3" +version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "83c12132d3619f85db54f6034b4e3872577886657b07e055c521baeb2d5f6733" +checksum = "69b98aeb531b6cf9c3a6eb36742cedc0168054e2f040b76ddc61260c10dec589" dependencies = [ "async-channel", "gdk4-win32", @@ -2090,14 +1965,14 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4e5e874f1660252fd2ec81c602066df3633b3a6fcbe2b196f7f93c27cf069b2a" dependencies = [ "chrono", - "toml_edit 0.22.9", + "toml_edit 0.22.16", ] [[package]] name = "gstreamer" -version = "0.22.4" +version = "0.23.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fc6f2d7dcde4b42b5297d25e9f51914cacfa148c99ba6ddabebf006fb2b18c20" +checksum = "21e95b1d1153239a621ec143501fdcca6c1ad3efb87d268597285f85c4136f73" dependencies = [ "cfg-if", "futures-channel", @@ -2105,7 +1980,7 @@ dependencies = [ "futures-util", "glib", "gstreamer-sys", - "itertools 0.12.1", + "itertools 0.13.0", "libc", "muldiv", "num-integer", @@ -2120,9 +1995,9 @@ dependencies = [ [[package]] name = "gstreamer-audio" -version = "0.22.4" +version = "0.23.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "73a5de9ced05f9650168a74c7a4afeddbf3e63af595a7d56a700765be3b4869c" +checksum = "50c434cbdde750d82853a978a59eb96e270c238d721a41bee0f37bfdc771f997" dependencies = [ "cfg-if", "glib", @@ -2136,23 +2011,23 @@ dependencies = [ [[package]] name = "gstreamer-audio-sys" -version = "0.22.0" +version = "0.23.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "34d92a1e2a915874f70f0a33c3ea4589bc6b66a138b6ec8bb6acedf49bdec2c3" +checksum = "4bb0542026fb062c2880d15e712c0814336e3209a054da43a64c14f7570da02f" dependencies = [ "glib-sys", "gobject-sys", "gstreamer-base-sys", "gstreamer-sys", "libc", - "system-deps", + "system-deps 7.0.1", ] [[package]] name = "gstreamer-base" -version = "0.22.0" +version = "0.23.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "514c71195b53c7eced4842b66ca9149833e41cf6a1d949e45e2ca4a4fa929850" +checksum = "a3faa0b3cf361bf538dcb25b5cb7f6e73bd872ed031d85f3997b42d3fbd66409" dependencies = [ "atomic_refcell", "cfg-if", @@ -2164,22 +2039,22 @@ dependencies = [ [[package]] name = "gstreamer-base-sys" -version = "0.22.0" +version = "0.23.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "286591e0f85bbda1adf9bab6f21d015acd9ca0a4d4acb61da65e3d0487e23c4e" +checksum = "4a6643ef963c636b8022adc93aa19eac6f356bd174a187c499339fc5d64c1e05" dependencies = [ "glib-sys", "gobject-sys", "gstreamer-sys", "libc", - "system-deps", + "system-deps 7.0.1", ] [[package]] name = "gstreamer-gl" -version = "0.22.0" +version = "0.23.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d21c0c5fbf74018a0254b3ab77bca0a5b2c0f002bcfd910c09113ae90a95d98" +checksum = "cfe28e4b7c72022958add8a3d86e7293ff227a5086c426731b5ec5a15ffbc759" dependencies = [ "glib", "gstreamer", @@ -2192,9 +2067,9 @@ dependencies = [ [[package]] name = "gstreamer-gl-sys" -version = "0.22.0" +version = "0.23.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61d1e3b9b02abc23835e9d770f2bd705b67a50406ea37e963b4526a77c6a7cd8" +checksum = "2bc2ff7c20ae47c4a80f42a67d85d6889a5fad3bc2385aec6dc9b58795920c5b" dependencies = [ "glib-sys", "gobject-sys", @@ -2202,14 +2077,14 @@ dependencies = [ "gstreamer-sys", "gstreamer-video-sys", "libc", - "system-deps", + "system-deps 7.0.1", ] [[package]] name = "gstreamer-pbutils" -version = "0.22.0" +version = "0.23.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f173b14cdf3d10bc57d136797946fe2091c322015d879919765c317a0ea5edb3" +checksum = "05155dded8d67ecae23d22b9e8cad67e16b46f9f9fec161cabfda804716bba4c" dependencies = [ "glib", "gstreamer", @@ -2222,9 +2097,9 @@ dependencies = [ [[package]] name = "gstreamer-pbutils-sys" -version = "0.22.0" +version = "0.23.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b3afcb1df3d217b2a6b00aa7a391a779764b5be6ccb7dcf35b5690279c61c5c" +checksum = "5a1711616229f46a5767b79eb3bf15cb5ab9be9a721dc00b857f1cd6454387ac" dependencies = [ "glib-sys", "gobject-sys", @@ -2232,14 +2107,14 @@ dependencies = [ "gstreamer-sys", "gstreamer-video-sys", "libc", - "system-deps", + "system-deps 7.0.1", ] [[package]] name = "gstreamer-play" -version = "0.22.0" +version = "0.23.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "04cd4315d97f8f38a6a6fdaad27d51cc67fd132785816091ad9985e197d2c052" +checksum = "fcc9fac3926d08f882d5a7b98fc7780b2ea812cbebc0c56c56c7186bde34fcdd" dependencies = [ "glib", "gstreamer", @@ -2250,35 +2125,35 @@ dependencies = [ [[package]] name = "gstreamer-play-sys" -version = "0.22.0" +version = "0.23.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "19def7b12d3a53c520ad661b8f4501ae04158627e4a9fc49cc30c4ea04522cbf" +checksum = "37ffb862566a025cb5477089bbcdb15cc871e317ad451169835a2c06efaa7097" dependencies = [ "glib-sys", "gobject-sys", "gstreamer-sys", "gstreamer-video-sys", "libc", - "system-deps", + "system-deps 7.0.1", ] [[package]] name = "gstreamer-sys" -version = "0.22.2" +version = "0.23.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d5ddf526b3bf90ea627224c804f00b8bcb0452e3b447978b4d5092f8e8ff5918" +checksum = "d9c9005b55dd2b1784645963c1ec409f9d420a56f6348d0ae69c2eaff584bcc3" dependencies = [ "glib-sys", "gobject-sys", "libc", - "system-deps", + "system-deps 7.0.1", ] [[package]] name = "gstreamer-video" -version = "0.22.4" +version = "0.23.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5fc0a96481ecfcdd120d5057bb7ab5a6f6cd392cc34ba1e8b86cac3ba082f788" +checksum = "57332bca1ae7825a53fe57d993b63389f132d335aed691ac76f0ffe4304548e3" dependencies = [ "cfg-if", "futures-channel", @@ -2293,23 +2168,23 @@ dependencies = [ [[package]] name = "gstreamer-video-sys" -version = "0.22.1" +version = "0.23.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1ea7996ba44fbbf563aeeda96e24259efc9f06b407854d837ee58e260d7ba78" +checksum = "0f5c334d143384e8dc714af948c2e5d7d12cb588fdcfb56f3bf37c24daf350ef" dependencies = [ "glib-sys", "gobject-sys", "gstreamer-base-sys", "gstreamer-sys", "libc", - "system-deps", + "system-deps 7.0.1", ] [[package]] name = "gtk4" -version = "0.8.1" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa82753b8c26277e4af1446c70e35b19aad4fb794a7b143859e7eeb9a4025d83" +checksum = "eaffc6c743c9160514cc9b67eace364e5dc5798369fa809cdb04e035c21c5c5d" dependencies = [ "cairo-rs", "field-offset", @@ -2328,23 +2203,21 @@ dependencies = [ [[package]] name = "gtk4-macros" -version = "0.8.1" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "40300bf071d2fcd4c94eacc09e84ec6fe73129d2ceb635cf7e55b026b5443567" +checksum = "188211f546ce5801f6d0245c37b6249143a2cb4fa040e54829ca1e76796e9f09" dependencies = [ - "anyhow", - "proc-macro-crate 3.1.0", - "proc-macro-error", + "proc-macro-crate", "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.71", ] [[package]] name = "gtk4-sys" -version = "0.8.1" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0db1b104138f087ccdc81d2c332de5dd049b89de3d384437cc1093b17cd2da18" +checksum = "1114a207af8ada02cf4658a76692f4190f06f093380d5be07e3ca8b43aa7c666" dependencies = [ "cairo-sys-rs", "gdk-pixbuf-sys", @@ -2356,26 +2229,7 @@ dependencies = [ "gsk4-sys", "libc", "pango-sys", - "system-deps", -] - -[[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", + "system-deps 7.0.1", ] [[package]] @@ -2390,15 +2244,9 @@ dependencies = [ [[package]] name = "hashbrown" -version = "0.12.3" +version = "0.14.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" - -[[package]] -name = "hashbrown" -version = "0.14.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604" +checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1" dependencies = [ "ahash", "allocator-api2", @@ -2410,39 +2258,9 @@ version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e8094feaf31ff591f651a2664fb9cfd92bba7a60ce3197265e9482ebe753c8f7" dependencies = [ - "hashbrown 0.14.3", + "hashbrown", ] -[[package]] -name = "headers" -version = "0.3.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06683b93020a07e3dbcf5f8c0f6d40080d725bea7936fc01ad345c01b97dc270" -dependencies = [ - "base64 0.21.7", - "bytes", - "headers-core", - "http", - "httpdate", - "mime", - "sha1", -] - -[[package]] -name = "headers-core" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7f66481bfee273957b1f20485a4ff3362987f85b2c236580d81b4eb7a326429" -dependencies = [ - "http", -] - -[[package]] -name = "heck" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" - [[package]] name = "heck" version = "0.5.0" @@ -2455,6 +2273,12 @@ version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024" +[[package]] +name = "hermit-abi" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fbf6a919d6cf397374f7dfeeea91d974c7c0a7221d0d0f4f20d859d329e53fcc" + [[package]] name = "hex" version = "0.4.3" @@ -2479,59 +2303,25 @@ dependencies = [ "digest", ] -[[package]] -name = "html-escape" -version = "0.2.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d1ad449764d627e22bfd7cd5e8868264fc9236e07c752972b4080cd351cb476" -dependencies = [ - "utf8-width", -] - -[[package]] -name = "html2pango" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a5f061cc3c0538033f81a94417f209e2b1908e3dab8b87b205d84e6109c8091b" -dependencies = [ - "ammonia", - "anyhow", - "html5ever", - "linkify", - "maplit", - "markup5ever_rcdom", - "once_cell", - "regex", -] - [[package]] name = "html5ever" -version = "0.26.0" +version = "0.27.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bea68cab48b8459f17cf1c944c67ddc572d272d9f2b274140f223ecb1da4a3b7" +checksum = "c13771afe0e6e846f1e67d038d4cb29998a6779f93c809212e4e9c32efd244d4" dependencies = [ "log", "mac", "markup5ever", "proc-macro2", "quote", - "syn 1.0.109", -] - -[[package]] -name = "html5gum" -version = "0.5.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c4e556171a058ba117bbe88b059fb37b6289023e007d2903ea6dca3a3cbff14" -dependencies = [ - "jetscii", + "syn 2.0.71", ] [[package]] name = "http" -version = "0.2.12" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "601cbb57e577e2f5ef5be8e7b83f0f63994f25aa94d673e54a92d5c516d101f1" +checksum = "21b9ddb458710bc376481b842f5da65cdf31522de232c1ca8146abce2a358258" dependencies = [ "bytes", "fnv", @@ -2540,26 +2330,32 @@ 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", ] -[[package]] -name = "http-range-header" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "add0ab9360ddbd88cfeb3bd9574a1d85cfdfa14db10b3e21d3700dbc4328758f" - [[package]] name = "httparse" -version = "1.8.0" +version = "1.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d897f394bad6a705d5f4104762e116a75639e470d80901eed05a860a95cb1904" +checksum = "0fcc0b4a115bf80b728eb8ea024ad5bd707b615bfed49e0665b6e0f86fd082d9" [[package]] name = "httpdate" @@ -2569,39 +2365,58 @@ checksum = "df3b46402a9d5adb4c86a0cf463f42e19994e3ee891101b1841f30a545cb49a9" [[package]] name = "hyper" -version = "0.14.28" +version = "1.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf96e135eb83a2a8ddf766e426a841d8ddd7449d5f00d34ea02b41d2f19eef80" +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-tls" -version = "0.5.0" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d6183ddfa99b85da61a140bea0efc93fdf56ceaa041b37d553518030827f9905" +checksum = "70206fc6890eaca9fde8a0bf71caa2ddfc9fe045ac9e5c70df101a7dbde866e0" dependencies = [ "bytes", + "http-body-util", "hyper", + "hyper-util", "native-tls", "tokio", "tokio-native-tls", + "tower-service", +] + +[[package]] +name = "hyper-util" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3ab92f4f49ee4fb4f997c784b7a2e0fa70050211e0b6a287f898c3c9785ca956" +dependencies = [ + "bytes", + "futures-channel", + "futures-util", + "http", + "http-body", + "hyper", + "pin-project-lite", + "socket2", + "tokio", + "tower", + "tower-service", + "tracing", ] [[package]] @@ -2668,19 +2483,19 @@ dependencies = [ [[package]] name = "image-webp" -version = "0.1.1" +version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a84a25dcae3ac487bc24ef280f9e20c79c9b1a3e5e32cbed3041d1c514aa87c" +checksum = "f79afb8cbee2ef20f59ccd477a218c12a93943d075b492015ecb1bb81f8ee904" dependencies = [ - "byteorder", - "thiserror", + "byteorder-lite", + "quick-error", ] [[package]] name = "imbl" -version = "2.0.3" +version = "3.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "978d142c8028edf52095703af2fad11d6f611af1246685725d6b850634647085" +checksum = "bc3be8d8cd36f33a46b1849f31f837c44d9fa87223baee3b4bd96b8f11df81eb" dependencies = [ "bitmaps", "imbl-sized-chunks", @@ -2707,18 +2522,18 @@ checksum = "44feda355f4159a7c757171a77de25daf6411e217b4cabd03bd6650690468126" [[package]] name = "include_dir" -version = "0.7.3" +version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "18762faeff7122e89e0857b02f7ce6fcc0d101d5e9ad2ad7846cc01d61b7f19e" +checksum = "923d117408f1e49d914f1a379a309cffe4f18c05cf4e3d12e613a15fc81bd0dd" dependencies = [ "include_dir_macros", ] [[package]] name = "include_dir_macros" -version = "0.7.3" +version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b139284b5cf57ecfa712bcc66950bb635b31aff41c188e8a4cfc758eca374a3f" +checksum = "7cab85a7ed0bd5f0e76d93846e0147172bed2e2d3f859bcc33a8d9699cad1a75" dependencies = [ "proc-macro2", "quote", @@ -2741,17 +2556,6 @@ dependencies = [ "web-sys", ] -[[package]] -name = "indexmap" -version = "1.9.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99" -dependencies = [ - "autocfg", - "hashbrown 0.12.3", - "serde", -] - [[package]] name = "indexmap" version = "2.2.6" @@ -2759,7 +2563,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "168fb715dda47215e360912c096649d23d58bf392ac62f73919e831745e40f26" dependencies = [ "equivalent", - "hashbrown 0.14.3", + "hashbrown", "serde", ] @@ -2775,9 +2579,9 @@ dependencies = [ [[package]] name = "instant" -version = "0.1.12" +version = "0.1.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c" +checksum = "e0242819d153cba4b4b05a5a8f2a7e9bbf97b6055b2a002b395c96b5ff3c0222" dependencies = [ "cfg-if", "js-sys", @@ -2793,7 +2597,7 @@ checksum = "c34819042dc3d3971c46c2190835914dfbe0c3c13f61449b2997f4e9722dfa60" dependencies = [ "proc-macro2", "quote", - "syn 2.0.58", + "syn 2.0.71", ] [[package]] @@ -2820,23 +2624,26 @@ dependencies = [ "either", ] +[[package]] +name = "itertools" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "413ee7dfc52ee1a4949ceeb7dbc8a33f2d6c088194d9f922fb8318faf1f01186" +dependencies = [ + "either", +] + [[package]] name = "itoa" version = "1.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b" -[[package]] -name = "jetscii" -version = "0.5.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "47f142fe24a9c9944451e8349de0a56af5f3e7226dc46f3ed4d4ecc0b85af75e" - [[package]] name = "jobserver" -version = "0.1.28" +version = "0.1.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab46a6e9526ddef3ae7f787c06f0f2600639ba80ea3eade3d8e670a2230f51d6" +checksum = "d2b099aaa34a9751c5bf0878add70444e1ed2dd73f347be99003d4577277de6e" dependencies = [ "libc", ] @@ -2874,25 +2681,11 @@ dependencies = [ "serde", ] -[[package]] -name = "k256" -version = "0.13.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "956ff9b67e26e1a6a866cb758f12c6f8746208489e3e4a4b5580802f2f0a587b" -dependencies = [ - "cfg-if", - "ecdsa", - "elliptic-curve", - "once_cell", - "sha2", - "signature", -] - [[package]] name = "konst" -version = "0.3.8" +version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8d712a8c49d4274f8d8a5cf61368cb5f3c143d149882b1a2918129e53395fdb0" +checksum = "50a0ba6de5f7af397afff922f22c149ff605c766cd3269cf6c1cd5e466dbe3b9" dependencies = [ "const_panic", "konst_kernel", @@ -2901,29 +2694,20 @@ dependencies = [ [[package]] name = "konst_kernel" -version = "0.3.8" +version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dac6ea8c376b6e208a81cf39b8e82bebf49652454d98a4829e907dac16ef1790" +checksum = "be0a455a1719220fd6adf756088e1c69a85bf14b6a9e24537a5cc04f503edb2b" dependencies = [ "typewit", ] -[[package]] -name = "language-tags" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d4345964bb142484797b161f473a503a434de77149dd8c7427788c6e13379388" -dependencies = [ - "serde", -] - [[package]] name = "lazy_static" -version = "1.4.0" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" +checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe" dependencies = [ - "spin 0.5.2", + "spin", ] [[package]] @@ -2940,11 +2724,10 @@ checksum = "03087c2bad5e1034e8cace5926dec053fb3790248370865f5117a7d0213354c8" [[package]] name = "libadwaita" -version = "0.6.0" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91b4990248b9e1ec5e72094a2ccaea70ec3809f88f6fd52192f2af306b87c5d9" +checksum = "2ff9c222b5c783729de45185f07b2fec2d43a7f9c63961e777d3667e20443878" dependencies = [ - "gdk-pixbuf", "gdk4", "gio", "glib", @@ -2956,9 +2739,9 @@ dependencies = [ [[package]] name = "libadwaita-sys" -version = "0.6.0" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23a748e4e92be1265cd9e93d569c0b5dfc7814107985aa6743d670ab281ea1a8" +checksum = "1c44d8bdbad31d6639e1f20cc9c1424f1a8e02d751fc28d44659bf743fb9eca6" dependencies = [ "gdk4-sys", "gio-sys", @@ -2967,14 +2750,14 @@ dependencies = [ "gtk4-sys", "libc", "pango-sys", - "system-deps", + "system-deps 7.0.1", ] [[package]] name = "libc" -version = "0.2.153" +version = "0.2.155" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd" +checksum = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c" [[package]] name = "libfuzzer-sys" @@ -2989,12 +2772,12 @@ dependencies = [ [[package]] name = "libloading" -version = "0.8.3" +version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c2a198fb6b0eada2a8df47933734e6d35d350665a33a3593d7164fa52c75c19" +checksum = "e310b3a6b5907f99202fcdb4960ff45b93735d7c7d96b760fcff8db2dc0e103d" dependencies = [ "cfg-if", - "windows-targets 0.52.4", + "windows-targets 0.52.6", ] [[package]] @@ -3005,9 +2788,9 @@ checksum = "4ec2a862134d2a7d32d7983ddcdd1c4923530833c9f2ea1a44fc5fa473989058" [[package]] name = "libshumate" -version = "0.5.0" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd77c1202aaccef5460f4ca95b3b3c117f85986c942127e4e518c47058a6eaf6" +checksum = "fc9921cc829fb2d546bd6a3a158a4134002098887e0bb01ceb4535521af610ec" dependencies = [ "gdk-pixbuf", "gdk4", @@ -3020,9 +2803,9 @@ dependencies = [ [[package]] name = "libshumate-sys" -version = "0.5.0" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef5765221e416ebe7b5e9c5bd7e8dd09ca9e920b012474ca8f3da18f8e13c4a5" +checksum = "b238767323bdd28dc72471fa8a512ad0ae99a18d9668deb626c55f373f7aff81" dependencies = [ "gdk-pixbuf-sys", "gdk4-sys", @@ -3031,7 +2814,7 @@ dependencies = [ "gobject-sys", "gtk4-sys", "libc", - "system-deps", + "system-deps 7.0.1", ] [[package]] @@ -3040,7 +2823,7 @@ version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "65f3a4b81b2a2d8c7f300643676202debd1b7c929dbf5c9bb89402ea11d19810" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "cc", "convert_case", "cookie-factory", @@ -3048,7 +2831,7 @@ dependencies = [ "libspa-sys", "nix 0.27.1", "nom", - "system-deps", + "system-deps 6.2.2", ] [[package]] @@ -3059,7 +2842,7 @@ checksum = "bf0d9716420364790e85cbb9d3ac2c950bde16a7dd36f3209b7dfdfc4a24d01f" dependencies = [ "bindgen", "cc", - "system-deps", + "system-deps 6.2.2", ] [[package]] @@ -3074,18 +2857,18 @@ dependencies = [ [[package]] name = "linkify" -version = "0.9.0" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96dd5884008358112bc66093362197c7248ece00d46624e2cf71e50029f8cff5" +checksum = "f1dfa36d52c581e9ec783a7ce2a5e0143da6237be5811a0b3153fedfdbe9f780" dependencies = [ "memchr", ] [[package]] name = "linux-raw-sys" -version = "0.4.13" +version = "0.4.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "01cda141df6706de531b6c46c3a33ecca755538219bd484262fa09410c13539c" +checksum = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89" [[package]] name = "locale_config" @@ -3102,9 +2885,9 @@ dependencies = [ [[package]] name = "lock_api" -version = "0.4.11" +version = "0.4.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c168f8615b12bc01f9c17e2eb0cc07dcae1940121185446edc3744920e8ef45" +checksum = "07af8b9cdd281b7915f413fa73f29ebd5d55d0d3f0155584dade1ff18cea1b17" dependencies = [ "autocfg", "scopeguard", @@ -3112,9 +2895,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 = "loop9" @@ -3131,7 +2914,7 @@ version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d3262e75e648fce39813cb56ac41f3c3e3f65217ebf3844d818d1f9398cfb0dc" dependencies = [ - "hashbrown 0.14.3", + "hashbrown", ] [[package]] @@ -3160,7 +2943,7 @@ dependencies = [ "cfg-if", "proc-macro2", "quote", - "syn 2.0.58", + "syn 2.0.71", ] [[package]] @@ -3171,7 +2954,7 @@ checksum = "13198c120864097a565ccb3ff947672d969932b7975ebd4085732c9f09435e55" dependencies = [ "proc-macro2", "quote", - "syn 2.0.58", + "syn 2.0.71", ] [[package]] @@ -3184,7 +2967,7 @@ dependencies = [ "macroific_core", "proc-macro2", "quote", - "syn 2.0.58", + "syn 2.0.71", ] [[package]] @@ -3204,120 +2987,18 @@ checksum = "3e2e65a1a2e43cfcb47a895c4c8b10d1f4a61097f9f254f183aee60cad9c651d" [[package]] name = "markup5ever" -version = "0.11.0" +version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a2629bb1404f3d34c2e921f21fd34ba00b206124c81f65c50b43b6aaefeb016" +checksum = "16ce3abbeba692c8b8441d036ef91aea6df8da2c6b6e21c7e14d3c18e526be45" dependencies = [ "log", - "phf 0.10.1", + "phf", "phf_codegen", "string_cache", "string_cache_codegen", "tendril", ] -[[package]] -name = "markup5ever_rcdom" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9521dd6750f8e80ee6c53d65e2e4656d7de37064f3a7a5d2d11d05df93839c2" -dependencies = [ - "html5ever", - "markup5ever", - "tendril", - "xml5ever", -] - -[[package]] -name = "mas-http" -version = "0.8.0" -source = "git+https://github.com/matrix-org/matrix-authentication-service?rev=099eabd1371d2840a2f025a6372d6428039eb511#099eabd1371d2840a2f025a6372d6428039eb511" -dependencies = [ - "bytes", - "futures-util", - "headers", - "http", - "http-body", - "hyper", - "opentelemetry", - "serde", - "serde_json", - "serde_urlencoded", - "thiserror", - "tower", - "tower-http", - "tracing", - "tracing-opentelemetry", -] - -[[package]] -name = "mas-iana" -version = "0.8.0" -source = "git+https://github.com/matrix-org/matrix-authentication-service?rev=099eabd1371d2840a2f025a6372d6428039eb511#099eabd1371d2840a2f025a6372d6428039eb511" -dependencies = [ - "schemars", - "serde", -] - -[[package]] -name = "mas-jose" -version = "0.8.0" -source = "git+https://github.com/matrix-org/matrix-authentication-service?rev=099eabd1371d2840a2f025a6372d6428039eb511#099eabd1371d2840a2f025a6372d6428039eb511" -dependencies = [ - "base64ct", - "chrono", - "digest", - "ecdsa", - "elliptic-curve", - "generic-array", - "hmac", - "k256", - "mas-iana", - "p256", - "p384", - "rand", - "rsa", - "schemars", - "sec1", - "serde", - "serde_json", - "serde_with", - "sha2", - "signature", - "thiserror", - "tracing", - "url", -] - -[[package]] -name = "mas-oidc-client" -version = "0.8.0" -source = "git+https://github.com/matrix-org/matrix-authentication-service?rev=099eabd1371d2840a2f025a6372d6428039eb511#099eabd1371d2840a2f025a6372d6428039eb511" -dependencies = [ - "base64ct", - "bytes", - "chrono", - "form_urlencoded", - "futures-util", - "headers", - "http", - "language-tags", - "mas-http", - "mas-iana", - "mas-jose", - "mime", - "oauth2-types", - "rand", - "serde", - "serde_json", - "serde_urlencoded", - "serde_with", - "thiserror", - "tower", - "tracing", - "url", -] - [[package]] name = "matchers" version = "0.1.0" @@ -3328,10 +3009,16 @@ dependencies = [ ] [[package]] -name = "matrix-pickle" -version = "0.1.1" +name = "matchit" +version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d7fd26463ce5d86b8d9bb9c4142d453198ba22fb91bd46d3c9f144ae699d821d" +checksum = "0e7465ac9959cc2b1404e8e2367b43684a6d13790fe23056cc8c6c5a6b7bcb94" + +[[package]] +name = "matrix-pickle" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7eb521190328c57a2051f70250beb874dc0fac6bcd22b615f7f9700b7b4fb826" dependencies = [ "matrix-pickle-derive", "thiserror", @@ -3339,21 +3026,21 @@ dependencies = [ [[package]] name = "matrix-pickle-derive" -version = "0.1.1" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93779aa78d39c2fe34746287b10a866192cf8af1b81767fff76bd64099acc0f5" +checksum = "c6fb3c7231cbb7fbbc50871615edebf65183b382cdaa1fe21c5e88a12617de8e" dependencies = [ - "proc-macro-crate 2.0.0", + "proc-macro-crate", "proc-macro-error", "proc-macro2", "quote", - "syn 2.0.58", + "syn 2.0.71", ] [[package]] name = "matrix-sdk" version = "0.7.1" -source = "git+https://github.com/matrix-org/matrix-rust-sdk.git?rev=88c4dec35f05ae295e0f2bf0362d6f5d72606d92#88c4dec35f05ae295e0f2bf0362d6f5d72606d92" +source = "git+https://github.com/matrix-org/matrix-rust-sdk.git?rev=92b4c2a469f507696fa9db3d6bdb000a761e2694#92b4c2a469f507696fa9db3d6bdb000a761e2694" dependencies = [ "anymap2", "aquamarine", @@ -3361,26 +3048,21 @@ dependencies = [ "async-channel", "async-stream", "async-trait", + "axum", "backoff", "bytes", "bytesize", - "cfg-vis", - "chrono", - "event-listener 4.0.3", + "event-listener", "eyeball", "eyeball-im", - "eyeball-im-util", "futures-core", "futures-util", "gloo-timers", "http", - "hyper", "image", "imbl", - "indexmap 2.2.6", + "indexmap", "js_int", - "language-tags", - "mas-oidc-client", "matrix-sdk-base", "matrix-sdk-common", "matrix-sdk-indexeddb", @@ -3393,7 +3075,6 @@ dependencies = [ "serde", "serde_html_form", "serde_json", - "sha2", "tempfile", "thiserror", "tokio", @@ -3403,20 +3084,22 @@ dependencies = [ "tracing", "url", "urlencoding", + "vodozemac", "zeroize", ] [[package]] name = "matrix-sdk-base" version = "0.7.0" -source = "git+https://github.com/matrix-org/matrix-rust-sdk.git?rev=88c4dec35f05ae295e0f2bf0362d6f5d72606d92#88c4dec35f05ae295e0f2bf0362d6f5d72606d92" +source = "git+https://github.com/matrix-org/matrix-rust-sdk.git?rev=92b4c2a469f507696fa9db3d6bdb000a761e2694#92b4c2a469f507696fa9db3d6bdb000a761e2694" dependencies = [ "as_variant", "async-trait", - "bitflags 2.5.0", + "bitflags 2.6.0", "eyeball", "eyeball-im", "futures-util", + "growable-bloom-filter", "matrix-sdk-common", "matrix-sdk-crypto", "matrix-sdk-store-encryption", @@ -3432,7 +3115,7 @@ dependencies = [ [[package]] name = "matrix-sdk-common" version = "0.7.0" -source = "git+https://github.com/matrix-org/matrix-rust-sdk.git?rev=88c4dec35f05ae295e0f2bf0362d6f5d72606d92#88c4dec35f05ae295e0f2bf0362d6f5d72606d92" +source = "git+https://github.com/matrix-org/matrix-rust-sdk.git?rev=92b4c2a469f507696fa9db3d6bdb000a761e2694#92b4c2a469f507696fa9db3d6bdb000a761e2694" dependencies = [ "async-trait", "futures-core", @@ -3453,8 +3136,8 @@ dependencies = [ [[package]] name = "matrix-sdk-crypto" -version = "0.7.0" -source = "git+https://github.com/matrix-org/matrix-rust-sdk.git?rev=88c4dec35f05ae295e0f2bf0362d6f5d72606d92#88c4dec35f05ae295e0f2bf0362d6f5d72606d92" +version = "0.7.1" +source = "git+https://github.com/matrix-org/matrix-rust-sdk.git?rev=92b4c2a469f507696fa9db3d6bdb000a761e2694#92b4c2a469f507696fa9db3d6bdb000a761e2694" dependencies = [ "aes", "as_variant", @@ -3487,6 +3170,7 @@ dependencies = [ "tokio-stream", "tracing", "ulid", + "url", "vodozemac", "zeroize", ] @@ -3494,13 +3178,14 @@ dependencies = [ [[package]] name = "matrix-sdk-indexeddb" version = "0.7.0" -source = "git+https://github.com/matrix-org/matrix-rust-sdk.git?rev=88c4dec35f05ae295e0f2bf0362d6f5d72606d92#88c4dec35f05ae295e0f2bf0362d6f5d72606d92" +source = "git+https://github.com/matrix-org/matrix-rust-sdk.git?rev=92b4c2a469f507696fa9db3d6bdb000a761e2694#92b4c2a469f507696fa9db3d6bdb000a761e2694" dependencies = [ "anyhow", "async-trait", - "base64 0.21.7", + "base64", "getrandom", "gloo-utils", + "hkdf", "indexed_db_futures", "js-sys", "matrix-sdk-crypto", @@ -3509,17 +3194,19 @@ dependencies = [ "serde", "serde-wasm-bindgen", "serde_json", + "sha2", "thiserror", "tokio", "tracing", "wasm-bindgen", "web-sys", + "zeroize", ] [[package]] name = "matrix-sdk-qrcode" version = "0.7.0" -source = "git+https://github.com/matrix-org/matrix-rust-sdk.git?rev=88c4dec35f05ae295e0f2bf0362d6f5d72606d92#88c4dec35f05ae295e0f2bf0362d6f5d72606d92" +source = "git+https://github.com/matrix-org/matrix-rust-sdk.git?rev=92b4c2a469f507696fa9db3d6bdb000a761e2694#92b4c2a469f507696fa9db3d6bdb000a761e2694" dependencies = [ "byteorder", "qrcode", @@ -3531,7 +3218,7 @@ dependencies = [ [[package]] name = "matrix-sdk-sqlite" version = "0.7.0" -source = "git+https://github.com/matrix-org/matrix-rust-sdk.git?rev=88c4dec35f05ae295e0f2bf0362d6f5d72606d92#88c4dec35f05ae295e0f2bf0362d6f5d72606d92" +source = "git+https://github.com/matrix-org/matrix-rust-sdk.git?rev=92b4c2a469f507696fa9db3d6bdb000a761e2694#92b4c2a469f507696fa9db3d6bdb000a761e2694" dependencies = [ "async-trait", "deadpool-sqlite", @@ -3553,12 +3240,11 @@ dependencies = [ [[package]] name = "matrix-sdk-store-encryption" version = "0.7.0" -source = "git+https://github.com/matrix-org/matrix-rust-sdk.git?rev=88c4dec35f05ae295e0f2bf0362d6f5d72606d92#88c4dec35f05ae295e0f2bf0362d6f5d72606d92" +source = "git+https://github.com/matrix-org/matrix-rust-sdk.git?rev=92b4c2a469f507696fa9db3d6bdb000a761e2694#92b4c2a469f507696fa9db3d6bdb000a761e2694" dependencies = [ - "base64 0.21.7", + "base64", "blake3", "chacha20poly1305", - "displaydoc", "hmac", "pbkdf2", "rand", @@ -3573,7 +3259,7 @@ dependencies = [ [[package]] name = "matrix-sdk-ui" version = "0.7.0" -source = "git+https://github.com/matrix-org/matrix-rust-sdk.git?rev=88c4dec35f05ae295e0f2bf0362d6f5d72606d92#88c4dec35f05ae295e0f2bf0362d6f5d72606d92" +source = "git+https://github.com/matrix-org/matrix-rust-sdk.git?rev=92b4c2a469f507696fa9db3d6bdb000a761e2694#92b4c2a469f507696fa9db3d6bdb000a761e2694" dependencies = [ "as_variant", "async-once-cell", @@ -3588,8 +3274,9 @@ dependencies = [ "futures-core", "futures-util", "fuzzy-matcher", + "growable-bloom-filter", "imbl", - "indexmap 2.2.6", + "indexmap", "itertools 0.12.1", "matrix-sdk", "matrix-sdk-base", @@ -3603,7 +3290,6 @@ dependencies = [ "tokio", "tracing", "unicode-normalization", - "url", ] [[package]] @@ -3618,9 +3304,9 @@ dependencies = [ [[package]] name = "memchr" -version = "2.7.2" +version = "2.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c8640c5d730cb13ebd907d8d04b52f55ac9a2eec55b440c8892f40d56c76c1d" +checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3" [[package]] name = "memoffset" @@ -3645,9 +3331,9 @@ checksum = "a1a85a5069ebd40e64b1985773cc81addbe9d90d7ecf60e7b5475a57ad584c70" [[package]] name = "mime_guess" -version = "2.0.4" +version = "2.0.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4192263c238a5f0d0c6bfd21f336a313a4ce1c450542449ca191bb657b4642ef" +checksum = "f7c44f8e672c00fe5308fa235f821cb4198414e1c77935c1ab6948d3fd78550e" dependencies = [ "mime", "unicase", @@ -3661,9 +3347,9 @@ checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" [[package]] name = "miniz_oxide" -version = "0.7.2" +version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d811f3e15f28568be3407c8e7fdb6514c1cda3cb30683f15b6a1a1dc4ea14a7" +checksum = "b8a240ddb74feaf34a79a7add65a741f3167852fba007066dcac1ca548d89c08" dependencies = [ "adler", "simd-adler32", @@ -3688,11 +3374,10 @@ checksum = "956787520e75e9bd233246045d19f42fb73242759cc57fba9611d940ae96d4b0" [[package]] name = "native-tls" -version = "0.2.11" +version = "0.2.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "07226173c32f2926027b63cce4bcd8076c3552846cbe7925f3aaffeac0a3b92e" +checksum = "a8614eb2c83d59d1c8cc974dd3f920198647674a0a035e1af1fa58707e317466" dependencies = [ - "lazy_static", "libc", "log", "openssl", @@ -3716,18 +3401,18 @@ version = "0.27.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2eb04e9c688eff1c89d72b407f168cf79bb9e867a9d3323ed6c01519eb9cc053" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "cfg-if", "libc", ] [[package]] name = "nix" -version = "0.28.0" +version = "0.29.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab2156c4fce2f8df6c499cc1c763e4394b7482525bf2a9701c9d79d215f519e4" +checksum = "71e2746dc3a24dd78b3cfcb7be93368c6de9963d30f43a6a73998a9cf4b17b46" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "cfg-if", "cfg_aliases", "libc", @@ -3762,9 +3447,9 @@ dependencies = [ [[package]] name = "num" -version = "0.4.1" +version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b05180d69e3da0e530ba2a1dae5110317e49e3b7f3d41be227dc5f92e49ee7af" +checksum = "35bd024e8b2ff75562e5f34e7f4905839deb4b22955ef5e73d2fea1b9813cb23" dependencies = [ "num-bigint", "num-complex", @@ -3776,11 +3461,10 @@ dependencies = [ [[package]] name = "num-bigint" -version = "0.4.4" +version = "0.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "608e7659b5c3d7cba262d894801b9ec9d00de989e8a82bd4bef91d08da45cdc0" +checksum = "a5e44f723f1133c9deac646763579fdb3ac745e418f2a7af9cd0c431da1f20b9" dependencies = [ - "autocfg", "num-integer", "num-traits", ] @@ -3805,9 +3489,9 @@ dependencies = [ [[package]] name = "num-complex" -version = "0.4.5" +version = "0.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23c6602fda94a57c990fe0df199a035d83576b496aa29f4e634a8ac6004e68a6" +checksum = "73f88a1307638156682bada9d7604135552957b7818057dcef22705b4d509495" dependencies = [ "num-traits", ] @@ -3826,7 +3510,7 @@ checksum = "ed3955f1a9c7c0c15e092f9c887db08b1fc683305fdf6eb6684f22555355e202" dependencies = [ "proc-macro2", "quote", - "syn 2.0.58", + "syn 2.0.71", ] [[package]] @@ -3840,9 +3524,9 @@ dependencies = [ [[package]] name = "num-iter" -version = "0.1.44" +version = "0.1.45" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d869c01cc0c455284163fd0092f1f93835385ccab5a98a0dcc497b2f8bf055a9" +checksum = "1429034a0490724d0075ebb2bc9e875d6503c3cf69e235a8941aa757d83ef5bf" dependencies = [ "autocfg", "num-integer", @@ -3851,11 +3535,10 @@ dependencies = [ [[package]] name = "num-rational" -version = "0.4.1" +version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0638a1c9d0a3c0914158145bc76cff373a75a627e6ecbfb71cbe6f453a5a19b0" +checksum = "f83d14da390562dca69fc84082e73e548e1ad308d24accdedd2720017cb37824" dependencies = [ - "autocfg", "num-bigint", "num-integer", "num-traits", @@ -3863,12 +3546,11 @@ dependencies = [ [[package]] name = "num-traits" -version = "0.2.18" +version = "0.2.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da0df0e5185db44f69b44f26786fe401b6c293d1907744beaa7fa62b2e5a517a" +checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841" dependencies = [ "autocfg", - "libm", ] [[package]] @@ -3877,30 +3559,10 @@ version = "1.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43" dependencies = [ - "hermit-abi", + "hermit-abi 0.3.9", "libc", ] -[[package]] -name = "oauth2-types" -version = "0.8.0" -source = "git+https://github.com/matrix-org/matrix-authentication-service?rev=099eabd1371d2840a2f025a6372d6428039eb511#099eabd1371d2840a2f025a6372d6428039eb511" -dependencies = [ - "chrono", - "data-encoding", - "http", - "language-tags", - "mas-iana", - "mas-jose", - "parse-display", - "serde", - "serde_json", - "serde_with", - "sha2", - "thiserror", - "url", -] - [[package]] name = "objc" version = "0.2.7" @@ -3932,9 +3594,9 @@ dependencies = [ [[package]] name = "object" -version = "0.32.2" +version = "0.36.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a6a622008b6e321afc04970976f62ee297fdbaa6f95318ca343e3eebb9648441" +checksum = "081b846d1d56ddfc18fdf1a922e4f6e07a11768ea1b92dec44e42b72712ccfce" dependencies = [ "memchr", ] @@ -3947,10 +3609,11 @@ checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" [[package]] name = "oo7" -version = "0.3.0" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "37558cac1af63a81fd2ff7f3469c02a4da06b163c5671791553b8dac10f07c82" +checksum = "8fc6ce4692fbfd044ce22ca07dcab1a30fa12432ca2aa5b1294eca50d3332a24" dependencies = [ + "endi", "futures-util", "num", "num-bigint-dig", @@ -3976,7 +3639,7 @@ version = "0.10.64" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "95a0481286a310808298130d22dd1fef0fa571e05a8f44ec801801e84b216b1f" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "cfg-if", "foreign-types", "libc", @@ -3993,7 +3656,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.58", + "syn 2.0.71", ] [[package]] @@ -4014,40 +3677,6 @@ dependencies = [ "vcpkg", ] -[[package]] -name = "opentelemetry" -version = "0.22.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "900d57987be3f2aeb70d385fff9b27fb74c5723cc9a52d904d4f9c807a0667bf" -dependencies = [ - "futures-core", - "futures-sink", - "js-sys", - "once_cell", - "pin-project-lite", - "thiserror", - "urlencoding", -] - -[[package]] -name = "opentelemetry_sdk" -version = "0.22.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e90c7113be649e31e9a0f8b5ee24ed7a16923b322c3c5ab6367469c049d6b7e" -dependencies = [ - "async-trait", - "crossbeam-channel", - "futures-channel", - "futures-executor", - "futures-util", - "once_cell", - "opentelemetry", - "ordered-float", - "percent-encoding", - "rand", - "thiserror", -] - [[package]] name = "option-operations" version = "0.5.0" @@ -4057,15 +3686,6 @@ dependencies = [ "paste", ] -[[package]] -name = "ordered-float" -version = "4.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a76df7075c7d4d01fdcb46c912dd17fba5b60c78ea480b475f2b6ab6f666584e" -dependencies = [ - "num-traits", -] - [[package]] name = "ordered-stream" version = "0.2.0" @@ -4082,35 +3702,11 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39" -[[package]] -name = "p256" -version = "0.13.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c9863ad85fa8f4460f9c48cb909d38a0d689dba1f6f6988a5e3e0d31071bcd4b" -dependencies = [ - "ecdsa", - "elliptic-curve", - "primeorder", - "sha2", -] - -[[package]] -name = "p384" -version = "0.13.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70786f51bcc69f6a4c0360e063a4cac5419ef7c5cd5b3c99ad70f3be5ba79209" -dependencies = [ - "ecdsa", - "elliptic-curve", - "primeorder", - "sha2", -] - [[package]] name = "pango" -version = "0.19.3" +version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1264d13deb823cc652f26cfe59afb1ec4b9db2a5bd27c41b738c879cc1bfaa1" +checksum = "54768854025df6903061d0084fd9702a253ddfd60db7d9b751d43b76689a7f0a" dependencies = [ "gio", "glib", @@ -4120,14 +3716,14 @@ dependencies = [ [[package]] name = "pango-sys" -version = "0.19.0" +version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f52ef6a881c19fbfe3b1484df5cad411acaaba29dbec843941c3110d19f340ea" +checksum = "b07cc57d10cee4ec661f718a6902cee18c2f4cfae08e87e5a390525946913390" dependencies = [ "glib-sys", "gobject-sys", "libc", - "system-deps", + "system-deps 7.0.1", ] [[package]] @@ -4138,9 +3734,9 @@ checksum = "bb813b8af86854136c6922af0598d719255ecb2179515e6e7730d468f05c9cae" [[package]] name = "parking_lot" -version = "0.12.1" +version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f" +checksum = "f1bf18183cf54e8d6059647fc3063646a1801cf30896933ec2311622cc4b9a27" dependencies = [ "lock_api", "parking_lot_core", @@ -4148,47 +3744,22 @@ dependencies = [ [[package]] name = "parking_lot_core" -version = "0.9.9" +version = "0.9.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c42a9226546d68acdd9c0a280d17ce19bfe27a46bf68784e4066115788d008e" +checksum = "1e401f977ab385c9e4e3ab30627d6f26d00e2c73eef317493c4ec6d468726cf8" dependencies = [ "cfg-if", "libc", "redox_syscall", "smallvec", - "windows-targets 0.48.5", -] - -[[package]] -name = "parse-display" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06af5f9333eb47bd9ba8462d612e37a8328a5cb80b13f0af4de4c3b89f52dee5" -dependencies = [ - "parse-display-derive", - "regex", - "regex-syntax 0.8.3", -] - -[[package]] -name = "parse-display-derive" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc9252f259500ee570c75adcc4e317fa6f57a1e47747d622e0bf838002a7b790" -dependencies = [ - "proc-macro2", - "quote", - "regex", - "regex-syntax 0.8.3", - "structmeta", - "syn 2.0.58", + "windows-targets 0.52.6", ] [[package]] name = "paste" -version = "1.0.14" +version = "1.0.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "de3145af08024dea9fa9914f381a17b8fc6034dfb00f3a84013f7ff43f29ed4c" +checksum = "57c0d7b74b563b49d38dae00a0c37d4d6de9b432382b2892f0574ddcae73fd0a" [[package]] name = "pbkdf2" @@ -4200,30 +3771,12 @@ dependencies = [ "hmac", ] -[[package]] -name = "pem-rfc7468" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "88b39c9bfcfc231068454382784bb460aae594343fb030d46e9f50a645418412" -dependencies = [ - "base64ct", -] - [[package]] name = "percent-encoding" version = "2.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" -[[package]] -name = "phf" -version = "0.10.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fabbf1ead8a5bcbc20f5f8b939ee3f5b0f6f281b6ad3468b84656b658b455259" -dependencies = [ - "phf_shared 0.10.0", -] - [[package]] name = "phf" version = "0.11.2" @@ -4236,12 +3789,12 @@ dependencies = [ [[package]] name = "phf_codegen" -version = "0.10.0" +version = "0.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4fb1c3a8bc4dd4e5cfce29b44ffc14bedd2ee294559a294e2a4d4c9e9a6a13cd" +checksum = "e8d39688d359e6b34654d328e262234662d16cc0f60ec8dcbe5e718709342a5a" dependencies = [ - "phf_generator 0.10.0", - "phf_shared 0.10.0", + "phf_generator 0.11.2", + "phf_shared 0.11.2", ] [[package]] @@ -4274,7 +3827,7 @@ dependencies = [ "phf_shared 0.11.2", "proc-macro2", "quote", - "syn 2.0.58", + "syn 2.0.71", ] [[package]] @@ -4312,7 +3865,7 @@ checksum = "2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965" dependencies = [ "proc-macro2", "quote", - "syn 2.0.58", + "syn 2.0.71", ] [[package]] @@ -4329,9 +3882,9 @@ checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" [[package]] name = "piper" -version = "0.2.1" +version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "668d31b1c4eba19242f2088b2bf3316b82ca31082a8335764db4e083db7485d4" +checksum = "ae1d5c74c9876f070d3e8fd503d748c7d974c3e48da8f41350fa5222ef9b4391" dependencies = [ "atomic-waker", "fastrand", @@ -4345,7 +3898,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "08e645ba5c45109106d56610b3ee60eb13a6f2beb8b74f8dc8186cf261788dda" dependencies = [ "anyhow", - "bitflags 2.5.0", + "bitflags 2.6.0", "libc", "libspa", "libspa-sys", @@ -4363,18 +3916,7 @@ checksum = "849e188f90b1dda88fe2bfe1ad31fe5f158af2c98f80fb5d13726c44f3f01112" dependencies = [ "bindgen", "libspa-sys", - "system-deps", -] - -[[package]] -name = "pkcs1" -version = "0.7.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c8ffb9f10fa047879315e6625af03c164b16962a5368d724ed16323b68ace47f" -dependencies = [ - "der", - "pkcs8", - "spki", + "system-deps 6.2.2", ] [[package]] @@ -4404,12 +3946,6 @@ version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec" -[[package]] -name = "platforms" -version = "3.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db23d408679286588f4d4644f965003d056e3dd5abcaaa938116871d7ce2fee7" - [[package]] name = "png" version = "0.17.13" @@ -4425,13 +3961,13 @@ dependencies = [ [[package]] name = "polling" -version = "3.6.0" +version = "3.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e0c976a60b2d7e99d6f229e414670a9b85d13ac305cc6d1e9c134de58c5aaaf6" +checksum = "a3ed00ed3fbf728b5816498ecd316d1716eecaced9c0c8d2c5a6740ca214985b" dependencies = [ "cfg-if", "concurrent-queue", - "hermit-abi", + "hermit-abi 0.4.0", "pin-project-lite", "rustix", "tracing", @@ -4467,34 +4003,6 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "925383efa346730478fb4838dbe9137d2a47675ad789c546d150a6e1dd4ab31c" -[[package]] -name = "primeorder" -version = "0.13.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "353e1ca18966c16d9deb1c69278edbc5f194139612772bd9537af60ac231e1e6" -dependencies = [ - "elliptic-curve", -] - -[[package]] -name = "proc-macro-crate" -version = "1.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f4c021e1093a56626774e81216a4ce732a735e5bad4868a03f3ed65ca0c3919" -dependencies = [ - "once_cell", - "toml_edit 0.19.15", -] - -[[package]] -name = "proc-macro-crate" -version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e8366a6159044a37876a2b9817124296703c586a5c92e2c53751fa06d8d43e8" -dependencies = [ - "toml_edit 0.20.7", -] - [[package]] name = "proc-macro-crate" version = "3.1.0" @@ -4530,9 +4038,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.79" +version = "1.0.86" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e835ff2298f5721608eb1a980ecaee1aef2c132bf95ecc026a11b7bf3c01c02e" +checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77" dependencies = [ "unicode-ident", ] @@ -4553,14 +4061,14 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8021cf59c8ec9c432cfc2526ac6b8aa508ecaf29cd415f271b8406c1b851c3fd" dependencies = [ "quote", - "syn 2.0.58", + "syn 2.0.71", ] [[package]] name = "prost" -version = "0.12.4" +version = "0.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d0f5d036824e4761737860779c906171497f6d55681139d8312388f8fe398922" +checksum = "e13db3d3fde688c61e2446b4d843bc27a7e8af269a69440c0308021dc92333cc" dependencies = [ "bytes", "prost-derive", @@ -4568,35 +4076,24 @@ dependencies = [ [[package]] name = "prost-derive" -version = "0.12.4" +version = "0.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "19de2de2a00075bf566bee3bd4db014b11587e84184d3f7a791bc17f1a8e9e48" +checksum = "18bec9b0adc4eba778b33684b7ba3e7137789434769ee3ce3930463ef904cfca" dependencies = [ "anyhow", - "itertools 0.12.1", + "itertools 0.13.0", "proc-macro2", "quote", - "syn 2.0.58", + "syn 2.0.71", ] [[package]] name = "pulldown-cmark" -version = "0.9.6" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57206b407293d2bcd3af849ce869d52068623f19e1b5ff8e8778e3309439682b" +checksum = "8746739f11d39ce5ad5c2520a9b75285310dbfe78c541ccf832d38615765aec0" dependencies = [ - "bitflags 2.5.0", - "memchr", - "unicase", -] - -[[package]] -name = "pulldown-cmark" -version = "0.10.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f0530d13d87d1f549b66a3e8d0c688952abe5994e204ed62615baaf25dc029c" -dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "getopts", "memchr", "pulldown-cmark-escape", @@ -4605,9 +4102,9 @@ dependencies = [ [[package]] name = "pulldown-cmark-escape" -version = "0.10.0" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d5d8f9aa0e3cbcfaf8bf00300004ee3b72f74770f9cbac93f6928771f613276b" +checksum = "007d8adb5ddab6f8e3f491ac63566a7d5002cc7ed73901f72057943fa71ae1ae" [[package]] name = "qoi" @@ -4620,9 +4117,9 @@ dependencies = [ [[package]] name = "qrcode" -version = "0.14.0" +version = "0.14.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23e719ca51966ff9f5a8436edb00d6115b3c606a0bb27c8f8ca74a38ff2b036d" +checksum = "d68782463e408eb1e668cf6152704bd856c78c5b6417adaee3203d8f4c1fc9ec" dependencies = [ "image", ] @@ -4710,7 +4207,7 @@ dependencies = [ "rand", "rand_chacha", "simd_helpers", - "system-deps", + "system-deps 6.2.2", "thiserror", "v_frame", "wasm-bindgen", @@ -4718,9 +4215,9 @@ dependencies = [ [[package]] name = "ravif" -version = "0.11.5" +version = "0.11.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc13288f5ab39e6d7c9d501759712e6969fcc9734220846fc9ed26cae2cc4234" +checksum = "c6ba61c28ba24c0cf8406e025cb29a742637e3f70776e61c27a8a8b72a042d12" dependencies = [ "avif-serialize", "imgref", @@ -4753,29 +4250,29 @@ dependencies = [ [[package]] name = "readlock" -version = "0.1.7" +version = "0.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d7b323e7196daa571c8584de958be19e92941c41f845776fe06babfe8fa280a2" +checksum = "072cfe5b1d2dcd38d20e18f85e9c9978b6cc08f0b373e9f1fff1541335622974" [[package]] name = "redox_syscall" -version = "0.4.1" +version = "0.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4722d768eff46b75989dd134e5c353f0d6296e5aaa3132e776cbdb56be7731aa" +checksum = "2a908a6e00f1fdd0dfd9c0eb08ce85126f6d8bbda50017e74bc4a4b7d4a926a4" dependencies = [ - "bitflags 1.3.2", + "bitflags 2.6.0", ] [[package]] name = "regex" -version = "1.10.4" +version = "1.10.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c117dbdfde9c8308975b6a18d71f3f385c89461f7b3fb054288ecf2a2058ba4c" +checksum = "b91213439dad192326a0d7c6ee3955910425f441d7038e0d6933b0aec5c4517f" dependencies = [ "aho-corasick", "memchr", - "regex-automata 0.4.6", - "regex-syntax 0.8.3", + "regex-automata 0.4.7", + "regex-syntax 0.8.4", ] [[package]] @@ -4789,13 +4286,13 @@ dependencies = [ [[package]] name = "regex-automata" -version = "0.4.6" +version = "0.4.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86b83b8b9847f9bf95ef68afb0b8e6cdb80f498442f5179a29fad448fcc1eaea" +checksum = "38caf58cc5ef2fed281f89292ef23f6365465ed9a41b7a7754eb4e26496c92df" dependencies = [ "aho-corasick", "memchr", - "regex-syntax 0.8.3", + "regex-syntax 0.8.4", ] [[package]] @@ -4806,27 +4303,27 @@ checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1" [[package]] name = "regex-syntax" -version = "0.8.3" +version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "adad44e29e4c806119491a7f06f03de4d1af22c3a680dd47f1e6e179439d1f56" +checksum = "7a66a03ae7c801facd77a29370b4faec201768915ac14a721ba36f20bc9c209b" [[package]] name = "reqwest" -version = "0.11.27" +version = "0.12.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd67538700a17451e7cba03ac727fb961abb7607553461627b97de0b89cf4a62" +checksum = "c7d6d2a27d57148378eb5e111173f4276ad26340ecc5c49a4a2152167a2d6a37" dependencies = [ "async-compression", - "base64 0.21.7", + "base64", "bytes", - "encoding_rs", "futures-core", "futures-util", - "h2", "http", "http-body", + "http-body-util", "hyper", "hyper-tls", + "hyper-util", "ipnet", "js-sys", "log", @@ -4839,8 +4336,7 @@ dependencies = [ "serde", "serde_json", "serde_urlencoded", - "sync_wrapper", - "system-configuration", + "sync_wrapper 1.0.1", "tokio", "tokio-native-tls", "tokio-socks", @@ -4854,30 +4350,20 @@ dependencies = [ "winreg", ] -[[package]] -name = "rfc6979" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8dd2a808d456c4a54e300a23e9f5a67e122c3024119acbfd73e3bf664491cb2" -dependencies = [ - "hmac", - "subtle", -] - [[package]] name = "rgb" -version = "0.8.37" +version = "0.8.45" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05aaa8004b64fd573fc9d002f4e632d51ad4f026c2b5ba95fcb6c2f32c2c47d8" +checksum = "ade4539f42266ded9e755c605bdddf546242b2c961b03b06a7375260788a0523" dependencies = [ "bytemuck", ] [[package]] name = "rmp" -version = "0.8.12" +version = "0.8.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f9860a6cc38ed1da53456442089b4dfa35e7cedaa326df63017af88385e6b20" +checksum = "228ed7c16fa39782c3b3468e974aec2795e9089153cd08ee2e9aefb3613334c4" dependencies = [ "byteorder", "num-traits", @@ -4886,9 +4372,9 @@ dependencies = [ [[package]] name = "rmp-serde" -version = "1.1.2" +version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bffea85eea980d8a74453e5d02a8d93028f3c34725de143085a844ebe953258a" +checksum = "52e599a477cf9840e92f2cde9a7189e67b42c57532749bf90aea6ec10facd4db" dependencies = [ "byteorder", "rmp", @@ -4906,30 +4392,10 @@ dependencies = [ "lru", ] -[[package]] -name = "rsa" -version = "0.9.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d0e5124fcb30e76a7e79bfee683a2746db83784b86289f6251b54b7950a0dfc" -dependencies = [ - "const-oid", - "digest", - "num-bigint-dig", - "num-integer", - "num-traits", - "pkcs1", - "pkcs8", - "rand_core", - "signature", - "spki", - "subtle", - "zeroize", -] - [[package]] name = "ruma" -version = "0.9.4" -source = "git+https://github.com/ruma/ruma.git?rev=4c00bd010dbdca6005bd599b52e90a0b7015d056#4c00bd010dbdca6005bd599b52e90a0b7015d056" +version = "0.10.1" +source = "git+https://github.com/matrix-org/ruma.git?rev=4d3d8b46fd519012e4585ccf00dbea1eb602c028#4d3d8b46fd519012e4585ccf00dbea1eb602c028" dependencies = [ "assign", "js_int", @@ -4940,16 +4406,18 @@ dependencies = [ "ruma-federation-api", "ruma-html", "ruma-push-gateway-api", + "web-time", ] [[package]] name = "ruma-client-api" -version = "0.17.4" -source = "git+https://github.com/ruma/ruma.git?rev=4c00bd010dbdca6005bd599b52e90a0b7015d056#4c00bd010dbdca6005bd599b52e90a0b7015d056" +version = "0.18.0" +source = "git+https://github.com/matrix-org/ruma.git?rev=4d3d8b46fd519012e4585ccf00dbea1eb602c028#4d3d8b46fd519012e4585ccf00dbea1eb602c028" dependencies = [ "as_variant", "assign", "bytes", + "date_header", "http", "js_int", "js_option", @@ -4959,20 +4427,23 @@ dependencies = [ "serde", "serde_html_form", "serde_json", + "thiserror", + "url", + "web-time", ] [[package]] name = "ruma-common" -version = "0.12.1" -source = "git+https://github.com/ruma/ruma.git?rev=4c00bd010dbdca6005bd599b52e90a0b7015d056#4c00bd010dbdca6005bd599b52e90a0b7015d056" +version = "0.13.0" +source = "git+https://github.com/matrix-org/ruma.git?rev=4d3d8b46fd519012e4585ccf00dbea1eb602c028#4d3d8b46fd519012e4585ccf00dbea1eb602c028" dependencies = [ "as_variant", - "base64 0.21.7", + "base64", "bytes", "form_urlencoded", "getrandom", "http", - "indexmap 2.2.6", + "indexmap", "js-sys", "js_int", "konst", @@ -4995,15 +4466,15 @@ dependencies = [ [[package]] name = "ruma-events" -version = "0.27.11" -source = "git+https://github.com/ruma/ruma.git?rev=4c00bd010dbdca6005bd599b52e90a0b7015d056#4c00bd010dbdca6005bd599b52e90a0b7015d056" +version = "0.28.1" +source = "git+https://github.com/matrix-org/ruma.git?rev=4d3d8b46fd519012e4585ccf00dbea1eb602c028#4d3d8b46fd519012e4585ccf00dbea1eb602c028" dependencies = [ "as_variant", - "indexmap 2.2.6", + "indexmap", "js_int", "js_option", "percent-encoding", - "pulldown-cmark 0.9.6", + "pulldown-cmark", "regex", "ruma-common", "ruma-html", @@ -5014,13 +4485,14 @@ dependencies = [ "thiserror", "tracing", "url", + "web-time", "wildmatch", ] [[package]] name = "ruma-federation-api" -version = "0.8.0" -source = "git+https://github.com/ruma/ruma.git?rev=4c00bd010dbdca6005bd599b52e90a0b7015d056#4c00bd010dbdca6005bd599b52e90a0b7015d056" +version = "0.9.0" +source = "git+https://github.com/matrix-org/ruma.git?rev=4d3d8b46fd519012e4585ccf00dbea1eb602c028#4d3d8b46fd519012e4585ccf00dbea1eb602c028" dependencies = [ "js_int", "ruma-common", @@ -5031,20 +4503,21 @@ dependencies = [ [[package]] name = "ruma-html" -version = "0.1.0" -source = "git+https://github.com/ruma/ruma.git?rev=4c00bd010dbdca6005bd599b52e90a0b7015d056#4c00bd010dbdca6005bd599b52e90a0b7015d056" +version = "0.2.0" +source = "git+https://github.com/matrix-org/ruma.git?rev=4d3d8b46fd519012e4585ccf00dbea1eb602c028#4d3d8b46fd519012e4585ccf00dbea1eb602c028" dependencies = [ "as_variant", "html5ever", - "phf 0.11.2", + "phf", + "ruma-common", "tracing", "wildmatch", ] [[package]] name = "ruma-identifiers-validation" -version = "0.9.3" -source = "git+https://github.com/ruma/ruma.git?rev=4c00bd010dbdca6005bd599b52e90a0b7015d056#4c00bd010dbdca6005bd599b52e90a0b7015d056" +version = "0.9.5" +source = "git+https://github.com/matrix-org/ruma.git?rev=4d3d8b46fd519012e4585ccf00dbea1eb602c028#4d3d8b46fd519012e4585ccf00dbea1eb602c028" dependencies = [ "js_int", "thiserror", @@ -5052,23 +4525,23 @@ dependencies = [ [[package]] name = "ruma-macros" -version = "0.12.0" -source = "git+https://github.com/ruma/ruma.git?rev=4c00bd010dbdca6005bd599b52e90a0b7015d056#4c00bd010dbdca6005bd599b52e90a0b7015d056" +version = "0.13.0" +source = "git+https://github.com/matrix-org/ruma.git?rev=4d3d8b46fd519012e4585ccf00dbea1eb602c028#4d3d8b46fd519012e4585ccf00dbea1eb602c028" dependencies = [ "once_cell", - "proc-macro-crate 2.0.0", + "proc-macro-crate", "proc-macro2", "quote", "ruma-identifiers-validation", "serde", - "syn 2.0.58", + "syn 2.0.71", "toml", ] [[package]] name = "ruma-push-gateway-api" -version = "0.8.0" -source = "git+https://github.com/ruma/ruma.git?rev=4c00bd010dbdca6005bd599b52e90a0b7015d056#4c00bd010dbdca6005bd599b52e90a0b7015d056" +version = "0.9.0" +source = "git+https://github.com/matrix-org/ruma.git?rev=4d3d8b46fd519012e4585ccf00dbea1eb602c028#4d3d8b46fd519012e4585ccf00dbea1eb602c028" dependencies = [ "js_int", "ruma-common", @@ -5083,7 +4556,7 @@ version = "0.30.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a78046161564f5e7cd9008aff3b2990b3850dc8e0349119b98e8f251e099f24d" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "fallible-iterator", "fallible-streaming-iterator", "hashlink", @@ -5093,9 +4566,9 @@ dependencies = [ [[package]] name = "rustc-demangle" -version = "0.1.23" +version = "0.1.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76" +checksum = "719b953e2095829ee67db738b3bfa9fa368c94900df327b3f07fe6e794d2fe1f" [[package]] name = "rustc-hash" @@ -5114,11 +4587,11 @@ dependencies = [ [[package]] name = "rustix" -version = "0.38.32" +version = "0.38.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "65e04861e65f21776e67888bfbea442b3642beaa0138fdb1dd7a84a52dffdb89" +checksum = "70dc5ec042f7a43c4a73241207cecc9873a06d45debb38b329f8541d85c2730f" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "errno", "libc", "linux-raw-sys", @@ -5127,24 +4600,31 @@ dependencies = [ [[package]] name = "rustls-pemfile" -version = "1.0.4" +version = "2.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1c74cae0a4cf6ccbbf5f359f08efdf8ee7e1dc532573bf0db71968cb56b1448c" +checksum = "29993a25686778eb88d4189742cd713c9bce943bc54251a33509dc63cbacf73d" dependencies = [ - "base64 0.21.7", + "base64", + "rustls-pki-types", ] [[package]] -name = "rustversion" -version = "1.0.15" +name = "rustls-pki-types" +version = "1.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "80af6f9131f277a45a3fba6ce8e2258037bb0477a67e610d3c1fe046ab31de47" +checksum = "976295e77ce332211c0d24d92c0e83e50f5c5f046d11082cea19f3df13a3562d" + +[[package]] +name = "rustversion" +version = "1.0.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "955d28af4278de8121b7ebeb796b6a45735dc01436d898801014aced2773a3d6" [[package]] name = "ryu" -version = "1.0.17" +version = "1.0.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e86697c916019a8588c99b5fac3cead74ec0b4b819707a682fd4d23fa0ce1ba1" +checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f" [[package]] name = "schannel" @@ -5155,53 +4635,12 @@ dependencies = [ "windows-sys 0.52.0", ] -[[package]] -name = "schemars" -version = "0.8.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "45a28f4c49489add4ce10783f7911893516f15afe45d015608d41faca6bc4d29" -dependencies = [ - "chrono", - "dyn-clone", - "indexmap 1.9.3", - "schemars_derive", - "serde", - "serde_json", - "url", -] - -[[package]] -name = "schemars_derive" -version = "0.8.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c767fd6fa65d9ccf9cf026122c1b555f2ef9a4f0cea69da4d7dbc3e258d30967" -dependencies = [ - "proc-macro2", - "quote", - "serde_derive_internals", - "syn 1.0.109", -] - [[package]] name = "scopeguard" version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" -[[package]] -name = "sec1" -version = "0.7.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d3e97a565f76233a6003f9f5c54be1d9c5bdfa3eccfb189469f11ec4901c47dc" -dependencies = [ - "base16ct", - "der", - "generic-array", - "pkcs8", - "subtle", - "zeroize", -] - [[package]] name = "secular" version = "1.0.1" @@ -5213,11 +4652,11 @@ dependencies = [ [[package]] name = "security-framework" -version = "2.10.0" +version = "2.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "770452e37cad93e0a50d5abc3990d2bc351c36d0328f86cefec2f2fb206eaef6" +checksum = "897b2245f0b511c87893af39b033e5ca9cce68824c4d7e7630b5a1d339658d02" dependencies = [ - "bitflags 1.3.2", + "bitflags 2.6.0", "core-foundation", "core-foundation-sys", "libc", @@ -5226,9 +4665,9 @@ dependencies = [ [[package]] name = "security-framework-sys" -version = "2.10.0" +version = "2.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41f3cc463c0ef97e11c3461a9d3787412d30e8e7eb907c79180c4a57bf7c04ef" +checksum = "75da29fe9b9b08fe9d6b22b5b4bcbc75d8db3aa31e639aa56bb62e9d46bfceaf" dependencies = [ "core-foundation-sys", "libc", @@ -5236,15 +4675,15 @@ dependencies = [ [[package]] name = "semver" -version = "1.0.22" +version = "1.0.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "92d43fe69e652f3df9bdc2b85b2854a0825b86e4fb76bc44d945137d053639ca" +checksum = "61697e0a1c7e512e84a621326239844a24d8207b4669b41bc18b32ea5cbf988b" [[package]] name = "serde" -version = "1.0.197" +version = "1.0.204" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fb1c873e1b9b056a4dc4c0c198b24c3ffa059243875552b2bd0933b1aee4ce2" +checksum = "bc76f558e0cbb2a839d37354c575f1dc3fdc6546b5be373ba43d95f231bf7c12" dependencies = [ "serde_derive", ] @@ -5262,33 +4701,22 @@ dependencies = [ [[package]] name = "serde_bytes" -version = "0.11.14" +version = "0.11.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b8497c313fd43ab992087548117643f6fcd935cbf36f176ffda0aacf9591734" +checksum = "387cc504cb06bb40a96c8e04e951fe01854cf6bc921053c954e4a606d9675c6a" dependencies = [ "serde", ] [[package]] name = "serde_derive" -version = "1.0.197" +version = "1.0.204" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7eb0b34b42edc17f6b7cac84a52a1c5f0e1bb2227e997ca9011ea3dd34e8610b" +checksum = "e0cd7e117be63d3c3678776753929474f3b04a43a080c744d6b0ae2a8c28e222" dependencies = [ "proc-macro2", "quote", - "syn 2.0.58", -] - -[[package]] -name = "serde_derive_internals" -version = "0.26.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85bf8229e7920a9f636479437026331ce11aa132b4dde37d121944a44d6e5f3c" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", + "syn 2.0.71", ] [[package]] @@ -5298,7 +4726,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8de514ef58196f1fc96dcaef80fe6170a1ce6215df9687a93fe8300e773fefc5" dependencies = [ "form_urlencoded", - "indexmap 2.2.6", + "indexmap", "itoa", "ryu", "serde", @@ -5306,16 +4734,25 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.115" +version = "1.0.120" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12dc5c46daa8e9fdf4f5e71b6cf9a53f2487da0e86e55808e2d35539666497dd" +checksum = "4e0d21c9a8cae1235ad58a00c11cb40d4b1e5c784f1ef2c537876ed6ffd8b7c5" dependencies = [ - "indexmap 2.2.6", "itoa", "ryu", "serde", ] +[[package]] +name = "serde_path_to_error" +version = "0.1.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "af99884400da37c88f5e9146b7f1fd0fbcae8f6eec4e9da38b67d05486f814a6" +dependencies = [ + "itoa", + "serde", +] + [[package]] name = "serde_repr" version = "0.1.19" @@ -5324,14 +4761,14 @@ checksum = "6c64451ba24fc7a6a2d60fc75dd9c83c90903b19028d4eff35e88fc1e86564e9" dependencies = [ "proc-macro2", "quote", - "syn 2.0.58", + "syn 2.0.71", ] [[package]] name = "serde_spanned" -version = "0.6.5" +version = "0.6.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb3622f419d1296904700073ea6cc23ad690adbd66f13ea683df73298736f0c1" +checksum = "79e674e01f999af37c49f70a6ede167a8a60b2503e56c5599532a65baa5969a0" dependencies = [ "serde", ] @@ -5348,36 +4785,6 @@ dependencies = [ "serde", ] -[[package]] -name = "serde_with" -version = "3.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee80b0e361bbf88fd2f6e242ccd19cfda072cb0faa6ae694ecee08199938569a" -dependencies = [ - "base64 0.21.7", - "chrono", - "hex", - "indexmap 1.9.3", - "indexmap 2.2.6", - "serde", - "serde_derive", - "serde_json", - "serde_with_macros", - "time", -] - -[[package]] -name = "serde_with_macros" -version = "3.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6561dc161a9224638a31d876ccdfefbc1df91d3f3a8342eddb35f055d48c7655" -dependencies = [ - "darling", - "proc-macro2", - "quote", - "syn 2.0.58", -] - [[package]] name = "sha1" version = "0.10.6" @@ -5417,9 +4824,9 @@ checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64" [[package]] name = "signal-hook-registry" -version = "1.4.1" +version = "1.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d8229b473baa5980ac72ef434c4415e70c4b5e71b423043adb4ba059f89c99a1" +checksum = "a9e9e0b4211b72e7b8b6e85c807d36c212bdb33ea8587f7569562a84df5465b1" dependencies = [ "libc", ] @@ -5430,7 +4837,6 @@ version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "77549399552de45a898a580c1b41d445bf730df867cc44e6c0233bbc4b8329de" dependencies = [ - "digest", "rand_core", ] @@ -5472,9 +4878,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67" [[package]] name = "socket2" -version = "0.5.6" +version = "0.5.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05ffd9c0a93b7543e062e759284fcf5f5e3b098501104bfbdde4d404db792871" +checksum = "ce305eb0b4296696835b71df73eb912e0f1ffd2556a501fcede6e0c50349191c" dependencies = [ "libc", "windows-sys 0.52.0", @@ -5482,9 +4888,9 @@ dependencies = [ [[package]] name = "sourceview5" -version = "0.8.0" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f0bf70f2f1ac4624af22056f9c4cf58dccff73dafc7207b46fbd3df7b57410f" +checksum = "905c83b38d4aff1800a12adba65b083deba61b4d948f62fc2ff7ad7d77656d05" dependencies = [ "futures-channel", "futures-core", @@ -5500,9 +4906,9 @@ dependencies = [ [[package]] name = "sourceview5-sys" -version = "0.8.0" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eac236ad7ce6dad2b819ced8b68b5a1cf4d968aa301cb9a7692470eb21f657be" +checksum = "4a3759467713554a8063faa380237ee2c753e89026bbe1b8e9611d991cb106ff" dependencies = [ "gdk-pixbuf-sys", "gdk4-sys", @@ -5512,15 +4918,9 @@ dependencies = [ "gtk4-sys", "libc", "pango-sys", - "system-deps", + "system-deps 7.0.1", ] -[[package]] -name = "spin" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d" - [[package]] name = "spin" version = "0.9.8" @@ -5574,60 +4974,37 @@ dependencies = [ [[package]] name = "strsim" -version = "0.10.0" +version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" - -[[package]] -name = "structmeta" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2e1575d8d40908d70f6fd05537266b90ae71b15dbbe7a8b7dffa2b759306d329" -dependencies = [ - "proc-macro2", - "quote", - "structmeta-derive", - "syn 2.0.58", -] - -[[package]] -name = "structmeta-derive" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "152a0b65a590ff6c3da95cabe2353ee04e6167c896b28e3b14478c2636c922fc" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.58", -] +checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f" [[package]] name = "strum" -version = "0.26.2" +version = "0.26.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d8cec3501a5194c432b2b7976db6b7d10ec95c253208b45f83f7136aa985e29" +checksum = "8fec0f0aef304996cf250b31b5a10dee7980c85da9d759361292b8bca5a18f06" dependencies = [ "strum_macros", ] [[package]] name = "strum_macros" -version = "0.26.2" +version = "0.26.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c6cf59daf282c0a494ba14fd21610a0325f9f90ec9d1231dea26bcb1d696c946" +checksum = "4c6bee85a5a24955dc440386795aa378cd9cf82acd5f764469152d2270e581be" dependencies = [ - "heck 0.4.1", + "heck", "proc-macro2", "quote", "rustversion", - "syn 2.0.58", + "syn 2.0.71", ] [[package]] name = "subtle" -version = "2.5.0" +version = "2.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81cdd64d312baedb58e21336b31bc043b77e01cc99033ce76ef539f78e965ebc" +checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292" [[package]] name = "syn" @@ -5642,9 +5019,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.58" +version = "2.0.71" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44cfb93f38070beee36b3fef7d4f5a16f27751d94b187b666a5cc5e9b0d30687" +checksum = "b146dcf730474b4bcd16c311627b31ede9ab149045db4d6088b3becaea046462" dependencies = [ "proc-macro2", "quote", @@ -5658,25 +5035,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2047c6ded9c721764247e62cd3b03c09ffc529b2ba5b10ec482ae507a4a70160" [[package]] -name = "system-configuration" -version = "0.5.1" +name = "sync_wrapper" +version = "1.0.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", -] +checksum = "a7065abeca94b6a8a577f9bd45aa0867a2238b74e8eb67cf10d492bc39351394" [[package]] name = "system-deps" @@ -5685,7 +5047,20 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a3e535eb8dded36d55ec13eddacd30dec501792ff23a0b1682c38601b8cf2349" dependencies = [ "cfg-expr", - "heck 0.5.0", + "heck", + "pkg-config", + "toml", + "version-compare", +] + +[[package]] +name = "system-deps" +version = "7.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6c81f13d9a334a6c242465140bd262fae382b752ff2011c4f7419919a9c97922" +dependencies = [ + "cfg-expr", + "heck", "pkg-config", "toml", "version-compare", @@ -5693,9 +5068,9 @@ dependencies = [ [[package]] name = "target-lexicon" -version = "0.12.14" +version = "0.12.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e1fc403891a21bcfb7c37834ba66a547a8f402146eba7265b5a6d88059c9ff2f" +checksum = "4873307b7c257eddcb50c9bedf158eb669578359fb28428bef438fec8e6ba7c2" [[package]] name = "temp-dir" @@ -5728,22 +5103,22 @@ dependencies = [ [[package]] name = "thiserror" -version = "1.0.58" +version = "1.0.63" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "03468839009160513471e86a034bb2c5c0e4baae3b43f79ffc55c4a5427b3297" +checksum = "c0342370b38b6a11b6cc11d6a805569958d54cfa061a29969c3b5ce2ea405724" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.58" +version = "1.0.63" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c61f3ba182994efc43764a46c018c347bc492c79f024e705f46567b418f6d4f7" +checksum = "a4558b58466b9ad7ca0f102865eccc95938dca1a74a856f2b57b6629050da261" dependencies = [ "proc-macro2", "quote", - "syn 2.0.58", + "syn 2.0.71", ] [[package]] @@ -5800,9 +5175,9 @@ dependencies = [ [[package]] name = "tinyvec" -version = "1.6.0" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87cc5ceb3875bb20c2890005a4e226a4651264a5c75edb2421b52861a0a0cb50" +checksum = "445e881f4f6d382d5f27c034e25eb92edd7c784ceab92a0937db7f2e9471b938" dependencies = [ "tinyvec_macros", ] @@ -5814,10 +5189,20 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] -name = "tokio" -version = "1.37.0" +name = "tld" +version = "2.35.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1adbebffeca75fcfd058afa480fb6c0b81e165a0323f9c9d39c9697e37c46787" +checksum = "73ca5fc340fcb4f52570c502cf443fc22d5521e9ef2bb03528e3634254016cf7" +dependencies = [ + "phf", + "phf_codegen", +] + +[[package]] +name = "tokio" +version = "1.38.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eb2caba9f80616f438e09748d5acda951967e1ea58508ef53d9c6402485a46df" dependencies = [ "backtrace", "bytes", @@ -5834,13 +5219,13 @@ dependencies = [ [[package]] name = "tokio-macros" -version = "2.2.0" +version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b8a1e28f2deaa14e508979454cb3a223b10b938b45af148bc0986de36f1923b" +checksum = "5f5ae998a069d4b5aba8ee9dad856af7d520c3699e6159b185c2acd48155d39a" dependencies = [ "proc-macro2", "quote", - "syn 2.0.58", + "syn 2.0.71", ] [[package]] @@ -5879,83 +5264,60 @@ dependencies = [ [[package]] name = "tokio-util" -version = "0.7.10" +version = "0.7.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5419f34732d9eb6ee4c3578b7989078579b7f039cbbb9ca2c4da015749371e15" +checksum = "9cf6b47b3771c49ac75ad09a6162f53ad4b8088b76ac60e8ec1455b31a189fe1" dependencies = [ "bytes", "futures-core", "futures-sink", "pin-project-lite", "tokio", - "tracing", ] [[package]] name = "toml" -version = "0.8.12" +version = "0.8.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e9dd1545e8208b4a5af1aa9bbd0b4cf7e9ea08fabc5d0a5c67fcaafa17433aa3" +checksum = "ac2caab0bf757388c6c0ae23b3293fdb463fee59434529014f85e3263b995c28" dependencies = [ "serde", "serde_spanned", "toml_datetime", - "toml_edit 0.22.9", + "toml_edit 0.22.16", ] [[package]] name = "toml_datetime" -version = "0.6.5" +version = "0.6.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3550f4e9685620ac18a50ed434eb3aec30db8ba93b0287467bca5826ea25baf1" +checksum = "4badfd56924ae69bcc9039335b2e017639ce3f9b001c393c1b2d1ef846ce2cbf" dependencies = [ "serde", ] -[[package]] -name = "toml_edit" -version = "0.19.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421" -dependencies = [ - "indexmap 2.2.6", - "toml_datetime", - "winnow 0.5.40", -] - -[[package]] -name = "toml_edit" -version = "0.20.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70f427fce4d84c72b5b732388bf4a9f4531b53f74e2887e3ecb2481f68f66d81" -dependencies = [ - "indexmap 2.2.6", - "toml_datetime", - "winnow 0.5.40", -] - [[package]] name = "toml_edit" version = "0.21.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6a8534fd7f78b5405e860340ad6575217ce99f38d4d5c8f2442cb5ecb50090e1" dependencies = [ - "indexmap 2.2.6", + "indexmap", "toml_datetime", "winnow 0.5.40", ] [[package]] name = "toml_edit" -version = "0.22.9" +version = "0.22.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e40bb779c5187258fd7aad0eb68cb8706a0a81fa712fbea808ab43c4b8374c4" +checksum = "278f3d518e152219c994ce877758516bca5e118eaed6996192a774fb9fbf0788" dependencies = [ - "indexmap 2.2.6", + "indexmap", "serde", "serde_spanned", "toml_datetime", - "winnow 0.6.5", + "winnow 0.6.13", ] [[package]] @@ -5974,24 +5336,6 @@ dependencies = [ "tracing", ] -[[package]] -name = "tower-http" -version = "0.4.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61c5bb1d698276a2443e5ecfabc1008bf15a36c12e6a7176e7bf089ea9131140" -dependencies = [ - "bitflags 2.5.0", - "bytes", - "futures-core", - "futures-util", - "http", - "http-body", - "http-range-header", - "pin-project-lite", - "tower-layer", - "tower-service", -] - [[package]] name = "tower-layer" version = "0.3.2" @@ -6024,7 +5368,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.58", + "syn 2.0.71", ] [[package]] @@ -6048,22 +5392,6 @@ dependencies = [ "tracing-core", ] -[[package]] -name = "tracing-opentelemetry" -version = "0.23.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a9be14ba1bbe4ab79e9229f7f89fab8d120b865859f10527f31c033e599d2284" -dependencies = [ - "js-sys", - "once_cell", - "opentelemetry", - "opentelemetry_sdk", - "tracing", - "tracing-core", - "tracing-subscriber", - "web-time", -] - [[package]] name = "tracing-subscriber" version = "0.3.18" @@ -6122,9 +5450,9 @@ dependencies = [ [[package]] name = "ulid" -version = "1.1.2" +version = "1.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "34778c17965aa2a08913b57e1f34db9b4a63f5de31768b55bf20d2795f921259" +checksum = "04f903f293d11f31c0c29e4148f6dc0d033a7f80cebc0282bea147611667d289" dependencies = [ "getrandom", "rand", @@ -6169,9 +5497,9 @@ checksum = "d4c87d22b6e3f4a18d4d40ef354e97c90fcb14dd91d7dc0aa9d8a1172ebf7202" [[package]] name = "unicode-width" -version = "0.1.11" +version = "0.1.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e51733f11c9c4f72aa0c160008246859e340b00807569a0da0e7a1079b27ba85" +checksum = "0336d538f7abc86d282a4189614dfaa90810dfc2c6f6427eaf88e16311dd225d" [[package]] name = "universal-hash" @@ -6185,9 +5513,9 @@ dependencies = [ [[package]] name = "url" -version = "2.5.0" +version = "2.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31e6302e3bb753d46e83516cae55ae196fc0c309407cf11ab35cc51a4c2a4633" +checksum = "22784dbdf76fdde8af1aeda5622b546b422b6fc585325248a2bf9f5e41e94d6c" dependencies = [ "form_urlencoded", "idna", @@ -6207,12 +5535,6 @@ version = "0.7.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "09cc8ee72d2a9becf2f2febe0205bbed8fc6615b7cb429ad062dc7b7ddd036a9" -[[package]] -name = "utf8-width" -version = "0.1.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86bd8d4e895da8537e5315b8254664e6b769c4ff3db18321b297a1e7004392e3" - [[package]] name = "uuid" version = "1.6.1" @@ -6260,13 +5582,16 @@ checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" [[package]] name = "vodozemac" -version = "0.5.1" -source = "git+https://github.com/matrix-org/vodozemac?rev=0c75746fc8a5eda4a0e490d345d1798b4c6cbd67#0c75746fc8a5eda4a0e490d345d1798b4c6cbd67" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "051d4af70b53b42adf2aac459a305851b8d754f210aaf11ab509e1065beff422" dependencies = [ "aes", "arrayvec", - "base64 0.22.0", + "base64", + "base64ct", "cbc", + "chacha20poly1305", "curve25519-dalek", "ed25519-dalek", "getrandom", @@ -6322,7 +5647,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn 2.0.58", + "syn 2.0.71", "wasm-bindgen-shared", ] @@ -6356,7 +5681,7 @@ checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.58", + "syn 2.0.71", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -6408,9 +5733,9 @@ checksum = "53a85b86a771b1c87058196170769dd264f66c0782acf1ae6cc51bfd64b39082" [[package]] name = "wildmatch" -version = "2.3.3" +version = "2.3.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "939e59c1bc731542357fdaad98b209ef78c8743d652bb61439d16b16a79eb025" +checksum = "3928939971918220fed093266b809d1ee4ec6c1a2d72692ff6876898f3b16c19" [[package]] name = "winapi" @@ -6440,7 +5765,7 @@ version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9" dependencies = [ - "windows-targets 0.52.4", + "windows-targets 0.52.6", ] [[package]] @@ -6458,7 +5783,7 @@ version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" dependencies = [ - "windows-targets 0.52.4", + "windows-targets 0.52.6", ] [[package]] @@ -6478,17 +5803,18 @@ dependencies = [ [[package]] name = "windows-targets" -version = "0.52.4" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7dd37b7e5ab9018759f893a1952c9420d060016fc19a472b4bb20d1bdd694d1b" +checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973" dependencies = [ - "windows_aarch64_gnullvm 0.52.4", - "windows_aarch64_msvc 0.52.4", - "windows_i686_gnu 0.52.4", - "windows_i686_msvc 0.52.4", - "windows_x86_64_gnu 0.52.4", - "windows_x86_64_gnullvm 0.52.4", - "windows_x86_64_msvc 0.52.4", + "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.6", + "windows_x86_64_gnu 0.52.6", + "windows_x86_64_gnullvm 0.52.6", + "windows_x86_64_msvc 0.52.6", ] [[package]] @@ -6499,9 +5825,9 @@ checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" [[package]] name = "windows_aarch64_gnullvm" -version = "0.52.4" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bcf46cf4c365c6f2d1cc93ce535f2c8b244591df96ceee75d8e83deb70a9cac9" +checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3" [[package]] name = "windows_aarch64_msvc" @@ -6511,9 +5837,9 @@ checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" [[package]] name = "windows_aarch64_msvc" -version = "0.52.4" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da9f259dd3bcf6990b55bffd094c4f7235817ba4ceebde8e6d11cd0c5633b675" +checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469" [[package]] name = "windows_i686_gnu" @@ -6523,9 +5849,15 @@ checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" [[package]] name = "windows_i686_gnu" -version = "0.52.4" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b474d8268f99e0995f25b9f095bc7434632601028cf86590aea5c8a5cb7801d3" +checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b" + +[[package]] +name = "windows_i686_gnullvm" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66" [[package]] name = "windows_i686_msvc" @@ -6535,9 +5867,9 @@ checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" [[package]] name = "windows_i686_msvc" -version = "0.52.4" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1515e9a29e5bed743cb4415a9ecf5dfca648ce85ee42e15873c3cd8610ff8e02" +checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66" [[package]] name = "windows_x86_64_gnu" @@ -6547,9 +5879,9 @@ checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" [[package]] name = "windows_x86_64_gnu" -version = "0.52.4" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5eee091590e89cc02ad514ffe3ead9eb6b660aedca2183455434b93546371a03" +checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78" [[package]] name = "windows_x86_64_gnullvm" @@ -6559,9 +5891,9 @@ checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" [[package]] name = "windows_x86_64_gnullvm" -version = "0.52.4" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77ca79f2451b49fa9e2af39f0747fe999fcda4f5e241b2898624dca97a1f2177" +checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d" [[package]] name = "windows_x86_64_msvc" @@ -6571,9 +5903,9 @@ checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" [[package]] name = "windows_x86_64_msvc" -version = "0.52.4" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32b752e52a2da0ddfbdbcc6fceadfeede4c939ed16d13e648833a61dfb611ed8" +checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" [[package]] name = "winnow" @@ -6586,18 +5918,18 @@ dependencies = [ [[package]] name = "winnow" -version = "0.6.5" +version = "0.6.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dffa400e67ed5a4dd237983829e66475f0a4a26938c4b04c21baede6262215b8" +checksum = "59b5e5f6c299a3c7890b876a2a587f3115162487e704907d9b6cd29473052ba1" dependencies = [ "memchr", ] [[package]] name = "winreg" -version = "0.50.0" +version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "524e57b2c537c0f9b1e69f1965311ec12182b4122e45035b1508cd24d2adadb1" +checksum = "a277a57398d4bfa075df44f501a17cfdf8542d224f0d36095a2adc7aee4ef0a5" dependencies = [ "cfg-if", "windows-sys 0.48.0", @@ -6628,24 +5960,19 @@ dependencies = [ [[package]] name = "xdg-home" -version = "1.1.0" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "21e5a325c3cb8398ad6cf859c1135b25dd29e186679cf2da7581d9679f63b38e" +checksum = "ca91dcf8f93db085f3a0a29358cd0b9d670915468f4290e8b85d118a34211ab8" dependencies = [ "libc", - "winapi", + "windows-sys 0.52.0", ] [[package]] -name = "xml5ever" -version = "0.17.0" +name = "xxhash-rust" +version = "0.8.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4034e1d05af98b51ad7214527730626f019682d797ba38b51689212118d8e650" -dependencies = [ - "log", - "mac", - "markup5ever", -] +checksum = "63658493314859b4dfdf3fb8c1defd61587839def09582db50b8a4e93afca6bb" [[package]] name = "yansi-term" @@ -6658,22 +5985,21 @@ dependencies = [ [[package]] name = "zbus" -version = "4.1.2" +version = "4.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c9ff46f2a25abd690ed072054733e0bc3157e3d4c45f41bd183dce09c2ff8ab9" +checksum = "851238c133804e0aa888edf4a0229481c753544ca12a60fd1c3230c8a500fe40" dependencies = [ "async-broadcast", "async-process", "async-recursion", "async-trait", - "derivative", "enumflags2", - "event-listener 5.3.0", + "event-listener", "futures-core", "futures-sink", "futures-util", "hex", - "nix 0.28.0", + "nix 0.29.0", "ordered-stream", "rand", "serde", @@ -6692,15 +6018,14 @@ dependencies = [ [[package]] name = "zbus_macros" -version = "4.1.2" +version = "4.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e0e3852c93dcdb49c9462afe67a2a468f7bd464150d866e861eaf06208633e0" +checksum = "8d5a3f12c20bd473be3194af6b49d50d7bb804ef3192dc70eddedb26b85d9da7" dependencies = [ - "proc-macro-crate 3.1.0", + "proc-macro-crate", "proc-macro2", "quote", - "regex", - "syn 1.0.109", + "syn 2.0.71", "zvariant_utils", ] @@ -6717,29 +6042,29 @@ dependencies = [ [[package]] name = "zerocopy" -version = "0.7.32" +version = "0.7.35" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "74d4d3961e53fa4c9a25a8637fc2bfaf2595b3d3ae34875568a5cf64787716be" +checksum = "1b9b4fd18abc82b8136838da5d50bae7bdea537c574d8dc1a34ed098d6c166f0" dependencies = [ "zerocopy-derive", ] [[package]] name = "zerocopy-derive" -version = "0.7.32" +version = "0.7.35" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ce1b18ccd8e73a9321186f97e46f9f04b778851177567b1975109d26a08d2a6" +checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e" dependencies = [ "proc-macro2", "quote", - "syn 2.0.58", + "syn 2.0.71", ] [[package]] name = "zeroize" -version = "1.7.0" +version = "1.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "525b4ec142c6b68a2d10f01f7bbf6755599ca3f81ea53b8431b7dd348f5fdb2d" +checksum = "ced3678a2879b30306d323f4542626697a464a97c0a07c9aebf7ebca65cd4dde" dependencies = [ "zeroize_derive", ] @@ -6752,7 +6077,7 @@ checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69" dependencies = [ "proc-macro2", "quote", - "syn 2.0.58", + "syn 2.0.71", ] [[package]] @@ -6781,9 +6106,9 @@ dependencies = [ [[package]] name = "zvariant" -version = "4.0.2" +version = "4.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c1b3ca6db667bfada0f1ebfc94b2b1759ba25472ee5373d4551bb892616389a" +checksum = "1724a2b330760dc7d2a8402d841119dc869ef120b139d29862d6980e9c75bfc9" dependencies = [ "endi", "enumflags2", @@ -6795,24 +6120,24 @@ dependencies = [ [[package]] name = "zvariant_derive" -version = "4.0.2" +version = "4.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b7a4b236063316163b69039f77ce3117accb41a09567fd24c168e43491e521bc" +checksum = "55025a7a518ad14518fb243559c058a2e5b848b015e31f1d90414f36e3317859" dependencies = [ - "proc-macro-crate 3.1.0", + "proc-macro-crate", "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.71", "zvariant_utils", ] [[package]] name = "zvariant_utils" -version = "1.1.0" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "00bedb16a193cc12451873fee2a1bc6550225acece0e36f333e68326c73c8172" +checksum = "fc242db087efc22bd9ade7aa7809e4ba828132edc312871584a6b4391bdf8786" dependencies = [ "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.71", ] diff --git a/pkgs/applications/networking/instant-messengers/fractal/default.nix b/pkgs/applications/networking/instant-messengers/fractal/default.nix index 56593cc315cb..887a5cc17241 100644 --- a/pkgs/applications/networking/instant-messengers/fractal/default.nix +++ b/pkgs/applications/networking/instant-messengers/fractal/default.nix @@ -25,23 +25,21 @@ stdenv.mkDerivation rec { pname = "fractal"; - version = "7"; + version = "8"; src = fetchFromGitLab { domain = "gitlab.gnome.org"; owner = "World"; repo = "fractal"; rev = "refs/tags/${version}"; - hash = "sha256-IfcThpsGATMD3Uj9tvw/aK7IVbiVT8sdZ088gRUqnlg="; + hash = "sha256-a77+lPH2eqWTLFrYfcBXSvbyyYC52zSo+Rh/diqKYx4="; }; cargoDeps = rustPlatform.importCargoLock { lockFile = ./Cargo.lock; outputHashes = { - "mas-http-0.8.0" = "sha256-IiYxF9qT/J/n8t/cVT/DRV3gl2MTA6/YfjshVIic/n4="; - "matrix-sdk-0.7.1" = "sha256-quwt9Dx0K6LDMwHBipc52Ek59zz5mlTAdOj+RXZBU3Q="; - "ruma-0.9.4" = "sha256-tp0EFS39UTXZJQPUDjeQixb8wzsMCzyFggVj6M8TRYg="; - "vodozemac-0.5.1" = "sha256-Hm0C696RmNX6n1Jx+hqkKMjpdbArliuzdiS4wCv3OIM="; + "matrix-sdk-0.7.1" = "sha256-ZlkxGXGrmZ8VQV7UY7A7BBfcqFCAB9Ep7l65irx4Dy8="; + "ruma-0.10.1" = "sha256-C/GJ0hDWJ9/grfjMuPSatJq2SrVkV0jxQlAAASkUWqg="; }; }; From 4ec746337634ceebbaa0a35372dc2227412be55a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 2 Aug 2024 13:02:50 +0000 Subject: [PATCH 11/43] carapace: 1.0.4 -> 1.0.5 --- pkgs/shells/carapace/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/shells/carapace/default.nix b/pkgs/shells/carapace/default.nix index 37b3d67559c9..65df6529242b 100644 --- a/pkgs/shells/carapace/default.nix +++ b/pkgs/shells/carapace/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "carapace"; - version = "1.0.4"; + version = "1.0.5"; src = fetchFromGitHub { owner = "rsteube"; repo = "${pname}-bin"; rev = "v${version}"; - hash = "sha256-ht0zeeePU2fPMP7/Q0K2VKUudVCa4T94sESJCxix04M="; + hash = "sha256-PDxYRFf7nQfPb6uazwRmZOvCy3xMF5OqHDLy7hsFSBE="; }; - vendorHash = "sha256-XDX59HFf0yMEy9D5nQLZk1LeKrBcgC8M5kUyGiy29Ak="; + vendorHash = "sha256-GnwOyIKJ1K8+0a+VrXcohclgxnQTezu4S0C2cJO+ULU="; ldflags = [ "-s" From 81343957e651c19f5199f3c032a4b67bee92e973 Mon Sep 17 00:00:00 2001 From: DCsunset Date: Thu, 1 Aug 2024 18:51:23 -0400 Subject: [PATCH 12/43] step-cli: install shell completion --- pkgs/by-name/st/step-cli/package.nix | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/pkgs/by-name/st/step-cli/package.nix b/pkgs/by-name/st/step-cli/package.nix index ce3793463590..e901cf614f09 100644 --- a/pkgs/by-name/st/step-cli/package.nix +++ b/pkgs/by-name/st/step-cli/package.nix @@ -1,7 +1,9 @@ { lib, + stdenv, buildGoModule, fetchFromGitHub, + installShellFiles, }: let version = "0.27.2"; @@ -30,6 +32,15 @@ buildGoModule { vendorHash = "sha256-GD9TAvWqE3nvgVpoy/4CkkdVxliNMy+GNBXJtGSNVqo="; + nativeBuildInputs = [ installShellFiles ]; + + postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' + installShellCompletion --cmd step \ + --bash <($out/bin/step completion bash) \ + --zsh <($out/bin/step completion zsh) \ + --fish <($out/bin/step completion fish) + ''; + meta = { description = "Zero trust swiss army knife for working with X509, OAuth, JWT, OATH OTP, etc"; homepage = "https://smallstep.com/cli/"; From b506b66affa57a87bde86f3aa8a5508c6958b428 Mon Sep 17 00:00:00 2001 From: DCsunset Date: Fri, 2 Aug 2024 18:02:28 -0400 Subject: [PATCH 13/43] step-cli: update .git-blame-ignore-revs --- .git-blame-ignore-revs | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs index d83dc1efe44f..fe5ae020247b 100644 --- a/.git-blame-ignore-revs +++ b/.git-blame-ignore-revs @@ -156,3 +156,6 @@ bdfde18037f8d9f9b641a4016c8ada4dc4cbf856 # nixos/nvidia: apply nixfmt-rfc-style (#313440) fbdcdde04a7caa007e825a8b822c75fab9adb2d6 + +# step-cli: format package.nix with nixfmt (#331629) +fc7a83f8b62e90de5679e993d4d49ca014ea013d From 4b111056cf46e08c76f329a3c9716b83dfefaa25 Mon Sep 17 00:00:00 2001 From: Tristan Ross Date: Fri, 2 Aug 2024 18:22:41 -0700 Subject: [PATCH 14/43] pkgs/top-level/aliases.nix: move llvmPackages_git back in --- pkgs/top-level/aliases.nix | 2 ++ pkgs/top-level/all-packages.nix | 5 +---- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index a0b4ad43fbe1..4fb40e6104d6 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -874,6 +874,8 @@ mapAliases ({ linuxPackages_testing_bcachefs = throw "'linuxPackages_testing_bcachefs' has been removed, please use 'linuxPackages_latest', any kernel version at least 6.7, or any other linux kernel with bcachefs support"; linux_testing_bcachefs = throw "'linux_testing_bcachefs' has been removed, please use 'linux_latest', any kernel version at least 6.7, or any other linux kernel with bcachefs support"; + llvmPackages_git = (recurseIntoAttrs (callPackages ../development/compilers/llvm { })).git; + lld_6 = throw "lld_6 has been removed from nixpkgs"; # Added 2024-01-08 lld_7 = throw "lld_7 has been removed from nixpkgs"; # Added 2023-11-19 lld_8 = throw "lld_8 has been removed from nixpkgs"; # Added 2024-01-24 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 553bb6794a9d..295b3e6edfb7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15973,8 +15973,6 @@ with pkgs; lldb_19 = llvmPackages_19.lldb; llvm_19 = llvmPackages_19.llvm; bolt_19 = llvmPackages_19.bolt; - - llvmPackages_git = llvmPackagesSet.git; }) llvmPackages_13 llvmPackages_14 llvmPackages_15 @@ -15990,8 +15988,7 @@ with pkgs; lld_19 lldb_19 llvm_19 - bolt_19 - llvmPackages_git; + bolt_19; lorri = callPackage ../tools/misc/lorri { inherit (darwin.apple_sdk.frameworks) CoreServices Security; From 01890a284a0902246e00f3bfda54715e0a8e6981 Mon Sep 17 00:00:00 2001 From: Riley Bruins Date: Fri, 2 Aug 2024 18:27:52 -0700 Subject: [PATCH 15/43] lua-language-server: 3.9.3 -> 3.10.1 --- .../tools/language-servers/lua-language-server/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/language-servers/lua-language-server/default.nix b/pkgs/development/tools/language-servers/lua-language-server/default.nix index 8bdcd20cdb53..56d01b585bf3 100644 --- a/pkgs/development/tools/language-servers/lua-language-server/default.nix +++ b/pkgs/development/tools/language-servers/lua-language-server/default.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "lua-language-server"; - version = "3.9.3"; + version = "3.10.1"; src = fetchFromGitHub { owner = "luals"; repo = "lua-language-server"; rev = finalAttrs.version; - hash = "sha256-o3NRiJF9Cl420TYOZXC3JplKW5MYo/6nc0XPdukaly4="; + hash = "sha256-05b/NUpM6LASihZuMEduMCvh6ss44yHcA20gOQDMPAQ="; fetchSubmodules = true; }; From 6f13ea465a2496f4139b61263e97bbe1977b6bbc Mon Sep 17 00:00:00 2001 From: techknowlogick Date: Sat, 3 Aug 2024 00:22:18 -0400 Subject: [PATCH 16/43] railway: 3.11.1 -> 3.11.2 Diff: https://github.com/railwayapp/cli/compare/v3.11.1...v3.11.2 Changelog: https://github.com/railwayapp/cli/releases/tag/v3.11.2 --- pkgs/development/tools/railway/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/railway/default.nix b/pkgs/development/tools/railway/default.nix index afa5b0d9630b..45527ab0c899 100644 --- a/pkgs/development/tools/railway/default.nix +++ b/pkgs/development/tools/railway/default.nix @@ -3,16 +3,16 @@ rustPlatform.buildRustPackage rec { pname = "railway"; - version = "3.11.1"; + version = "3.11.2"; src = fetchFromGitHub { owner = "railwayapp"; repo = "cli"; rev = "v${version}"; - hash = "sha256-96CfSRe6Myzk03xn+d8+d5i37g4FTYryaC+Bfn9qfL0="; + hash = "sha256-uYe/8FwiMFwxpKF3wz+EOz7OUjYV37RUG7kf1ZCZX1c="; }; - cargoHash = "sha256-EmmOI0jfd+IUFl7cU1nLkHX99u9XpaWBKy9TcEtMzYM="; + cargoHash = "sha256-3CjKI3lIIa2H8F9Kc34NZr0D99D0aypFNwh+YPN/EZQ="; nativeBuildInputs = [ pkg-config ]; From b3ddca49aa745add8a1529291e2113f57e3f80be Mon Sep 17 00:00:00 2001 From: techknowlogick Date: Sat, 3 Aug 2024 00:27:18 -0400 Subject: [PATCH 17/43] railway: nixfmt --- pkgs/development/tools/railway/default.nix | 27 ++++++++++++++++++---- 1 file changed, 22 insertions(+), 5 deletions(-) diff --git a/pkgs/development/tools/railway/default.nix b/pkgs/development/tools/railway/default.nix index 45527ab0c899..a7bf54716aaa 100644 --- a/pkgs/development/tools/railway/default.nix +++ b/pkgs/development/tools/railway/default.nix @@ -1,5 +1,14 @@ -{ lib, rustPlatform, fetchFromGitHub, pkg-config, openssl, stdenv, CoreServices -, Security, SystemConfiguration }: +{ + lib, + rustPlatform, + fetchFromGitHub, + pkg-config, + openssl, + stdenv, + CoreServices, + Security, + SystemConfiguration, +}: rustPlatform.buildRustPackage rec { pname = "railway"; @@ -16,8 +25,13 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ pkg-config ]; - buildInputs = [ openssl ] - ++ lib.optionals stdenv.isDarwin [ CoreServices Security SystemConfiguration ]; + buildInputs = + [ openssl ] + ++ lib.optionals stdenv.isDarwin [ + CoreServices + Security + SystemConfiguration + ]; OPENSSL_NO_VENDOR = 1; @@ -27,6 +41,9 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/railwayapp/cli"; changelog = "https://github.com/railwayapp/cli/releases/tag/v${version}"; license = licenses.mit; - maintainers = with maintainers; [ Crafter techknowlogick ]; + maintainers = with maintainers; [ + Crafter + techknowlogick + ]; }; } From 9246489a8af4a093f60460ce0e07e63072edcdfd Mon Sep 17 00:00:00 2001 From: techknowlogick Date: Sat, 3 Aug 2024 00:29:12 -0400 Subject: [PATCH 18/43] railway: move to pkgs/by-name --- .../default.nix => by-name/ra/railway/package.nix} | 8 ++++---- pkgs/top-level/all-packages.nix | 4 ---- 2 files changed, 4 insertions(+), 8 deletions(-) rename pkgs/{development/tools/railway/default.nix => by-name/ra/railway/package.nix} (90%) diff --git a/pkgs/development/tools/railway/default.nix b/pkgs/by-name/ra/railway/package.nix similarity index 90% rename from pkgs/development/tools/railway/default.nix rename to pkgs/by-name/ra/railway/package.nix index a7bf54716aaa..5656ed8457ae 100644 --- a/pkgs/development/tools/railway/default.nix +++ b/pkgs/by-name/ra/railway/package.nix @@ -1,15 +1,15 @@ { lib, + darwin, rustPlatform, fetchFromGitHub, pkg-config, openssl, stdenv, - CoreServices, - Security, - SystemConfiguration, }: - +let + inherit (darwin.apple_sdk.frameworks) CoreServices Security SystemConfiguration; +in rustPlatform.buildRustPackage rec { pname = "railway"; version = "3.11.2"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 553bb6794a9d..c495cf3f1d2b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12045,10 +12045,6 @@ with pkgs; raider = callPackage ../applications/misc/raider { }; - railway = callPackage ../development/tools/railway { - inherit (darwin.apple_sdk.frameworks) CoreServices Security SystemConfiguration; - }; - quota = if stdenv.isLinux then linuxquota else unixtools.quota; qvge = libsForQt5.callPackage ../applications/graphics/qvge { }; From 6b618f7371f11d30a22d13000a4667e90280337f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 3 Aug 2024 06:15:10 +0000 Subject: [PATCH 19/43] remnote: 1.16.72 -> 1.16.93 --- pkgs/by-name/re/remnote/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/re/remnote/package.nix b/pkgs/by-name/re/remnote/package.nix index b0a3fc50d88b..48c0dc688471 100644 --- a/pkgs/by-name/re/remnote/package.nix +++ b/pkgs/by-name/re/remnote/package.nix @@ -6,10 +6,10 @@ }: let pname = "remnote"; - version = "1.16.72"; + version = "1.16.93"; src = fetchurl { url = "https://download2.remnote.io/remnote-desktop2/RemNote-${version}.AppImage"; - hash = "sha256-BoKxQ8ngfShm7tC+ojgIR8krq82gJOdbGy8/K7yDRLM="; + hash = "sha256-2TyOEzB21RE/Ymz7LSyI5bnbiVXGos6vngbiphTEDSw="; }; appimageContents = appimageTools.extractType2 { inherit pname version src; }; in From 3ad3b5c925fa7e9d33692daeb1cc290c6036f118 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 3 Aug 2024 09:20:43 +0000 Subject: [PATCH 20/43] fluent-bit: 3.1.3 -> 3.1.4 --- pkgs/by-name/fl/fluent-bit/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/fl/fluent-bit/package.nix b/pkgs/by-name/fl/fluent-bit/package.nix index cc0370de6858..d640a7da023f 100644 --- a/pkgs/by-name/fl/fluent-bit/package.nix +++ b/pkgs/by-name/fl/fluent-bit/package.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "fluent-bit"; - version = "3.1.3"; + version = "3.1.4"; src = fetchFromGitHub { owner = "fluent"; repo = "fluent-bit"; rev = "v${finalAttrs.version}"; - hash = "sha256-bRgRpCnMt20JEuKqW5VetW8HyMgjNuqEgoeBG7sm++Y="; + hash = "sha256-TXFVvnjEitEFwQAuqNCgV0xbABcDxGS9KfCUenKN448="; }; # optional only to avoid linux rebuild From 30d807f937f5943db8d04b98960060f5981a2fc1 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 3 Aug 2024 13:31:02 +0000 Subject: [PATCH 21/43] rqlite: 8.26.7 -> 8.26.8 --- pkgs/servers/sql/rqlite/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/sql/rqlite/default.nix b/pkgs/servers/sql/rqlite/default.nix index f3c1d76da55e..af4e21103379 100644 --- a/pkgs/servers/sql/rqlite/default.nix +++ b/pkgs/servers/sql/rqlite/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "rqlite"; - version = "8.26.7"; + version = "8.26.8"; src = fetchFromGitHub { owner = "rqlite"; repo = pname; rev = "v${version}"; - sha256 = "sha256-LiYPubQF5eGJwSDzy+0zhO6YeMNhti0CoOg7+rR1DOU="; + sha256 = "sha256-1mwrI3OAhkk7VSNxy47g5xt5PcWiHUCSjFw9UtDeqTM="; }; vendorHash = "sha256-Hxo5pFz8IGvHoB5N2S6VOWVu4U/Fwit1x1WpbckKCeU="; From 91107bd5ef5a04b5625768e9edfaa20d3098f856 Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Sat, 3 Aug 2024 10:28:47 -0400 Subject: [PATCH 22/43] neatvnc: 0.8.0 -> 0.8.1 Diff: https://github.com/any1/neatvnc/compare/v0.8.0...v0.8.1 Changelog: https://github.com/any1/neatvnc/releases/tag/v0.8.1 --- pkgs/development/libraries/neatvnc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/neatvnc/default.nix b/pkgs/development/libraries/neatvnc/default.nix index d8b439847ad4..dbed519662fe 100644 --- a/pkgs/development/libraries/neatvnc/default.nix +++ b/pkgs/development/libraries/neatvnc/default.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation rec { pname = "neatvnc"; - version = "0.8.0"; + version = "0.8.1"; src = fetchFromGitHub { owner = "any1"; repo = pname; rev = "v${version}"; - hash = "sha256-BArEaQa+CNGzIoENsZSj9seFx9qdCLWiejh6EvpTch8="; + hash = "sha256-2gPDcFcu1kGIDubguL38Z0K+k7WGFf7DX8yZteedcNg="; }; strictDeps = true; From 9775520308ebc5fe9b7dccfe28049ac046e9dc8a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 3 Aug 2024 14:31:16 +0000 Subject: [PATCH 23/43] helm-ls: 0.0.19 -> 0.0.20 --- 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 55ab439118e1..0a671ed2bac8 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.19"; + version = "0.0.20"; src = fetchFromGitHub { owner = "mrjosh"; repo = "helm-ls"; rev = "v${version}"; - hash = "sha256-mG3H7XvvXtckMjCSWkj1DqoJTUwVVQU02IQj7za1USw="; + hash = "sha256-E2I4gEcJQ1NJqpN5rJGyFuj/KfjJC4bG/5Ei9gjIKCY="; }; vendorHash = "sha256-jGC8JNlorw0FSc0HhFdUVZJDCNaX4PWPaFKRklufIsQ="; From 95a8a2436cbfcea5103a16974186978b9c263bb5 Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Sat, 3 Aug 2024 10:31:52 -0400 Subject: [PATCH 24/43] weston: raise neatvnc version bound to < 0.9.0 --- pkgs/applications/window-managers/weston/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/window-managers/weston/default.nix b/pkgs/applications/window-managers/weston/default.nix index c67b760e4df3..e9f8f245dfa7 100644 --- a/pkgs/applications/window-managers/weston/default.nix +++ b/pkgs/applications/window-managers/weston/default.nix @@ -27,10 +27,10 @@ stdenv.mkDerivation rec { }; postPatch = '' - # raise neatvnc version bound to 0.8.0 + # raise neatvnc version bound to < 0.9.0 # https://gitlab.freedesktop.org/wayland/weston/-/issues/890 substituteInPlace libweston/backend-vnc/meson.build \ - --replace-fail "'neatvnc', version: ['>= 0.7.0', '< 0.8.0']" "'neatvnc', version: ['>= 0.7.0', '<= 0.8.0']" + --replace-fail "'neatvnc', version: ['>= 0.7.0', '< 0.8.0']" "'neatvnc', version: ['>= 0.7.0', '< 0.9.0']" ''; depsBuildBuild = [ pkg-config ]; From 5d0bff94ca75188ad609506db5bd5ba599b2ba4a Mon Sep 17 00:00:00 2001 From: emilylange Date: Sat, 3 Aug 2024 16:38:03 +0200 Subject: [PATCH 25/43] laurel: fix compiling on aarch64-linux This solves the following build error: ~~~ error: linker `aarch64-linux-gnu-gcc` not found | = note: No such file or directory (os error 2) ~~~ Which happens on aarch64-linux and armv7-linux because upstream redirects the linker for that platform in https://github.com/threathunters-io/laurel/blob/v0.6.3/.cargo/config.toml Since there is nothing else besides linker redirects in there, we simply delete the whole file. --- pkgs/servers/monitoring/laurel/default.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/servers/monitoring/laurel/default.nix b/pkgs/servers/monitoring/laurel/default.nix index 56bbfc09cb52..54d38a52c616 100644 --- a/pkgs/servers/monitoring/laurel/default.nix +++ b/pkgs/servers/monitoring/laurel/default.nix @@ -17,6 +17,13 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-uQs+BUBWdbSoE3UqrSjqImVm5uwYf7XiTFtGG1BcFZI="; + postPatch = '' + # Upstream started to redirect aarch64-unknown-linux-gnu to aarch64-linux-gnu-gcc + # for their CI which breaks compiling on aarch64 in nixpkgs: + # error: linker `aarch64-linux-gnu-gcc` not found + rm .cargo/config.toml + ''; + nativeBuildInputs = [ rustPlatform.bindgenHook ]; buildInputs = [ acl ]; From 63d05d989e73c5a59bb1c4fd3b32e5e40136528d Mon Sep 17 00:00:00 2001 From: Sigmanificient Date: Thu, 1 Aug 2024 01:59:21 +0200 Subject: [PATCH 26/43] pkgs/development: remove unused arguments --- .../ada-modules/gnatcoll/bindings.nix | 1 - .../development/ada-modules/gnatcoll/core.nix | 1 - pkgs/development/ada-modules/gnatcoll/db.nix | 1 - .../beam-modules/elvis-erlang/default.nix | 2 +- .../beam-modules/erlang-ls/default.nix | 2 +- pkgs/development/compilers/clasp/default.nix | 1 - pkgs/development/compilers/dotnet/stage0.nix | 1 - pkgs/development/compilers/dotnet/vmr.nix | 2 - pkgs/development/compilers/gambit/build.nix | 3 +- pkgs/development/compilers/gerbil/build.nix | 2 +- pkgs/development/compilers/gerbil/default.nix | 2 +- .../compilers/gerbil/gerbil-leveldb.nix | 2 +- .../compilers/gerbil/gerbil-libxml.nix | 2 +- .../compilers/gerbil/gerbil-libyaml.nix | 2 +- .../compilers/gerbil/gerbil-lmdb.nix | 2 +- .../compilers/gerbil/gerbil-mysql.nix | 2 +- .../development/compilers/gerbil/unstable.nix | 2 +- .../compilers/ghcjs/8.10/default.nix | 1 - pkgs/development/compilers/gmqcc/default.nix | 1 - .../compilers/gnu-cobol/default.nix | 1 - pkgs/development/compilers/go/binary.nix | 2 +- .../compilers/jetbrains-jdk/jcef.nix | 1 - pkgs/development/compilers/koka/default.nix | 1 - .../compilers/lingua-franca/default.nix | 2 +- .../compilers/llvm/common/libcxx/default.nix | 1 - .../compilers/llvm/common/openmp/default.nix | 1 - .../compilers/mrustc/bootstrap.nix | 1 - pkgs/development/compilers/rust/cargo.nix | 2 +- pkgs/development/compilers/rust/clippy.nix | 2 +- pkgs/development/compilers/terra/default.nix | 2 +- pkgs/development/compilers/tinygo/default.nix | 1 - .../coq-modules/compcert/default.nix | 2 +- .../coq-modules/coqprime/default.nix | 2 +- .../development/coq-modules/flocq/default.nix | 3 +- .../coq-modules/gappalib/default.nix | 2 +- .../development/coq-modules/ltac2/default.nix | 2 +- .../coq-modules/mathcomp/default.nix | 2 +- .../coq-modules/metacoq/default.nix | 4 +- .../coq-modules/smtcoq/default.nix | 2 +- .../coq-modules/topology/default.nix | 2 +- .../vscoq-language-server/default.nix | 2 +- .../generic-builders/manifest.nix | 1 - pkgs/development/embedded/bossa/arduino.nix | 2 +- .../gnuradio-modules/limesdr/default.nix | 1 - .../haskell-modules/package-list.nix | 2 +- .../interpreters/cling/default.nix | 1 - .../interpreters/octave/build-env.nix | 1 - .../interpreters/yex-lang/default.nix | 1 - pkgs/development/libraries/blst/default.nix | 2 +- pkgs/development/libraries/cegui/default.nix | 1 - pkgs/development/libraries/codec2/default.nix | 1 - .../libraries/dbus/make-dbus-conf.nix | 1 - .../development/libraries/doctest/default.nix | 2 +- pkgs/development/libraries/elpa/default.nix | 2 +- pkgs/development/libraries/folly/default.nix | 1 - .../libraries/gfbgraph/default.nix | 1 - pkgs/development/libraries/glib/default.nix | 2 +- .../gobject-introspection/default.nix | 1 - .../libraries/grilo-plugins/default.nix | 1 - pkgs/development/libraries/gtk/3.x.nix | 1 - pkgs/development/libraries/gtk/4.x.nix | 1 - pkgs/development/libraries/gtkd/default.nix | 2 +- pkgs/development/libraries/gvfs/default.nix | 1 - pkgs/development/libraries/hamlib/default.nix | 1 - pkgs/development/libraries/hpx/default.nix | 1 - pkgs/development/libraries/irrlicht/mac.nix | 2 +- .../kde-frameworks/kcalendarcore.nix | 1 - .../libraries/kde-frameworks/ki18n.nix | 2 +- .../libraries/kde-frameworks/kquickcharts.nix | 2 +- .../libraries/kerberos/heimdal.nix | 1 - .../development/libraries/lensfun/default.nix | 2 +- .../development/libraries/libagar/default.nix | 2 +- .../libraries/libdatachannel/default.nix | 1 - .../libraries/libdatrie/default.nix | 2 +- .../development/libraries/libdwarf/common.nix | 2 +- .../libraries/libfprint/default.nix | 1 - .../development/libraries/libgpod/default.nix | 1 - pkgs/development/libraries/libmx/default.nix | 2 +- pkgs/development/libraries/libpsl/default.nix | 1 - .../libraries/libsixel/default.nix | 1 - .../development/libraries/libthai/default.nix | 2 +- .../libraries/libusbgx/default.nix | 2 +- .../development/libraries/libvirt/default.nix | 1 - .../development/libraries/libwebp/default.nix | 1 - .../libraries/lpcnetfreedv/default.nix | 2 +- pkgs/development/libraries/lrdf/default.nix | 3 +- pkgs/development/libraries/lyra/default.nix | 2 +- .../libraries/maui-core/default.nix | 1 - .../libraries/mediastreamer/msopenh264.nix | 4 +- .../development/libraries/neardal/default.nix | 2 +- .../development/libraries/ocl-icd/default.nix | 1 - .../libraries/opencl-clang/default.nix | 1 - .../libraries/openjpeg/default.nix | 2 +- .../development/libraries/openmpi/default.nix | 2 +- .../libraries/openzwave/default.nix | 2 +- .../libraries/qgnomeplatform/default.nix | 1 - .../libraries/qt-6/modules/qtbase.nix | 4 -- .../libraries/qtfeedback/default.nix | 1 - .../libraries/retro-gtk/default.nix | 1 - .../libraries/rnnoise-plugin/default.nix | 2 - .../libraries/rustls-ffi/default.nix | 52 +++++++++++++++++++ .../libraries/safefile/default.nix | 2 +- .../chemistry/avogadrolibs/default.nix | 2 +- .../science/chemistry/simple-dftd3/python.nix | 2 - .../science/math/tensorflow-lite/default.nix | 1 - .../libraries/swiftshader/default.nix | 2 +- .../libraries/sycl-info/default.nix | 1 - .../libraries/usbredir/default.nix | 1 - pkgs/development/libraries/v8/default.nix | 2 +- .../libraries/vapoursynth/default.nix | 2 +- .../libraries/volume-key/default.nix | 1 - .../libraries/wxwidgets/wxGTK32.nix | 1 - .../development/libraries/xtensor/default.nix | 1 - pkgs/development/libraries/xtl/default.nix | 1 - pkgs/development/lua-modules/nfd/default.nix | 2 +- pkgs/development/misc/or1k/newlib.nix | 2 +- pkgs/development/misc/resholve/default.nix | 1 - .../mobile/androidenv/cmdline-tools.nix | 2 +- .../development/mobile/androidenv/patcher.nix | 2 +- .../ocaml-modules/ounit2/default.nix | 2 +- .../octave-modules/financial/default.nix | 2 - .../octave-modules/level-set/default.nix | 1 - .../php-packages/couchbase/default.nix | 2 - .../python-modules/cocotb/default.nix | 1 - .../python-modules/httpie/default.nix | 1 - .../python-modules/levenshtein/default.nix | 1 - .../python-modules/pillow/generic.nix | 1 - .../pytest-cov-stub/default.nix | 1 - .../python-modules/typer/default.nix | 1 - .../python2-modules/attrs/default.nix | 1 - .../rocm-modules/5/llvm/stage-3/mlir.nix | 1 - .../rocm-modules/5/rocblas/default.nix | 1 - .../rocm-modules/6/llvm/stage-3/mlir.nix | 1 - .../rocm-modules/6/rocblas/default.nix | 1 - .../ruby-modules/rbenv/default.nix | 2 +- .../sdnotify-wrapper/default.nix | 2 +- .../tools/analysis/hopper/default.nix | 1 - pkgs/development/tools/ashpd-demo/default.nix | 3 -- .../azure-functions-core-tools/default.nix | 1 - .../build-managers/bazel/bazel_5/default.nix | 6 +-- .../build-managers/bazel/bazel_6/default.nix | 4 +- pkgs/development/tools/cocogitto/default.nix | 2 +- .../tools/dbus-test-runner/default.nix | 1 - .../tools/haskell/ihaskell/wrapper.nix | 2 +- pkgs/development/tools/hover/default.nix | 1 - .../tools/java/visualvm/default.nix | 2 +- pkgs/development/tools/ldid/default.nix | 1 - .../tools/mblock-mlink/default.nix | 2 +- .../tools/misc/binutils/default.nix | 1 - pkgs/development/tools/misc/cvise/default.nix | 1 - .../development/tools/misc/hydra/unstable.nix | 1 - .../tools/misc/jscoverage/default.nix | 2 +- pkgs/development/tools/misc/ptags/default.nix | 1 - pkgs/development/tools/nap/default.nix | 2 +- pkgs/development/tools/ocaml/utop/default.nix | 2 +- .../tools/profiling/EZTrace/default.nix | 1 - .../tools/react-native-debugger/default.nix | 1 - .../tools/rust/bindgen/unwrapped.nix | 2 - .../tools/rust/cargo-espmonitor/default.nix | 2 - .../tools/rust/cargo-leptos/default.nix | 1 - .../tools/rust/duckscript/default.nix | 1 - pkgs/development/tools/smlfmt/default.nix | 2 +- .../tools/steamos-devkit/default.nix | 1 - .../development/tools/swiftformat/default.nix | 2 +- pkgs/development/tools/trunk/default.nix | 2 - pkgs/development/web/cypress/default.nix | 1 - pkgs/development/web/nodejs/v22.nix | 2 +- 167 files changed, 129 insertions(+), 190 deletions(-) create mode 100644 pkgs/development/libraries/rustls-ffi/default.nix diff --git a/pkgs/development/ada-modules/gnatcoll/bindings.nix b/pkgs/development/ada-modules/gnatcoll/bindings.nix index c8896c14c32f..0b7efb60deb9 100644 --- a/pkgs/development/ada-modules/gnatcoll/bindings.nix +++ b/pkgs/development/ada-modules/gnatcoll/bindings.nix @@ -9,7 +9,6 @@ , gmp , libiconv , xz -, gcc-unwrapped , readline , zlib , python3 diff --git a/pkgs/development/ada-modules/gnatcoll/core.nix b/pkgs/development/ada-modules/gnatcoll/core.nix index 7fdd4e99d550..0180558e1b96 100644 --- a/pkgs/development/ada-modules/gnatcoll/core.nix +++ b/pkgs/development/ada-modules/gnatcoll/core.nix @@ -3,7 +3,6 @@ , gnat , gprbuild , fetchFromGitHub -, xmlada , which }: diff --git a/pkgs/development/ada-modules/gnatcoll/db.nix b/pkgs/development/ada-modules/gnatcoll/db.nix index 6eacff1ddb82..017a51e2fb75 100644 --- a/pkgs/development/ada-modules/gnatcoll/db.nix +++ b/pkgs/development/ada-modules/gnatcoll/db.nix @@ -5,7 +5,6 @@ , gprbuild , which , gnatcoll-core -, xmlada , component # components built by this derivation other components depend on , gnatcoll-sql diff --git a/pkgs/development/beam-modules/elvis-erlang/default.nix b/pkgs/development/beam-modules/elvis-erlang/default.nix index 4dff6a21ed84..2a6322cec899 100644 --- a/pkgs/development/beam-modules/elvis-erlang/default.nix +++ b/pkgs/development/beam-modules/elvis-erlang/default.nix @@ -1,4 +1,4 @@ -{ fetchFromGitHub, fetchgit, fetchHex, rebar3WithPlugins, rebar3-nix, rebar3Relx +{ fetchFromGitHub, fetchgit, fetchHex, rebar3Relx , buildRebar3, writeScript, lib }: let diff --git a/pkgs/development/beam-modules/erlang-ls/default.nix b/pkgs/development/beam-modules/erlang-ls/default.nix index 95b991cc7d82..a2ea7c8bd449 100644 --- a/pkgs/development/beam-modules/erlang-ls/default.nix +++ b/pkgs/development/beam-modules/erlang-ls/default.nix @@ -1,5 +1,5 @@ { fetchFromGitHub, fetchgit, fetchHex, rebar3Relx, buildRebar3, rebar3-proper -, stdenv, writeScript, lib, erlang }: +, stdenv, writeScript, lib }: let version = "0.52.0"; owner = "erlang-ls"; diff --git a/pkgs/development/compilers/clasp/default.nix b/pkgs/development/compilers/clasp/default.nix index 0d27b9f62c8a..d5d56546b576 100644 --- a/pkgs/development/compilers/clasp/default.nix +++ b/pkgs/development/compilers/clasp/default.nix @@ -9,7 +9,6 @@ , boost , libunwind , ninja -, cacert }: let diff --git a/pkgs/development/compilers/dotnet/stage0.nix b/pkgs/development/compilers/dotnet/stage0.nix index 6e336904a50f..a78f5a9c5c8d 100644 --- a/pkgs/development/compilers/dotnet/stage0.nix +++ b/pkgs/development/compilers/dotnet/stage0.nix @@ -1,5 +1,4 @@ { stdenv -, stdenvNoCC , callPackage , lib , writeShellScript diff --git a/pkgs/development/compilers/dotnet/vmr.nix b/pkgs/development/compilers/dotnet/vmr.nix index a443d31c499d..8fd7cce1aa94 100644 --- a/pkgs/development/compilers/dotnet/vmr.nix +++ b/pkgs/development/compilers/dotnet/vmr.nix @@ -1,5 +1,4 @@ { clangStdenv -, stdenvNoCC , lib , fetchurl , dotnetCorePackages @@ -20,7 +19,6 @@ , swiftPackages , openssl , getconf -, makeWrapper , python3 , xmlstarlet , nodejs diff --git a/pkgs/development/compilers/gambit/build.nix b/pkgs/development/compilers/gambit/build.nix index 60b9fb792d2f..05d92d434faf 100644 --- a/pkgs/development/compilers/gambit/build.nix +++ b/pkgs/development/compilers/gambit/build.nix @@ -1,6 +1,5 @@ { gccStdenv, lib, pkgs, - git, openssl, autoconf, gcc, coreutils, gnused, gnugrep, - makeStaticLibraries, + git, openssl, autoconf, coreutils, src, version, git-version, stampYmd ? 0, stampHms ? 0, gambit-support, diff --git a/pkgs/development/compilers/gerbil/build.nix b/pkgs/development/compilers/gerbil/build.nix index af983be968b0..c71ea137eadc 100644 --- a/pkgs/development/compilers/gerbil/build.nix +++ b/pkgs/development/compilers/gerbil/build.nix @@ -1,4 +1,4 @@ -{ pkgs, gccStdenv, lib, coreutils, +{ gccStdenv, lib, coreutils, openssl, zlib, sqlite, version, git-version, src, gambit-support, diff --git a/pkgs/development/compilers/gerbil/default.nix b/pkgs/development/compilers/gerbil/default.nix index 148bf7451675..ff35cee6c993 100644 --- a/pkgs/development/compilers/gerbil/default.nix +++ b/pkgs/development/compilers/gerbil/default.nix @@ -1,4 +1,4 @@ -{ callPackage, fetchFromGitHub, gambit-unstable, gambit-support, pkgs, gccStdenv }: +{ callPackage, fetchFromGitHub, gambit-support }: callPackage ./build.nix rec { version = "0.18.1"; diff --git a/pkgs/development/compilers/gerbil/gerbil-leveldb.nix b/pkgs/development/compilers/gerbil/gerbil-leveldb.nix index 811e677e9218..2938469d62b7 100644 --- a/pkgs/development/compilers/gerbil/gerbil-leveldb.nix +++ b/pkgs/development/compilers/gerbil/gerbil-leveldb.nix @@ -1,4 +1,4 @@ -{ pkgs, lib, fetchFromGitHub, gerbilPackages, leveldb, ... }: +{ pkgs, lib, fetchFromGitHub, leveldb, ... }: { pname = "gerbil-leveldb"; diff --git a/pkgs/development/compilers/gerbil/gerbil-libxml.nix b/pkgs/development/compilers/gerbil/gerbil-libxml.nix index bbd33752670e..bee0d0f16f59 100644 --- a/pkgs/development/compilers/gerbil/gerbil-libxml.nix +++ b/pkgs/development/compilers/gerbil/gerbil-libxml.nix @@ -1,4 +1,4 @@ -{ pkgs, lib, fetchFromGitHub, gerbilPackages, libxml2, ... }: +{ pkgs, lib, fetchFromGitHub, libxml2, ... }: { pname = "gerbil-libxml"; diff --git a/pkgs/development/compilers/gerbil/gerbil-libyaml.nix b/pkgs/development/compilers/gerbil/gerbil-libyaml.nix index 0a69537b365d..b88beb9f6986 100644 --- a/pkgs/development/compilers/gerbil/gerbil-libyaml.nix +++ b/pkgs/development/compilers/gerbil/gerbil-libyaml.nix @@ -1,4 +1,4 @@ -{ pkgs, lib, fetchFromGitHub, gerbilPackages, libyaml, ... }: +{ pkgs, lib, fetchFromGitHub, libyaml, ... }: { pname = "gerbil-libyaml"; diff --git a/pkgs/development/compilers/gerbil/gerbil-lmdb.nix b/pkgs/development/compilers/gerbil/gerbil-lmdb.nix index f86912aeaaa8..1a3355c14908 100644 --- a/pkgs/development/compilers/gerbil/gerbil-lmdb.nix +++ b/pkgs/development/compilers/gerbil/gerbil-lmdb.nix @@ -1,4 +1,4 @@ -{ pkgs, lib, fetchFromGitHub, gerbilPackages, lmdb, ... }: +{ pkgs, lib, fetchFromGitHub, lmdb, ... }: { pname = "gerbil-lmdb"; diff --git a/pkgs/development/compilers/gerbil/gerbil-mysql.nix b/pkgs/development/compilers/gerbil/gerbil-mysql.nix index ca1960e0ed39..a8cf710ec654 100644 --- a/pkgs/development/compilers/gerbil/gerbil-mysql.nix +++ b/pkgs/development/compilers/gerbil/gerbil-mysql.nix @@ -1,4 +1,4 @@ -{ pkgs, lib, fetchFromGitHub, gerbilPackages, mariadb-connector-c, ... }: +{ pkgs, lib, fetchFromGitHub, mariadb-connector-c, ... }: { pname = "gerbil-mysql"; diff --git a/pkgs/development/compilers/gerbil/unstable.nix b/pkgs/development/compilers/gerbil/unstable.nix index 4b0d3289c107..0dd078556efb 100644 --- a/pkgs/development/compilers/gerbil/unstable.nix +++ b/pkgs/development/compilers/gerbil/unstable.nix @@ -1,4 +1,4 @@ -{ callPackage, fetchFromGitHub, gambit-unstable, gambit-support, pkgs, gccStdenv }: +{ callPackage, fetchFromGitHub, gambit-support }: callPackage ./build.nix rec { version = "unstable-2023-12-06"; diff --git a/pkgs/development/compilers/ghcjs/8.10/default.nix b/pkgs/development/compilers/ghcjs/8.10/default.nix index 4363dc32c21e..9a648f838406 100644 --- a/pkgs/development/compilers/ghcjs/8.10/default.nix +++ b/pkgs/development/compilers/ghcjs/8.10/default.nix @@ -17,7 +17,6 @@ , gcc , lib , ghcjsDepOverrides ? (_:_:{}) -, haskell , linkFarm , buildPackages }: diff --git a/pkgs/development/compilers/gmqcc/default.nix b/pkgs/development/compilers/gmqcc/default.nix index 144131887fba..ec39f8744f58 100644 --- a/pkgs/development/compilers/gmqcc/default.nix +++ b/pkgs/development/compilers/gmqcc/default.nix @@ -1,5 +1,4 @@ { lib -, pkgs , stdenv , fetchFromGitHub }: diff --git a/pkgs/development/compilers/gnu-cobol/default.nix b/pkgs/development/compilers/gnu-cobol/default.nix index f086f22cc1af..83f24fff864e 100644 --- a/pkgs/development/compilers/gnu-cobol/default.nix +++ b/pkgs/development/compilers/gnu-cobol/default.nix @@ -16,7 +16,6 @@ , texinfo , texliveBasic # test -, writeText }: stdenv.mkDerivation rec { diff --git a/pkgs/development/compilers/go/binary.nix b/pkgs/development/compilers/go/binary.nix index cd2e429e704a..777c82a59775 100644 --- a/pkgs/development/compilers/go/binary.nix +++ b/pkgs/development/compilers/go/binary.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, version, hashes }: +{ stdenv, fetchurl, version, hashes }: let toGoKernel = platform: if platform.isDarwin then "darwin" diff --git a/pkgs/development/compilers/jetbrains-jdk/jcef.nix b/pkgs/development/compilers/jetbrains-jdk/jcef.nix index 0ed9c159b128..537133524a2c 100644 --- a/pkgs/development/compilers/jetbrains-jdk/jcef.nix +++ b/pkgs/development/compilers/jetbrains-jdk/jcef.nix @@ -6,7 +6,6 @@ , python3 , jdk , git -, libcef , rsync , lib , ant diff --git a/pkgs/development/compilers/koka/default.nix b/pkgs/development/compilers/koka/default.nix index 8cb38b4f783a..029bd88dfb0f 100644 --- a/pkgs/development/compilers/koka/default.nix +++ b/pkgs/development/compilers/koka/default.nix @@ -2,7 +2,6 @@ , pkgsHostTarget , cmake , makeWrapper -, fetchpatch , mkDerivation , fetchFromGitHub , alex diff --git a/pkgs/development/compilers/lingua-franca/default.nix b/pkgs/development/compilers/lingua-franca/default.nix index fccfa1eb691b..f989a5e9d6be 100644 --- a/pkgs/development/compilers/lingua-franca/default.nix +++ b/pkgs/development/compilers/lingua-franca/default.nix @@ -1,4 +1,4 @@ -{ lib, pkgs, stdenv, fetchzip, jdk17_headless }: +{ lib, stdenv, fetchzip, jdk17_headless }: stdenv.mkDerivation rec { pname = "lfc"; diff --git a/pkgs/development/compilers/llvm/common/libcxx/default.nix b/pkgs/development/compilers/llvm/common/libcxx/default.nix index 646d435489c6..f646edf03019 100644 --- a/pkgs/development/compilers/llvm/common/libcxx/default.nix +++ b/pkgs/development/compilers/llvm/common/libcxx/default.nix @@ -6,7 +6,6 @@ , src ? null , patches ? [] , runCommand -, substitute , cmake , lndir , ninja diff --git a/pkgs/development/compilers/llvm/common/openmp/default.nix b/pkgs/development/compilers/llvm/common/openmp/default.nix index 7d9d813f024c..0de91473dd8c 100644 --- a/pkgs/development/compilers/llvm/common/openmp/default.nix +++ b/pkgs/development/compilers/llvm/common/openmp/default.nix @@ -14,7 +14,6 @@ , clang-unwrapped , perl , pkg-config -, xcbuild , version }: let diff --git a/pkgs/development/compilers/mrustc/bootstrap.nix b/pkgs/development/compilers/mrustc/bootstrap.nix index ab5b9d7d2166..9fd9d95e0b72 100644 --- a/pkgs/development/compilers/mrustc/bootstrap.nix +++ b/pkgs/development/compilers/mrustc/bootstrap.nix @@ -3,7 +3,6 @@ , mrustc , mrustc-minicargo , llvm_12 -, llvmPackages_12 , libffi , cmake , python3 diff --git a/pkgs/development/compilers/rust/cargo.nix b/pkgs/development/compilers/rust/cargo.nix index b0c40c5760cb..9a12537f3e32 100644 --- a/pkgs/development/compilers/rust/cargo.nix +++ b/pkgs/development/compilers/rust/cargo.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, pkgsBuildHost, pkgsHostHost +{ lib, stdenv, pkgsHostHost , file, curl, pkg-config, python3, openssl, cmake, zlib , installShellFiles, makeWrapper, rustPlatform, rustc , CoreFoundation, Security diff --git a/pkgs/development/compilers/rust/clippy.nix b/pkgs/development/compilers/rust/clippy.nix index beee43323dad..640ea7908e25 100644 --- a/pkgs/development/compilers/rust/clippy.nix +++ b/pkgs/development/compilers/rust/clippy.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, rustPlatform, rustc, Security, patchelf }: +{ stdenv, lib, rustPlatform, rustc, Security }: rustPlatform.buildRustPackage { pname = "clippy"; diff --git a/pkgs/development/compilers/terra/default.nix b/pkgs/development/compilers/terra/default.nix index 908e025bf332..1d50d6e23ddb 100644 --- a/pkgs/development/compilers/terra/default.nix +++ b/pkgs/development/compilers/terra/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub, llvmPackages_16, ncurses, cmake, libxml2 -, symlinkJoin, breakpointHook, cudaPackages, enableCUDA ? false +, symlinkJoin, cudaPackages, enableCUDA ? false , libffi, libobjc, libpfm, Cocoa, Foundation }: diff --git a/pkgs/development/compilers/tinygo/default.nix b/pkgs/development/compilers/tinygo/default.nix index a2bbf561a379..f9de0cf3142a 100644 --- a/pkgs/development/compilers/tinygo/default.nix +++ b/pkgs/development/compilers/tinygo/default.nix @@ -1,6 +1,5 @@ { stdenv , lib -, buildPackages , buildGoModule , fetchFromGitHub , makeWrapper diff --git a/pkgs/development/coq-modules/compcert/default.nix b/pkgs/development/coq-modules/compcert/default.nix index 36b126af63ce..7d78a2d37686 100644 --- a/pkgs/development/coq-modules/compcert/default.nix +++ b/pkgs/development/coq-modules/compcert/default.nix @@ -1,5 +1,5 @@ { lib, mkCoqDerivation -, coq, flocq, compcert +, coq, flocq , ocamlPackages, fetchpatch, makeWrapper, coq2html , stdenv, tools ? stdenv.cc , version ? null diff --git a/pkgs/development/coq-modules/coqprime/default.nix b/pkgs/development/coq-modules/coqprime/default.nix index f9a4d6e7956d..2382141f2232 100644 --- a/pkgs/development/coq-modules/coqprime/default.nix +++ b/pkgs/development/coq-modules/coqprime/default.nix @@ -1,4 +1,4 @@ -{ which, lib, mkCoqDerivation, coq, bignums, version ? null }: +{ lib, mkCoqDerivation, coq, bignums, version ? null }: mkCoqDerivation { diff --git a/pkgs/development/coq-modules/flocq/default.nix b/pkgs/development/coq-modules/flocq/default.nix index bb8c2ccb1bd5..a7ff7044257f 100644 --- a/pkgs/development/coq-modules/flocq/default.nix +++ b/pkgs/development/coq-modules/flocq/default.nix @@ -1,5 +1,4 @@ -{ lib, bash, autoconf, automake, - mkCoqDerivation, coq, version ? null }: +{ lib, bash, autoconf, mkCoqDerivation, coq, version ? null }: mkCoqDerivation { pname = "flocq"; diff --git a/pkgs/development/coq-modules/gappalib/default.nix b/pkgs/development/coq-modules/gappalib/default.nix index 83285d187f46..0fbf19d24a45 100644 --- a/pkgs/development/coq-modules/gappalib/default.nix +++ b/pkgs/development/coq-modules/gappalib/default.nix @@ -1,4 +1,4 @@ -{ which, lib, mkCoqDerivation, autoconf, coq, flocq, version ? null }: +{ lib, mkCoqDerivation, autoconf, coq, flocq, version ? null }: mkCoqDerivation { pname = "gappalib"; diff --git a/pkgs/development/coq-modules/ltac2/default.nix b/pkgs/development/coq-modules/ltac2/default.nix index c9d6845aa938..11fa1af24de6 100644 --- a/pkgs/development/coq-modules/ltac2/default.nix +++ b/pkgs/development/coq-modules/ltac2/default.nix @@ -1,4 +1,4 @@ -{ lib, mkCoqDerivation, which, coq, version ? null }: +{ lib, mkCoqDerivation, coq, version ? null }: mkCoqDerivation { pname = "ltac2"; diff --git a/pkgs/development/coq-modules/mathcomp/default.nix b/pkgs/development/coq-modules/mathcomp/default.nix index 51accc11d249..f3f20adc7288 100644 --- a/pkgs/development/coq-modules/mathcomp/default.nix +++ b/pkgs/development/coq-modules/mathcomp/default.nix @@ -12,7 +12,7 @@ { lib, ncurses, graphviz, lua, fetchzip, mkCoqDerivation, withDoc ? false, single ? false, - coqPackages, coq, hierarchy-builder, version ? null }@args: + coq, hierarchy-builder, version ? null }@args: let repo = "math-comp"; diff --git a/pkgs/development/coq-modules/metacoq/default.nix b/pkgs/development/coq-modules/metacoq/default.nix index 8534f098faee..ef1a2131af2c 100644 --- a/pkgs/development/coq-modules/metacoq/default.nix +++ b/pkgs/development/coq-modules/metacoq/default.nix @@ -1,6 +1,6 @@ -{ lib, fetchzip, +{ lib, mkCoqDerivation, single ? false, - coqPackages, coq, equations, version ? null }@args: + coq, equations, version ? null }@args: let repo = "metacoq"; diff --git a/pkgs/development/coq-modules/smtcoq/default.nix b/pkgs/development/coq-modules/smtcoq/default.nix index 942ba1dc18bd..e8c944254091 100644 --- a/pkgs/development/coq-modules/smtcoq/default.nix +++ b/pkgs/development/coq-modules/smtcoq/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, pkgs, mkCoqDerivation, coq, veriT, zchaff, fetchurl, cvc5, version ? null }: +{ lib, pkgs, mkCoqDerivation, coq, veriT, zchaff, fetchurl, cvc5, version ? null }: let # version of veriT that works with SMTCoq diff --git a/pkgs/development/coq-modules/topology/default.nix b/pkgs/development/coq-modules/topology/default.nix index 9ffe598156c0..d50c83f0745e 100644 --- a/pkgs/development/coq-modules/topology/default.nix +++ b/pkgs/development/coq-modules/topology/default.nix @@ -1,4 +1,4 @@ -{ lib, mkCoqDerivation, coq, mathcomp, zorns-lemma, version ? null }: +{ lib, mkCoqDerivation, coq, zorns-lemma, version ? null }: mkCoqDerivation rec { pname = "topology"; diff --git a/pkgs/development/coq-modules/vscoq-language-server/default.nix b/pkgs/development/coq-modules/vscoq-language-server/default.nix index fd3a81f08c58..b9cdb622d9ca 100644 --- a/pkgs/development/coq-modules/vscoq-language-server/default.nix +++ b/pkgs/development/coq-modules/vscoq-language-server/default.nix @@ -1,4 +1,4 @@ -{ metaFetch, mkCoqDerivation, coq, lib, glib, adwaita-icon-theme, wrapGAppsHook3, +{ metaFetch, coq, lib, glib, adwaita-icon-theme, wrapGAppsHook3, version ? null }: let ocamlPackages = coq.ocamlPackages; diff --git a/pkgs/development/cuda-modules/generic-builders/manifest.nix b/pkgs/development/cuda-modules/generic-builders/manifest.nix index 4af16c8921cb..eccc7c2d216f 100644 --- a/pkgs/development/cuda-modules/generic-builders/manifest.nix +++ b/pkgs/development/cuda-modules/generic-builders/manifest.nix @@ -6,7 +6,6 @@ backendStdenv, fetchurl, lib, - lndir, markForCudatoolkitRootHook, flags, stdenv, diff --git a/pkgs/development/embedded/bossa/arduino.nix b/pkgs/development/embedded/bossa/arduino.nix index 04e483ff38b5..519b9820278b 100644 --- a/pkgs/development/embedded/bossa/arduino.nix +++ b/pkgs/development/embedded/bossa/arduino.nix @@ -1,4 +1,4 @@ -{ bossa, git, fetchFromGitHub }: +{ bossa, fetchFromGitHub }: bossa.overrideAttrs (attrs: rec { pname = "bossa-arduino"; diff --git a/pkgs/development/gnuradio-modules/limesdr/default.nix b/pkgs/development/gnuradio-modules/limesdr/default.nix index bdd541f04432..62db654270b9 100644 --- a/pkgs/development/gnuradio-modules/limesdr/default.nix +++ b/pkgs/development/gnuradio-modules/limesdr/default.nix @@ -5,7 +5,6 @@ , thrift , cmake , pkg-config -, doxygen , swig , python , logLib diff --git a/pkgs/development/haskell-modules/package-list.nix b/pkgs/development/haskell-modules/package-list.nix index bde8daed6f35..3b0efe120b0e 100644 --- a/pkgs/development/haskell-modules/package-list.nix +++ b/pkgs/development/haskell-modules/package-list.nix @@ -1,4 +1,4 @@ -{ runCommand, haskellPackages, lib, all-cabal-hashes, writeShellScript }: +{ runCommand, haskellPackages, lib, all-cabal-hashes }: let # Checks if the version looks like a Haskell PVP version which is the format # Hackage enforces. This will return false if the version strings is empty or diff --git a/pkgs/development/interpreters/cling/default.nix b/pkgs/development/interpreters/cling/default.nix index 2b6d2c26c09f..f1cbd213b871 100644 --- a/pkgs/development/interpreters/cling/default.nix +++ b/pkgs/development/interpreters/cling/default.nix @@ -7,7 +7,6 @@ , makeWrapper , ncurses , python3 -, runCommand , zlib # *NOT* from LLVM 9! diff --git a/pkgs/development/interpreters/octave/build-env.nix b/pkgs/development/interpreters/octave/build-env.nix index e7da04b38144..8e81d7eebc38 100644 --- a/pkgs/development/interpreters/octave/build-env.nix +++ b/pkgs/development/interpreters/octave/build-env.nix @@ -1,6 +1,5 @@ { lib, stdenv, octave, buildEnv , makeWrapper, texinfo -, octavePackages , wrapOctave , computeRequiredOctavePackages , extraLibs ? [] diff --git a/pkgs/development/interpreters/yex-lang/default.nix b/pkgs/development/interpreters/yex-lang/default.nix index ba00c0ec0c7a..87719884a06e 100644 --- a/pkgs/development/interpreters/yex-lang/default.nix +++ b/pkgs/development/interpreters/yex-lang/default.nix @@ -1,5 +1,4 @@ { lib -, stdenv , rustPlatform , fetchFromGitHub }: diff --git a/pkgs/development/libraries/blst/default.nix b/pkgs/development/libraries/blst/default.nix index 128318480853..2bf2e2c614e7 100644 --- a/pkgs/development/libraries/blst/default.nix +++ b/pkgs/development/libraries/blst/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, autoreconfHook }: +{ stdenv, lib, fetchFromGitHub }: stdenv.mkDerivation ( finalAttrs: { pname = "blst"; diff --git a/pkgs/development/libraries/cegui/default.nix b/pkgs/development/libraries/cegui/default.nix index 0a1fd07e2508..af52aabca79b 100644 --- a/pkgs/development/libraries/cegui/default.nix +++ b/pkgs/development/libraries/cegui/default.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchFromGitHub -, writeShellScript , cmake , ogre , freetype diff --git a/pkgs/development/libraries/codec2/default.nix b/pkgs/development/libraries/codec2/default.nix index 7f127870032c..308db170bc32 100644 --- a/pkgs/development/libraries/codec2/default.nix +++ b/pkgs/development/libraries/codec2/default.nix @@ -4,7 +4,6 @@ , cmake , freedvSupport ? false , lpcnetfreedv -, codec2 }: stdenv.mkDerivation rec { diff --git a/pkgs/development/libraries/dbus/make-dbus-conf.nix b/pkgs/development/libraries/dbus/make-dbus-conf.nix index 0a8b630d073b..d6e3e86200cf 100644 --- a/pkgs/development/libraries/dbus/make-dbus-conf.nix +++ b/pkgs/development/libraries/dbus/make-dbus-conf.nix @@ -1,5 +1,4 @@ { runCommand -, writeText , libxslt , dbus , findXMLCatalogs diff --git a/pkgs/development/libraries/doctest/default.nix b/pkgs/development/libraries/doctest/default.nix index 1acddbbd12ec..1ce085544492 100644 --- a/pkgs/development/libraries/doctest/default.nix +++ b/pkgs/development/libraries/doctest/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch, installShellFiles, cmake }: +{ lib, stdenv, fetchFromGitHub, fetchpatch, cmake }: stdenv.mkDerivation rec { pname = "doctest"; diff --git a/pkgs/development/libraries/elpa/default.nix b/pkgs/development/libraries/elpa/default.nix index 6e0c1b537518..e598f77db9dc 100644 --- a/pkgs/development/libraries/elpa/default.nix +++ b/pkgs/development/libraries/elpa/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, autoreconfHook, mpiCheckPhaseHook -, gfortran, perl, mpi, blas, lapack, scalapack, openssh +, perl, mpi, blas, lapack, scalapack, openssh # CPU optimizations , avxSupport ? stdenv.hostPlatform.avxSupport , avx2Support ? stdenv.hostPlatform.avx2Support diff --git a/pkgs/development/libraries/folly/default.nix b/pkgs/development/libraries/folly/default.nix index 171b81af8365..532fc4847715 100644 --- a/pkgs/development/libraries/folly/default.nix +++ b/pkgs/development/libraries/folly/default.nix @@ -1,6 +1,5 @@ { lib , stdenv -, overrideSDK , fetchFromGitHub , boost , cmake diff --git a/pkgs/development/libraries/gfbgraph/default.nix b/pkgs/development/libraries/gfbgraph/default.nix index c3c41d971beb..b099a2dd10e3 100644 --- a/pkgs/development/libraries/gfbgraph/default.nix +++ b/pkgs/development/libraries/gfbgraph/default.nix @@ -10,7 +10,6 @@ , json-glib , gobject-introspection , gtk-doc -, pkgs , docbook-xsl-nons }: diff --git a/pkgs/development/libraries/glib/default.nix b/pkgs/development/libraries/glib/default.nix index 4057d4618816..22df229d47cc 100644 --- a/pkgs/development/libraries/glib/default.nix +++ b/pkgs/development/libraries/glib/default.nix @@ -17,7 +17,7 @@ , buildPackages # this is just for tests (not in the closure of any regular package) -, coreutils, dbus, tzdata +, dbus, tzdata , desktop-file-utils, shared-mime-info , darwin , makeHardcodeGsettingsPatch diff --git a/pkgs/development/libraries/gobject-introspection/default.nix b/pkgs/development/libraries/gobject-introspection/default.nix index 1a205a6c04cb..d58bdd2e7800 100644 --- a/pkgs/development/libraries/gobject-introspection/default.nix +++ b/pkgs/development/libraries/gobject-introspection/default.nix @@ -8,7 +8,6 @@ , ninja , gtk-doc , docbook-xsl-nons -, docbook_xml_dtd_43 , docbook_xml_dtd_45 , pkg-config , libffi diff --git a/pkgs/development/libraries/grilo-plugins/default.nix b/pkgs/development/libraries/grilo-plugins/default.nix index 5193cedf868b..128ed788f43f 100644 --- a/pkgs/development/libraries/grilo-plugins/default.nix +++ b/pkgs/development/libraries/grilo-plugins/default.nix @@ -14,7 +14,6 @@ , libxml2 , lua5_4 , liboauth -, libgdata , libmediaart , grilo , gst_all_1 diff --git a/pkgs/development/libraries/gtk/3.x.nix b/pkgs/development/libraries/gtk/3.x.nix index 5473f02f35c6..ed0612bf2ecb 100644 --- a/pkgs/development/libraries/gtk/3.x.nix +++ b/pkgs/development/libraries/gtk/3.x.nix @@ -30,7 +30,6 @@ , libepoxy , libxkbcommon , libxml2 -, gmp , gnome , gsettings-desktop-schemas , sassc diff --git a/pkgs/development/libraries/gtk/4.x.nix b/pkgs/development/libraries/gtk/4.x.nix index dfd09e5dc6c4..57ef21ed595f 100644 --- a/pkgs/development/libraries/gtk/4.x.nix +++ b/pkgs/development/libraries/gtk/4.x.nix @@ -17,7 +17,6 @@ , glib , cairo , pango -, pandoc , gdk-pixbuf , gobject-introspection , fribidi diff --git a/pkgs/development/libraries/gtkd/default.nix b/pkgs/development/libraries/gtkd/default.nix index d773434b8323..faba68ede148 100644 --- a/pkgs/development/libraries/gtkd/default.nix +++ b/pkgs/development/libraries/gtkd/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchzip, atk, cairo, dcompiler, gdk-pixbuf, gnome, gst_all_1, librsvg +{ lib, stdenv, fetchzip, atk, cairo, dcompiler, gdk-pixbuf, gst_all_1, librsvg , glib, gtk3, gtksourceview4, libgda, libpeas, pango, pkg-config, which, vte }: let diff --git a/pkgs/development/libraries/gvfs/default.nix b/pkgs/development/libraries/gvfs/default.nix index 3fea0ff9cea2..7c5cdca3f619 100644 --- a/pkgs/development/libraries/gvfs/default.nix +++ b/pkgs/development/libraries/gvfs/default.nix @@ -41,7 +41,6 @@ , libgdata , libmsgraph , python3 -, python3Packages , gsettings-desktop-schemas }: diff --git a/pkgs/development/libraries/hamlib/default.nix b/pkgs/development/libraries/hamlib/default.nix index 2b7f05bcdef0..2089050552e7 100644 --- a/pkgs/development/libraries/hamlib/default.nix +++ b/pkgs/development/libraries/hamlib/default.nix @@ -12,7 +12,6 @@ , pkg-config , boost , libtool -, perlPackages , pythonBindings ? true , tclBindings ? true , perlBindings ? stdenv.buildPlatform == stdenv.hostPlatform diff --git a/pkgs/development/libraries/hpx/default.nix b/pkgs/development/libraries/hpx/default.nix index cef877d286a6..843fc1991f27 100644 --- a/pkgs/development/libraries/hpx/default.nix +++ b/pkgs/development/libraries/hpx/default.nix @@ -6,7 +6,6 @@ , cmake , hwloc , gperftools -, ninja , pkg-config , python3 }: diff --git a/pkgs/development/libraries/irrlicht/mac.nix b/pkgs/development/libraries/irrlicht/mac.nix index b3ef27e38774..06a5dfa5e9aa 100644 --- a/pkgs/development/libraries/irrlicht/mac.nix +++ b/pkgs/development/libraries/irrlicht/mac.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchzip, libGLU, libGL, fetchFromGitHub, cmake, Cocoa, OpenGL, IOKit }: +{ lib, stdenv, fetchzip, fetchFromGitHub, cmake, Cocoa, OpenGL, IOKit }: let common = import ./common.nix { inherit fetchzip; }; diff --git a/pkgs/development/libraries/kde-frameworks/kcalendarcore.nix b/pkgs/development/libraries/kde-frameworks/kcalendarcore.nix index 3f02765af8ea..6d4fb30ef75d 100644 --- a/pkgs/development/libraries/kde-frameworks/kcalendarcore.nix +++ b/pkgs/development/libraries/kde-frameworks/kcalendarcore.nix @@ -2,7 +2,6 @@ mkDerivation, extra-cmake-modules, libical, - qtbase }: mkDerivation { diff --git a/pkgs/development/libraries/kde-frameworks/ki18n.nix b/pkgs/development/libraries/kde-frameworks/ki18n.nix index be8016155b87..fc04f2074501 100644 --- a/pkgs/development/libraries/kde-frameworks/ki18n.nix +++ b/pkgs/development/libraries/kde-frameworks/ki18n.nix @@ -1,7 +1,7 @@ { mkDerivation, extra-cmake-modules, gettext, python3, - qtbase, qtdeclarative, qtscript, + qtdeclarative, qtscript, }: mkDerivation { diff --git a/pkgs/development/libraries/kde-frameworks/kquickcharts.nix b/pkgs/development/libraries/kde-frameworks/kquickcharts.nix index 20c1b2368a7b..a7e42f48c18d 100644 --- a/pkgs/development/libraries/kde-frameworks/kquickcharts.nix +++ b/pkgs/development/libraries/kde-frameworks/kquickcharts.nix @@ -1,7 +1,7 @@ { mkDerivation, extra-cmake-modules, - qtquickcontrols2, qtbase, + qtquickcontrols2, }: mkDerivation { diff --git a/pkgs/development/libraries/kerberos/heimdal.nix b/pkgs/development/libraries/kerberos/heimdal.nix index 2dc1a9625dc1..60b3ad00aeda 100644 --- a/pkgs/development/libraries/kerberos/heimdal.nix +++ b/pkgs/development/libraries/kerberos/heimdal.nix @@ -17,7 +17,6 @@ , db , libedit , pam -, krb5 , libmicrohttpd , cjson diff --git a/pkgs/development/libraries/lensfun/default.nix b/pkgs/development/libraries/lensfun/default.nix index 82e519f6f100..766a1161e2c6 100644 --- a/pkgs/development/libraries/lensfun/default.nix +++ b/pkgs/development/libraries/lensfun/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, pkg-config, glib, zlib, libpng, cmake, libxml2, python3 }: +{ lib, stdenv, fetchFromGitHub, pkg-config, glib, zlib, libpng, cmake, python3 }: let version = "0.3.4"; diff --git a/pkgs/development/libraries/libagar/default.nix b/pkgs/development/libraries/libagar/default.nix index bff80ab996db..a6fad154ad25 100644 --- a/pkgs/development/libraries/libagar/default.nix +++ b/pkgs/development/libraries/libagar/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, pkg-config, libtool, perl, bsdbuild, gettext, mandoc -, libpng, libjpeg, libXinerama, freetype, SDL, libGLU, libGL +, libpng, libjpeg, libXinerama, freetype, SDL, libGL , libsndfile, portaudio, libmysqlclient, fontconfig }: diff --git a/pkgs/development/libraries/libdatachannel/default.nix b/pkgs/development/libraries/libdatachannel/default.nix index 94c414a08356..d5e5f1db552a 100644 --- a/pkgs/development/libraries/libdatachannel/default.nix +++ b/pkgs/development/libraries/libdatachannel/default.nix @@ -1,7 +1,6 @@ { stdenv , lib , fetchFromGitHub -, srcOnly , cmake , ninja , pkg-config diff --git a/pkgs/development/libraries/libdatrie/default.nix b/pkgs/development/libraries/libdatrie/default.nix index be3717d2cba7..e810da2e96cd 100644 --- a/pkgs/development/libraries/libdatrie/default.nix +++ b/pkgs/development/libraries/libdatrie/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, makeWrapper +{ lib, stdenv, fetchFromGitHub , autoreconfHook, autoconf-archive , installShellFiles, libiconv }: diff --git a/pkgs/development/libraries/libdwarf/common.nix b/pkgs/development/libraries/libdwarf/common.nix index ebf59ccd03f9..4cf3102bbbfc 100644 --- a/pkgs/development/libraries/libdwarf/common.nix +++ b/pkgs/development/libraries/libdwarf/common.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, buildInputs, hash, version, libelf, url, knownVulnerabilities }: +{ lib, stdenv, fetchurl, buildInputs, hash, version, url, knownVulnerabilities }: stdenv.mkDerivation rec { pname = "libdwarf"; diff --git a/pkgs/development/libraries/libfprint/default.nix b/pkgs/development/libraries/libfprint/default.nix index fd7797ca0f14..3c1b14eaf909 100644 --- a/pkgs/development/libraries/libfprint/default.nix +++ b/pkgs/development/libraries/libfprint/default.nix @@ -9,7 +9,6 @@ , glib , nss , gobject-introspection -, coreutils , cairo , libgudev , gtk-doc diff --git a/pkgs/development/libraries/libgpod/default.nix b/pkgs/development/libraries/libgpod/default.nix index 2de6d8dd4d2c..a81f9587b3be 100644 --- a/pkgs/development/libraries/libgpod/default.nix +++ b/pkgs/development/libraries/libgpod/default.nix @@ -9,7 +9,6 @@ , glib , libxml2 , sqlite -, zlib , sg3_utils , gdk-pixbuf , taglib diff --git a/pkgs/development/libraries/libmx/default.nix b/pkgs/development/libraries/libmx/default.nix index de825b3b9dde..cdc4b4f077ad 100644 --- a/pkgs/development/libraries/libmx/default.nix +++ b/pkgs/development/libraries/libmx/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchFromGitHub , libtool, pkg-config, automake, autoconf, intltool -, glib, gobject-introspection, gtk2, gtk-doc +, gobject-introspection, gtk2, gtk-doc , clutter, clutter-gtk }: diff --git a/pkgs/development/libraries/libpsl/default.nix b/pkgs/development/libraries/libpsl/default.nix index a8fcd2581caa..18927df1f1bc 100644 --- a/pkgs/development/libraries/libpsl/default.nix +++ b/pkgs/development/libraries/libpsl/default.nix @@ -10,7 +10,6 @@ , libxslt , pkg-config , python3 -, valgrind , publicsuffix-list }: diff --git a/pkgs/development/libraries/libsixel/default.nix b/pkgs/development/libraries/libsixel/default.nix index dc773c3de400..81f13acb340a 100644 --- a/pkgs/development/libraries/libsixel/default.nix +++ b/pkgs/development/libraries/libsixel/default.nix @@ -5,7 +5,6 @@ , ninja , gdk-pixbuf , gd -, libjpeg , pkg-config }: stdenv.mkDerivation rec { diff --git a/pkgs/development/libraries/libthai/default.nix b/pkgs/development/libraries/libthai/default.nix index 0406c3dbafb1..a72bfc6f25d5 100644 --- a/pkgs/development/libraries/libthai/default.nix +++ b/pkgs/development/libraries/libthai/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, makeWrapper, installShellFiles, pkg-config, libdatrie }: +{ lib, stdenv, fetchurl, installShellFiles, pkg-config, libdatrie }: stdenv.mkDerivation rec { pname = "libthai"; diff --git a/pkgs/development/libraries/libusbgx/default.nix b/pkgs/development/libraries/libusbgx/default.nix index 84dcdff974c0..dacaf6d42da9 100644 --- a/pkgs/development/libraries/libusbgx/default.nix +++ b/pkgs/development/libraries/libusbgx/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, cmake, bash-completion, pkg-config, libconfig, autoreconfHook }: +{ stdenv, lib, fetchFromGitHub, pkg-config, libconfig, autoreconfHook }: stdenv.mkDerivation { pname = "libusbgx"; version = "unstable-2021-10-31"; diff --git a/pkgs/development/libraries/libvirt/default.nix b/pkgs/development/libraries/libvirt/default.nix index 63cc42bd706f..d7aac099b821 100644 --- a/pkgs/development/libraries/libvirt/default.nix +++ b/pkgs/development/libraries/libvirt/default.nix @@ -9,7 +9,6 @@ , dnsmasq , docutils , fetchFromGitLab -, fetchpatch , gettext , glib , gnutls diff --git a/pkgs/development/libraries/libwebp/default.nix b/pkgs/development/libraries/libwebp/default.nix index 184a48adf0dd..f788a7f59b9c 100644 --- a/pkgs/development/libraries/libwebp/default.nix +++ b/pkgs/development/libraries/libwebp/default.nix @@ -13,7 +13,6 @@ , libwebpdecoderSupport ? true # Build libwebpdecoder # for passthru.tests -, freeimage , gd , graphicsmagick , haskellPackages diff --git a/pkgs/development/libraries/lpcnetfreedv/default.nix b/pkgs/development/libraries/lpcnetfreedv/default.nix index b3b1d7059d81..c8af5c6baf33 100644 --- a/pkgs/development/libraries/lpcnetfreedv/default.nix +++ b/pkgs/development/libraries/lpcnetfreedv/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, fetchurl, cmake, codec2 }: +{ lib, stdenv, fetchFromGitHub, fetchurl, cmake }: let dataVersion = "191005_v1.0"; diff --git a/pkgs/development/libraries/lrdf/default.nix b/pkgs/development/libraries/lrdf/default.nix index bd78a4329a59..c9597f8320cb 100644 --- a/pkgs/development/libraries/lrdf/default.nix +++ b/pkgs/development/libraries/lrdf/default.nix @@ -1,6 +1,5 @@ { config, lib, stdenv, fetchFromGitHub, pkg-config, autoreconfHook -, librdf_raptor2, ladspaH, openssl, zlib -, doCheck ? config.doCheckByDefault or false, ladspaPlugins +, librdf_raptor2, doCheck ? config.doCheckByDefault or false, ladspaPlugins }: stdenv.mkDerivation rec { diff --git a/pkgs/development/libraries/lyra/default.nix b/pkgs/development/libraries/lyra/default.nix index 0a907bf4d285..0d34c42b8122 100644 --- a/pkgs/development/libraries/lyra/default.nix +++ b/pkgs/development/libraries/lyra/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, installShellFiles, meson, ninja }: +{ lib, stdenv, fetchFromGitHub, meson, ninja }: stdenv.mkDerivation rec { pname = "lyra"; diff --git a/pkgs/development/libraries/maui-core/default.nix b/pkgs/development/libraries/maui-core/default.nix index b173498189d6..901b26f4e646 100644 --- a/pkgs/development/libraries/maui-core/default.nix +++ b/pkgs/development/libraries/maui-core/default.nix @@ -1,5 +1,4 @@ { lib -, pkgs , mkDerivation , libcanberra , pulseaudio diff --git a/pkgs/development/libraries/mediastreamer/msopenh264.nix b/pkgs/development/libraries/mediastreamer/msopenh264.nix index 55ae2c8d9899..7c987f642269 100644 --- a/pkgs/development/libraries/mediastreamer/msopenh264.nix +++ b/pkgs/development/libraries/mediastreamer/msopenh264.nix @@ -1,9 +1,7 @@ -{ autoreconfHook -, cmake +{ cmake , fetchFromGitLab , mediastreamer , openh264 -, pkg-config , lib , stdenv }: diff --git a/pkgs/development/libraries/neardal/default.nix b/pkgs/development/libraries/neardal/default.nix index 04f429aa899f..243c9b81bbe1 100644 --- a/pkgs/development/libraries/neardal/default.nix +++ b/pkgs/development/libraries/neardal/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, autoconf, automake, libtool, pkg-config, glib, readline, makeWrapper }: +{ lib, stdenv, fetchFromGitHub, autoconf, automake, pkg-config, glib, readline, makeWrapper }: stdenv.mkDerivation { pname = "neardal"; diff --git a/pkgs/development/libraries/ocl-icd/default.nix b/pkgs/development/libraries/ocl-icd/default.nix index f5cdc9f4841a..2c092dd57b13 100644 --- a/pkgs/development/libraries/ocl-icd/default.nix +++ b/pkgs/development/libraries/ocl-icd/default.nix @@ -3,7 +3,6 @@ , fetchFromGitHub , ruby , opencl-headers -, addDriverRunpath , autoreconfHook , windows }: diff --git a/pkgs/development/libraries/opencl-clang/default.nix b/pkgs/development/libraries/opencl-clang/default.nix index 22478d72200b..b906be979f57 100644 --- a/pkgs/development/libraries/opencl-clang/default.nix +++ b/pkgs/development/libraries/opencl-clang/default.nix @@ -2,7 +2,6 @@ , stdenv , applyPatches , fetchFromGitHub -, fetchpatch , cmake , git , llvmPackages_14 diff --git a/pkgs/development/libraries/openjpeg/default.nix b/pkgs/development/libraries/openjpeg/default.nix index 12b05df234d8..25b43b3600e9 100644 --- a/pkgs/development/libraries/openjpeg/default.nix +++ b/pkgs/development/libraries/openjpeg/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub, cmake, pkg-config -, libdeflate, libpng, libtiff, zlib, lcms2, jpylyzer +, libpng, libtiff, zlib, lcms2, jpylyzer , jpipLibSupport ? false # JPIP library & executables , jpipServerSupport ? false, curl, fcgi # JPIP Server , jdk diff --git a/pkgs/development/libraries/openmpi/default.nix b/pkgs/development/libraries/openmpi/default.nix index 59f2d21d4c48..55fc330024d1 100644 --- a/pkgs/development/libraries/openmpi/default.nix +++ b/pkgs/development/libraries/openmpi/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, removeReferencesTo, gfortran, perl, libnl -, rdma-core, zlib, numactl, libevent, hwloc, targetPackages, symlinkJoin +, rdma-core, zlib, numactl, libevent, hwloc, targetPackages , libpsm2, libfabric, pmix, ucx, ucc, makeWrapper , config # Enable CUDA support diff --git a/pkgs/development/libraries/openzwave/default.nix b/pkgs/development/libraries/openzwave/default.nix index 4cde03bdf55b..ae9e63619a80 100644 --- a/pkgs/development/libraries/openzwave/default.nix +++ b/pkgs/development/libraries/openzwave/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch +{ lib, stdenv, fetchFromGitHub , doxygen, fontconfig, graphviz-nox, libxml2, pkg-config, which , systemd }: diff --git a/pkgs/development/libraries/qgnomeplatform/default.nix b/pkgs/development/libraries/qgnomeplatform/default.nix index aa0926a849cc..6e489f69b72c 100644 --- a/pkgs/development/libraries/qgnomeplatform/default.nix +++ b/pkgs/development/libraries/qgnomeplatform/default.nix @@ -10,7 +10,6 @@ , gtk3 , qtbase , qtwayland -, pantheon , substituteAll , gsettings-desktop-schemas , useQt6 ? false diff --git a/pkgs/development/libraries/qt-6/modules/qtbase.nix b/pkgs/development/libraries/qt-6/modules/qtbase.nix index 43c2c88ecd79..e738aba60560 100644 --- a/pkgs/development/libraries/qt-6/modules/qtbase.nix +++ b/pkgs/development/libraries/qt-6/modules/qtbase.nix @@ -3,11 +3,8 @@ , src , patches ? [ ] , version -, coreutils -, buildPackages , bison , flex -, gdb , gperf , lndir , perl @@ -36,7 +33,6 @@ , libdatrie , lttng-ust , libepoxy -, libiconv , dbus , fontconfig , freetype diff --git a/pkgs/development/libraries/qtfeedback/default.nix b/pkgs/development/libraries/qtfeedback/default.nix index a329ece074ba..285a81ae1ac4 100644 --- a/pkgs/development/libraries/qtfeedback/default.nix +++ b/pkgs/development/libraries/qtfeedback/default.nix @@ -3,7 +3,6 @@ , fetchFromGitHub , perl , qmake -, qtbase , qtdeclarative }: diff --git a/pkgs/development/libraries/retro-gtk/default.nix b/pkgs/development/libraries/retro-gtk/default.nix index 7387e6913073..69eb4b0cd12d 100644 --- a/pkgs/development/libraries/retro-gtk/default.nix +++ b/pkgs/development/libraries/retro-gtk/default.nix @@ -2,7 +2,6 @@ , stdenv , fetchurl , fetchpatch -, cmake , meson , ninja , pkg-config diff --git a/pkgs/development/libraries/rnnoise-plugin/default.nix b/pkgs/development/libraries/rnnoise-plugin/default.nix index ad7ba8a5a549..d41459e25ead 100644 --- a/pkgs/development/libraries/rnnoise-plugin/default.nix +++ b/pkgs/development/libraries/rnnoise-plugin/default.nix @@ -4,12 +4,10 @@ , fetchFromGitHub , freetype , gtk3-x11 -, mount , pcre , pkg-config , webkitgtk , xorg -, llvmPackages , WebKit , MetalKit , CoreAudioKit diff --git a/pkgs/development/libraries/rustls-ffi/default.nix b/pkgs/development/libraries/rustls-ffi/default.nix new file mode 100644 index 000000000000..d5d736dd2225 --- /dev/null +++ b/pkgs/development/libraries/rustls-ffi/default.nix @@ -0,0 +1,52 @@ +{ + lib, + stdenv, + fetchFromGitHub, + rustPlatform, + Security, + apacheHttpd, +}: + +rustPlatform.buildRustPackage rec { + pname = "rustls-ffi"; + version = "0.10.0"; + + src = fetchFromGitHub { + owner = "rustls"; + repo = pname; + rev = "v${version}"; + hash = "sha256-IDIWN5g1aaE6SDdXSm4WYK6n+BpuypPYQITuDj1WJEc="; + }; + + propagatedBuildInputs = lib.optionals stdenv.isDarwin [ Security ]; + + cargoLock.lockFile = ./Cargo.lock; + postPatch = '' + cp ${./Cargo.lock} Cargo.lock + ''; + + installPhase = '' + runHook preInstall + + make install DESTDIR=${placeholder "out"} + + runHook postInstall + ''; + + passthru.tests = { + apacheHttpd = apacheHttpd.override { modTlsSupport = true; }; + # Currently broken notably because of https://github.com/curl/curl/issues/13248 + # curl = curl.override { opensslSupport = false; rustlsSupport = true; }; + }; + + meta = with lib; { + description = "C-to-rustls bindings"; + homepage = "https://github.com/rustls/rustls-ffi/"; + license = with lib.licenses; [ + mit + asl20 + isc + ]; + maintainers = [ maintainers.lesuisse ]; + }; +} diff --git a/pkgs/development/libraries/safefile/default.nix b/pkgs/development/libraries/safefile/default.nix index 1f49afbacff2..279ce4356b69 100644 --- a/pkgs/development/libraries/safefile/default.nix +++ b/pkgs/development/libraries/safefile/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, path, runtimeShell }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation rec { pname = "safefile"; version = "1.0.5"; diff --git a/pkgs/development/libraries/science/chemistry/avogadrolibs/default.nix b/pkgs/development/libraries/science/chemistry/avogadrolibs/default.nix index e50bde243e85..f0d23b7e2e25 100644 --- a/pkgs/development/libraries/science/chemistry/avogadrolibs/default.nix +++ b/pkgs/development/libraries/science/chemistry/avogadrolibs/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch, cmake, zlib, eigen, libGL, doxygen, spglib +{ lib, stdenv, fetchFromGitHub, fetchpatch, cmake, zlib, eigen, libGL, spglib , mmtf-cpp, glew, python3, libarchive, libmsym, msgpack, qttools, wrapQtAppsHook }: diff --git a/pkgs/development/libraries/science/chemistry/simple-dftd3/python.nix b/pkgs/development/libraries/science/chemistry/simple-dftd3/python.nix index 74f24e10f55f..267ac53d75d1 100644 --- a/pkgs/development/libraries/science/chemistry/simple-dftd3/python.nix +++ b/pkgs/development/libraries/science/chemistry/simple-dftd3/python.nix @@ -1,6 +1,4 @@ { buildPythonPackage -, pkg-config -, meson , simple-dftd3 , cffi , numpy diff --git a/pkgs/development/libraries/science/math/tensorflow-lite/default.nix b/pkgs/development/libraries/science/math/tensorflow-lite/default.nix index 4ecd08d103fa..9f9405dec318 100644 --- a/pkgs/development/libraries/science/math/tensorflow-lite/default.nix +++ b/pkgs/development/libraries/science/math/tensorflow-lite/default.nix @@ -1,5 +1,4 @@ { stdenv -, bash , buildPackages , buildBazelPackage , fetchFromGitHub diff --git a/pkgs/development/libraries/swiftshader/default.nix b/pkgs/development/libraries/swiftshader/default.nix index 36564110d283..3d6a3653d267 100644 --- a/pkgs/development/libraries/swiftshader/default.nix +++ b/pkgs/development/libraries/swiftshader/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchgit, python3, cmake, jq, libX11, libXext, zlib }: +{ lib, stdenv, fetchgit, python3, cmake, jq }: stdenv.mkDerivation rec { pname = "swiftshader"; diff --git a/pkgs/development/libraries/sycl-info/default.nix b/pkgs/development/libraries/sycl-info/default.nix index 5d70bed4dd0f..e0c4296cb277 100644 --- a/pkgs/development/libraries/sycl-info/default.nix +++ b/pkgs/development/libraries/sycl-info/default.nix @@ -1,6 +1,5 @@ { lib, stdenv , fetchFromGitHub -, installShellFiles , cmake , ninja , ocl-icd diff --git a/pkgs/development/libraries/usbredir/default.nix b/pkgs/development/libraries/usbredir/default.nix index e4a8c7628bc8..55feb41bec8a 100644 --- a/pkgs/development/libraries/usbredir/default.nix +++ b/pkgs/development/libraries/usbredir/default.nix @@ -1,6 +1,5 @@ { lib , stdenv -, cmake , fetchFromGitLab , pkg-config , meson diff --git a/pkgs/development/libraries/v8/default.nix b/pkgs/development/libraries/v8/default.nix index 9320fe34bb64..3ea2d075602a 100644 --- a/pkgs/development/libraries/v8/default.nix +++ b/pkgs/development/libraries/v8/default.nix @@ -1,6 +1,6 @@ { stdenv, lib, fetchgit , gn, ninja, python3, glib, pkg-config, icu -, xcbuild, darwin +, xcbuild , fetchpatch , llvmPackages , symlinkJoin diff --git a/pkgs/development/libraries/vapoursynth/default.nix b/pkgs/development/libraries/vapoursynth/default.nix index 79d3feca5245..742f5c58d281 100644 --- a/pkgs/development/libraries/vapoursynth/default.nix +++ b/pkgs/development/libraries/vapoursynth/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub, pkg-config, autoreconfHook, makeWrapper -, runCommandCC, runCommand, vapoursynth, writeText, patchelf, buildEnv +, runCommandCC, runCommand, vapoursynth, writeText, buildEnv , zimg, libass, python3, libiconv, testers , ApplicationServices }: diff --git a/pkgs/development/libraries/volume-key/default.nix b/pkgs/development/libraries/volume-key/default.nix index b005582b7f54..1991f2d6d7f9 100644 --- a/pkgs/development/libraries/volume-key/default.nix +++ b/pkgs/development/libraries/volume-key/default.nix @@ -1,6 +1,5 @@ { lib, stdenv, fetchgit, autoreconfHook, pkg-config, gettext, python3 , ncurses, swig, glib, util-linux, cryptsetup, nss, gpgme -, autoconf, automake, libtool , buildPackages }: diff --git a/pkgs/development/libraries/wxwidgets/wxGTK32.nix b/pkgs/development/libraries/wxwidgets/wxGTK32.nix index 1eb1ede66cb0..a77dedb0c6ee 100644 --- a/pkgs/development/libraries/wxwidgets/wxGTK32.nix +++ b/pkgs/development/libraries/wxwidgets/wxGTK32.nix @@ -32,7 +32,6 @@ , AVFoundation , AVKit , WebKit -, fetchpatch }: let catch = fetchFromGitHub { diff --git a/pkgs/development/libraries/xtensor/default.nix b/pkgs/development/libraries/xtensor/default.nix index da85a37ab5bc..03ac85418710 100644 --- a/pkgs/development/libraries/xtensor/default.nix +++ b/pkgs/development/libraries/xtensor/default.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchFromGitHub -, fetchpatch , cmake , doctest , enableAssertions ? false diff --git a/pkgs/development/libraries/xtl/default.nix b/pkgs/development/libraries/xtl/default.nix index 87f480ea29fe..208aceb3e35b 100644 --- a/pkgs/development/libraries/xtl/default.nix +++ b/pkgs/development/libraries/xtl/default.nix @@ -3,7 +3,6 @@ , fetchFromGitHub , cmake , doctest -, gtest }: stdenv.mkDerivation rec { pname = "xtl"; diff --git a/pkgs/development/lua-modules/nfd/default.nix b/pkgs/development/lua-modules/nfd/default.nix index 1cc8d66044c7..0bd421ede7ce 100644 --- a/pkgs/development/lua-modules/nfd/default.nix +++ b/pkgs/development/lua-modules/nfd/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, buildLuarocksPackage, lua51Packages, lua, pkg-config, lib, substituteAll, zenity, AppKit}: +{ stdenv, fetchFromGitHub, buildLuarocksPackage, lua, pkg-config, lib, substituteAll, zenity, AppKit}: buildLuarocksPackage { pname = "nfd"; diff --git a/pkgs/development/misc/or1k/newlib.nix b/pkgs/development/misc/or1k/newlib.nix index 92829896a27c..39ddf063eacb 100644 --- a/pkgs/development/misc/or1k/newlib.nix +++ b/pkgs/development/misc/or1k/newlib.nix @@ -1,4 +1,4 @@ -{ stdenv, texinfo, flex, bison, fetchFromGitHub, crossLibcStdenv, buildPackages }: +{ stdenv, fetchFromGitHub, crossLibcStdenv, buildPackages }: crossLibcStdenv.mkDerivation { name = "newlib"; diff --git a/pkgs/development/misc/resholve/default.nix b/pkgs/development/misc/resholve/default.nix index 13fd7a9adecc..5b68631e344d 100644 --- a/pkgs/development/misc/resholve/default.nix +++ b/pkgs/development/misc/resholve/default.nix @@ -1,5 +1,4 @@ { lib -, pkgs , pkgsBuildHost , ... }: diff --git a/pkgs/development/mobile/androidenv/cmdline-tools.nix b/pkgs/development/mobile/androidenv/cmdline-tools.nix index 11ad37453f2a..0279b948a7ab 100644 --- a/pkgs/development/mobile/androidenv/cmdline-tools.nix +++ b/pkgs/development/mobile/androidenv/cmdline-tools.nix @@ -1,4 +1,4 @@ -{deployAndroidPackage, lib, package, autoPatchelfHook, makeWrapper, os, pkgs, pkgsi686Linux, stdenv, postInstall}: +{deployAndroidPackage, lib, package, autoPatchelfHook, makeWrapper, os, pkgs, stdenv, postInstall}: deployAndroidPackage { name = "androidsdk"; diff --git a/pkgs/development/mobile/androidenv/patcher.nix b/pkgs/development/mobile/androidenv/patcher.nix index 9fd112063cb8..c0252839cf23 100644 --- a/pkgs/development/mobile/androidenv/patcher.nix +++ b/pkgs/development/mobile/androidenv/patcher.nix @@ -1,4 +1,4 @@ -{deployAndroidPackage, lib, package, os, autoPatchelfHook, pkgs, stdenv}: +{deployAndroidPackage, lib, package, os, autoPatchelfHook, stdenv}: deployAndroidPackage { inherit package os; diff --git a/pkgs/development/ocaml-modules/ounit2/default.nix b/pkgs/development/ocaml-modules/ounit2/default.nix index 0a302d26b624..1d629daef875 100644 --- a/pkgs/development/ocaml-modules/ounit2/default.nix +++ b/pkgs/development/ocaml-modules/ounit2/default.nix @@ -1,4 +1,4 @@ -{ lib, buildDunePackage, fetchurl, seq, stdlib-shims, ncurses }: +{ lib, buildDunePackage, fetchurl, seq, stdlib-shims }: buildDunePackage rec { minimalOCamlVersion = "4.08"; diff --git a/pkgs/development/octave-modules/financial/default.nix b/pkgs/development/octave-modules/financial/default.nix index 5fb6a00df78b..d034718ab5b8 100644 --- a/pkgs/development/octave-modules/financial/default.nix +++ b/pkgs/development/octave-modules/financial/default.nix @@ -1,8 +1,6 @@ { buildOctavePackage , lib , fetchurl -, io -, statistics }: buildOctavePackage rec { diff --git a/pkgs/development/octave-modules/level-set/default.nix b/pkgs/development/octave-modules/level-set/default.nix index 3cc0873e3813..325ce0390ada 100644 --- a/pkgs/development/octave-modules/level-set/default.nix +++ b/pkgs/development/octave-modules/level-set/default.nix @@ -1,5 +1,4 @@ { buildOctavePackage -, stdenv , lib , fetchgit , automake diff --git a/pkgs/development/php-packages/couchbase/default.nix b/pkgs/development/php-packages/couchbase/default.nix index e638d4c470ab..2ed284fe6079 100644 --- a/pkgs/development/php-packages/couchbase/default.nix +++ b/pkgs/development/php-packages/couchbase/default.nix @@ -2,10 +2,8 @@ lib, buildPecl, fetchFromGitHub, - writeText, libcouchbase, zlib, - php, substituteAll, }: let diff --git a/pkgs/development/python-modules/cocotb/default.nix b/pkgs/development/python-modules/cocotb/default.nix index 271ad52a9595..b477d447c562 100644 --- a/pkgs/development/python-modules/cocotb/default.nix +++ b/pkgs/development/python-modules/cocotb/default.nix @@ -1,6 +1,5 @@ { lib, - stdenv, buildPythonPackage, fetchFromGitHub, setuptools, diff --git a/pkgs/development/python-modules/httpie/default.nix b/pkgs/development/python-modules/httpie/default.nix index 381eba4f5fcc..aba7e3fe32c1 100644 --- a/pkgs/development/python-modules/httpie/default.nix +++ b/pkgs/development/python-modules/httpie/default.nix @@ -14,7 +14,6 @@ requests-toolbelt, setuptools, rich, - pysocks, pip, pytest-httpbin, pytest-lazy-fixture, diff --git a/pkgs/development/python-modules/levenshtein/default.nix b/pkgs/development/python-modules/levenshtein/default.nix index 4f04a810bd5e..dab384316fb7 100644 --- a/pkgs/development/python-modules/levenshtein/default.nix +++ b/pkgs/development/python-modules/levenshtein/default.nix @@ -1,6 +1,5 @@ { lib, - stdenv, buildPythonPackage, cmake, cython, diff --git a/pkgs/development/python-modules/pillow/generic.nix b/pkgs/development/python-modules/pillow/generic.nix index 83816d8958ac..36fe5b0421fe 100644 --- a/pkgs/development/python-modules/pillow/generic.nix +++ b/pkgs/development/python-modules/pillow/generic.nix @@ -1,7 +1,6 @@ { pname, version, - disabled, src, patches ? [ ], meta, diff --git a/pkgs/development/python-modules/pytest-cov-stub/default.nix b/pkgs/development/python-modules/pytest-cov-stub/default.nix index 025a815686f6..0d2ab63bd9bd 100644 --- a/pkgs/development/python-modules/pytest-cov-stub/default.nix +++ b/pkgs/development/python-modules/pytest-cov-stub/default.nix @@ -1,7 +1,6 @@ { lib, buildPythonPackage, - python, hatchling, }: diff --git a/pkgs/development/python-modules/typer/default.nix b/pkgs/development/python-modules/typer/default.nix index 2ef63fd1f97a..9839f6d6c55d 100644 --- a/pkgs/development/python-modules/typer/default.nix +++ b/pkgs/development/python-modules/typer/default.nix @@ -3,7 +3,6 @@ stdenv, buildPythonPackage, click, - colorama, coverage, fetchPypi, pdm-backend, diff --git a/pkgs/development/python2-modules/attrs/default.nix b/pkgs/development/python2-modules/attrs/default.nix index e894ee27d3fb..30eb0ab17e25 100644 --- a/pkgs/development/python2-modules/attrs/default.nix +++ b/pkgs/development/python2-modules/attrs/default.nix @@ -1,5 +1,4 @@ { lib -, callPackage , buildPythonPackage , fetchPypi }: diff --git a/pkgs/development/rocm-modules/5/llvm/stage-3/mlir.nix b/pkgs/development/rocm-modules/5/llvm/stage-3/mlir.nix index 6de685ea2771..11b9ae9ab5de 100644 --- a/pkgs/development/rocm-modules/5/llvm/stage-3/mlir.nix +++ b/pkgs/development/rocm-modules/5/llvm/stage-3/mlir.nix @@ -6,7 +6,6 @@ , vulkan-loader , glslang , shaderc -, lit }: callPackage ../base.nix rec { diff --git a/pkgs/development/rocm-modules/5/rocblas/default.nix b/pkgs/development/rocm-modules/5/rocblas/default.nix index bd8a4ed4e35d..187775e25a65 100644 --- a/pkgs/development/rocm-modules/5/rocblas/default.nix +++ b/pkgs/development/rocm-modules/5/rocblas/default.nix @@ -3,7 +3,6 @@ , stdenv , fetchFromGitHub , rocmUpdateScript -, runCommand , cmake , rocm-cmake , clr diff --git a/pkgs/development/rocm-modules/6/llvm/stage-3/mlir.nix b/pkgs/development/rocm-modules/6/llvm/stage-3/mlir.nix index 8b71b3fb2977..7611a30165a7 100644 --- a/pkgs/development/rocm-modules/6/llvm/stage-3/mlir.nix +++ b/pkgs/development/rocm-modules/6/llvm/stage-3/mlir.nix @@ -6,7 +6,6 @@ , vulkan-loader , glslang , shaderc -, lit , fetchpatch }: diff --git a/pkgs/development/rocm-modules/6/rocblas/default.nix b/pkgs/development/rocm-modules/6/rocblas/default.nix index f93cceddd68a..4233aa640690 100644 --- a/pkgs/development/rocm-modules/6/rocblas/default.nix +++ b/pkgs/development/rocm-modules/6/rocblas/default.nix @@ -3,7 +3,6 @@ , fetchFromGitHub , fetchpatch , rocmUpdateScript -, runCommand , cmake , rocm-cmake , clr diff --git a/pkgs/development/ruby-modules/rbenv/default.nix b/pkgs/development/ruby-modules/rbenv/default.nix index ef8b4c47818b..6c080f4f2181 100644 --- a/pkgs/development/ruby-modules/rbenv/default.nix +++ b/pkgs/development/ruby-modules/rbenv/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, bash, installShellFiles }: +{ lib, stdenv, fetchFromGitHub, installShellFiles }: stdenv.mkDerivation rec { pname = "rbenv"; diff --git a/pkgs/development/skaware-packages/sdnotify-wrapper/default.nix b/pkgs/development/skaware-packages/sdnotify-wrapper/default.nix index e28e77989939..25d5bc965193 100644 --- a/pkgs/development/skaware-packages/sdnotify-wrapper/default.nix +++ b/pkgs/development/skaware-packages/sdnotify-wrapper/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, runCommandCC, skawarePackages, skalibs }: +{ lib, runCommandCC, skalibs }: let # From https://skarnet.org/software/misc/sdnotify-wrapper.c, diff --git a/pkgs/development/tools/analysis/hopper/default.nix b/pkgs/development/tools/analysis/hopper/default.nix index 8fcaa144ab8c..a3ceed9c43e0 100644 --- a/pkgs/development/tools/analysis/hopper/default.nix +++ b/pkgs/development/tools/analysis/hopper/default.nix @@ -3,7 +3,6 @@ , lib , autoPatchelfHook , wrapQtAppsHook -, gmpxx , gnustep , libbsd , libffi_3_3 diff --git a/pkgs/development/tools/ashpd-demo/default.nix b/pkgs/development/tools/ashpd-demo/default.nix index ba844a6250dd..8c9127296b17 100644 --- a/pkgs/development/tools/ashpd-demo/default.nix +++ b/pkgs/development/tools/ashpd-demo/default.nix @@ -1,7 +1,6 @@ { stdenv , lib , fetchFromGitHub -, nix-update-script , cargo , meson , ninja @@ -13,8 +12,6 @@ , gst_all_1 , gtk4 , libadwaita -, llvmPackages -, glibc , pipewire , wayland , wrapGAppsHook4 diff --git a/pkgs/development/tools/azure-functions-core-tools/default.nix b/pkgs/development/tools/azure-functions-core-tools/default.nix index 288bcecd3b8d..17c3a181ec9a 100644 --- a/pkgs/development/tools/azure-functions-core-tools/default.nix +++ b/pkgs/development/tools/azure-functions-core-tools/default.nix @@ -1,6 +1,5 @@ { lib, stdenv, - callPackage, fetchFromGitHub, buildDotnetModule, buildGoModule, diff --git a/pkgs/development/tools/build-managers/bazel/bazel_5/default.nix b/pkgs/development/tools/build-managers/bazel/bazel_5/default.nix index 2e1459c16bea..c2210358344c 100644 --- a/pkgs/development/tools/build-managers/bazel/bazel_5/default.nix +++ b/pkgs/development/tools/build-managers/bazel/bazel_5/default.nix @@ -1,8 +1,8 @@ { stdenv, callPackage, lib, fetchurl, fetchFromGitHub, installShellFiles -, runCommand, runCommandCC, makeWrapper, recurseIntoAttrs +, runCommand, runCommandCC, makeWrapper # this package (through the fixpoint glass) , bazel_self -, lr, xe, zip, unzip, bash, writeCBin, coreutils +, lr, xe, zip, unzip, bash, coreutils , which, gawk, gnused, gnutar, gnugrep, gzip, findutils # updater , python3, writeScript @@ -14,8 +14,6 @@ # Always assume all markers valid (this is needed because we remove markers; they are non-deterministic). # Also, don't clean up environment variables (so that NIX_ environment variables are passed to compilers). , enableNixHacks ? false -, gcc-unwrapped -, autoPatchelfHook , file , substituteAll , writeTextFile diff --git a/pkgs/development/tools/build-managers/bazel/bazel_6/default.nix b/pkgs/development/tools/build-managers/bazel/bazel_6/default.nix index 5521fcf0d53d..a49530ecfc69 100644 --- a/pkgs/development/tools/build-managers/bazel/bazel_6/default.nix +++ b/pkgs/development/tools/build-managers/bazel/bazel_6/default.nix @@ -2,7 +2,7 @@ , runCommand, runCommandCC, makeWrapper, recurseIntoAttrs # this package (through the fixpoint glass) , bazel_self -, lr, xe, zip, unzip, bash, writeCBin, coreutils +, lr, xe, zip, unzip, bash, coreutils , which, gawk, gnused, gnutar, gnugrep, gzip, findutils , diffutils, gnupatch # updater @@ -15,8 +15,6 @@ # Always assume all markers valid (this is needed because we remove markers; they are non-deterministic). # Also, don't clean up environment variables (so that NIX_ environment variables are passed to compilers). , enableNixHacks ? false -, gcc-unwrapped -, autoPatchelfHook , file , substituteAll , writeTextFile diff --git a/pkgs/development/tools/cocogitto/default.nix b/pkgs/development/tools/cocogitto/default.nix index 7c604e711203..16bb018e36dd 100644 --- a/pkgs/development/tools/cocogitto/default.nix +++ b/pkgs/development/tools/cocogitto/default.nix @@ -1,4 +1,4 @@ -{ lib, rustPlatform, fetchFromGitHub, installShellFiles, stdenv, Security, makeWrapper, libgit2 }: +{ lib, rustPlatform, fetchFromGitHub, installShellFiles, stdenv, Security, libgit2 }: rustPlatform.buildRustPackage rec { pname = "cocogitto"; diff --git a/pkgs/development/tools/dbus-test-runner/default.nix b/pkgs/development/tools/dbus-test-runner/default.nix index 15f219ac9b1d..93b186095923 100644 --- a/pkgs/development/tools/dbus-test-runner/default.nix +++ b/pkgs/development/tools/dbus-test-runner/default.nix @@ -4,7 +4,6 @@ , testers , autoreconfHook , bash -, coreutils , dbus , dbus-glib , glib diff --git a/pkgs/development/tools/haskell/ihaskell/wrapper.nix b/pkgs/development/tools/haskell/ihaskell/wrapper.nix index b5ea07dde147..a2d73ae7c816 100644 --- a/pkgs/development/tools/haskell/ihaskell/wrapper.nix +++ b/pkgs/development/tools/haskell/ihaskell/wrapper.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, writeScriptBin, makeWrapper, buildEnv, haskell, ghcWithPackages, jupyter, packages }: +{ lib, stdenv, writeScriptBin, makeWrapper, buildEnv, ghcWithPackages, jupyter, packages }: let ihaskellEnv = ghcWithPackages (self: [ self.ihaskell diff --git a/pkgs/development/tools/hover/default.nix b/pkgs/development/tools/hover/default.nix index 5a2ea9772b40..b661adaac136 100644 --- a/pkgs/development/tools/hover/default.nix +++ b/pkgs/development/tools/hover/default.nix @@ -6,7 +6,6 @@ , pkg-config , fetchFromGitHub , roboto -, writeScript , xorg , libglvnd , addDriverRunpath diff --git a/pkgs/development/tools/java/visualvm/default.nix b/pkgs/development/tools/java/visualvm/default.nix index c7207a686ca7..2de6e6618d29 100644 --- a/pkgs/development/tools/java/visualvm/default.nix +++ b/pkgs/development/tools/java/visualvm/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchzip, lib, makeWrapper, makeDesktopItem, jdk, gawk }: +{ stdenv, fetchzip, lib, makeWrapper, makeDesktopItem, jdk }: stdenv.mkDerivation rec { version = "2.1.8"; diff --git a/pkgs/development/tools/ldid/default.nix b/pkgs/development/tools/ldid/default.nix index fc8692205fc5..38b252781c7e 100644 --- a/pkgs/development/tools/ldid/default.nix +++ b/pkgs/development/tools/ldid/default.nix @@ -1,6 +1,5 @@ { lib , stdenv -, callPackage , fetchgit , libplist , libxml2 diff --git a/pkgs/development/tools/mblock-mlink/default.nix b/pkgs/development/tools/mblock-mlink/default.nix index 4d70efbbc50e..0b6ec3252ef5 100644 --- a/pkgs/development/tools/mblock-mlink/default.nix +++ b/pkgs/development/tools/mblock-mlink/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, dpkg, makeWrapper, autoPatchelfHook }: +{ stdenv, lib, fetchurl, dpkg, autoPatchelfHook }: stdenv.mkDerivation rec { pname = "mblock-mlink"; diff --git a/pkgs/development/tools/misc/binutils/default.nix b/pkgs/development/tools/misc/binutils/default.nix index 610f04fd35a5..491bfc19ae0f 100644 --- a/pkgs/development/tools/misc/binutils/default.nix +++ b/pkgs/development/tools/misc/binutils/default.nix @@ -14,7 +14,6 @@ in , lib , noSysDirs , perl -, substitute , zlib , CoreServices diff --git a/pkgs/development/tools/misc/cvise/default.nix b/pkgs/development/tools/misc/cvise/default.nix index 129b534339ee..228f8ed98a67 100644 --- a/pkgs/development/tools/misc/cvise/default.nix +++ b/pkgs/development/tools/misc/cvise/default.nix @@ -1,7 +1,6 @@ { lib , buildPythonApplication , fetchFromGitHub -, bash , cmake , colordiff , flex diff --git a/pkgs/development/tools/misc/hydra/unstable.nix b/pkgs/development/tools/misc/hydra/unstable.nix index f60c0c0b1de7..8c6f089099f2 100644 --- a/pkgs/development/tools/misc/hydra/unstable.nix +++ b/pkgs/development/tools/misc/hydra/unstable.nix @@ -43,7 +43,6 @@ , cacert , glibcLocales , fetchFromGitHub -, fetchpatch2 , nixosTests }: diff --git a/pkgs/development/tools/misc/jscoverage/default.nix b/pkgs/development/tools/misc/jscoverage/default.nix index 83dbfb93c86d..a082614aece3 100644 --- a/pkgs/development/tools/misc/jscoverage/default.nix +++ b/pkgs/development/tools/misc/jscoverage/default.nix @@ -1,4 +1,4 @@ -{ autoconf, fetchurl, makedepend, perl, python3, lib, stdenv, zip }: +{ fetchurl, perl, python3, lib, stdenv, zip }: stdenv.mkDerivation rec { pname = "jscoverage"; diff --git a/pkgs/development/tools/misc/ptags/default.nix b/pkgs/development/tools/misc/ptags/default.nix index b9c616b1fa31..b855a648a537 100644 --- a/pkgs/development/tools/misc/ptags/default.nix +++ b/pkgs/development/tools/misc/ptags/default.nix @@ -1,5 +1,4 @@ { fetchFromGitHub -, cargo , ctags , lib , makeWrapper diff --git a/pkgs/development/tools/nap/default.nix b/pkgs/development/tools/nap/default.nix index aad1a6c53a3a..784877af792f 100644 --- a/pkgs/development/tools/nap/default.nix +++ b/pkgs/development/tools/nap/default.nix @@ -1,4 +1,4 @@ -{ lib, buildGoModule, fetchFromGitHub, callPackage }: +{ lib, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "nap"; diff --git a/pkgs/development/tools/ocaml/utop/default.nix b/pkgs/development/tools/ocaml/utop/default.nix index 450666a25609..7c92c1acdd22 100644 --- a/pkgs/development/tools/ocaml/utop/default.nix +++ b/pkgs/development/tools/ocaml/utop/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchurl, ocaml, findlib , lambda-term, cppo, makeWrapper, buildDunePackage -, xdg, zed, logs, lwt, react, lwt_react +, xdg, zed, logs }: buildDunePackage rec { diff --git a/pkgs/development/tools/profiling/EZTrace/default.nix b/pkgs/development/tools/profiling/EZTrace/default.nix index 2e2cecf77439..fdd665bbae22 100644 --- a/pkgs/development/tools/profiling/EZTrace/default.nix +++ b/pkgs/development/tools/profiling/EZTrace/default.nix @@ -9,7 +9,6 @@ # is released we can switch to latest binutils. libbfd_2_38, libopcodes_2_38, - buildPackages, autoreconfHook }: diff --git a/pkgs/development/tools/react-native-debugger/default.nix b/pkgs/development/tools/react-native-debugger/default.nix index 9479a949ff3c..61d808e23c6d 100644 --- a/pkgs/development/tools/react-native-debugger/default.nix +++ b/pkgs/development/tools/react-native-debugger/default.nix @@ -7,7 +7,6 @@ , gdk-pixbuf , fontconfig , pango -, gnome , atk , at-spi2-atk , at-spi2-core diff --git a/pkgs/development/tools/rust/bindgen/unwrapped.nix b/pkgs/development/tools/rust/bindgen/unwrapped.nix index 5051949d08b6..db2b4417c1b5 100644 --- a/pkgs/development/tools/rust/bindgen/unwrapped.nix +++ b/pkgs/development/tools/rust/bindgen/unwrapped.nix @@ -1,6 +1,4 @@ { lib, fetchCrate, rustPlatform, clang, rustfmt -, runtimeShell -, bash }: let # bindgen hardcodes rustfmt outputs that use nightly features diff --git a/pkgs/development/tools/rust/cargo-espmonitor/default.nix b/pkgs/development/tools/rust/cargo-espmonitor/default.nix index 9c4874a97555..4c65c7bba3b2 100644 --- a/pkgs/development/tools/rust/cargo-espmonitor/default.nix +++ b/pkgs/development/tools/rust/cargo-espmonitor/default.nix @@ -1,8 +1,6 @@ { lib , fetchFromGitHub , rustPlatform -, pkg-config -, systemd , }: rustPlatform.buildRustPackage rec { diff --git a/pkgs/development/tools/rust/cargo-leptos/default.nix b/pkgs/development/tools/rust/cargo-leptos/default.nix index da48ad231e34..e9398de3e8cf 100644 --- a/pkgs/development/tools/rust/cargo-leptos/default.nix +++ b/pkgs/development/tools/rust/cargo-leptos/default.nix @@ -1,7 +1,6 @@ { darwin , fetchFromGitHub , lib -, pkg-config , rustPlatform , stdenv }: diff --git a/pkgs/development/tools/rust/duckscript/default.nix b/pkgs/development/tools/rust/duckscript/default.nix index 6f8092dd0fc3..be536194d290 100644 --- a/pkgs/development/tools/rust/duckscript/default.nix +++ b/pkgs/development/tools/rust/duckscript/default.nix @@ -1,6 +1,5 @@ { lib , stdenv -, runCommand , fetchCrate , rustPlatform , Security diff --git a/pkgs/development/tools/smlfmt/default.nix b/pkgs/development/tools/smlfmt/default.nix index 1ae8c49ab262..a8a1d4fb4d62 100644 --- a/pkgs/development/tools/smlfmt/default.nix +++ b/pkgs/development/tools/smlfmt/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, pkg-config, mlton }: +{ lib, stdenv, fetchFromGitHub, mlton }: stdenv.mkDerivation rec { pname = "smlfmt"; diff --git a/pkgs/development/tools/steamos-devkit/default.nix b/pkgs/development/tools/steamos-devkit/default.nix index 462bf620e730..ed0e41b5f84a 100644 --- a/pkgs/development/tools/steamos-devkit/default.nix +++ b/pkgs/development/tools/steamos-devkit/default.nix @@ -1,7 +1,6 @@ { lib , fetchFromGitHub , fetchFromGitLab -, writeScript , python3 , copyDesktopItems , makeDesktopItem diff --git a/pkgs/development/tools/swiftformat/default.nix b/pkgs/development/tools/swiftformat/default.nix index 086c79d964a0..317f0ee41617 100644 --- a/pkgs/development/tools/swiftformat/default.nix +++ b/pkgs/development/tools/swiftformat/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, runCommand }: +{ stdenv, lib, fetchFromGitHub }: # This derivation is impure: it relies on an Xcode toolchain being installed # and available in the expected place. The values of sandboxProfile and diff --git a/pkgs/development/tools/trunk/default.nix b/pkgs/development/tools/trunk/default.nix index 0de59f4256e1..bbb340b42a9a 100644 --- a/pkgs/development/tools/trunk/default.nix +++ b/pkgs/development/tools/trunk/default.nix @@ -4,8 +4,6 @@ rustPlatform, fetchFromGitHub, pkg-config, openssl, -jq, -moreutils, CoreServices, SystemConfiguration }: diff --git a/pkgs/development/web/cypress/default.nix b/pkgs/development/web/cypress/default.nix index 8ce3c5aef739..dfe13b69a559 100644 --- a/pkgs/development/web/cypress/default.nix +++ b/pkgs/development/web/cypress/default.nix @@ -1,6 +1,5 @@ { alsa-lib , autoPatchelfHook -, callPackage , fetchzip , gtk2 , gtk3 diff --git a/pkgs/development/web/nodejs/v22.nix b/pkgs/development/web/nodejs/v22.nix index 44737d2ba8ec..cb1f5242e265 100644 --- a/pkgs/development/web/nodejs/v22.nix +++ b/pkgs/development/web/nodejs/v22.nix @@ -1,4 +1,4 @@ -{ callPackage, fetchpatch2, openssl, python3, enableNpm ? true }: +{ callPackage, openssl, python3, enableNpm ? true }: let buildNodejs = callPackage ./nodejs.nix { From e90f9a5491311a7e1055968295669d5b5e1dd122 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 3 Aug 2024 15:34:39 +0000 Subject: [PATCH 27/43] python312Packages.pandoc-latex-environment: 1.1.6.4 -> 1.1.6.5 --- .../python-modules/pandoc-latex-environment/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pandoc-latex-environment/default.nix b/pkgs/development/python-modules/pandoc-latex-environment/default.nix index fef2811083d9..c2cdf7e679a2 100644 --- a/pkgs/development/python-modules/pandoc-latex-environment/default.nix +++ b/pkgs/development/python-modules/pandoc-latex-environment/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "pandoc-latex-environment"; - version = "1.1.6.4"; + version = "1.1.6.5"; pyproject = true; src = fetchFromGitHub { owner = "chdemko"; repo = "pandoc-latex-environment"; rev = "refs/tags/${version}"; - hash = "sha256-DLuLFCKP5ip3duHlGAZnFip7GCDzWK91bka3DrknQSA="; + hash = "sha256-yBVxQW042mGQAksTG5Vr8fExcKt2YnuiPL1cSZRJJYA="; }; build-system = [ From ec581817caba11e5fd97d68526bb89403a2cf715 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Sat, 3 Aug 2024 20:24:27 +0200 Subject: [PATCH 28/43] nixos/wordpress: unpin php81 in check phase --- nixos/modules/services/web-apps/wordpress.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/web-apps/wordpress.nix b/nixos/modules/services/web-apps/wordpress.nix index 0d49f2d92998..37c39608edae 100644 --- a/nixos/modules/services/web-apps/wordpress.nix +++ b/nixos/modules/services/web-apps/wordpress.nix @@ -70,7 +70,7 @@ let require_once(ABSPATH . 'wp-settings.php'); ?> ''; - checkPhase = "${pkgs.php81}/bin/php --syntax-check $target"; + checkPhase = "${pkgs.php}/bin/php --syntax-check $target"; }; mkPhpValue = v: let From 611196a5b0982efed912541b5ffde7e3c5d7b2cd Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 3 Aug 2024 18:30:03 +0000 Subject: [PATCH 29/43] python312Packages.jupytext: 1.16.3 -> 1.16.4 --- pkgs/development/python-modules/jupytext/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/jupytext/default.nix b/pkgs/development/python-modules/jupytext/default.nix index 77e41807355f..4708b5363141 100644 --- a/pkgs/development/python-modules/jupytext/default.nix +++ b/pkgs/development/python-modules/jupytext/default.nix @@ -20,14 +20,14 @@ buildPythonPackage rec { pname = "jupytext"; - version = "1.16.3"; + version = "1.16.4"; pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-HrrJkEYd2fR3/3/uyeMAP6GsyJ88FroBtz95/XbwGpg="; + hash = "sha256-KOM/RvLOekH7nWd6SiyVMnKFV5tkyhBEN8S56x5BdOk="; }; build-system = [ From 9c181bc79394068828a4aefe4ed76e7051cb6278 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 3 Aug 2024 18:39:31 +0000 Subject: [PATCH 30/43] python312Packages.pynitrokey: 0.4.49 -> 0.4.50 --- pkgs/development/python-modules/pynitrokey/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pynitrokey/default.nix b/pkgs/development/python-modules/pynitrokey/default.nix index 7f52440f9702..a144da100369 100644 --- a/pkgs/development/python-modules/pynitrokey/default.nix +++ b/pkgs/development/python-modules/pynitrokey/default.nix @@ -30,7 +30,7 @@ let pname = "pynitrokey"; - version = "0.4.49"; + version = "0.4.50"; mainProgram = "nitropy"; in @@ -40,7 +40,7 @@ buildPythonPackage { src = fetchPypi { inherit pname version; - hash = "sha256-lYdrqXdB5ATFQZMUIMebpIng26ZuZW3zRnQPXiO+uTY="; + hash = "sha256-BIBwIYxoUcK7E69REcu/qmrpNlyYwnA7Im3iRSsWlnA="; }; propagatedBuildInputs = [ From 6cb21508562f3179e99c95c34c4c68038421ccf4 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 3 Aug 2024 22:34:03 +0000 Subject: [PATCH 31/43] openvas-scanner: 23.6.0 -> 23.8.2 --- pkgs/by-name/op/openvas-scanner/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/op/openvas-scanner/package.nix b/pkgs/by-name/op/openvas-scanner/package.nix index a554b6403dff..baba85269424 100644 --- a/pkgs/by-name/op/openvas-scanner/package.nix +++ b/pkgs/by-name/op/openvas-scanner/package.nix @@ -31,13 +31,13 @@ stdenv.mkDerivation rec { pname = "openvas-scanner"; - version = "23.6.0"; + version = "23.8.2"; src = fetchFromGitHub { owner = "greenbone"; repo = "openvas-scanner"; rev = "refs/tags/v${version}"; - hash = "sha256-VIjkrlE39eq8a7Kgj4QZSZ5R9bAnw0oodUc8m/4bSCQ="; + hash = "sha256-sHu6GF+T5Ce2aiGccv9uM+KdAWCLB8CCXujxgxhg4Ho="; }; nativeBuildInputs = [ From 4bc97676080706585de8cdefc3da32f574dc2306 Mon Sep 17 00:00:00 2001 From: Semnodime Date: Thu, 1 Aug 2024 18:48:50 +0200 Subject: [PATCH 32/43] jpexs: 18.4.1 -> 20.1.0 --- pkgs/development/tools/jpexs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/jpexs/default.nix b/pkgs/development/tools/jpexs/default.nix index f9ba57b10e8b..f5c3bf79842c 100644 --- a/pkgs/development/tools/jpexs/default.nix +++ b/pkgs/development/tools/jpexs/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "jpexs"; - version = "18.4.1"; + version = "20.1.0"; src = fetchzip { url = "https://github.com/jindrapetrik/jpexs-decompiler/releases/download/version${version}/ffdec_${version}.zip"; - sha256 = "sha256-aaEL3xJZkFw78zo3IyauWJM9kOo0rJTUSKmWsv9xQZ8="; + hash = "sha256-ytGtylhyNSdKfuPclZRJasOb/cskW65hMd4NM/q+/Ko="; stripRoot = false; }; From 888d768d2b28e570e3b878014cf1ee96170fcd39 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 3 Aug 2024 22:50:35 +0000 Subject: [PATCH 33/43] fflogs: 8.6.0 -> 8.12.0 --- pkgs/by-name/ff/fflogs/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ff/fflogs/package.nix b/pkgs/by-name/ff/fflogs/package.nix index 7b5f8849c800..ebc5bdbb3c37 100644 --- a/pkgs/by-name/ff/fflogs/package.nix +++ b/pkgs/by-name/ff/fflogs/package.nix @@ -5,10 +5,10 @@ let pname = "fflogs"; - version = "8.6.0"; + version = "8.12.0"; src = fetchurl { url = "https://github.com/RPGLogs/Uploaders-fflogs/releases/download/v${version}/fflogs-v${version}.AppImage"; - hash = "sha256-fJOZHvnGOB+b67w2F8kJ+1hogc0DTmtujvNw3W8WWSU="; + hash = "sha256-2hpCcA/RN7fpNhaqMAyVC4d1fTRhp+lwYf/Wc0FjXxI="; }; extracted = appimageTools.extractType2 { inherit pname version src; }; in From 89c64de2a8938777d3d5092d6b1ca4b045ef2590 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 3 Aug 2024 23:56:45 +0000 Subject: [PATCH 34/43] python312Packages.reolink-aio: 0.9.5 -> 0.9.6 --- pkgs/development/python-modules/reolink-aio/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/reolink-aio/default.nix b/pkgs/development/python-modules/reolink-aio/default.nix index 897e4fd21b08..4aad6212e6de 100644 --- a/pkgs/development/python-modules/reolink-aio/default.nix +++ b/pkgs/development/python-modules/reolink-aio/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "reolink-aio"; - version = "0.9.5"; + version = "0.9.6"; pyproject = true; disabled = pythonOlder "3.9"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "starkillerOG"; repo = "reolink_aio"; rev = "refs/tags/${version}"; - hash = "sha256-qwVrC3ZbnbQeyaLSRcrceeDSkYlB3AAywRa8eIOL2ls="; + hash = "sha256-/W0X5lFcVNp2qj8GX5mIZ5ucRlkcKHY+ESrM0gc5FYA="; }; build-system = [ setuptools ]; From 2f96b1f722d97338591ff4a673ba4cc70efbbd50 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 3 Aug 2024 23:57:36 +0000 Subject: [PATCH 35/43] codux: 15.30.0 -> 15.32.0 --- pkgs/by-name/co/codux/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/co/codux/package.nix b/pkgs/by-name/co/codux/package.nix index 89cec09f24b3..3109ad9885fd 100644 --- a/pkgs/by-name/co/codux/package.nix +++ b/pkgs/by-name/co/codux/package.nix @@ -5,11 +5,11 @@ let pname = "codux"; - version = "15.30.0"; + version = "15.32.0"; src = fetchurl { url = "https://github.com/wixplosives/codux-versions/releases/download/${version}/Codux-${version}.x86_64.AppImage"; - sha256 = "sha256-TMtZq58UswbhMgY3FCqVuZaSQ8b4mBYA9wEykMXF9Kc="; + sha256 = "sha256-Uk7QUbcYqbWgu6pKs4iiRwPJASZTDmN1Kv338ZKJQgk="; }; appimageContents = appimageTools.extractType2 { inherit pname version src; }; From ea2ddc7f7ee9794b6c89de6161790c4dcca4903b Mon Sep 17 00:00:00 2001 From: crertel Date: Sun, 28 Jul 2024 23:28:29 -0500 Subject: [PATCH 36/43] lmstudio: adding crertel to maintainers --- pkgs/by-name/lm/lmstudio/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/lm/lmstudio/package.nix b/pkgs/by-name/lm/lmstudio/package.nix index 59af9b4f96b5..54f84f2385cd 100644 --- a/pkgs/by-name/lm/lmstudio/package.nix +++ b/pkgs/by-name/lm/lmstudio/package.nix @@ -11,7 +11,7 @@ let homepage = "https://lmstudio.ai/"; license = lib.licenses.unfree; mainProgram = "lmstudio"; - maintainers = with lib.maintainers; [ cig0 eeedean ]; + maintainers = with lib.maintainers; [ cig0 eeedean crertel ]; platforms = [ "x86_64-linux" "aarch64-darwin" ]; sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; }; From e574238af418d40b7b90bc97b152f582161cf21f Mon Sep 17 00:00:00 2001 From: crertel Date: Sun, 28 Jul 2024 23:27:17 -0500 Subject: [PATCH 37/43] lmstudio: 0.2.27 -> 0.2.31 --- pkgs/by-name/lm/lmstudio/darwin.nix | 4 ++-- pkgs/by-name/lm/lmstudio/linux.nix | 4 ++-- pkgs/by-name/lm/lmstudio/package.nix | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/lm/lmstudio/darwin.nix b/pkgs/by-name/lm/lmstudio/darwin.nix index 2a96f05bebe6..305de818b80d 100644 --- a/pkgs/by-name/lm/lmstudio/darwin.nix +++ b/pkgs/by-name/lm/lmstudio/darwin.nix @@ -9,8 +9,8 @@ stdenv.mkDerivation { inherit meta pname version; src = fetchurl { - url = "https://releases.lmstudio.ai/mac/arm64/${version}/latest/LM-Studio-${version}-arm64.dmg"; - hash = "sha256-zLbkb33Fmz2b+cloEINJybuj+i3ya+EVxb5CPWo/iXk="; + url = "https://releases.lmstudio.ai/mac/arm64/${version}/1/LM-Studio-${version}-arm64.dmg"; + hash = "sha256-ZitdLHuGIH22Ohk7UWVz32BPFTj796HoR+5zEs5rh6E="; }; nativeBuildInputs = [ undmg ]; diff --git a/pkgs/by-name/lm/lmstudio/linux.nix b/pkgs/by-name/lm/lmstudio/linux.nix index f4ed1b048000..827e89df406d 100644 --- a/pkgs/by-name/lm/lmstudio/linux.nix +++ b/pkgs/by-name/lm/lmstudio/linux.nix @@ -6,8 +6,8 @@ }: let src = fetchurl { - url = "https://releases.lmstudio.ai/linux/x86/${version}/beta/LM_Studio-${version}.AppImage"; - hash = "sha256-Mui9QxK7UDnt6cWpYzsoy4hp7P46kx/53+em7Alu1BA="; + url = "https://files.lmstudio.ai/linux/${version}/beta/LM_Studio-${version}.AppImage"; + hash = "sha256-zC8QQNsT1X8ICiYLy/jYMVp8w8NP7ghtVF06UMC4eOg="; }; appimageContents = appimageTools.extractType2 { inherit pname version src; }; diff --git a/pkgs/by-name/lm/lmstudio/package.nix b/pkgs/by-name/lm/lmstudio/package.nix index 54f84f2385cd..c61622085ba9 100644 --- a/pkgs/by-name/lm/lmstudio/package.nix +++ b/pkgs/by-name/lm/lmstudio/package.nix @@ -5,7 +5,7 @@ }: let pname = "lmstudio"; - version = "0.2.27"; + version = "0.2.31"; meta = { description = "LM Studio is an easy to use desktop app for experimenting with local and open-source Large Language Models (LLMs)"; homepage = "https://lmstudio.ai/"; From e8a6875398a763309440b241867a30accb9a9564 Mon Sep 17 00:00:00 2001 From: Pyrox Date: Fri, 2 Aug 2024 23:54:09 -0400 Subject: [PATCH 38/43] diagnostic-languageserver: migrate from mkYarnPackage --- .../di/diagnostic-languageserver/package.json | 33 ------------------ .../di/diagnostic-languageserver/package.nix | 34 +++++++++++-------- 2 files changed, 19 insertions(+), 48 deletions(-) delete mode 100644 pkgs/by-name/di/diagnostic-languageserver/package.json diff --git a/pkgs/by-name/di/diagnostic-languageserver/package.json b/pkgs/by-name/di/diagnostic-languageserver/package.json deleted file mode 100644 index 17483d559a2f..000000000000 --- a/pkgs/by-name/di/diagnostic-languageserver/package.json +++ /dev/null @@ -1,33 +0,0 @@ -{ - "name": "diagnostic-languageserver", - "version": "1.15.0", - "description": "diagnostic language server", - "main": "./lib/index.js", - "repository": "git@github.com:iamcco/diagnostic-languageserver.git", - "author": "iamcco ", - "license": "MIT", - "scripts": { - "build": "tsc -p ./", - "watch": "tsc -w -p ./" - }, - "bin": { - "diagnostic-languageserver": "./bin/index.js" - }, - "dependencies": { - "commander": "^5.1.0", - "find-up": "^4.1.0", - "lodash": "^4.17.15", - "rxjs": "^6.5.5", - "tempy": "^0.7.1", - "tslib": "^1.11.2", - "vscode-languageserver": "^6.1.1", - "vscode-languageserver-textdocument": "^1.0.1", - "vscode-uri": "^2.1.1" - }, - "devDependencies": { - "@types/lodash": "^4.14.150", - "@types/node": "^11.11.3", - "ignore": "^5.1.8", - "typescript": "^3.8.3" - } -} diff --git a/pkgs/by-name/di/diagnostic-languageserver/package.nix b/pkgs/by-name/di/diagnostic-languageserver/package.nix index 81d99c83ac9f..85f35db24ec9 100644 --- a/pkgs/by-name/di/diagnostic-languageserver/package.nix +++ b/pkgs/by-name/di/diagnostic-languageserver/package.nix @@ -1,41 +1,45 @@ { lib, - mkYarnPackage, + stdenv, fetchYarnDeps, fetchFromGitHub, - nix-update-script -}: mkYarnPackage rec { + nix-update-script, + yarnConfigHook, + yarnBuildHook, + npmHooks, + nodejs, +}: +stdenv.mkDerivation (finalAttrs: { pname = "diagnostic-languageserver"; version = "1.15.0"; src = fetchFromGitHub { owner = "iamcco"; repo = "diagnostic-languageserver"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-EFkvxMvtA5L6ZiDxrZxGnNAphNn/P3ra6ZrslplScZg="; }; - packageJSON = ./package.json; - offlineCache = fetchYarnDeps { - yarnLock = "${src}/yarn.lock"; + yarnOfflineCache = fetchYarnDeps { + yarnLock = "${finalAttrs.src}/yarn.lock"; hash = "sha256-T8ppt8EDljtMhGp9i0VleU2Nw3tJexE2ufT6C4EtAz0="; }; - buildPhase = '' - runHook preBuild - yarn --offline build - runHook postBuild - ''; - doDist = false; + nativeBuildInputs = [ + yarnConfigHook + yarnBuildHook + npmHooks.npmInstallHook + nodejs + ]; passthru.updateScript = nix-update-script { }; meta = { description = "General purpose Language Server that integrate with linter to support diagnostic features"; homepage = "https://github.com/iamcco/diagnostic-languageserver"; - changelog = "https://github.com/iamcco/diagnostic-languageserver/releases/tag/v${version}"; + changelog = "https://github.com/iamcco/diagnostic-languageserver/releases/tag/v${finalAttrs.version}"; license = lib.licenses.mit; mainProgram = "diagnostic-languageserver"; maintainers = with lib.maintainers; [ pyrox0 ]; }; -} +}) From 0502f67fa6f46db44b0f7e9c08bf31b9eb3eb223 Mon Sep 17 00:00:00 2001 From: Pyrox Date: Fri, 2 Aug 2024 23:59:55 -0400 Subject: [PATCH 39/43] get-graphql-schema: remove usage of mkYarnPackage --- .../ge/get-graphql-schema/package.json | 35 ------------------- .../by-name/ge/get-graphql-schema/package.nix | 35 +++++++++---------- 2 files changed, 17 insertions(+), 53 deletions(-) delete mode 100644 pkgs/by-name/ge/get-graphql-schema/package.json diff --git a/pkgs/by-name/ge/get-graphql-schema/package.json b/pkgs/by-name/ge/get-graphql-schema/package.json deleted file mode 100644 index ade37982b91f..000000000000 --- a/pkgs/by-name/ge/get-graphql-schema/package.json +++ /dev/null @@ -1,35 +0,0 @@ -{ - "name": "get-graphql-schema", - "bin": "dist/index.js", - "files": [ - "README.md", - "dist/" - ], - "version": "2.1.1", - "description": "Downloads the GraphQL Schema of an GraphQL endpoint URL", - "scripts": { - "build": "tsc", - "prepublish": "npm run build && chmod +x dist/index.js", - "test": "echo \"Error: no test specified\" && exit 1" - }, - "repository": { - "type": "git", - "url": "git+https://github.com/graphcool/get-graphql-schema.git" - }, - "author": "Johannes Schickling ", - "license": "MIT", - "dependencies": { - "@types/chalk": "^0.4.31", - "@types/graphql": "^0.8.6", - "@types/minimist": "^1.2.0", - "@types/node": "^7.0.4", - "@types/node-fetch": "^1.6.7", - "chalk": "^1.1.3", - "graphql": "^0.9.1", - "minimist": "^1.2.0", - "node-fetch": "^1.6.3" - }, - "devDependencies": { - "typescript": "^2.1.5" - } -} diff --git a/pkgs/by-name/ge/get-graphql-schema/package.nix b/pkgs/by-name/ge/get-graphql-schema/package.nix index 25d9f839778c..c32fb60544d0 100644 --- a/pkgs/by-name/ge/get-graphql-schema/package.nix +++ b/pkgs/by-name/ge/get-graphql-schema/package.nix @@ -1,37 +1,36 @@ { lib, - mkYarnPackage, + stdenv, fetchYarnDeps, fetchFromGitHub, - nodejs_22 -}: mkYarnPackage rec { + nodejs, + yarnConfigHook, + yarnBuildHook, + npmHooks, +}: +stdenv.mkDerivation (finalAttrs: { pname = "get-graphql-schema"; version = "2.1.1"; src = fetchFromGitHub { owner = "prisma-labs"; repo = "get-graphql-schema"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-ujc0LGAqmo4SmItm4VcbBOtmUvL6aV1ppMm4fMmuSRs="; }; - packageJSON = ./package.json; - offlineCache = fetchYarnDeps { - yarnLock = "${src}/yarn.lock"; + yarnOfflineCache = fetchYarnDeps { + yarnLock = "${finalAttrs.src}/yarn.lock"; hash = "sha256-TZGNX8UHbolLyBmQNGTnFjgx3/3f2HNVQf/h9rIVJKs="; }; - buildPhase = '' - runHook preBuild - yarn --offline build - runHook postBuild - ''; + nativeBuildInputs = [ + yarnConfigHook + yarnBuildHook + npmHooks.npmInstallHook + nodejs + ]; - postFixup = '' - substituteInPlace $out/libexec/get-graphql-schema/deps/get-graphql-schema/dist/index.js \ - --replace-fail "#!/usr/bin/env node" "#!${lib.getExe nodejs_22}" - chmod +x $out/bin/get-graphql-schema - ''; meta = { description = "Command line tool for generating a changelog from git tags and commit history"; homepage = "https://github.com/cookpete/auto-changelog"; @@ -40,4 +39,4 @@ mainProgram = "get-graphql-schema"; maintainers = with lib.maintainers; [ pyrox0 ]; }; -} +}) From 04c0c779b7ccb53b9b99bd01bca41b46e8f7b139 Mon Sep 17 00:00:00 2001 From: Pyrox Date: Fri, 2 Aug 2024 23:48:42 -0400 Subject: [PATCH 40/43] auto-changelog: remove usage of mkYarnPackage --- pkgs/by-name/au/auto-changelog/package.json | 100 -------------------- pkgs/by-name/au/auto-changelog/package.nix | 36 +++++-- 2 files changed, 28 insertions(+), 108 deletions(-) delete mode 100644 pkgs/by-name/au/auto-changelog/package.json diff --git a/pkgs/by-name/au/auto-changelog/package.json b/pkgs/by-name/au/auto-changelog/package.json deleted file mode 100644 index 573119c376c5..000000000000 --- a/pkgs/by-name/au/auto-changelog/package.json +++ /dev/null @@ -1,100 +0,0 @@ -{ - "name": "auto-changelog", - "version": "2.4.0", - "description": "Command line tool for generating a changelog from git tags and commit history", - "main": "./src/index.js", - "bin": { - "auto-changelog": "./src/index.js" - }, - "engines": { - "node": ">=8.3" - }, - "scripts": { - "lint": "standard --verbose | snazzy", - "lint-fix": "standard --fix", - "lint-markdown": "markdownlint README.md test/data/*.md", - "test": "cross-env NODE_ENV=test mocha -r @babel/register test", - "test-coverage": "cross-env NODE_ENV=test nyc mocha test", - "report-coverage": "nyc report --reporter=json && codecov -f coverage/coverage-final.json", - "preversion": "npm run lint && npm run test", - "version": "node src/index.js --package && git add CHANGELOG.md", - "generate-test-data": "cross-env NODE_ENV=test node scripts/generate-test-data.js" - }, - "author": "Pete Cook (https://github.com/cookpete)", - "homepage": "https://github.com/CookPete/auto-changelog", - "repository": { - "type": "git", - "url": "https://github.com/CookPete/auto-changelog.git" - }, - "bugs": { - "url": "https://github.com/CookPete/auto-changelog/issues" - }, - "keywords": [ - "auto", - "automatic", - "changelog", - "change", - "log", - "generator", - "git", - "commit", - "commits", - "history" - ], - "license": "MIT", - "dependencies": { - "commander": "^7.2.0", - "handlebars": "^4.7.7", - "node-fetch": "^2.6.1", - "parse-github-url": "^1.0.2", - "semver": "^7.3.5" - }, - "devDependencies": { - "@babel/core": "^7.14.3", - "@babel/register": "^7.13.16", - "babel-plugin-istanbul": "^6.0.0", - "babel-plugin-rewire": "^1.2.0", - "chai": "^4.3.4", - "codecov": "^3.8.2", - "cross-env": "^7.0.3", - "markdownlint-cli": "^0.30.0", - "mocha": "^9.2.0", - "nyc": "^15.1.0", - "snazzy": "^9.0.0", - "standard": "^16.0.3" - }, - "babel": { - "env": { - "test": { - "plugins": [ - "istanbul", - "rewire" - ] - } - } - }, - "standard": { - "ignore": [ - "test/data/" - ] - }, - "nyc": { - "all": true, - "include": "src", - "exclude": "src/index.js", - "sourceMap": false, - "instrument": false, - "report-dir": "./coverage", - "temp-dir": "./coverage/.nyc_output", - "require": [ - "@babel/register" - ], - "reporter": [ - "text", - "html" - ] - }, - "auto-changelog": { - "breakingPattern": "Breaking change" - } -} diff --git a/pkgs/by-name/au/auto-changelog/package.nix b/pkgs/by-name/au/auto-changelog/package.nix index 44a4273b9042..ba35a26d6e37 100644 --- a/pkgs/by-name/au/auto-changelog/package.nix +++ b/pkgs/by-name/au/auto-changelog/package.nix @@ -1,25 +1,45 @@ { lib, - mkYarnPackage, + stdenv, fetchYarnDeps, - fetchFromGitHub -}: mkYarnPackage rec { + fetchFromGitHub, + yarnConfigHook, + npmHooks, + nodejs, + git, +}: +stdenv.mkDerivation (finalAttrs: { pname = "auto-changelog"; version = "2.4.0"; src = fetchFromGitHub { owner = "cookpete"; repo = "auto-changelog"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-qgJ/TVyViMhISt/EfCWV7XWQLXKTeZalGHFG905Ma5I="; }; - packageJSON = ./package.json; - offlineCache = fetchYarnDeps { - yarnLock = "${src}/yarn.lock"; + yarnOfflineCache = fetchYarnDeps { + yarnLock = "${finalAttrs.src}/yarn.lock"; hash = "sha256-rP/Xt0txwfEUmGZ0CyHXSEG9zSMtv8wr5M2Na+6PbyQ="; }; + nativeBuildInputs = [ + yarnConfigHook + npmHooks.npmInstallHook + nodejs + ]; + + doCheck = true; + + nativeCheckInputs = [ git ]; + + checkPhase = '' + runHook preCheck + yarn --offline run test -i -g 'compileTemplate' + runHook postCheck + ''; + meta = { description = "Command line tool for generating a changelog from git tags and commit history"; homepage = "https://github.com/cookpete/auto-changelog"; @@ -28,4 +48,4 @@ mainProgram = "auto-changelog"; maintainers = with lib.maintainers; [ pyrox0 ]; }; -} +}) From b812646b79772bb7e9f21c8ecb935a55e7e8e7ff Mon Sep 17 00:00:00 2001 From: Pyrox Date: Sat, 3 Aug 2024 22:25:27 -0400 Subject: [PATCH 41/43] get-graphql-schema: Fix meta attributes --- pkgs/by-name/ge/get-graphql-schema/package.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ge/get-graphql-schema/package.nix b/pkgs/by-name/ge/get-graphql-schema/package.nix index c32fb60544d0..fe6b35e9bcad 100644 --- a/pkgs/by-name/ge/get-graphql-schema/package.nix +++ b/pkgs/by-name/ge/get-graphql-schema/package.nix @@ -32,9 +32,8 @@ stdenv.mkDerivation (finalAttrs: { ]; meta = { - description = "Command line tool for generating a changelog from git tags and commit history"; - homepage = "https://github.com/cookpete/auto-changelog"; - changelog = "https://github.com/cookpete/auto-changelog/blob/master/CHANGELOG.md"; + description = "Fetch and print the GraphQL schema from a GraphQL HTTP endpoint."; + homepage = "https://github.com/prisma-labs/get-graphql-schema"; license = lib.licenses.mit; mainProgram = "get-graphql-schema"; maintainers = with lib.maintainers; [ pyrox0 ]; From 3fcb87d5ba0509fd082468ee19b0448f4c861062 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 4 Aug 2024 03:02:36 +0000 Subject: [PATCH 42/43] maa-cli: 0.4.8 -> 0.4.9 --- pkgs/by-name/ma/maa-cli/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ma/maa-cli/package.nix b/pkgs/by-name/ma/maa-cli/package.nix index e1bfed03e0eb..fcbb89c8e339 100644 --- a/pkgs/by-name/ma/maa-cli/package.nix +++ b/pkgs/by-name/ma/maa-cli/package.nix @@ -15,13 +15,13 @@ rustPlatform.buildRustPackage rec { pname = "maa-cli"; - version = "0.4.8"; + version = "0.4.9"; src = fetchFromGitHub { owner = "MaaAssistantArknights"; repo = "maa-cli"; rev = "v${version}"; - hash = "sha256-qsyMLYAcniYz3gHw2N0itewmEaeCfXHCNwKUq6zUwX0="; + hash = "sha256-klcS4SNMB5bAy4Gzk9NgbjbZL+7kh0lNXwIwJoXBbVU="; }; nativeBuildInputs = [ @@ -47,7 +47,7 @@ rustPlatform.buildRustPackage rec { "core_installer" ]; - cargoHash = "sha256-cmsr4XEccerQMo1ksBzJvA/xdx9sAJlyum+YCpFATOw="; + cargoHash = "sha256-C4NkJc7msyaUjQAsc0kbDwkr0cj3Esv+JjA24RvFsXA="; # maa-cli would only seach libMaaCore.so and resources in itself's path # https://github.com/MaaAssistantArknights/maa-cli/issues/67 From f22364d259b341636fb446bf432df14b8f066f78 Mon Sep 17 00:00:00 2001 From: Tristan Ross Date: Sat, 3 Aug 2024 19:29:53 -0700 Subject: [PATCH 43/43] alsa-firmware: fix building with llvm --- pkgs/by-name/al/alsa-firmware/package.nix | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/pkgs/by-name/al/alsa-firmware/package.nix b/pkgs/by-name/al/alsa-firmware/package.nix index 06b6ef47d430..1666cce5646f 100644 --- a/pkgs/by-name/al/alsa-firmware/package.nix +++ b/pkgs/by-name/al/alsa-firmware/package.nix @@ -1,6 +1,13 @@ -{ lib, buildPackages, stdenvNoCC, autoreconfHook, fetchurl, fetchpatch }: +{ + lib, + stdenv, + buildPackages, + autoreconfHook, + fetchurl, + fetchpatch, +}: -stdenvNoCC.mkDerivation rec { +stdenv.mkDerivation rec { pname = "alsa-firmware"; version = "1.2.4"; @@ -17,12 +24,13 @@ stdenvNoCC.mkDerivation rec { }) ]; - depsBuildBuild = [ buildPackages.stdenv.cc ]; nativeBuildInputs = [ autoreconfHook ]; - configureFlags = [ - "--with-hotplug-dir=$(out)/lib/firmware" - ]; + configureFlags = [ "--with-hotplug-dir=$(out)/lib/firmware" ]; + + depsBuildBuild = lib.optional ( + stdenv.buildPlatform != stdenv.hostPlatform || stdenv.hostPlatform.isAarch64 + ) buildPackages.stdenv.cc; dontStrip = true;