From 655768419e15811f2143941f98d35594f566e78a Mon Sep 17 00:00:00 2001 From: Elian Doran Date: Sun, 4 Aug 2024 09:30:12 +0300 Subject: [PATCH 001/174] nixos/trilium: add adjustable package --- nixos/modules/services/web-apps/trilium.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/nixos/modules/services/web-apps/trilium.nix b/nixos/modules/services/web-apps/trilium.nix index 42b0a16827c3e..5a3542cdd23e5 100644 --- a/nixos/modules/services/web-apps/trilium.nix +++ b/nixos/modules/services/web-apps/trilium.nix @@ -26,6 +26,8 @@ in options.services.trilium-server = with lib; { enable = mkEnableOption "trilium-server"; + package = mkPackageOption pkgs "trilium-server" {}; + dataDir = mkOption { type = types.str; default = "/var/lib/trilium"; @@ -117,7 +119,7 @@ in wantedBy = [ "multi-user.target" ]; environment.TRILIUM_DATA_DIR = cfg.dataDir; serviceConfig = { - ExecStart = "${pkgs.trilium-server}/bin/trilium-server"; + ExecStart = lib.getExe cfg.package; User = "trilium"; Group = "trilium"; PrivateTmp = "true"; From a689ece741d27c8d00cfac5de4b917a12c7d7357 Mon Sep 17 00:00:00 2001 From: "Julie B." Date: Wed, 25 Dec 2024 15:52:57 +0100 Subject: [PATCH 002/174] electrum-ltc: unbreak --- pkgs/applications/misc/electrum/ltc.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/applications/misc/electrum/ltc.nix b/pkgs/applications/misc/electrum/ltc.nix index e2d1f54c63a9b..8e2ad76b2655c 100644 --- a/pkgs/applications/misc/electrum/ltc.nix +++ b/pkgs/applications/misc/electrum/ltc.nix @@ -109,6 +109,9 @@ python3.pkgs.buildPythonApplication { # copy the patched `/run_electrum` over `/electrum/electrum` # so the aiorpcx compatibility patch is used cp run_electrum electrum_ltc/electrum-ltc + + # refresh stale generated code, per electrum_ltc/paymentrequest.py line 40 + protoc --proto_path=electrum_ltc/ --python_out=electrum_ltc/ electrum_ltc/paymentrequest.proto ''; preBuild = From 11bed26c582bcb724e20760d9a585489481ff859 Mon Sep 17 00:00:00 2001 From: PerchunPak Date: Fri, 13 Dec 2024 07:48:04 +0100 Subject: [PATCH 003/174] python3Packages.basedmypy: init at 2.8.1 --- .../python-modules/basedmypy/default.nix | 133 ++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + pkgs/top-level/python-packages.nix | 2 + 3 files changed, 137 insertions(+) create mode 100644 pkgs/development/python-modules/basedmypy/default.nix diff --git a/pkgs/development/python-modules/basedmypy/default.nix b/pkgs/development/python-modules/basedmypy/default.nix new file mode 100644 index 0000000000000..889b0b357af2d --- /dev/null +++ b/pkgs/development/python-modules/basedmypy/default.nix @@ -0,0 +1,133 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + nix-update-script, + pythonAtLeast, + pythonOlder, + stdenv, + + # build-system + setuptools, + types-psutil, + types-setuptools, + + # propagates + basedtyping, + mypy-extensions, + tomli, + typing-extensions, + + # optionals + lxml, + psutil, + + # tests + attrs, + filelock, + pytest-xdist, + pytestCheckHook, +}: + +buildPythonPackage rec { + pname = "basedmypy"; + version = "2.8.1"; + pyproject = true; + + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "KotlinIsland"; + repo = "basedmypy"; + tag = "v${version}"; + hash = "sha256-scPIcUoay8cChiKNhaXcKjN5S5G7teGCakkaFMmAJlo="; + }; + + postPatch = '' + substituteInPlace \ + pyproject.toml \ + --replace-warn 'types-setuptools==' 'types-setuptools>=' + ''; + + build-system = [ + basedtyping + mypy-extensions + types-psutil + types-setuptools + typing-extensions + ] ++ lib.optionals (pythonOlder "3.11") [ tomli ]; + + dependencies = [ + basedtyping + mypy-extensions + typing-extensions + ] ++ lib.optionals (pythonOlder "3.11") [ tomli ]; + + optional-dependencies = { + dmypy = [ psutil ]; + reports = [ lxml ]; + }; + + # Compile mypy with mypyc, which makes mypy about 4 times faster. The compiled + # version is also the default in the wheels on Pypi that include binaries. + # is64bit: unfortunately the build would exhaust all possible memory on i686-linux. + env.MYPY_USE_MYPYC = stdenv.buildPlatform.is64bit; + + # when testing reduce optimisation level to reduce build time by 20% + env.MYPYC_OPT_LEVEL = 1; + + pythonImportsCheck = + [ + "mypy" + "mypy.api" + "mypy.fastparse" + "mypy.types" + "mypyc" + "mypyc.analysis" + ] + ++ lib.optionals (!stdenv.hostPlatform.isi686) [ + # ImportError: cannot import name 'map_instance_to_supertype' from partially initialized module 'mypy.maptype' (most likely due to a circular import) + "mypy.report" + ]; + + nativeCheckInputs = [ + attrs + filelock + pytest-xdist + pytestCheckHook + setuptools + tomli + ] ++ lib.flatten (lib.attrValues optional-dependencies); + + disabledTests = lib.optionals (pythonAtLeast "3.12") [ + # cannot find distutils, and distutils cannot find types + # https://github.com/NixOS/nixpkgs/pull/364818#discussion_r1895715378 + "test_c_unit_test" + ]; + + disabledTestPaths = + [ + # fails to find typing_extensions + "mypy/test/testcmdline.py" + "mypy/test/testdaemon.py" + # fails to find setuptools + "mypyc/test/test_commandline.py" + # fails to find hatchling + "mypy/test/testpep561.py" + ] + ++ lib.optionals stdenv.hostPlatform.isi686 [ + # https://github.com/python/mypy/issues/15221 + "mypyc/test/test_run.py" + ]; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Based Python static type checker with baseline, sane default settings and based typing features"; + homepage = "https://kotlinisland.github.io/basedmypy/"; + changelog = "https://github.com/KotlinIsland/basedmypy/blob/${src.tag}/CHANGELOG.md"; + license = lib.licenses.mit; + mainProgram = "mypy"; + maintainers = with lib.maintainers; [ perchun ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 844ba5a100d62..120b63f810d26 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8595,6 +8595,8 @@ with pkgs; mypy-protobuf = with python3Packages; toPythonApplication mypy-protobuf; + basedmypy = with python3Packages; toPythonApplication basedmypy; + ### DEVELOPMENT / LIBRARIES abseil-cpp_202103 = callPackage ../development/libraries/abseil-cpp/202103.nix { diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index c889890951e94..47fd8a4ed0fa0 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1506,6 +1506,8 @@ self: super: with self; { basedtyping = callPackage ../development/python-modules/basedtyping { }; + basedmypy = callPackage ../development/python-modules/basedmypy { }; + baseline = callPackage ../development/python-modules/baseline { }; baselines = callPackage ../development/python-modules/baselines { }; From c0c964d8ae68a87a9dd2af578f881f44137a8ddb Mon Sep 17 00:00:00 2001 From: sharpchen Date: Sun, 15 Dec 2024 16:27:01 +0800 Subject: [PATCH 004/174] powershell-editor-services: init at 4.1.0 --- .../po/powershell-editor-services/package.nix | 38 +++++++++++++++++++ 1 file changed, 38 insertions(+) create mode 100644 pkgs/by-name/po/powershell-editor-services/package.nix diff --git a/pkgs/by-name/po/powershell-editor-services/package.nix b/pkgs/by-name/po/powershell-editor-services/package.nix new file mode 100644 index 0000000000000..cea882e0d8f77 --- /dev/null +++ b/pkgs/by-name/po/powershell-editor-services/package.nix @@ -0,0 +1,38 @@ +{ + stdenvNoCC, + fetchzip, + lib, + powershell, + runtimeShell, +}: +stdenvNoCC.mkDerivation rec { + pname = "powershell-editor-services"; + version = "4.1.0"; + + src = fetchzip { + url = "https://github.com/PowerShell/PowerShellEditorServices/releases/download/v${version}/PowerShellEditorServices.zip"; + hash = "sha256-B6RF4RoJB+C5i6puZhfy6FZzyZ9eMo81dd0XsaIEK6Q="; + stripRoot = false; + }; + + installPhase = '' + mkdir -p $out/lib/powershell-editor-services/ $out/bin + mv * $out/lib/powershell-editor-services/ + cat > $out/bin/powershell-editor-services < Date: Sun, 15 Dec 2024 23:20:40 +0800 Subject: [PATCH 005/174] maintainers: add sharpchen --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 0a644419f1c9c..33ea06606bc4f 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -20508,6 +20508,12 @@ githubId = 16765155; name = "Shardul Baral"; }; + sharpchen = { + github = "sharpchen"; + githubId = 77432836; + name = "sharpchen"; + email = "rui.chen.sharp@gmail.com"; + }; sharzy = { email = "me@sharzy.in"; github = "SharzyL"; From 4e288104d3553a5553c08d27be8c328283ece324 Mon Sep 17 00:00:00 2001 From: crop Date: Thu, 2 Jan 2025 08:14:53 +0100 Subject: [PATCH 006/174] faust: 2.74.6 -> 2.77.3 --- pkgs/applications/audio/faust/faust2.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/faust/faust2.nix b/pkgs/applications/audio/faust/faust2.nix index a178dac8b47f5..b9bb561fd7917 100644 --- a/pkgs/applications/audio/faust/faust2.nix +++ b/pkgs/applications/audio/faust/faust2.nix @@ -13,6 +13,7 @@ libmicrohttpd, gnutls, libtasn1, + libxml2, p11-kit, vim, which, @@ -24,13 +25,13 @@ with lib.strings; let - version = "2.74.6"; + version = "2.77.3"; src = fetchFromGitHub { owner = "grame-cncm"; repo = "faust"; rev = version; - hash = "sha256-0r7DjTrsNKZ5ZmWoA+Y9OXyJFUiUFZiPQb1skXXWYTw="; + hash = "sha256-C2EOd85idiSKKnWYcfoUFMuCQHB36d3CkrYVNNYmotw="; fetchSubmodules = true; }; @@ -73,6 +74,7 @@ let libtasn1 p11-kit ncurses_static + libxml2 ]; passthru = { inherit wrap wrapWithBuildEnv faust2ApplBase; }; From 596dfcba3203650d87848411be9bb6e5bbb24b6f Mon Sep 17 00:00:00 2001 From: Sergei Zimmerman <145775305+xokdvium@users.noreply.github.com> Date: Fri, 25 Oct 2024 11:00:44 +0300 Subject: [PATCH 007/174] just: fix cross-compilation Get rid of calls to `cargo run` in a, which lead to cargo TARGET and CC to be out of sync for cross-compilation. Only build man pages, shell completions and source for the docs when `stdenv.buildPlatform.canExecute stdenv.hostPlatform`, as this seems to be the current consensus. --- pkgs/by-name/ju/just/package.nix | 72 ++++++++++++++++---------------- 1 file changed, 37 insertions(+), 35 deletions(-) diff --git a/pkgs/by-name/ju/just/package.nix b/pkgs/by-name/ju/just/package.nix index ea20cef8b3a1b..2667c47d45808 100644 --- a/pkgs/by-name/ju/just/package.nix +++ b/pkgs/by-name/ju/just/package.nix @@ -9,16 +9,22 @@ libiconv, mdbook, nix-update-script, + installShellCompletions ? stdenv.buildPlatform.canExecute stdenv.hostPlatform, + installManPages ? stdenv.buildPlatform.canExecute stdenv.hostPlatform, + withDocumentation ? stdenv.buildPlatform.canExecute stdenv.hostPlatform, }: rustPlatform.buildRustPackage rec { pname = "just"; version = "1.38.0"; - outputs = [ - "out" - "man" - "doc" - ]; + outputs = + [ + "out" + ] + ++ lib.optionals installManPages [ + "man" + ] + ++ lib.optionals withDocumentation [ "doc" ]; src = fetchFromGitHub { owner = "casey"; @@ -29,10 +35,9 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-JHLkjMy5b1spJrAqFCCzqgnlYTAKA1Z9Tx4w1WWuiAI="; - nativeBuildInputs = [ - installShellFiles - mdbook - ]; + nativeBuildInputs = + lib.optionals (installShellCompletions || installManPages) [ installShellFiles ] + ++ lib.optionals withDocumentation [ mdbook ]; buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ libiconv ]; preCheck = '' @@ -61,22 +66,9 @@ rustPlatform.buildRustPackage rec { ./fix-just-path-in-tests.patch ]; - postBuild = '' - cargo run --package generate-book - - mkdir -p completions man - - cargo run -- --man > man/just.1 - - for shell in bash fish zsh; do - cargo run -- --completions $shell > completions/just.$shell - done - - # No linkcheck in sandbox - echo 'optional = true' >> book/en/book.toml - mdbook build book/en - find . - ''; + cargoBuildFlags = [ + "--package=just" + ] ++ (lib.optionals withDocumentation [ "--package=generate-book" ]); checkFlags = [ "--skip=backticks::trailing_newlines_are_stripped" # Wants to use python3 as alternate shell @@ -87,16 +79,26 @@ rustPlatform.buildRustPackage rec { "--skip=shebang::run_shebang" # test case very rarely fails with "Text file busy" ]; - postInstall = '' - mkdir -p $doc/share/doc/$name - mv ./book/en/build/html $doc/share/doc/$name - installManPage man/just.1 - - installShellCompletion --cmd just \ - --bash completions/just.bash \ - --fish completions/just.fish \ - --zsh completions/just.zsh - ''; + postInstall = + lib.optionalString withDocumentation '' + $out/bin/generate-book + rm $out/bin/generate-book + # No linkcheck in sandbox + echo 'optional = true' >> book/en/book.toml + mdbook build book/en + mkdir -p $doc/share/doc/$name + mv ./book/en/build/html $doc/share/doc/$name + '' + + lib.optionalString installManPages '' + $out/bin/just --man > ./just.1 + installManPage ./just.1 + '' + + lib.optionalString installShellCompletions '' + installShellCompletion --cmd just \ + --bash <($out/bin/just --completions bash) \ + --fish <($out/bin/just --completions fish) \ + --zsh <($out/bin/just --completions zsh) + ''; setupHook = ./setup-hook.sh; From 91ab20c866fb86bc8f6012a12d54f152c31ad04a Mon Sep 17 00:00:00 2001 From: Tobias Mayer Date: Thu, 26 Dec 2024 12:20:07 +0100 Subject: [PATCH 008/174] restinio: fix cross compilation We always build tests, even when cross compiling. Moving `catch_2_3` from `checkInputs` to `buildInputs` fixes that mode. --- pkgs/by-name/re/restinio/package.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/re/restinio/package.nix b/pkgs/by-name/re/restinio/package.nix index 3f4a00491f134..0d267b42cc1fd 100644 --- a/pkgs/by-name/re/restinio/package.nix +++ b/pkgs/by-name/re/restinio/package.nix @@ -54,12 +54,13 @@ stdenv.mkDerivation (finalAttrs: { ] ); - checkInputs = [ + buildInputs = [ catch2_3 ]; cmakeDir = "../dev"; cmakeFlags = [ + "-DCMAKE_CATCH_DISCOVER_TESTS_DISCOVERY_MODE=PRE_TEST" "-DRESTINIO_TEST=ON" "-DRESTINIO_SAMPLE=OFF" "-DRESTINIO_BENCHMARK=OFF" From 03b400b595b2e3fab91c1803bfc7622c047ea8d3 Mon Sep 17 00:00:00 2001 From: oluceps Date: Mon, 6 Jan 2025 17:57:51 +0800 Subject: [PATCH 009/174] nixos/pam: update u2f authfile description --- nixos/modules/security/pam.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/nixos/modules/security/pam.nix b/nixos/modules/security/pam.nix index 280ef183068b6..264c9f60461c9 100644 --- a/nixos/modules/security/pam.nix +++ b/nixos/modules/security/pam.nix @@ -1219,7 +1219,10 @@ in be changed using {option}`security.pam.u2f.authFile` option. File format is: - `username:first_keyHandle,first_public_key: second_keyHandle,second_public_key` + ``` + :,,,:,,,:... + :,,,:,,,:... + ``` This file can be generated using {command}`pamu2fcfg` command. More information can be found [here](https://developers.yubico.com/pam-u2f/). From e9126cb74bd93b0796acd385f15b5feda2b367a3 Mon Sep 17 00:00:00 2001 From: Sergei Zimmerman <145775305+xokdvium@users.noreply.github.com> Date: Mon, 6 Jan 2025 22:16:20 +0300 Subject: [PATCH 010/174] just: add comments for completion and doc generation Co-authored-by: j-k --- pkgs/by-name/ju/just/package.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/by-name/ju/just/package.nix b/pkgs/by-name/ju/just/package.nix index 2667c47d45808..287ebd2909a4f 100644 --- a/pkgs/by-name/ju/just/package.nix +++ b/pkgs/by-name/ju/just/package.nix @@ -9,8 +9,11 @@ libiconv, mdbook, nix-update-script, + # run the compiled `just` to build the completions installShellCompletions ? stdenv.buildPlatform.canExecute stdenv.hostPlatform, + # run the compiled `just` to build the man pages installManPages ? stdenv.buildPlatform.canExecute stdenv.hostPlatform, + # run the compiled `generate-book` utility to prepare the files for mdbook withDocumentation ? stdenv.buildPlatform.canExecute stdenv.hostPlatform, }: From 14d97890361d49ca4a9415788cabd98f86d3014b Mon Sep 17 00:00:00 2001 From: gale Date: Mon, 6 Jan 2025 21:53:04 -0600 Subject: [PATCH 011/174] slimevr-server: fix OSC support --- pkgs/by-name/sl/slimevr-server/package.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/sl/slimevr-server/package.nix b/pkgs/by-name/sl/slimevr-server/package.nix index 2cc03b62f7942..18f855bd48119 100644 --- a/pkgs/by-name/sl/slimevr-server/package.nix +++ b/pkgs/by-name/sl/slimevr-server/package.nix @@ -4,13 +4,14 @@ runCommand, replaceVars, slimevr, - jdk17_headless, + jdk17, gradle, hidapi, makeWrapper, }: let - java = jdk17_headless; + # JDK can't be headless while SlimeVR uses JavaOSC 0.8. + java = jdk17; # Without this the hidapi bundled with `org.hid4java:hid4java` will be used. # The bundled version won't be able to find `libudev.so.1`. javaOptions = From 05dee0ab01af4c06b80c2589aa9494fe4e1a660b Mon Sep 17 00:00:00 2001 From: nartsisss Date: Tue, 7 Jan 2025 22:59:02 +0300 Subject: [PATCH 012/174] telegram-bot-api: 8.0 -> 8.2 --- pkgs/by-name/te/telegram-bot-api/package.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/te/telegram-bot-api/package.nix b/pkgs/by-name/te/telegram-bot-api/package.nix index 608a1104570e8..ea4ba3185a8d2 100644 --- a/pkgs/by-name/te/telegram-bot-api/package.nix +++ b/pkgs/by-name/te/telegram-bot-api/package.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation { pname = "telegram-bot-api"; - version = "8.0"; + version = "8.2"; src = fetchFromGitHub { owner = "tdlib"; repo = "telegram-bot-api"; - rev = "53e15345b04fcea73b415897f10d7543005044ce"; - hash = "sha256-OnYoJM2f9+/W4m1Ew9nDQQ/Mk0NnGr1dL5jCvLAXc1c="; + rev = "fa6706fc8f6e22b3c25b512ede6474613f32b32b"; + hash = "sha256-0ra1sL121ksUIhpV738tL3y1gu1csMf0rK95G8ElMuo="; fetchSubmodules = true; }; @@ -24,6 +24,7 @@ stdenv.mkDerivation { cmake gperf ]; + buildInputs = [ openssl zlib From ad1fd36660aceed6d6392d191d078e94d1896834 Mon Sep 17 00:00:00 2001 From: nartsisss Date: Tue, 7 Jan 2025 22:59:20 +0300 Subject: [PATCH 013/174] telegram-bot-api: add version check hook --- pkgs/by-name/te/telegram-bot-api/package.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/by-name/te/telegram-bot-api/package.nix b/pkgs/by-name/te/telegram-bot-api/package.nix index ea4ba3185a8d2..740439f9a5482 100644 --- a/pkgs/by-name/te/telegram-bot-api/package.nix +++ b/pkgs/by-name/te/telegram-bot-api/package.nix @@ -6,6 +6,7 @@ gperf, openssl, zlib, + versionCheckHook, }: stdenv.mkDerivation { @@ -30,6 +31,11 @@ stdenv.mkDerivation { zlib ]; + nativeInstallCheckInputs = [ versionCheckHook ]; + + doInstallCheck = true; + versionCheckProgramArg = [ "--version" ]; + meta = { description = "Telegram Bot API server"; homepage = "https://github.com/tdlib/telegram-bot-api"; From 285e0f1ba3df08e7799a0910932bd91e4e54edb2 Mon Sep 17 00:00:00 2001 From: Otto Sabart Date: Thu, 9 Jan 2025 21:00:00 +0100 Subject: [PATCH 014/174] python312Packages.yoto-api: 1.24.3 -> 1.24.4 --- pkgs/development/python-modules/yoto-api/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/yoto-api/default.nix b/pkgs/development/python-modules/yoto-api/default.nix index b42bfa2615c48..b119a8902d609 100644 --- a/pkgs/development/python-modules/yoto-api/default.nix +++ b/pkgs/development/python-modules/yoto-api/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "yoto-api"; - version = "1.24.3"; + version = "1.24.4"; pyproject = true; src = fetchFromGitHub { owner = "cdnninja"; repo = "yoto_api"; tag = "v${version}"; - hash = "sha256-C6pucQDM/iyGTaCy9t7vZLNc1EVMqQGAknJQ+nk9QZY="; + hash = "sha256-CZz1zfNoxrySo0cUobk0Sjzk4QjuZxpUczK+FhMKXMU="; }; build-system = [ setuptools ]; From e4aaec299ffd32c21de2303530620fa2b104c1ab Mon Sep 17 00:00:00 2001 From: Otto Sabart Date: Thu, 9 Jan 2025 21:00:00 +0100 Subject: [PATCH 015/174] home-assistant-custom-components.yoto_ha: 1.22.0 -> 1.22.4 --- .../home-assistant/custom-components/yoto_ha/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/home-assistant/custom-components/yoto_ha/package.nix b/pkgs/servers/home-assistant/custom-components/yoto_ha/package.nix index f005c0ecc3652..7fc52d8ff0dd1 100644 --- a/pkgs/servers/home-assistant/custom-components/yoto_ha/package.nix +++ b/pkgs/servers/home-assistant/custom-components/yoto_ha/package.nix @@ -8,13 +8,13 @@ buildHomeAssistantComponent rec { owner = "cdnninja"; domain = "yoto"; - version = "1.22.0"; + version = "1.22.4"; src = fetchFromGitHub { owner = "cdnninja"; repo = "yoto_ha"; tag = "v${version}"; - hash = "sha256-uaakUxuPxYqLnE2UK6ept91Lycvvhr0r9vZw44y1W4g="; + hash = "sha256-4OKiXwluatm/WRO77tK/VE+fnRn7Cvvh4et3SjANJWE="; }; dependencies = [ From 98aebc56ada492fe5d293cf942f30c13925bdb91 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 10 Jan 2025 07:03:32 +0000 Subject: [PATCH 016/174] zoekt: 3.7.2-2-unstable-2024-12-18 -> 3.7.2-2-unstable-2025-01-08 --- pkgs/by-name/zo/zoekt/package.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/zo/zoekt/package.nix b/pkgs/by-name/zo/zoekt/package.nix index eb5430d3742dc..09244585a55ad 100644 --- a/pkgs/by-name/zo/zoekt/package.nix +++ b/pkgs/by-name/zo/zoekt/package.nix @@ -7,16 +7,16 @@ buildGoModule { pname = "zoekt"; - version = "3.7.2-2-unstable-2024-12-18"; + version = "3.7.2-2-unstable-2025-01-08"; src = fetchFromGitHub { owner = "sourcegraph"; repo = "zoekt"; - rev = "dc1b23bb0da9a0fa91056ad6d5fcf9b8e641f67d"; - hash = "sha256-sMYGFA6zazY64IGELbp4H1xNfKeH72pJ7bJ0Vy9YYFk="; + rev = "b51a2335d51b865e1ffe84aa549e85570da61463"; + hash = "sha256-D8jQ/u5kKRbOihbsX4U7RsoRoyqcJCqrELFt4YTgyj4="; }; - vendorHash = "sha256-Dvs8XMOxZEE9moA8aCxuxg947+x/6C8cKtgdcByL4Eo="; + vendorHash = "sha256-laiBp+nMWEGofu7zOgfM2b8MIC+Dfw7eCLgb/5zf9oo="; nativeCheckInputs = [ git From 431c902d6f6e411782d42c4f44389ccea7150dab Mon Sep 17 00:00:00 2001 From: FliegendeWurst Date: Wed, 8 Jan 2025 12:32:19 +0100 Subject: [PATCH 017/174] pantheon.switchboard-plug-applications: fix cross build --- .../pantheon/apps/switchboard-plugs/applications/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/applications/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/applications/default.nix index 2a7f5c78df6f3..4456b14805306 100644 --- a/pkgs/desktops/pantheon/apps/switchboard-plugs/applications/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/applications/default.nix @@ -3,6 +3,7 @@ stdenv, fetchFromGitHub, nix-update-script, + gettext, meson, ninja, pkg-config, @@ -27,6 +28,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ + gettext # msgfmt meson ninja pkg-config From 6b4c745a8bb9a72ca94edaff8f0389d3c3a3dd5c Mon Sep 17 00:00:00 2001 From: Reno Dakota Date: Thu, 2 Jan 2025 17:03:55 -0800 Subject: [PATCH 018/174] python312Packages.prometheus-client: ignore tests that fail in darwin sandbox --- .../python-modules/prometheus-client/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/development/python-modules/prometheus-client/default.nix b/pkgs/development/python-modules/prometheus-client/default.nix index 3c465a430a292..757794a9d05a9 100644 --- a/pkgs/development/python-modules/prometheus-client/default.nix +++ b/pkgs/development/python-modules/prometheus-client/default.nix @@ -1,5 +1,6 @@ { lib, + stdenv, buildPythonPackage, fetchFromGitHub, setuptools, @@ -32,6 +33,11 @@ buildPythonPackage rec { pythonImportsCheck = [ "prometheus_client" ]; + disabledTests = lib.optionals stdenv.hostPlatform.isDarwin [ + # fails in darwin sandbox: Operation not permitted + "test_instance_ip_grouping_key" + ]; + meta = with lib; { description = "Prometheus instrumentation library for Python applications"; homepage = "https://github.com/prometheus/client_python"; From f2ac0ae1e42bce5cc31bf18dbc63f5f1c9acd6a9 Mon Sep 17 00:00:00 2001 From: FliegendeWurst Date: Wed, 8 Jan 2025 12:32:19 +0100 Subject: [PATCH 019/174] pantheon.switchboard-plug-about: fix cross build --- .../pantheon/apps/switchboard-plugs/about/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/about/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/about/default.nix index be8a879d72884..42df4bea777eb 100644 --- a/pkgs/desktops/pantheon/apps/switchboard-plugs/about/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/about/default.nix @@ -12,6 +12,8 @@ libgtop, libgudev, libsoup_3, + gettext, + glib, granite7, gtk4, packagekit, @@ -35,6 +37,8 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ + gettext # msgfmt + glib # glib-compile-resources meson ninja pkg-config From 4d8384aaa8ccd08d8b7b19ee5ff2db6ebc24ba6b Mon Sep 17 00:00:00 2001 From: FliegendeWurst Date: Wed, 8 Jan 2025 12:32:19 +0100 Subject: [PATCH 020/174] pantheon.switchboard-plug-datetime: fix cross build --- .../pantheon/apps/switchboard-plugs/datetime/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/datetime/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/datetime/default.nix index e72aed12a73a8..9ecda8e925d60 100644 --- a/pkgs/desktops/pantheon/apps/switchboard-plugs/datetime/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/datetime/default.nix @@ -12,6 +12,7 @@ libgee, libical, granite7, + gettext, gtk4, libxml2, switchboard, @@ -37,6 +38,7 @@ stdenv.mkDerivation rec { ]; nativeBuildInputs = [ + gettext # msgfmt libxml2 meson ninja From efee565065275122bfae74e1f8aa76537215006d Mon Sep 17 00:00:00 2001 From: FliegendeWurst Date: Wed, 8 Jan 2025 12:32:19 +0100 Subject: [PATCH 021/174] pantheon.switchboard-plug-display: fix cross build --- .../pantheon/apps/switchboard-plugs/display/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/display/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/display/default.nix index 08b4bb5488b53..8801916abf612 100644 --- a/pkgs/desktops/pantheon/apps/switchboard-plugs/display/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/display/default.nix @@ -9,6 +9,8 @@ vala, libadwaita, libgee, + gettext, + glib, granite7, gtk4, switchboard, @@ -26,6 +28,8 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ + gettext # msgfmt + glib # glib-compile-resources meson ninja pkg-config From 3a188a28669b26d982043e7bdc280c35cadb5987 Mon Sep 17 00:00:00 2001 From: FliegendeWurst Date: Wed, 8 Jan 2025 12:32:19 +0100 Subject: [PATCH 022/174] pantheon.switchboard-plug-keyboard: fix cross build --- .../pantheon/apps/switchboard-plugs/keyboard/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/keyboard/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/keyboard/default.nix index e30a7faf726ca..36fc465a300c5 100644 --- a/pkgs/desktops/pantheon/apps/switchboard-plugs/keyboard/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/keyboard/default.nix @@ -9,6 +9,7 @@ , vala , libadwaita , libgee +, gettext , gnome-settings-daemon , granite7 , gsettings-desktop-schemas @@ -44,6 +45,7 @@ stdenv.mkDerivation rec { ]; nativeBuildInputs = [ + gettext # msgfmt libxml2 meson ninja From eeec44920b8feff7b55b6a27982f57caedca15e3 Mon Sep 17 00:00:00 2001 From: FliegendeWurst Date: Wed, 8 Jan 2025 12:32:19 +0100 Subject: [PATCH 023/174] pantheon.switchboard-plug-notifications: fix cross build --- .../pantheon/apps/switchboard-plugs/notifications/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/notifications/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/notifications/default.nix index b90f64057557b..5e3622f1ed24f 100644 --- a/pkgs/desktops/pantheon/apps/switchboard-plugs/notifications/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/notifications/default.nix @@ -9,6 +9,8 @@ vala, libadwaita, libgee, + gettext, + glib, granite7, gtk4, switchboard, @@ -27,6 +29,8 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ + gettext # msgfmt + glib # glib-compile-resources meson ninja pkg-config From 942c3a28740e3d4bfebed925beddb3bfebbffe6f Mon Sep 17 00:00:00 2001 From: FliegendeWurst Date: Wed, 8 Jan 2025 12:32:19 +0100 Subject: [PATCH 024/174] pantheon.switchboard-plug-onlineaccounts: fix cross build --- .../pantheon/apps/switchboard-plugs/onlineaccounts/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/onlineaccounts/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/onlineaccounts/default.nix index 51074196553b5..d2d6136bf8d2a 100644 --- a/pkgs/desktops/pantheon/apps/switchboard-plugs/onlineaccounts/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/onlineaccounts/default.nix @@ -27,6 +27,8 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ + glib # glib-compile-resources + gtk4 # gtk-update-icon-cache meson ninja pkg-config From a74d1c5c28c4744a38475260abb2b0c02d1c2d38 Mon Sep 17 00:00:00 2001 From: FliegendeWurst Date: Wed, 8 Jan 2025 12:32:19 +0100 Subject: [PATCH 025/174] pantheon.switchboard-plug-printers: fix cross build --- .../pantheon/apps/switchboard-plugs/printers/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/printers/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/printers/default.nix index 278cbfbeec122..a3ad381e12cb1 100644 --- a/pkgs/desktops/pantheon/apps/switchboard-plugs/printers/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/printers/default.nix @@ -9,6 +9,7 @@ vala, libadwaita, libgee, + gettext, granite7, gtk4, cups, @@ -27,6 +28,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ + gettext # msgfmt meson ninja pkg-config From 70d3ccf45f87a4c59c5c51f50ac71eade42c5bc2 Mon Sep 17 00:00:00 2001 From: FliegendeWurst Date: Wed, 8 Jan 2025 12:32:19 +0100 Subject: [PATCH 026/174] pantheon.switchboard-plug-security-privacy: fix cross build --- .../apps/switchboard-plugs/security-privacy/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/security-privacy/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/security-privacy/default.nix index ff4a36666d37f..3007862edd71b 100644 --- a/pkgs/desktops/pantheon/apps/switchboard-plugs/security-privacy/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/security-privacy/default.nix @@ -9,6 +9,7 @@ vala, elementary-settings-daemon, libgee, + gettext, granite7, gsettings-desktop-schemas, gala, @@ -31,6 +32,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ + gettext # msgfmt meson ninja pkg-config From f9e1bbeb2f97579c65830c50b78768e371de41c7 Mon Sep 17 00:00:00 2001 From: FliegendeWurst Date: Wed, 8 Jan 2025 12:32:19 +0100 Subject: [PATCH 027/174] pantheon.switchboard-plug-sharing: fix cross build --- .../pantheon/apps/switchboard-plugs/sharing/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/sharing/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/sharing/default.nix index c0e342dd00882..94503b403df3d 100644 --- a/pkgs/desktops/pantheon/apps/switchboard-plugs/sharing/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/sharing/default.nix @@ -9,6 +9,7 @@ vala, elementary-bluetooth-daemon, libgee, + gettext, granite7, gtk4, switchboard, @@ -26,6 +27,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ + gettext # msgfmt meson ninja pkg-config From 5bc833a17bf55dd1af197afb288856ddf27af169 Mon Sep 17 00:00:00 2001 From: FliegendeWurst Date: Wed, 8 Jan 2025 12:32:19 +0100 Subject: [PATCH 028/174] pantheon.switchboard-plug-wacom: fix cross build --- pkgs/desktops/pantheon/apps/switchboard-plugs/wacom/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/wacom/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/wacom/default.nix index 9fb0562e02fa5..bb96b4a8add94 100644 --- a/pkgs/desktops/pantheon/apps/switchboard-plugs/wacom/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/wacom/default.nix @@ -7,6 +7,7 @@ ninja, pkg-config, vala, + gettext, glib, granite7, gtk4, @@ -30,6 +31,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ + gettext # msgfmt meson ninja pkg-config From 48df1c6e7415ce03913ada5daab609a7c5f5b198 Mon Sep 17 00:00:00 2001 From: FliegendeWurst Date: Wed, 8 Jan 2025 12:32:19 +0100 Subject: [PATCH 029/174] pantheon.switchboard-plug-power: fix strictDeps build --- pkgs/desktops/pantheon/apps/switchboard-plugs/power/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/power/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/power/default.nix index 8c89bae1d427c..7c9078ad9b6b6 100644 --- a/pkgs/desktops/pantheon/apps/switchboard-plugs/power/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/power/default.nix @@ -9,6 +9,7 @@ vala, libadwaita, libgee, + gettext, gnome-settings-daemon, granite7, gtk4, @@ -31,6 +32,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ + gettext # msgfmt meson ninja pkg-config From 2c81ee6df7806dc854370dbd98a49641aa98a5c1 Mon Sep 17 00:00:00 2001 From: FliegendeWurst Date: Wed, 8 Jan 2025 12:32:19 +0100 Subject: [PATCH 030/174] pantheon.switchboard-plug-bluetooth: fix strictDeps build --- .../pantheon/apps/switchboard-plugs/bluetooth/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/bluetooth/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/bluetooth/default.nix index 3366a34e73af8..16b54deeefb5a 100644 --- a/pkgs/desktops/pantheon/apps/switchboard-plugs/bluetooth/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/bluetooth/default.nix @@ -9,6 +9,7 @@ vala, libadwaita, libgee, + gettext, granite7, gtk4, bluez, @@ -28,6 +29,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ + gettext # msgfmt meson ninja pkg-config From 782ce8e3aeeb85259a3acb0cebc0ced33708b562 Mon Sep 17 00:00:00 2001 From: FliegendeWurst Date: Wed, 8 Jan 2025 12:32:19 +0100 Subject: [PATCH 031/174] pantheon.wingpanel-indicator-power: fix strictDeps build --- .../pantheon/desktop/wingpanel-indicators/power/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/power/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/power/default.nix index 895615d37426d..6140d85064e56 100644 --- a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/power/default.nix +++ b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/power/default.nix @@ -10,6 +10,7 @@ ninja, vala, elementary-settings-daemon, + gettext, gtk3, granite, libgtop, @@ -38,6 +39,7 @@ stdenv.mkDerivation rec { ]; nativeBuildInputs = [ + gettext # msgfmt meson ninja pkg-config From 410c4e0f031539b8c036bfb871c6e2278accc1df Mon Sep 17 00:00:00 2001 From: Karolis Stasaitis Date: Mon, 18 Nov 2024 12:35:39 +0100 Subject: [PATCH 032/174] q2pro: 3510 -> 0-unstable-2025-01-02 --- pkgs/by-name/q2/q2pro/package.nix | 53 +++++++++++++++++++++++++------ pkgs/by-name/q2/q2pro/update.sh | 23 ++++++++++++++ 2 files changed, 66 insertions(+), 10 deletions(-) create mode 100755 pkgs/by-name/q2/q2pro/update.sh diff --git a/pkgs/by-name/q2/q2pro/package.nix b/pkgs/by-name/q2/q2pro/package.nix index 9a3465f517f48..bfbc24297da32 100644 --- a/pkgs/by-name/q2/q2pro/package.nix +++ b/pkgs/by-name/q2/q2pro/package.nix @@ -19,33 +19,40 @@ libdecor, ffmpeg, wayland-scanner, - makeWrapper, + makeBinaryWrapper, versionCheckHook, + copyDesktopItems, + makeDesktopItem, + desktopToDarwinBundle, x11Support ? stdenv.hostPlatform.isLinux, waylandSupport ? stdenv.hostPlatform.isLinux, }: stdenv.mkDerivation (finalAttrs: rec { pname = "q2pro"; - version = "3510"; + version = "0-unstable-2025-01-02"; src = fetchFromGitHub { owner = "skullernet"; repo = "q2pro"; - tag = "r${version}"; - hash = "sha256-LNOrGJarXnf4QqFXDkUfUgLGrjSqbjncpIN2yttbMuk="; + rev = "5b2d9f29aa9fb07cfe2b4ba9ee628a0153e759c2"; + hash = "sha256-vz7f6isv3pcMtr3hO96sV1G2F94/w431FxtB6DcpCVU="; }; + # build date and rev number is displayed in the game's console + revCount = "3660"; # git rev-list --count ${src.rev} + SOURCE_DATE_EPOCH = "1735838714"; # git show -s --format=%ct ${src.rev} + nativeBuildInputs = [ meson pkg-config ninja - makeWrapper + makeBinaryWrapper + copyDesktopItems ] - ++ lib.optionals waylandSupport [ - wayland-scanner - ]; + ++ lib.optional waylandSupport wayland-scanner + ++ lib.optional stdenv.hostPlatform.isDarwin desktopToDarwinBundle; buildInputs = [ @@ -64,7 +71,7 @@ stdenv.mkDerivation (finalAttrs: rec { wayland-protocols libdecor ] - ++ lib.optionals x11Support [ libXi ]; + ++ lib.optional x11Support libXi; mesonBuildType = "release"; @@ -79,8 +86,9 @@ stdenv.mkDerivation (finalAttrs: rec { (lib.mesonEnable "windows-crash-dumps" false) ]; + internalVersion = "r${revCount}~${builtins.substring 0 8 src.rev}"; postPatch = '' - echo 'r${version}' > VERSION + echo '${internalVersion}' > VERSION ''; postInstall = @@ -92,12 +100,37 @@ stdenv.mkDerivation (finalAttrs: rec { mv -v $out/bin/q2pro $out/bin/q2pro-unwrapped makeWrapper $out/bin/q2pro-unwrapped $out/bin/q2pro \ --prefix ${ldLibraryPathEnvName} : "${lib.makeLibraryPath finalAttrs.buildInputs}" + + install -D ${src}/src/unix/res/q2pro.xpm $out/share/icons/hicolor/32x32/apps/q2pro.xpm ''; nativeInstallCheckInputs = [ versionCheckHook ]; versionCheckProgramArg = "--version"; + preVersionCheck = '' + export version='${internalVersion}' + ''; doInstallCheck = true; + desktopItems = [ + (makeDesktopItem { + name = "q2pro"; + desktopName = "Q2PRO"; + exec = if stdenv.hostPlatform.isDarwin then "q2pro" else "q2pro +connect %u"; + icon = "q2pro"; + terminal = false; + mimeTypes = [ + "x-scheme-handler/quake2" + ]; + type = "Application"; + categories = [ + "Game" + "ActionGame" + ]; + }) + ]; + + passthru.updateScript = ./update.sh; + meta = { description = "Enhanced Quake 2 client and server focused on multiplayer"; homepage = "https://github.com/skullernet/q2pro"; diff --git a/pkgs/by-name/q2/q2pro/update.sh b/pkgs/by-name/q2/q2pro/update.sh new file mode 100755 index 0000000000000..1adc54dfae66c --- /dev/null +++ b/pkgs/by-name/q2/q2pro/update.sh @@ -0,0 +1,23 @@ +#!/usr/bin/env nix-shell +#!nix-shell -i bash -p git common-updater-scripts +set -euo pipefail + +attr="q2pro" + +tmpdir=$(mktemp -d "/tmp/$attr.XXX") +repo="$tmpdir/repo" +trap 'rm -rf $tmpdir' EXIT + +git clone https://github.com/skullernet/q2pro.git "$repo" + +rev="$(git -C "$repo" rev-parse HEAD)" +revCount="$(git -C "$repo" rev-list --count HEAD)" +sourceDate="$(git -C "$repo" show -s --format=%cd --date=format:'%Y-%m-%d' HEAD)" +sourceDateEpoch="$(git -C "$repo" show -s --format=%ct HEAD)" +version="0-unstable-$sourceDate" + +echo "Updating q2pro to version $version (rev: $rev, date: $sourceDateEpoch)" + +update-source-version "$attr" "$version" --rev="${rev}" +update-source-version "$attr" "$revCount" --ignore-same-hash --version-key=revCount +update-source-version "$attr" "$sourceDateEpoch" --ignore-same-hash --version-key=SOURCE_DATE_EPOCH From 4fcdf706929246476e52e960760b6643cb8395c4 Mon Sep 17 00:00:00 2001 From: Elian Doran Date: Mon, 29 Jul 2024 10:10:28 +0300 Subject: [PATCH 033/174] trilium-next-{desktop,server}: init at 0.90.12 Co-Authored-By: FliegendeWurst <2012gdwu+github@posteo.de> --- .../tr/trilium-next-desktop/package.nix | 129 ++++++++++++++++++ .../by-name/tr/trilium-next-desktop/update.sh | 23 ++++ ...sole-logger-instead-of-rolling-files.patch | 79 +++++++++++ .../tr/trilium-next-server/package.nix | 63 +++++++++ 4 files changed, 294 insertions(+) create mode 100644 pkgs/by-name/tr/trilium-next-desktop/package.nix create mode 100755 pkgs/by-name/tr/trilium-next-desktop/update.sh create mode 100644 pkgs/by-name/tr/trilium-next-server/0001-Use-console-logger-instead-of-rolling-files.patch create mode 100644 pkgs/by-name/tr/trilium-next-server/package.nix diff --git a/pkgs/by-name/tr/trilium-next-desktop/package.nix b/pkgs/by-name/tr/trilium-next-desktop/package.nix new file mode 100644 index 0000000000000..50ae15afeabd0 --- /dev/null +++ b/pkgs/by-name/tr/trilium-next-desktop/package.nix @@ -0,0 +1,129 @@ +{ + stdenv, + lib, + unzip, + fetchurl, + fetchzip, + makeBinaryWrapper, + # use specific electron since it has to load a compiled module + electron_31, + autoPatchelfHook, + makeDesktopItem, + copyDesktopItems, + wrapGAppsHook3, + asar, +}: + +let + pname = "trilium-next-desktop"; + version = "0.90.12"; + + linuxSource.url = "https://github.com/TriliumNext/Notes/releases/download/v${version}/TriliumNextNotes-v${version}-linux-x64.zip"; + linuxSource.sha256 = "0ji28l60wyzhjbi6g5845dnm763bvg7535zfgzcmfgwjs6zr6nfq"; + + darwinSource.url = "https://github.com/TriliumNext/Notes/releases/download/v${version}/TriliumNextNotes-v${version}-macos-x64.zip"; + darwinSource.sha256 = "0jv80k7dk6gpyfj36iin6y7fk7qan4bya72f14jcgfla95wvk6ls"; + + meta = { + description = "Hierarchical note taking application with focus on building large personal knowledge bases"; + homepage = "https://github.com/TriliumNext/Notes"; + license = lib.licenses.agpl3Plus; + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; + maintainers = with lib.maintainers; [ + eliandoran + fliegendewurst + ]; + mainProgram = "trilium"; + platforms = [ + "x86_64-linux" + "x86_64-darwin" + ]; + }; + + linux = stdenv.mkDerivation rec { + inherit pname version meta; + + src = fetchurl linuxSource; + + # Remove trilium-portable.sh, so trilium knows it is packaged making it stop auto generating a desktop item on launch + postPatch = '' + rm ./trilium-portable.sh + ''; + + nativeBuildInputs = [ + unzip + makeBinaryWrapper + wrapGAppsHook3 + copyDesktopItems + autoPatchelfHook + asar + ]; + + buildInputs = [ + (lib.getLib stdenv.cc.cc) + ]; + + desktopItems = [ + (makeDesktopItem { + name = "Trilium"; + exec = "trilium"; + icon = "trilium"; + comment = meta.description; + desktopName = "TriliumNext Notes"; + categories = [ "Office" ]; + startupWMClass = "Trilium Notes Next"; + }) + ]; + + installPhase = '' + runHook preInstall + mkdir -p "$out/bin" + mkdir -p "$out/share/trilium" + mkdir -p "$out/share/icons/hicolor/512x512/apps" + + cp -r ./* "$out/share/trilium/" + rm $out/share/trilium/{*.so*,trilium,chrome_crashpad_handler,chrome-sandbox} + + # Rebuild the ASAR archive, hardcoding the resourcesPath + tmp=$(mktemp -d) + asar extract $out/share/trilium/resources/app.asar $tmp + rm $out/share/trilium/resources/app.asar + + for f in "src/services/utils.ts" "dist/src/services/utils.js"; do + substituteInPlace $tmp/$f \ + --replace-fail "process.resourcesPath" "'$out/share/trilium/resources'" + done + autoPatchelf $tmp + cp $tmp/src/public/icon.png $out/share/icons/hicolor/512x512/apps/trilium.png + + asar pack $tmp/ $out/share/trilium/resources/app.asar + rm -rf $tmp + + makeWrapper ${lib.getExe electron_31} $out/bin/trilium \ + "''${gappsWrapperArgs[@]}" \ + --set-default ELECTRON_IS_DEV 0 \ + --add-flags $out/share/trilium/resources/app.asar + + runHook postInstall + ''; + + dontWrapGApps = true; + + passthru.updateScript = ./update.sh; + }; + + darwin = stdenv.mkDerivation { + inherit pname version meta; + + src = fetchzip darwinSource; + + installPhase = '' + runHook preInstall + mkdir -p $out/Applications + cp -r *.app $out/Applications + runHook postInstall + ''; + }; + +in +if stdenv.hostPlatform.isDarwin then darwin else linux diff --git a/pkgs/by-name/tr/trilium-next-desktop/update.sh b/pkgs/by-name/tr/trilium-next-desktop/update.sh new file mode 100755 index 0000000000000..763e62c467c22 --- /dev/null +++ b/pkgs/by-name/tr/trilium-next-desktop/update.sh @@ -0,0 +1,23 @@ +#!/usr/bin/env nix-shell +#!nix-shell -i bash -p coreutils curl jq +set -euo pipefail + +cd $(dirname "${BASH_SOURCE[0]}") + +setKV () { + sed -i "s|$2 = \".*\"|$2 = \"${3:-}\"|" $1 +} + +version=$(curl -s --show-error "https://api.github.com/repos/TriliumNext/Notes/releases/latest" | jq -r '.tag_name' | tail -c +2) +setKV ./package.nix version $version + +# Update desktop application +sha256_linux64=$(nix-prefetch-url --quiet https://github.com/TriliumNext/Notes/releases/download/v${version}/TriliumNextNotes-v${version}-linux-x64.zip) +sha256_darwin64=$(nix-prefetch-url --quiet https://github.com/TriliumNext/Notes/releases/download/v${version}/TriliumNextNotes-v${version}-macos-x64.zip) +setKV ./package.nix linuxSource.sha256 $sha256_linux64 +setKV ./package.nix darwinSource.sha256 $sha256_darwin64 + +# Update server +sha256_linux64_server=$(nix-prefetch-url --quiet https://github.com/TriliumNext/Notes/releases/download/v${version}/TriliumNextNotes-v${version}-server-linux-x64.tar.xz) +setKV ../trilium-next-server/package.nix version $version +setKV ../trilium-next-server/package.nix serverSource.sha256 $sha256_linux64_server diff --git a/pkgs/by-name/tr/trilium-next-server/0001-Use-console-logger-instead-of-rolling-files.patch b/pkgs/by-name/tr/trilium-next-server/0001-Use-console-logger-instead-of-rolling-files.patch new file mode 100644 index 0000000000000..871076a76331e --- /dev/null +++ b/pkgs/by-name/tr/trilium-next-server/0001-Use-console-logger-instead-of-rolling-files.patch @@ -0,0 +1,79 @@ +diff --git a/src/services/log.js b/src/services/log.js +index 2840c185a..7fb16dd08 100644 +--- a/src/services/log.js ++++ b/src/services/log.js +@@ -1,45 +1,12 @@ + "use strict"; +-import fs from "fs"; +-import dataDir from "./data_dir.js"; + import cls from "./cls.js"; +-if (!fs.existsSync(dataDir.LOG_DIR)) { +- fs.mkdirSync(dataDir.LOG_DIR, 0o700); +-} +-let logFile; + const SECOND = 1000; + const MINUTE = 60 * SECOND; +-const HOUR = 60 * MINUTE; +-const DAY = 24 * HOUR; +-const NEW_LINE = process.platform === "win32" ? '\r\n' : '\n'; +-let todaysMidnight; +-initLogFile(); +-function getTodaysMidnight() { +- const now = new Date(); +- return new Date(now.getFullYear(), now.getMonth(), now.getDate()); +-} +-function initLogFile() { +- todaysMidnight = getTodaysMidnight(); +- const path = `${dataDir.LOG_DIR}/trilium-${formatDate()}.log`; +- if (logFile) { +- logFile.end(); +- } +- logFile = fs.createWriteStream(path, { flags: 'a' }); +-} +-function checkDate(millisSinceMidnight) { +- if (millisSinceMidnight >= DAY) { +- initLogFile(); +- millisSinceMidnight -= DAY; +- } +- return millisSinceMidnight; +-} + function log(str) { + const bundleNoteId = cls.get("bundleNoteId"); + if (bundleNoteId) { + str = `[Script ${bundleNoteId}] ${str}`; +- } +- let millisSinceMidnight = Date.now() - todaysMidnight.getTime(); +- millisSinceMidnight = checkDate(millisSinceMidnight); +- logFile.write(`${formatTime(millisSinceMidnight)} ${str}${NEW_LINE}`); ++ } + console.log(str); + } + function info(message) { +@@ -61,27 +28,6 @@ function request(req, res, timeMs, responseLength = "?") { + info((timeMs >= 10 ? "Slow " : "") + + `${res.statusCode} ${req.method} ${req.url} with ${responseLength} bytes took ${timeMs}ms`); + } +-function pad(num) { +- num = Math.floor(num); +- return num < 10 ? (`0${num}`) : num.toString(); +-} +-function padMilli(num) { +- if (num < 10) { +- return `00${num}`; +- } +- else if (num < 100) { +- return `0${num}`; +- } +- else { +- return num.toString(); +- } +-} +-function formatTime(millisSinceMidnight) { +- return `${pad(millisSinceMidnight / HOUR)}:${pad((millisSinceMidnight % HOUR) / MINUTE)}:${pad((millisSinceMidnight % MINUTE) / SECOND)}.${padMilli(millisSinceMidnight % SECOND)}`; +-} +-function formatDate() { +- return `${pad(todaysMidnight.getFullYear())}-${pad(todaysMidnight.getMonth() + 1)}-${pad(todaysMidnight.getDate())}`; +-} + export default { + info, + error, diff --git a/pkgs/by-name/tr/trilium-next-server/package.nix b/pkgs/by-name/tr/trilium-next-server/package.nix new file mode 100644 index 0000000000000..4c29d71ebd4d1 --- /dev/null +++ b/pkgs/by-name/tr/trilium-next-server/package.nix @@ -0,0 +1,63 @@ +{ + stdenv, + lib, + autoPatchelfHook, + fetchurl, + makeBinaryWrapper, +}: + +let + version = "0.90.12"; + + serverSource.url = "https://github.com/TriliumNext/Notes/releases/download/v${version}/TriliumNextNotes-v${version}-server-linux-x64.tar.xz"; + serverSource.sha256 = "0gvb01cj334n805rs230xwwcv4rf2z2giikpagw8wqrs54gy3b35"; +in +stdenv.mkDerivation { + pname = "trilium-next-server"; + inherit version; + + src = fetchurl serverSource; + + patches = [ + # patch logger to use console instead of rolling files + ./0001-Use-console-logger-instead-of-rolling-files.patch + ]; + + nativeBuildInputs = [ + autoPatchelfHook + makeBinaryWrapper + ]; + + buildInputs = [ + (lib.getLib stdenv.cc.cc) + ]; + + dontConfigure = true; + dontBuild = true; + + installPhase = '' + runHook preInstall + mkdir -p "$out/share/trilium-server" + + cp -r ./* "$out/share/trilium-server/" + + makeWrapper "$out/share/trilium-server/node/bin/node" "$out/bin/trilium-server" \ + --chdir "$out/share/trilium-server" \ + --add-flags "src/main" + + runHook postInstall + ''; + + meta = { + description = "Hierarchical note taking application with focus on building large personal knowledge bases"; + homepage = "https://github.com/TriliumNext/Notes"; + license = lib.licenses.agpl3Plus; + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; + platforms = [ "x86_64-linux" ]; + maintainers = with lib.maintainers; [ + eliandoran + fliegendewurst + ]; + mainProgram = "trilium-server"; + }; +} From ea305d1ef53c4e2bc591daee92fdcf6a9c6c3e1b Mon Sep 17 00:00:00 2001 From: Dimitar Nestorov <8790386+dimitarnestorov@users.noreply.github.com> Date: Sun, 12 Jan 2025 22:39:18 +0200 Subject: [PATCH 034/174] net-news-wire: 6.1.8 -> 6.1.9 --- pkgs/by-name/ne/net-news-wire/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ne/net-news-wire/package.nix b/pkgs/by-name/ne/net-news-wire/package.nix index 3f99283f731a0..bd1280eec5bd4 100644 --- a/pkgs/by-name/ne/net-news-wire/package.nix +++ b/pkgs/by-name/ne/net-news-wire/package.nix @@ -8,11 +8,11 @@ stdenvNoCC.mkDerivation rec { pname = "net-news-wire"; - version = "6.1.8"; + version = "6.1.9"; src = fetchurl { url = "https://github.com/Ranchero-Software/NetNewsWire/releases/download/mac-${version}/NetNewsWire${version}.zip"; - hash = "sha256-/xhy0gF2YHYBVPUAlwySH0/yIelMNeFlU7Ya/ADx1NI="; + hash = "sha256-wG1/EpsK1CMXDTM/WlNFBBUVq6IUSj0GEkqY5Azf/ls="; }; sourceRoot = "."; From 2563b3b83da9a48c331eb93273adafdda9b0ce7a Mon Sep 17 00:00:00 2001 From: Dimitar Nestorov <8790386+dimitarnestorov@users.noreply.github.com> Date: Sun, 12 Jan 2025 22:47:09 +0200 Subject: [PATCH 035/174] net-news-wire: make wrapper --- pkgs/by-name/ne/net-news-wire/package.nix | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/ne/net-news-wire/package.nix b/pkgs/by-name/ne/net-news-wire/package.nix index bd1280eec5bd4..4534554b77efe 100644 --- a/pkgs/by-name/ne/net-news-wire/package.nix +++ b/pkgs/by-name/ne/net-news-wire/package.nix @@ -4,6 +4,7 @@ fetchurl, unzip, nix-update-script, + makeBinaryWrapper, }: stdenvNoCC.mkDerivation rec { @@ -17,12 +18,17 @@ stdenvNoCC.mkDerivation rec { sourceRoot = "."; - nativeBuildInputs = [ unzip ]; + nativeBuildInputs = [ + unzip + makeBinaryWrapper + ]; installPhase = '' runHook preInstall mkdir -p $out/Applications cp -R NetNewsWire.app $out/Applications/ + mkdir -p $out/bin + makeWrapper $out/Applications/NetNewsWire.app/Contents/MacOS/NetNewsWire $out/bin/net-news-wire runHook postInstall ''; From f42791fa124a825a8b47292410b435fe364048db Mon Sep 17 00:00:00 2001 From: Dalton Luce Date: Sun, 12 Jan 2025 17:56:42 -0500 Subject: [PATCH 036/174] maintainers: add da-luce --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index bb25b9c485b43..def877e3927ac 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -4956,6 +4956,12 @@ name = "Dov Alperin"; keys = [ { fingerprint = "4EED 5096 B925 86FA 1101 6673 7F2C 07B9 1B52 BB61"; } ]; }; + da-luce = { + email = "daltonluce42@gmail.com"; + github = "da-luce"; + githubId = 102048662; + name = "Dalton Luce"; + }; damhiya = { name = "SoonWon Moon"; email = "damhiya@gmail.com"; From fd5e1fab04f4bc045ab0dba2b628eac25c2c6511 Mon Sep 17 00:00:00 2001 From: usertam Date: Mon, 13 Jan 2025 04:49:49 +0800 Subject: [PATCH 037/174] firecracker: 1.9.1 -> 1.10.1 --- pkgs/by-name/fi/firecracker/package.nix | 58 ++++++++++++++----------- 1 file changed, 32 insertions(+), 26 deletions(-) diff --git a/pkgs/by-name/fi/firecracker/package.nix b/pkgs/by-name/fi/firecracker/package.nix index c16710e547127..293c9057a15c2 100644 --- a/pkgs/by-name/fi/firecracker/package.nix +++ b/pkgs/by-name/fi/firecracker/package.nix @@ -2,59 +2,65 @@ lib, stdenv, fetchFromGitHub, - makeRustPlatform, - rustc, - cargo, - llvmPackages, cmake, gcc, - - # gcc compile error at deps: aws-lc-sys, function 'memcpy' inlined from 'OPENSSL_memcpy' - # error: '__builtin_memcpy' specified bound exceeds maximum object size - # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=91397 - useRustPlatform ? makeRustPlatform { - inherit rustc cargo; - inherit (llvmPackages) stdenv; - }, + rust-bindgen, + rustPlatform, }: -useRustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage rec { pname = "firecracker"; - version = "1.9.1"; + version = "1.10.1"; src = fetchFromGitHub { owner = "firecracker-microvm"; repo = "firecracker"; rev = "v${version}"; - hash = "sha256-NgT06Xfb6j+d5EcqFjQeaiY08uJJjmrddzdwSoqpKbQ="; + hash = "sha256-kLQPAHbj8Q425Z5zdwofyHz+sd3bf7zGmcMjKn9yTKc="; }; - cargoLock = { - lockFile = ./Cargo.lock; - outputHashes = { - "micro_http-0.1.0" = "sha256-bso39jUUyhlNutUxHw8uHtKWQIHmoikfQ5O3RIePboo="; - }; - }; + useFetchCargoVendor = true; + cargoHash = "sha256-TnEPNTeeX1KP+9HLD/oGF0sZGcXDHpc1Q1wCWw3L6mU="; + + # For aws-lc-sys@0.22.0: use external bindgen. + AWS_LC_SYS_EXTERNAL_BINDGEN = "true"; + + # For aws-lc-sys@0.22.0: fix gcc error: + # In function 'memcpy', + # inlined from 'OPENSSL_memcpy' at aws-lc/crypto/asn1/../internal.h + # inlined from 'aws_lc_0_22_0_i2c_ASN1_BIT_STRING' at aws-lc/crypto/asn1/a_bitstr.c + # glibc/.../string_fortified.h: error: '__builtin_memcpy' specified bound exceeds maximum object size [-Werror=stringop-overflow=] + postPatch = '' + substituteInPlace $cargoDepsCopy/aws-lc-sys-*/aws-lc/crypto/asn1/a_bitstr.c \ + --replace-warn '(len > INT_MAX - 1)' '(len < 0 || len > INT_MAX - 1)' + ''; nativeBuildInputs = [ cmake gcc - useRustPlatform.bindgenHook + rust-bindgen # for aws-lc-sys@0.22.0 + rustPlatform.bindgenHook ]; cargoBuildFlags = [ "--workspace" ]; + cargoTestFlags = [ "--package" "firecracker" "--package" "jailer" ]; checkFlags = [ - # requires /sys/devices/virtual/dmi + # basic tests to skip in sandbox "--skip=fingerprint::dump::tests::test_read_valid_sysfs_file" - # requires /dev/kvm "--skip=template::dump::tests::test_dump" + "--skip=tests::test_filter_apply" "--skip=tests::test_fingerprint_dump_command" "--skip=tests::test_template_dump_command" "--skip=tests::test_template_verify_command" "--skip=utils::tests::test_build_microvm" - # requires seccomp == 0 - "--skip=tests::test_filter_apply" + # more tests to skip in sandbox + "--skip=env::tests::test_copy_cache_info" + "--skip=env::tests::test_dup2" + "--skip=env::tests::test_mknod_and_own_dev" + "--skip=env::tests::test_setup_jailed_folder" + "--skip=env::tests::test_userfaultfd_dev" + "--skip=resource_limits::tests::test_set_resource_limits" ]; installPhase = '' From 920dc0000371b9112aaee1895da7179aa75bd616 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 13 Jan 2025 06:01:05 +0000 Subject: [PATCH 038/174] drawterm: 0-unstable-2024-10-04 -> 0-unstable-2025-01-13 --- pkgs/tools/admin/drawterm/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/admin/drawterm/default.nix b/pkgs/tools/admin/drawterm/default.nix index 0ea9ab1a1b751..e0a648a62b50e 100644 --- a/pkgs/tools/admin/drawterm/default.nix +++ b/pkgs/tools/admin/drawterm/default.nix @@ -20,13 +20,13 @@ stdenv.mkDerivation { pname = "drawterm"; - version = "0-unstable-2024-10-04"; + version = "0-unstable-2025-01-13"; src = fetchFrom9Front { owner = "plan9front"; repo = "drawterm"; - rev = "d7620e8d528a87a3d6cf7285a839d52d4f705771"; - hash = "sha256-v84kvlLKUGR6SY+DPD9fVUivkE56txrMU0dlph2c7bM="; + rev = "daf2ab4550e555cdb6c58f2a9e647c2259a634de"; + hash = "sha256-JUjF6JIoGrBZt9a2j1T8ATxs9VGuNR2DU0o00fu5ueY="; }; enableParallelBuilding = true; From 9647c14b4a3c7cb715229ee26a64bf30a160be51 Mon Sep 17 00:00:00 2001 From: FliegendeWurst Date: Mon, 13 Jan 2025 12:38:31 +0100 Subject: [PATCH 039/174] klick: fix cross build --- pkgs/by-name/kl/klick/package.nix | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/kl/klick/package.nix b/pkgs/by-name/kl/klick/package.nix index ead231281a0dd..2326a26acf8cf 100644 --- a/pkgs/by-name/kl/klick/package.nix +++ b/pkgs/by-name/kl/klick/package.nix @@ -25,16 +25,22 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config - rubberband scons ]; buildInputs = [ + rubberband libsamplerate libsndfile liblo libjack2 boost ]; + + preBuild = '' + substituteInPlace SConstruct \ + --replace-fail 'pkg-config' "${stdenv.cc.targetPrefix}pkg-config" + ''; + prefixKey = "PREFIX="; meta = { From 29f7ee82a0ddf0f292b367831fe8125f0f060a83 Mon Sep 17 00:00:00 2001 From: aspauldingcode Date: Mon, 13 Jan 2025 07:47:21 -0800 Subject: [PATCH 040/174] contributors -> add aspauldingcode --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index c895898d1ac32..b0b1f0bd5b07e 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -2066,6 +2066,12 @@ githubId = 869771; name = "Kirill Boltaev"; }; + aspauldingcode = { + email = "aspauldingcode@gmail.com"; + github = "aspauldingcode"; + githubId = 10196826; + name = "Alex Spaulding"; + }; asppsa = { email = "asppsa@gmail.com"; github = "asppsa"; From ccc74115160d4256da0c36f97fe537d8f441f418 Mon Sep 17 00:00:00 2001 From: PopeRigby Date: Sun, 22 Dec 2024 13:58:41 -0800 Subject: [PATCH 041/174] python312Packages.virtual-glob: init at 0.2.0 --- .../python-modules/virtual-glob/default.nix | 49 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 51 insertions(+) create mode 100644 pkgs/development/python-modules/virtual-glob/default.nix diff --git a/pkgs/development/python-modules/virtual-glob/default.nix b/pkgs/development/python-modules/virtual-glob/default.nix new file mode 100644 index 0000000000000..bb91fba1c264f --- /dev/null +++ b/pkgs/development/python-modules/virtual-glob/default.nix @@ -0,0 +1,49 @@ +{ + buildPythonPackage, + fetchFromGitHub, + flit-core, + lib, + pytest, + pytestCheckHook, + pythonAtLeast, +}: + +buildPythonPackage rec { + pname = "virtual-glob"; + version = "0.2.0"; + pyproject = true; + + src = fetchFromGitHub { + owner = "chrisjsewell"; + repo = "virtual-glob"; + tag = "v${version}"; + hash = "sha256-ocCa8m7mPPvzOZHPrraSEdSJZwRJoYO/Q7nyDbhIFu8="; + }; + + build-system = [ + flit-core + ]; + + optional-dependencies = { + testing = [ + pytest + ]; + }; + + pythonImportsCheck = [ + "virtual_glob" + ]; + + disabledTests = lib.optionals (pythonAtLeast "3.13") [ + "test_baseline_pathlib" + ]; + + nativeCheckInputs = [ pytestCheckHook ]; + + meta = { + description = "Globbing of virtual file systems"; + homepage = "https://pypi.org/project/virtual_glob/"; + maintainers = with lib.maintainers; [ PopeRigby ]; + license = lib.licenses.mit; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 6ed57b2ba9aa9..347dff3f3b6c0 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -17699,6 +17699,8 @@ self: super: with self; { virtkey = callPackage ../development/python-modules/virtkey { }; + virtual-glob = callPackage ../development/python-modules/virtual-glob { }; + virtualenv = callPackage ../development/python-modules/virtualenv { }; virtualenv-clone = callPackage ../development/python-modules/virtualenv-clone { }; From 297e638bad0176417e69ad07c2bb0990093a5a87 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 11 Dec 2024 17:51:08 +0100 Subject: [PATCH 042/174] wyoming-faster-whisper: 2.2.0 -> 2.4.0 https://github.com/rhasspy/wyoming-faster-whisper/releases/tag/v2.4.0 --- pkgs/tools/audio/wyoming/faster-whisper.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/audio/wyoming/faster-whisper.nix b/pkgs/tools/audio/wyoming/faster-whisper.nix index 7ac5ea4b0562e..745eb67313de6 100644 --- a/pkgs/tools/audio/wyoming/faster-whisper.nix +++ b/pkgs/tools/audio/wyoming/faster-whisper.nix @@ -6,17 +6,17 @@ python3Packages.buildPythonApplication rec { pname = "wyoming-faster-whisper"; - version = "2.2.0"; + version = "2.4.0"; pyproject = true; src = fetchFromGitHub { owner = "rhasspy"; repo = "wyoming-faster-whisper"; rev = "refs/tags/v${version}"; - hash = "sha256-G46ycjpRu4MD00FiBM1H0DrPpXaaPlZ8yeoyZ7WYD48="; + hash = "sha256-Ai28i+2/oWI2Y61x7U5an5MBHfuBaGy6qZZwZydS308="; }; - nativeBuildInputs = with python3Packages; [ + build-system = with python3Packages; [ setuptools ]; @@ -25,7 +25,7 @@ python3Packages.buildPythonApplication rec { "wyoming" ]; - propagatedBuildInputs = with python3Packages; [ + dependencies = with python3Packages; [ faster-whisper wyoming ]; From 94fb6085248b68236240878013520d202fb7eadd Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 13 Jan 2025 17:05:33 +0100 Subject: [PATCH 043/174] nixos/wyoming-faster-whisper: refresh and update for 2.4.0 - Refresh the description for models to include all possible options - Add option for the initial prompt - Allow selecting Cantonese (yue) as language - Change the default beam size to 0 (auto) - Rework the commandline --- .../wyoming/faster-whisper.nix | 91 ++++++++++++++++--- 1 file changed, 76 insertions(+), 15 deletions(-) diff --git a/nixos/modules/services/home-automation/wyoming/faster-whisper.nix b/nixos/modules/services/home-automation/wyoming/faster-whisper.nix index 25216689599d5..7d92501821a5c 100644 --- a/nixos/modules/services/home-automation/wyoming/faster-whisper.nix +++ b/nixos/modules/services/home-automation/wyoming/faster-whisper.nix @@ -2,6 +2,7 @@ config, lib, pkgs, + utils, ... }: @@ -20,6 +21,10 @@ let toString ; + inherit (utils) + escapeSystemdExecArgs + ; + in { @@ -29,7 +34,7 @@ in servers = mkOption { default = { }; description = '' - Attribute set of faster-whisper instances to spawn. + Attribute set of wyoming-faster-whisper instances to spawn. ''; type = types.attrsOf ( types.submodule ( @@ -43,9 +48,33 @@ in default = "tiny-int8"; example = "Systran/faster-distil-whisper-small.en"; description = '' - Name of the voice model to use. + Name of the voice model to use. Can also be a HuggingFace model ID or a path to + a custom model directory. + + Compressed models (`int8`) are slightly less accurate, but smaller and faster. - Check the [2.0.0 release notes](https://github.com/rhasspy/wyoming-faster-whisper/releases/tag/v2.0.0) for possible values. + Available models: + - `tiny-int8` (compressed) + - `tiny` + - `tiny.en` (English only) + - `base-int8` (compressed) + - `base` + - `base.en` (English only) + - `small-int8` (compressed) + - `distil-small.en` (distilled, English only) + - `small` + - `small.en` (English only) + - `medium-int8` (compressed) + - `distil-medium.en` (distilled, English only) + - `medium` + - `medium.en` (English only) + - `large` + - `large-v1` + - `distil-large-v2` (distilled, English only) + - `large-v2` + - `distil-large-v3` (distilled, English only) + - `large-v3` + - `turbo` (faster than large-v3) ''; }; @@ -171,6 +200,7 @@ in "uz" "vi" "yi" + "yue" "yo" "zh" ]; @@ -180,12 +210,26 @@ in ''; }; + initialPrompt = mkOption { + type = nullOr str; + default = null; + example = '' + The following conversation takes place in the universe of Wizard of Oz. Key terms include 'Yellow Brick Road' (the path to follow), 'Emerald City' (the ultimate goal), and 'Ruby Slippers' (the magical tools to succeed). Keep these in mind as they guide the journey. + ''; + description = '' + Optional text to provide as a prompt for the first window. This can be used to provide, or + "prompt-engineer" a context for transcription, e.g. custom vocabularies or proper nouns + to make it more likely to predict those word correctly. + ''; + }; + beamSize = mkOption { type = ints.unsigned; - default = 1; + default = 0; example = 5; description = '' The number of beams to use in beam search. + Use `0` to automatically select a value based on the CPU. ''; apply = toString; }; @@ -233,18 +277,35 @@ in serviceConfig = { DynamicUser = true; User = "wyoming-faster-whisper"; - StateDirectory = "wyoming/faster-whisper"; + StateDirectory = [ + "wyoming/faster-whisper" + "wyoming/faster-whisper/models" + ]; # https://github.com/home-assistant/addons/blob/master/whisper/rootfs/etc/s6-overlay/s6-rc.d/whisper/run - ExecStart = '' - ${cfg.package}/bin/wyoming-faster-whisper \ - --data-dir $STATE_DIRECTORY \ - --download-dir $STATE_DIRECTORY \ - --uri ${options.uri} \ - --device ${options.device} \ - --model ${options.model} \ - --language ${options.language} \ - --beam-size ${options.beamSize} ${options.extraArgs} - ''; + ExecStart = escapeSystemdExecArgs ( + [ + (lib.getExe cfg.package) + "--data-dir" + "/var/lib/wyoming/faster-whisper" + "--download-dir" + "/var/lib/wyoming/faster-whisper/models" + "--uri" + options.uri + "--device" + options.device + "--model" + options.model + "--language" + options.language + "--beam-size" + options.beamSize + ] + ++ lib.optionals (options.initialPrompt != null) [ + "--initial-prompt" + options.initialPrompt + ] + ++ options.extraArgs + ); CapabilityBoundingSet = ""; DeviceAllow = if From 0a44f98cf32e87df7476106db163eea3b2a54248 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 14 Jan 2025 01:32:39 +0100 Subject: [PATCH 044/174] wyoming-satellite: pin wyoming at 1.5.4 API breaking in wyoming 1.6.0 and wyoming-satellite hasn't caught up. --- pkgs/by-name/wy/wyoming-satellite/package.nix | 21 ++++++++++++++++--- 1 file changed, 18 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/wy/wyoming-satellite/package.nix b/pkgs/by-name/wy/wyoming-satellite/package.nix index d0083f748fe96..3a56ff6cf6d33 100644 --- a/pkgs/by-name/wy/wyoming-satellite/package.nix +++ b/pkgs/by-name/wy/wyoming-satellite/package.nix @@ -4,7 +4,22 @@ fetchFromGitHub, }: -python3Packages.buildPythonApplication rec { +let + python = python3Packages.python.override { + self = python; + packageOverrides = self: super: { + wyoming = super.wyoming.overridePythonAttrs (oldAttrs: rec { + version = "1.5.4"; + src = fetchFromGitHub { + inherit (oldAttrs.src) owner repo; + tag = version; + hash = "sha256-gx9IbFkwR5fiFFAZTiQKzBbVBJ/RYz29sztgbvAEeRQ="; + }; + }); + }; + }; +in +python.pkgs.buildPythonApplication rec { pname = "wyoming-satellite"; version = "1.2.0"; pyproject = true; @@ -16,7 +31,7 @@ python3Packages.buildPythonApplication rec { hash = "sha256-KIWhWE9Qaxs72fJ1LRTkvk6QtpBJOFlmZv2od69O15g="; }; - nativeBuildInputs = with python3Packages; [ + build-system = with python.pkgs; [ setuptools ]; @@ -25,7 +40,7 @@ python3Packages.buildPythonApplication rec { "zeroconf" ]; - propagatedBuildInputs = with python3Packages; [ + dependencies = with python.pkgs; [ pyring-buffer wyoming zeroconf From 309b624ad1cb5d143c79dccbd8d88f86c2b9a10a Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 14 Jan 2025 00:59:31 +0100 Subject: [PATCH 045/174] python313Packages.wyoming: 1.5.4 -> 1.6.0 https://github.com/rhasspy/wyoming/releases/tag/1.6.0 --- pkgs/development/python-modules/wyoming/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/wyoming/default.nix b/pkgs/development/python-modules/wyoming/default.nix index 5b13cfff8bb3a..e05e8826d18e1 100644 --- a/pkgs/development/python-modules/wyoming/default.nix +++ b/pkgs/development/python-modules/wyoming/default.nix @@ -17,17 +17,17 @@ buildPythonPackage rec { pname = "wyoming"; - version = "1.5.4"; + version = "1.6.0"; pyproject = true; src = fetchFromGitHub { owner = "rhasspy"; repo = "wyoming"; tag = version; - hash = "sha256-gx9IbFkwR5fiFFAZTiQKzBbVBJ/RYz29sztgbvAEeRQ="; + hash = "sha256-V3bOgL8yT+cmc/oJWd/TuhA4DQlC+HXpox4O8Odi1EQ="; }; - nativeBuildInputs = [ setuptools ]; + build-system = [ setuptools ]; optional-dependencies = { zeroconf = [ zeroconf ]; From 3b91b9fbba4b3bb87a4212f55b6f8bfb682ff0dc Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 14 Jan 2025 01:33:40 +0100 Subject: [PATCH 046/174] homeassistant-satellite: drop Has been replaced by wyoming-satellite and the module has been migrated to that on 2023-12-28. --- .../ho/homeassistant-satellite/package.nix | 60 ------------------- 1 file changed, 60 deletions(-) delete mode 100644 pkgs/by-name/ho/homeassistant-satellite/package.nix diff --git a/pkgs/by-name/ho/homeassistant-satellite/package.nix b/pkgs/by-name/ho/homeassistant-satellite/package.nix deleted file mode 100644 index 8a07c104c8f5f..0000000000000 --- a/pkgs/by-name/ho/homeassistant-satellite/package.nix +++ /dev/null @@ -1,60 +0,0 @@ -{ - lib, - python3, - fetchFromGitHub, -}: - -python3.pkgs.buildPythonApplication rec { - pname = "homeassistant-satellite"; - version = "2.3.0"; - pyproject = true; - - src = fetchFromGitHub { - owner = "synesthesiam"; - repo = "homeassistant-satellite"; - rev = "v${version}"; - hash = "sha256-iosutOpkpt0JJIMyALuQSDLj4jk57ITShVyPYlQgMFg="; - }; - - nativeBuildInputs = with python3.pkgs; [ - setuptools - ]; - - pythonRelaxDeps = [ - "aiohttp" - ]; - - propagatedBuildInputs = with python3.pkgs; [ - aiohttp - ]; - - optional-dependencies = { - pulseaudio = with python3.pkgs; [ - pasimple - pulsectl - ]; - silerovad = with python3.pkgs; [ - numpy - onnxruntime - ]; - webrtc = with python3.pkgs; [ - webrtc-noise-gain - ]; - }; - - pythonImportsCheck = [ - "homeassistant_satellite" - ]; - - # no tests - doCheck = false; - - meta = with lib; { - changelog = "https://github.com/synesthesiam/homeassistant-satellite/blob/v${version}/CHANGELOG.md"; - description = "Streaming audio satellite for Home Assistant"; - homepage = "https://github.com/synesthesiam/homeassistant-satellite"; - license = licenses.mit; - maintainers = with maintainers; [ hexa ]; - mainProgram = "homeassistant-satellite"; - }; -} From 11301e9e74c44d22bf5a48ec174ce205f6ae5bdd Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 14 Jan 2025 01:37:56 +0100 Subject: [PATCH 047/174] wyoming-piper: 1.5.0 -> 1.5.2 https://github.com/rhasspy/wyoming-piper/blob/v1.5.2/CHANGELOG.md --- pkgs/tools/audio/wyoming/piper.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/tools/audio/wyoming/piper.nix b/pkgs/tools/audio/wyoming/piper.nix index f85c634cd3430..37118de9d98b9 100644 --- a/pkgs/tools/audio/wyoming/piper.nix +++ b/pkgs/tools/audio/wyoming/piper.nix @@ -6,17 +6,17 @@ python3Packages.buildPythonApplication rec { pname = "wyoming-piper"; - version = "1.5.0"; + version = "1.5.2"; pyproject = true; src = fetchFromGitHub { owner = "rhasspy"; repo = "wyoming-piper"; - rev = "v${version}"; - hash = "sha256-aI1CWtSpSPX1aK4UR/lsCQZQwNs7qOLKfatlSomJx1Q="; + tag = "v${version}"; + hash = "sha256-HxLs2NH5muYzVfOtfLlV09BQ3waIfZKBCTiK/Tha6r4="; }; - nativeBuildInputs = with python3Packages; [ + build-system = with python3Packages; [ setuptools ]; @@ -24,7 +24,7 @@ python3Packages.buildPythonApplication rec { "wyoming" ]; - propagatedBuildInputs = with python3Packages; [ + dependencies = with python3Packages; [ wyoming ]; @@ -35,7 +35,7 @@ python3Packages.buildPythonApplication rec { doCheck = false; meta = with lib; { - changelog = "https://github.com/rhasspy/wyoming-piper/v${version}/master/CHANGELOG.md"; + changelog = "https://github.com/rhasspy/wyoming-piper/blob/v${version}/CHANGELOG.md"; description = "Wyoming Server for Piper"; mainProgram = "wyoming-piper"; homepage = "https://github.com/rhasspy/wyoming-piper"; From a6c0c0ac092cc67a9c967015a0504cb3065b6cfa Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 14 Jan 2025 01:44:01 +0100 Subject: [PATCH 048/174] wyoming-faster-whisper: move to by-name --- .../wy/wyoming-faster-whisper/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 2 deletions(-) rename pkgs/{tools/audio/wyoming/faster-whisper.nix => by-name/wy/wyoming-faster-whisper/package.nix} (100%) diff --git a/pkgs/tools/audio/wyoming/faster-whisper.nix b/pkgs/by-name/wy/wyoming-faster-whisper/package.nix similarity index 100% rename from pkgs/tools/audio/wyoming/faster-whisper.nix rename to pkgs/by-name/wy/wyoming-faster-whisper/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 770d6c409fabd..24a72d1c2b9ee 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16114,8 +16114,6 @@ with pkgs; phonemizer = with python3Packages; toPythonApplication phonemizer; - wyoming-faster-whisper = callPackage ../tools/audio/wyoming/faster-whisper.nix { }; - wyoming-openwakeword = callPackage ../tools/audio/wyoming/openwakeword.nix { }; wyoming-piper = callPackage ../tools/audio/wyoming/piper.nix { }; From 96633b3bdc1e05c5098d9ab95fab11d71cb2def4 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 14 Jan 2025 01:46:14 +0100 Subject: [PATCH 049/174] wyoming-openwakeword: move to by-name --- .../wy/wyoming-openwakeword/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 2 deletions(-) rename pkgs/{tools/audio/wyoming/openwakeword.nix => by-name/wy/wyoming-openwakeword/package.nix} (100%) diff --git a/pkgs/tools/audio/wyoming/openwakeword.nix b/pkgs/by-name/wy/wyoming-openwakeword/package.nix similarity index 100% rename from pkgs/tools/audio/wyoming/openwakeword.nix rename to pkgs/by-name/wy/wyoming-openwakeword/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 24a72d1c2b9ee..77792d894f1c9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16114,8 +16114,6 @@ with pkgs; phonemizer = with python3Packages; toPythonApplication phonemizer; - wyoming-openwakeword = callPackage ../tools/audio/wyoming/openwakeword.nix { }; - wyoming-piper = callPackage ../tools/audio/wyoming/piper.nix { }; ### GAMES From 2fa61164c840b2e330cb7c39140f9ff312a13d85 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 14 Jan 2025 01:46:59 +0100 Subject: [PATCH 050/174] wyoming-piper: move to by-name --- .../wyoming/piper.nix => by-name/wy/wyoming-piper/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 2 deletions(-) rename pkgs/{tools/audio/wyoming/piper.nix => by-name/wy/wyoming-piper/package.nix} (100%) diff --git a/pkgs/tools/audio/wyoming/piper.nix b/pkgs/by-name/wy/wyoming-piper/package.nix similarity index 100% rename from pkgs/tools/audio/wyoming/piper.nix rename to pkgs/by-name/wy/wyoming-piper/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 77792d894f1c9..c563f2cb135f1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16114,8 +16114,6 @@ with pkgs; phonemizer = with python3Packages; toPythonApplication phonemizer; - wyoming-piper = callPackage ../tools/audio/wyoming/piper.nix { }; - ### GAMES _2048-cli = _2048-cli-terminal; From 0e327a55fea4bca6ce8ff3b78e650500f61e89b9 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 14 Jan 2025 02:11:04 +0100 Subject: [PATCH 051/174] nixos/wyoming-openwakeword: refresh module --- .../home-automation/wyoming/openwakeword.nix | 64 +++++++++++-------- 1 file changed, 36 insertions(+), 28 deletions(-) diff --git a/nixos/modules/services/home-automation/wyoming/openwakeword.nix b/nixos/modules/services/home-automation/wyoming/openwakeword.nix index be6c2b74e1222..7c3b21341f374 100644 --- a/nixos/modules/services/home-automation/wyoming/openwakeword.nix +++ b/nixos/modules/services/home-automation/wyoming/openwakeword.nix @@ -2,6 +2,7 @@ config, lib, pkgs, + utils, ... }: @@ -9,14 +10,11 @@ let cfg = config.services.wyoming.openwakeword; inherit (lib) - concatStringsSep - concatMapStringsSep - escapeShellArgs + concatMap mkOption mkEnableOption mkIf mkPackageOption - mkRemovedOptionModule types ; @@ -24,20 +22,12 @@ let toString ; + inherit (utils) + escapeSystemdExecArgs + ; in { - imports = [ - (mkRemovedOptionModule [ - "services" - "wyoming" - "openwakeword" - "models" - ] "Configuring models has been removed, they are now dynamically discovered and loaded at runtime") - ]; - - meta.buildDocsInSandbox = false; - options.services.wyoming.openwakeword = with types; { enable = mkEnableOption "Wyoming openWakeWord server"; @@ -79,10 +69,10 @@ in }; threshold = mkOption { - type = float; + type = numbers.between 0.0 1.0; default = 0.5; description = '' - Activation threshold (0-1), where higher means fewer activations. + Activation threshold (0.0-1.0), where higher means fewer activations. See trigger level for the relationship between activations and wake word detections. @@ -91,7 +81,7 @@ in }; triggerLevel = mkOption { - type = int; + type = ints.unsigned; default = 1; description = '' Number of activations before a detection is registered. @@ -107,7 +97,6 @@ in description = '' Extra arguments to pass to the server commandline. ''; - apply = escapeShellArgs; }; }; @@ -127,15 +116,34 @@ in DynamicUser = true; User = "wyoming-openwakeword"; # https://github.com/home-assistant/addons/blob/master/openwakeword/rootfs/etc/s6-overlay/s6-rc.d/openwakeword/run - ExecStart = concatStringsSep " " [ - "${cfg.package}/bin/wyoming-openwakeword" - "--uri ${cfg.uri}" - (concatMapStringsSep " " (model: "--preload-model ${model}") cfg.preloadModels) - (concatMapStringsSep " " (dir: "--custom-model-dir ${toString dir}") cfg.customModelsDirectories) - "--threshold ${cfg.threshold}" - "--trigger-level ${cfg.triggerLevel}" - "${cfg.extraArgs}" - ]; + ExecStart = escapeSystemdExecArgs ( + [ + (lib.getExe cfg.package) + "--uri" + cfg.uri + "--threshold" + cfg.threshold + "--trigger-level" + cfg.triggerLevel + ] + ++ concatMap ( + model: + [ + "--preload-model" + model + ] + cfg.preloadModels + ) + ++ concatMap ( + dir: + [ + "--custom-model-dir" + (toString dir) + ] + cfg.customModelsDirectories + ) + ++ cfg.extraArgs + ); CapabilityBoundingSet = ""; DeviceAllow = ""; DevicePolicy = "closed"; From 0ec8d2ab8ef11ad9381c884ab121694b17523d80 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 14 Jan 2025 02:27:04 +0100 Subject: [PATCH 052/174] nixos/wyoming-piper: refresh module --- .../home-automation/wyoming/piper.nix | 57 ++++++++++++------- 1 file changed, 36 insertions(+), 21 deletions(-) diff --git a/nixos/modules/services/home-automation/wyoming/piper.nix b/nixos/modules/services/home-automation/wyoming/piper.nix index 0f3af57e3aea8..7b6993a65daec 100644 --- a/nixos/modules/services/home-automation/wyoming/piper.nix +++ b/nixos/modules/services/home-automation/wyoming/piper.nix @@ -2,6 +2,7 @@ config, lib, pkgs, + utils, ... }: @@ -9,7 +10,6 @@ let cfg = config.services.wyoming.piper; inherit (lib) - escapeShellArgs mkOption mkEnableOption mkPackageOption @@ -20,18 +20,19 @@ let toString ; + inherit (utils) + escapeSystemdExecArgs + ; in { - meta.buildDocsInSandbox = false; - options.services.wyoming.piper = with types; { package = mkPackageOption pkgs "wyoming-piper" { }; servers = mkOption { default = { }; description = '' - Attribute set of piper instances to spawn. + Attribute set of wyoming-piper instances to spawn. ''; type = types.attrsOf ( types.submodule ( @@ -69,7 +70,7 @@ in }; noiseScale = mkOption { - type = float; + type = numbers.between 0.0 1.0; default = 0.667; description = '' Generator noise value. @@ -78,7 +79,7 @@ in }; noiseWidth = mkOption { - type = float; + type = numbers.between 0.0 1.0; default = 0.333; description = '' Phoneme width noise value. @@ -87,7 +88,7 @@ in }; lengthScale = mkOption { - type = float; + type = numbers.between 0.0 1.0; default = 1.0; description = '' Phoneme length value. @@ -101,7 +102,6 @@ in description = '' Extra arguments to pass to the server commandline. ''; - apply = escapeShellArgs; }; }; } @@ -136,20 +136,35 @@ in serviceConfig = { DynamicUser = true; User = "wyoming-piper"; - StateDirectory = "wyoming/piper"; + StateDirectory = [ + "wyoming/piper" + "wyoming/piper/models" + ]; # https://github.com/home-assistant/addons/blob/master/piper/rootfs/etc/s6-overlay/s6-rc.d/piper/run - ExecStart = '' - ${cfg.package}/bin/wyoming-piper \ - --data-dir $STATE_DIRECTORY \ - --download-dir $STATE_DIRECTORY \ - --uri ${options.uri} \ - --piper ${options.piper}/bin/piper \ - --voice ${options.voice} \ - --speaker ${options.speaker} \ - --length-scale ${options.lengthScale} \ - --noise-scale ${options.noiseScale} \ - --noise-w ${options.noiseWidth} ${options.extraArgs} - ''; + ExecStart = escapeSystemdExecArgs ( + [ + (lib.getExe cfg.package) + "--data-dir" + "/var/lib/wyoming/piper" + "--download-dir" + "/var/lib/wyoming/piper/models" + "--uri" + options.uri + "--piper" + (lib.getExe options.piper) + "--voice" + options.voice + "--speaker" + options.speaker + "--length-scale" + options.lengthScale + "--noise-scale" + options.noiseScale + "--noise-w" + options.noiseWidth + ] + ++ options.extraArgs + ); CapabilityBoundingSet = ""; DeviceAllow = ""; DevicePolicy = "closed"; From ef3933b2352513cc179f1ab5c421220d91662cf6 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 14 Jan 2025 04:08:12 +0000 Subject: [PATCH 053/174] protonmail-bridge: 3.15.1 -> 3.16.0 --- pkgs/by-name/pr/protonmail-bridge/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/pr/protonmail-bridge/package.nix b/pkgs/by-name/pr/protonmail-bridge/package.nix index 7a013cd2b4234..4687df70901b3 100644 --- a/pkgs/by-name/pr/protonmail-bridge/package.nix +++ b/pkgs/by-name/pr/protonmail-bridge/package.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "protonmail-bridge"; - version = "3.15.1"; + version = "3.16.0"; src = fetchFromGitHub { owner = "ProtonMail"; repo = "proton-bridge"; rev = "v${version}"; - hash = "sha256-TwMkayH5gRSYdv5zDoYT2imOU/8leJugk0HHQLLe/UI="; + hash = "sha256-uzAtoCQIkmCoQWsZbrQ/LycB3cT1ureqRGO8nKuvPEo="; }; - vendorHash = "sha256-avtw9MtnDo/992JAhXKCr/FXv+9M2j/pBLDNRVGsseM="; + vendorHash = "sha256-RKAkdCTkUcUKO+eXvn/Sh52Un4DzvgUlF19MiGm/K0c="; nativeBuildInputs = [ pkg-config ]; From afefc3a7a23090a09c284a5d345a8c20d99406b7 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 14 Jan 2025 04:55:32 +0000 Subject: [PATCH 054/174] docker: 27.4.1 -> 27.5.0 --- pkgs/applications/virtualization/docker/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/virtualization/docker/default.nix b/pkgs/applications/virtualization/docker/default.nix index 15b5a42f35bf4..90b6d708da43c 100644 --- a/pkgs/applications/virtualization/docker/default.nix +++ b/pkgs/applications/virtualization/docker/default.nix @@ -294,9 +294,9 @@ rec { }; docker_27 = callPackage dockerGen rec { - version = "27.4.1"; + version = "27.5.0"; cliRev = "v${version}"; - cliHash = "sha256-/lIp32ArtI8FGPepXnUqmkQ03YTC8SfK44+onAvHFnE="; + cliHash = "sha256-PbdT1CL8jSHHPV2iygTXNwoY0qcNF2XUDEAHHsM4fPM="; mobyRev = "v${version}"; mobyHash = "sha256-OSkI8F8bUjsCUT/pRWWbfTq9Fno5z35hW9OnLXHrIiQ="; runcRev = "v1.2.3"; From 417670631a1d9135f933aeced1676363d2e40067 Mon Sep 17 00:00:00 2001 From: Colin Date: Tue, 14 Jan 2025 08:11:26 +0000 Subject: [PATCH 055/174] gnome-settings-daemon: fix cross compilation --- pkgs/by-name/gn/gnome-settings-daemon/package.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/by-name/gn/gnome-settings-daemon/package.nix b/pkgs/by-name/gn/gnome-settings-daemon/package.nix index ce5d5400bf343..e07a354c20ba8 100644 --- a/pkgs/by-name/gn/gnome-settings-daemon/package.nix +++ b/pkgs/by-name/gn/gnome-settings-daemon/package.nix @@ -2,6 +2,7 @@ stdenv, lib, substituteAll, + buildPackages, fetchurl, meson, ninja, @@ -59,12 +60,18 @@ stdenv.mkDerivation (finalAttrs: { }) ]; + depsBuildBuild = [ + buildPackages.stdenv.cc + pkg-config + ]; + nativeBuildInputs = [ meson ninja pkg-config perl gettext + glib libxml2 libxslt docbook_xsl From 4c1b260aaa2a3cee34a1cb3169ec3de3dc78aacf Mon Sep 17 00:00:00 2001 From: kilianar Date: Tue, 14 Jan 2025 10:44:55 +0100 Subject: [PATCH 056/174] wealthfolio: 1.0.22 -> 1.0.23 https://github.com/afadil/wealthfolio/releases/tag/v1.0.23 --- pkgs/by-name/we/wealthfolio/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/we/wealthfolio/package.nix b/pkgs/by-name/we/wealthfolio/package.nix index 37b9c0a125edf..be5eacbe90edb 100644 --- a/pkgs/by-name/we/wealthfolio/package.nix +++ b/pkgs/by-name/we/wealthfolio/package.nix @@ -18,13 +18,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "wealthfolio"; - version = "1.0.22"; + version = "1.0.23"; src = fetchFromGitHub { owner = "afadil"; repo = "wealthfolio"; rev = "v${finalAttrs.version}"; - hash = "sha256-2g5zfRRxRm7/pCyut7weC4oTegwxCbvYpWSC2+qfcR8="; + hash = "sha256-+jJtvE28P/hoRIFP/fMUs8qVQU3QLxRTPGgGCNIYrtk="; }; pnpmDeps = pnpm.fetchDeps { @@ -38,7 +38,7 @@ stdenv.mkDerivation (finalAttrs: { cargoDeps = rustPlatform.fetchCargoTarball { inherit (finalAttrs) pname version src; sourceRoot = "${finalAttrs.src.name}/${finalAttrs.cargoRoot}"; - hash = "sha256-569k7s6h8eJABNy2+xkNQegEXUhBOlX+zkf1pzNX3ZU="; + hash = "sha256-Teno9y+busOGbreer2RzT+3sigRKvJbO1obfo0QpcPU="; }; nativeBuildInputs = [ From 1233224f22c1bf83d1b8161b48c5f2301b6261e6 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Tue, 14 Jan 2025 10:49:04 +0100 Subject: [PATCH 057/174] scalapack: 2.2.1 -> 2.2.2 --- pkgs/by-name/sc/scalapack/package.nix | 22 ++-------------------- 1 file changed, 2 insertions(+), 20 deletions(-) diff --git a/pkgs/by-name/sc/scalapack/package.nix b/pkgs/by-name/sc/scalapack/package.nix index 69caf221c5a6f..cf5d8a5e44804 100644 --- a/pkgs/by-name/sc/scalapack/package.nix +++ b/pkgs/by-name/sc/scalapack/package.nix @@ -2,7 +2,6 @@ lib, stdenv, fetchFromGitHub, - fetchpatch, cmake, mpiCheckPhaseHook, mpi, @@ -14,28 +13,19 @@ assert blas.isILP64 == lapack.isILP64; stdenv.mkDerivation rec { pname = "scalapack"; - version = "2.2.1"; + version = "2.2.2"; src = fetchFromGitHub { owner = "Reference-ScaLAPACK"; repo = pname; rev = "v${version}"; - sha256 = "sha256-GNVGWrIWdfyTfbz7c31Vjt9eDlVzCd/aLHoWq2DMyX4="; + sha256 = "sha256-KDMW/D7ubGaD2L7eTwULJ04fAYDPAKl8xKPZGZMkeik="; }; passthru = { inherit (blas) isILP64; }; __structuredAttrs = true; - # upstream patch, remove with next release - patches = [ - (fetchpatch { - name = "gcc-10"; - url = "https://github.com/Reference-ScaLAPACK/scalapack/commit/a0f76fc0c1c16646875b454b7d6f8d9d17726b5a.patch"; - sha256 = "0civn149ikghakic30bynqg1bal097hr7i12cm4kq3ssrhq073bp"; - }) - ]; - # Required to activate ILP64. # See https://github.com/Reference-ScaLAPACK/scalapack/pull/19 postPatch = lib.optionalString passthru.isILP64 '' @@ -86,14 +76,6 @@ stdenv.mkDerivation rec { # sometimes fail due to this checkFlags = [ "ARGS=--timeout 10000" ]; - postFixup = '' - # _IMPORT_PREFIX, used to point to lib, points to dev output. Every package using the generated - # cmake file will thus look for the library in the dev output instead of out. - # Use the absolute path to $out instead to fix the issue. - substituteInPlace $dev/lib/cmake/scalapack-${version}/scalapack-targets-release.cmake \ - --replace "\''${_IMPORT_PREFIX}" "$out" - ''; - meta = with lib; { homepage = "http://www.netlib.org/scalapack/"; description = "Library of high-performance linear algebra routines for parallel distributed memory machines"; From 4c70d33f97857f02a39c6055ad7aed8f3cd31b9b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?F=C3=A9lix=20Dorn?= Date: Sun, 3 Nov 2024 21:37:45 +0100 Subject: [PATCH 058/174] package-version-server: init at 0.0.7 --- maintainers/maintainer-list.nix | 6 +++ .../pa/package-version-server/package.nix | 40 +++++++++++++++++++ 2 files changed, 46 insertions(+) create mode 100644 pkgs/by-name/pa/package-version-server/package.nix diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 8c1b474b231b1..58f4f6958dac5 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -7065,6 +7065,12 @@ name = "Felix Albrigtsen"; matrix = "@felixalb:feal.no"; }; + felixdorn = { + name = "Félix"; + matrix = "@d:xfe.li"; + github = "felixdorn"; + githubId = 55788595; + }; felixscheinost = { name = "Felix Scheinost"; email = "felix.scheinost@posteo.de"; diff --git a/pkgs/by-name/pa/package-version-server/package.nix b/pkgs/by-name/pa/package-version-server/package.nix new file mode 100644 index 0000000000000..575cb7af1f204 --- /dev/null +++ b/pkgs/by-name/pa/package-version-server/package.nix @@ -0,0 +1,40 @@ +{ + lib, + rustPlatform, + fetchFromGitHub, + pkg-config, + openssl, + nix-update-script, +}: + +rustPlatform.buildRustPackage rec { + pname = "package-version-server"; + version = "0.0.7"; + + src = fetchFromGitHub { + owner = "zed-industries"; + repo = "package-version-server"; + rev = "refs/tags/v${version}"; + hash = "sha256-/YyJ8+tKrNKVrN+F/oHgtExBBRatIIOvWr9mAyTHA3E="; + }; + + cargoHash = "sha256-aO6d7NcWZtLMH2/2jcsD8vpDO+C2exMwxrLVFH3bsP0="; + + nativeBuildInputs = [ pkg-config ]; + + buildInputs = [ openssl ]; + + passthru = { + updateScript = nix-update-script { }; + }; + + doCheck = lib.versionAtLeast version "0.0.8"; + + meta = { + description = "Language server that handles hover information in package.json files"; + homepage = "https://github.com/zed-industries/package-version-server/"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ felixdorn ]; + mainProgram = "package-version-server"; + }; +} From 08ffc80b0b2dd94db780f2b85ae4385ac7ce6f64 Mon Sep 17 00:00:00 2001 From: tochiaha Date: Fri, 10 Jan 2025 16:28:33 +0000 Subject: [PATCH 059/174] python312Packages.sphinxcontrib-jinjadomain: init at 0.5.1 --- .../sphinxcontrib-jinjadomain/default.nix | 38 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 40 insertions(+) create mode 100644 pkgs/development/python-modules/sphinxcontrib-jinjadomain/default.nix diff --git a/pkgs/development/python-modules/sphinxcontrib-jinjadomain/default.nix b/pkgs/development/python-modules/sphinxcontrib-jinjadomain/default.nix new file mode 100644 index 0000000000000..172230d2306da --- /dev/null +++ b/pkgs/development/python-modules/sphinxcontrib-jinjadomain/default.nix @@ -0,0 +1,38 @@ +{ + buildPythonPackage, + fetchPypi, + lib, + pytestCheckHook, + setuptools, + sphinx, +}: + +buildPythonPackage rec { + pname = "sphinxcontrib-jinjadomain"; + version = "0.5.1"; + pyproject = true; + + src = fetchPypi { + inherit pname version; + hash = "sha256-frzcrUnJna8wmKbsC7wduazLSZ8lzOKOCf75Smk675E="; + }; + + prePatch = '' + substituteInPlace sphinxcontrib/jinjadomain.py \ + --replace-fail "content.sort(key=lambda (k, v): k)" "content.sort(key=lambda kv: kv[0])" + ''; + + build-system = [ setuptools ]; + + dependencies = [ sphinx ]; + + pythonImportsCheck = [ "sphinxcontrib.jinjadomain" ]; + + meta = { + description = "Sphinx domain for describing jinja templates"; + homepage = "https://github.com/offlinehacker/sphinxcontrib.jinjadomain"; + license = lib.licenses.bsd2; + maintainers = with lib.maintainers; [ tochiaha ]; + mainProgram = "sphinxcontrib-jinjadomain"; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 5134f53d3b4c9..5b304d3825228 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -14852,6 +14852,8 @@ self: super: with self; { sphinxcontrib-httpdomain = callPackage ../development/python-modules/sphinxcontrib-httpdomain { }; + sphinxcontrib-jinjadomain = callPackage ../development/python-modules/sphinxcontrib-jinjadomain { }; + sphinxcontrib-jquery = callPackage ../development/python-modules/sphinxcontrib-jquery { }; sphinxcontrib-jsmath = callPackage ../development/python-modules/sphinxcontrib-jsmath { }; From 3b4a9255ab084de29e2a70881c4829b8f1c967ac Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Tue, 14 Jan 2025 12:20:21 +0000 Subject: [PATCH 060/174] xfce.orage: 4.18.0 -> 4.20.0 https://gitlab.xfce.org/apps/orage/-/compare/orage-4.18.0...orage-4.20.0 --- pkgs/desktops/xfce/applications/orage/default.nix | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/pkgs/desktops/xfce/applications/orage/default.nix b/pkgs/desktops/xfce/applications/orage/default.nix index d5ca6ec37c4c4..811150041a258 100644 --- a/pkgs/desktops/xfce/applications/orage/default.nix +++ b/pkgs/desktops/xfce/applications/orage/default.nix @@ -1,32 +1,34 @@ { lib, mkXfceDerivation, + glib, gtk3, libical, libnotify, libxfce4ui, - popt, + libxfce4util, tzdata, }: mkXfceDerivation { category = "apps"; pname = "orage"; - version = "4.18.0"; + version = "4.20.0"; - sha256 = "sha256-vL9zexPbQKPqIzK5UqUIxkE9I7hEupkDOJehMgj2Leo="; + sha256 = "sha256-VaabhMRgH/q9HiFXBPQ90HbMLW21BXTvZtxd8bhYYnw="; buildInputs = [ + glib gtk3 libical libnotify libxfce4ui - popt + libxfce4util ]; postPatch = '' - substituteInPlace src/parameters.c --replace "/usr/share/zoneinfo" "${tzdata}/share/zoneinfo" - substituteInPlace src/tz_zoneinfo_read.c --replace "/usr/share/zoneinfo" "${tzdata}/share/zoneinfo" + substituteInPlace src/parameters.c --replace-fail "/usr/share/zoneinfo" "${tzdata}/share/zoneinfo" + substituteInPlace src/tz_zoneinfo_read.c --replace-fail "/usr/share/zoneinfo" "${tzdata}/share/zoneinfo" ''; meta = with lib; { From 39256929e986f73d442145070eaf8dd4dab5f1d2 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 14 Jan 2025 12:40:24 +0000 Subject: [PATCH 061/174] selene: 0.27.1 -> 0.28.0 --- pkgs/by-name/se/selene/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/se/selene/package.nix b/pkgs/by-name/se/selene/package.nix index 543f225050ae6..6a9c625eb84dd 100644 --- a/pkgs/by-name/se/selene/package.nix +++ b/pkgs/by-name/se/selene/package.nix @@ -11,16 +11,16 @@ rustPlatform.buildRustPackage rec { pname = "selene"; - version = "0.27.1"; + version = "0.28.0"; src = fetchFromGitHub { owner = "kampfkarren"; repo = pname; rev = version; - sha256 = "sha256-NbVSFYv3nyEjSf0bFajcMaoWP2bS0EfJT8tDddjS7jg="; + sha256 = "sha256-QE9kXGQWg0pHtSI1bTppn5IE+53KoxqFED1VvwkumEI="; }; - cargoHash = "sha256-e3oQUFtgdjqPiB2YpmqnFUG2scmYJhLSpUaw0W6RxIk="; + cargoHash = "sha256-Uh07CHuImsYqLolkwAERIkKbyKWevm2KeqjSicXqI+c="; nativeBuildInputs = lib.optionals robloxSupport [ pkg-config From 7c294532f0146a815ef4c457d3a7bf9432d582cb Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Tue, 14 Jan 2025 20:41:57 +0800 Subject: [PATCH 062/174] mint-y-icons: 1.8.1 -> 1.8.3 https://github.com/linuxmint/mint-y-icons/compare/1.8.1...1.8.3 --- pkgs/by-name/mi/mint-y-icons/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/mi/mint-y-icons/package.nix b/pkgs/by-name/mi/mint-y-icons/package.nix index 066beb7318076..a92d6543e6bd8 100644 --- a/pkgs/by-name/mi/mint-y-icons/package.nix +++ b/pkgs/by-name/mi/mint-y-icons/package.nix @@ -10,13 +10,13 @@ stdenvNoCC.mkDerivation rec { pname = "mint-y-icons"; - version = "1.8.1"; + version = "1.8.3"; src = fetchFromGitHub { owner = "linuxmint"; repo = pname; rev = version; - hash = "sha256-hVPDuDhmYhc+m+W703T9VdSHB5z0e6lMPDHYkcoB6nM="; + hash = "sha256-xGPihqXUraJy9lDCSVjQlNxrhETEcjBTYhyFsZGJRGo="; }; propagatedBuildInputs = [ From 867c924b2b9752763b3e3b7f80ddda420621d10c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 14 Jan 2025 13:23:44 +0000 Subject: [PATCH 063/174] libdatachannel: 0.22.3 -> 0.22.4 --- pkgs/by-name/li/libdatachannel/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/li/libdatachannel/package.nix b/pkgs/by-name/li/libdatachannel/package.nix index f5d7d81bdb0e8..a24fc8380f0ca 100644 --- a/pkgs/by-name/li/libdatachannel/package.nix +++ b/pkgs/by-name/li/libdatachannel/package.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation rec { pname = "libdatachannel"; - version = "0.22.3"; + version = "0.22.4"; src = fetchFromGitHub { owner = "paullouisageneau"; repo = "libdatachannel"; rev = "v${version}"; - hash = "sha256-hGqqHMBC0dSF4J2SNjFTNen0iIUEvENcdLWPM3/X2xM="; + hash = "sha256-mnBB2UyeQ73NckE3uF91RhezJDKMQeoOKn8515ygrU0="; }; outputs = [ From ac7e15b9b4f3fb60a2962f6709a05d54a33f7522 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 14 Jan 2025 13:41:09 +0000 Subject: [PATCH 064/174] mixxc: 0.2.3 -> 0.2.4 --- pkgs/by-name/mi/mixxc/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/mi/mixxc/package.nix b/pkgs/by-name/mi/mixxc/package.nix index 2f686571d8025..876217fab41ee 100644 --- a/pkgs/by-name/mi/mixxc/package.nix +++ b/pkgs/by-name/mi/mixxc/package.nix @@ -16,15 +16,15 @@ rustPlatform.buildRustPackage rec { pname = "mixxc"; - version = "0.2.3"; + version = "0.2.4"; src = fetchCrate { pname = "mixxc"; inherit version; - hash = "sha256-d/bMDqDR+sBtsI3ToCcByDxqd+aE6rDPRvGBcodU6iA="; + hash = "sha256-9ZQjNhmQKMfEJsMMpUBI8C6ebfl9UI4yBt6f331tFXU="; }; - cargoHash = "sha256-RoVqQaSlIvAb8mWJNOyALjCHejFEfxjJADQfHZ5EiOs="; + cargoHash = "sha256-EmASy5AHPECyV0mRQV9wjqdDSfFzfMTiL0Hf3/9gR8g="; cargoBuildFlags = [ "--locked" ]; From c50bf7a38fc7ccc01e685c9ec5c0eaa1bd39371f Mon Sep 17 00:00:00 2001 From: misilelab Date: Wed, 15 Jan 2025 00:58:16 +0900 Subject: [PATCH 065/174] simplex-chat-desktop: 6.2.3 -> 6.2.4 Signed-off-by: misilelab --- pkgs/by-name/si/simplex-chat-desktop/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/si/simplex-chat-desktop/package.nix b/pkgs/by-name/si/simplex-chat-desktop/package.nix index 347f2428a0a85..876fc9d883a4b 100644 --- a/pkgs/by-name/si/simplex-chat-desktop/package.nix +++ b/pkgs/by-name/si/simplex-chat-desktop/package.nix @@ -7,11 +7,11 @@ let pname = "simplex-chat-desktop"; - version = "6.2.3"; + version = "6.2.4"; src = fetchurl { url = "https://github.com/simplex-chat/simplex-chat/releases/download/v${version}/simplex-desktop-x86_64.AppImage"; - hash = "sha256-yS3KnR9JLUEwtV8e2J5l4WW+XNHWg7PDOKtlfT/zfUE="; + hash = "sha256-Qd9qbsMLCBSs2Ow/OXUDbfl4rFdAIOwUiDmPAvhvDrs="; }; appimageContents = appimageTools.extract { From 18f6b0e2099909e4d85ca98dc4840b9bf2033b1d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 14 Jan 2025 16:32:24 +0000 Subject: [PATCH 066/174] subfinder: 2.6.7 -> 2.6.8 --- pkgs/by-name/su/subfinder/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/su/subfinder/package.nix b/pkgs/by-name/su/subfinder/package.nix index 16d5a986422cd..d748a3c69a252 100644 --- a/pkgs/by-name/su/subfinder/package.nix +++ b/pkgs/by-name/su/subfinder/package.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "subfinder"; - version = "2.6.7"; + version = "2.6.8"; src = fetchFromGitHub { owner = "projectdiscovery"; repo = "subfinder"; tag = "v${version}"; - hash = "sha256-2IO7TyMcKUB2B9agCoIdjybEjr0RLCv+vhXn9e5eL28="; + hash = "sha256-xKK34SDjajLngmYsHADqof+/Hma2WuDj4SFkcqqm3hs="; }; - vendorHash = "sha256-+JOrephdT0k3onbgA3CKLeF8iLWycybwtJxalC0n0Ys="; + vendorHash = "sha256-jVLkClwjK7Uvj8ZxOpAACafftwpBNHipQetF2FSpbYY="; modRoot = "./v2"; From a6fd49dbc1c389ff01c04215b8c687f249e53f9f Mon Sep 17 00:00:00 2001 From: tahanonu Date: Fri, 26 Jul 2024 16:13:13 +0100 Subject: [PATCH 067/174] python312Packages.pcre2-py: init at 0.4.0 Release: https://github.com/grtetrault/pcre2.py/releases/tag/v0.4.0 --- .../python-modules/pcre2-py/default.nix | 90 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 92 insertions(+) create mode 100644 pkgs/development/python-modules/pcre2-py/default.nix diff --git a/pkgs/development/python-modules/pcre2-py/default.nix b/pkgs/development/python-modules/pcre2-py/default.nix new file mode 100644 index 0000000000000..d4c84f99affd4 --- /dev/null +++ b/pkgs/development/python-modules/pcre2-py/default.nix @@ -0,0 +1,90 @@ +{ + build, + bzip2, + cmake, + cython, + editline, + gitpython, + pytestCheckHook, + buildPythonPackage, + fetchFromGitHub, + haskellPackages, + lib, + libedit, + libz, + pcre2, + scikit-build, + setuptools, + twine, + readline, + requests, +}: + +buildPythonPackage rec { + pname = "pcre2-py"; + version = "0.4.0"; + pyproject = true; + + src = fetchFromGitHub { + owner = "grtetrault"; + repo = "pcre2.py"; + rev = "refs/tags/v${version}"; + hash = "sha256-NPpI3IWg58num0MZjlEam37Qz9D3dDMhFjfVXB8ugOg="; + fetchSubmodules = false; + }; + + postPatch = '' + substituteInPlace CMakeLists.txt \ + --replace-fail "add_subdirectory(src/libpcre2)" "" \ + --replace-fail "install" "#install" + substituteInPlace src/pcre2/CMakeLists.txt \ + --replace-fail "\''${PCRE2_INCLUDE_DIR}" "${pcre2.dev}/include" \ + --replace-fail "pcre2-8-static" "pcre2-8" + ''; + + dontUseCmakeConfigure = true; + + build-system = [ + cmake + cython + scikit-build + setuptools + ]; + + dependencies = + [ + haskellPackages.bz2 + haskellPackages.memfd + ] + ++ [ + build + bzip2 + editline + libedit + libz + pcre2 + readline + requests + ]; + + nativeCheckInputs = [ + pytestCheckHook + twine + gitpython + ]; + + pythonImportsCheck = [ "pcre2" ]; + + postCheck = '' + cd $out + rm -rf *.t* *.py requirements Makefile LICENSE *.md + ''; + + meta = { + description = "Python bindings for the PCRE2 library created by Philip Hazel"; + homepage = "https://github.com/grtetrault/pcre2.py"; + changelog = "https://github.com/grtetrault/pcre2.py/releases/tag/v{version}"; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ tochiaha ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 377d5e2587d1a..95bf76fb62438 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -9286,6 +9286,8 @@ self: super: with self; { pcpp = callPackage ../development/python-modules/pcpp { }; + pcre2-py = callPackage ../development/python-modules/pcre2-py { }; + pdb2pqr = callPackage ../development/python-modules/pdb2pqr { }; pdbfixer = callPackage ../development/python-modules/pdbfixer { }; From 7da8a65e0984316081d37f647c484f0eb0215db6 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 14 Jan 2025 17:43:29 +0000 Subject: [PATCH 068/174] labwc-tweaks-gtk: 0-unstable-2025-01-03 -> 0-unstable-2025-01-11 --- pkgs/by-name/la/labwc-tweaks-gtk/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/la/labwc-tweaks-gtk/package.nix b/pkgs/by-name/la/labwc-tweaks-gtk/package.nix index 39b9e2b8a95dd..9a794c513ab9c 100644 --- a/pkgs/by-name/la/labwc-tweaks-gtk/package.nix +++ b/pkgs/by-name/la/labwc-tweaks-gtk/package.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "labwc-tweaks-gtk"; - version = "0-unstable-2025-01-03"; + version = "0-unstable-2025-01-11"; src = fetchFromGitHub { owner = "labwc"; repo = "labwc-tweaks-gtk"; - rev = "ac8623a24d7490bbdbe7850adc8d242c1aca92fe"; - hash = "sha256-yAH+iq/YtUOnrS0ydxz0gQuGXue6zQWfpx3FIAUYEDA="; + rev = "d954bc6bce2e86893c0470de36beae0542eceaad"; + hash = "sha256-c+6AolglEF/+voa5mDwm3JLIA4btFOBI8e2/ZxCApGg="; }; nativeBuildInputs = [ From 7453d673aa49a143530876fd886437e1f1fed31a Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 14 Jan 2025 18:57:56 +0100 Subject: [PATCH 069/174] python313Packages.django_5: 5.1.4 -> 5.1.5 https://docs.djangoproject.com/en/5.1/releases/5.1.5/ https://www.djangoproject.com/weblog/2025/jan/14/security-releases/ Fixes: CVE-2024-56374 --- pkgs/development/python-modules/django/5.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/django/5.nix b/pkgs/development/python-modules/django/5.nix index 2dcaf0600b79e..542c1b936123d 100644 --- a/pkgs/development/python-modules/django/5.nix +++ b/pkgs/development/python-modules/django/5.nix @@ -43,7 +43,7 @@ buildPythonPackage rec { pname = "django"; - version = "5.1.4"; + version = "5.1.5"; pyproject = true; disabled = pythonOlder "3.10"; @@ -52,7 +52,7 @@ buildPythonPackage rec { owner = "django"; repo = "django"; rev = "refs/tags/${version}"; - hash = "sha256-rE/aErydql5UjS/IiLpDtA3YOsAa+0uRyo40RsjCGLc="; + hash = "sha256-sompUtVGoormybLxtpT6m1dsyCb29AE8tDptNyHYCgU="; }; patches = From bc4cf02c2e382d4a01ebc8cfc30c1582b0b46c29 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 14 Jan 2025 18:17:40 +0000 Subject: [PATCH 070/174] python312Packages.truststore: 0.9.2 -> 0.10.0 --- pkgs/development/python-modules/truststore/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/truststore/default.nix b/pkgs/development/python-modules/truststore/default.nix index eaa8968ad23df..b43bc451b0718 100644 --- a/pkgs/development/python-modules/truststore/default.nix +++ b/pkgs/development/python-modules/truststore/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "truststore"; - version = "0.9.2"; + version = "0.10.0"; pyproject = true; disabled = pythonOlder "3.10"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "sethmlarson"; repo = "truststore"; tag = "v${version}"; - hash = "sha256-BSJneLxwgnD8IJ8IJM43WhmlII5N3qic96SBquMdMnc="; + hash = "sha256-SzCeuc/tIOearYAXCK7s/Q99fK0JvJc1rSbsiE7m6+k="; }; build-system = [ flit-core ]; From 800bc72995e3425cdcec4b5155019032d1650eeb Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 14 Jan 2025 18:31:25 +0000 Subject: [PATCH 071/174] python312Packages.duckdb-engine: 0.14.0 -> 0.14.2 --- pkgs/development/python-modules/duckdb-engine/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/duckdb-engine/default.nix b/pkgs/development/python-modules/duckdb-engine/default.nix index b72640d521288..9e5f76ea4347a 100644 --- a/pkgs/development/python-modules/duckdb-engine/default.nix +++ b/pkgs/development/python-modules/duckdb-engine/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { pname = "duckdb-engine"; - version = "0.14.0"; + version = "0.14.2"; pyproject = true; disabled = pythonOlder "3.8"; @@ -28,7 +28,7 @@ buildPythonPackage rec { repo = "duckdb_engine"; owner = "Mause"; tag = "v${version}"; - hash = "sha256-tzVpCbX1zAU77lKGaYT3BqC/K0m12K+XPW8oyFwHKpg="; + hash = "sha256-ZPvkLVPyRPBc9O/yIowY6J1Ve4bxL+opBxrBHIFpFhk="; }; nativeBuildInputs = [ poetry-core ]; From 94f6d77e55ac77a3604605d4fb87bb215fdbf195 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 14 Jan 2025 20:23:48 +0000 Subject: [PATCH 072/174] discordo: 0-unstable-2024-12-22 -> 0-unstable-2025-01-12 --- pkgs/applications/networking/discordo/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/networking/discordo/default.nix b/pkgs/applications/networking/discordo/default.nix index e798685a1ab1e..06f42fbe1dad0 100644 --- a/pkgs/applications/networking/discordo/default.nix +++ b/pkgs/applications/networking/discordo/default.nix @@ -3,16 +3,16 @@ buildGoModule rec { pname = "discordo"; - version = "0-unstable-2024-12-22"; + version = "0-unstable-2025-01-12"; src = fetchFromGitHub { owner = "ayn2op"; repo = pname; - rev = "9f15a6342413f68531402b8aeb5ed272159fc370"; - hash = "sha256-8VBw7DsX/xnNkfiIe8jiG2oXjIp1tNT6wy6eTDBZxUg="; + rev = "2f071695146188c65b51f7030a89addfa845469a"; + hash = "sha256-k2wwFx0Wi60xpdiS7qGoHdS6TfXFlI6yDeXXfOp1ivc="; }; - vendorHash = "sha256-UTZIx4zXIMdQBQXfzk3+j43yx7vlitw4Mwmon8oYjd8="; + vendorHash = "sha256-FsZRh4k9ucmAruJa1MZ4kVVryrEuHy9StgXHvgBiWSg="; env.CGO_ENABLED = 0; From 408cda76e28fcf65a25462bb89cdb689ce55e17d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 14 Jan 2025 20:26:45 +0000 Subject: [PATCH 073/174] terraform-providers.spotinst: 1.204.0 -> 1.207.0 --- .../networking/cluster/terraform-providers/providers.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index fd83133630b7c..3c0da40700f20 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -1192,13 +1192,13 @@ "vendorHash": "sha256-c3R/7k7y7XS2Qli00nSj7gh/3Mj88PY4WybBTq/+pPs=" }, "spotinst": { - "hash": "sha256-odW3iNfCrl6VLWZGjwZoVfwWHJXCJXzfbjoh+QitbTo=", + "hash": "sha256-ovrWtOJe5AVF1oneb+9It4MMkT8uL3bBdiXJNjahYRY=", "homepage": "https://registry.terraform.io/providers/spotinst/spotinst", "owner": "spotinst", "repo": "terraform-provider-spotinst", - "rev": "v1.204.0", + "rev": "v1.207.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-m2WVp5FdEl1yyvdAqAe0tqbH7GC6M5WkxJxXevXxCL4=" + "vendorHash": "sha256-mVZbO2AH+mQeOj3I1FH2poQnQNGJUzxQNGmIv8nOqNw=" }, "ssh": { "hash": "sha256-1UN5QJyjCuxs2vQYlSuz2jsu/HgGTxOoWWRcv4qcwow=", From eca59fc50c26eb7d24921752209da2f970187c25 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 14 Jan 2025 20:27:34 +0000 Subject: [PATCH 074/174] python312Packages.clarifai-grpc: 10.11.2 -> 11.0.0 --- pkgs/development/python-modules/clarifai-grpc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/clarifai-grpc/default.nix b/pkgs/development/python-modules/clarifai-grpc/default.nix index b17a46cc3edcb..c5e47ae1da070 100644 --- a/pkgs/development/python-modules/clarifai-grpc/default.nix +++ b/pkgs/development/python-modules/clarifai-grpc/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "clarifai-grpc"; - version = "10.11.2"; + version = "11.0.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "Clarifai"; repo = "clarifai-python-grpc"; tag = version; - hash = "sha256-Px7VisC2j5pJctzB713cdalEccGbBsSuQBqDarwUTLA="; + hash = "sha256-i55fbE36lmILVo5/EDsUnh6JA1h5Yi0eyDb9+3ynofE="; }; build-system = [ setuptools ]; From 33acebf296b7ca82032cfd7c978ad322557ec35c Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Tue, 14 Jan 2025 21:36:17 +0100 Subject: [PATCH 075/174] nfs-ganesha: 6.4 -> 6.5 --- pkgs/by-name/nf/nfs-ganesha/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/nf/nfs-ganesha/package.nix b/pkgs/by-name/nf/nfs-ganesha/package.nix index 5eed1a97db4f2..c3b65eb372432 100644 --- a/pkgs/by-name/nf/nfs-ganesha/package.nix +++ b/pkgs/by-name/nf/nfs-ganesha/package.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { pname = "nfs-ganesha"; - version = "6.4"; + version = "6.5"; outputs = [ "out" @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { owner = "nfs-ganesha"; repo = "nfs-ganesha"; rev = "V${version}"; - hash = "sha256-iT/6p4T4xrGsK2zBs5TDfEIhcCwNfUalQFLlCOODp24="; + hash = "sha256-OHGmEzHu8y/TPQ70E2sicaLtNgvlf/bRq8JRs6S1tpY="; }; preConfigure = "cd src"; From 801b15c9fd2d05aeef48d5ec49b77d8338c1662e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 14 Jan 2025 21:00:48 +0000 Subject: [PATCH 076/174] terraform-providers.equinix: 3.1.0 -> 3.1.1 --- .../networking/cluster/terraform-providers/providers.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index fd83133630b7c..00d84925bbd74 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -417,11 +417,11 @@ "vendorHash": "sha256-oVTanZpCWs05HwyIKW2ajiBPz1HXOFzBAt5Us+EtTRw=" }, "equinix": { - "hash": "sha256-PiAJ5Rw9qOmxNIsgayNJAC3EATu24OsDvonuqegSS7U=", + "hash": "sha256-G1ZgklICoKoH339/ipKJXZD9ftM5fTy99kFh62FqfrI=", "homepage": "https://registry.terraform.io/providers/equinix/equinix", "owner": "equinix", "repo": "terraform-provider-equinix", - "rev": "v3.1.0", + "rev": "v3.1.1", "spdx": "MIT", "vendorHash": "sha256-wcrrSdSfL/hqA2Z2h1lTTCWWERfIdmsbOLY2H4SdVv0=" }, From 82daa4a2a5af425132969f7d3b8892d6bf18cdf2 Mon Sep 17 00:00:00 2001 From: Chuang Zhu Date: Wed, 15 Jan 2025 05:08:03 +0800 Subject: [PATCH 077/174] nixosTests.ejabberd: add mod_matrix_gw --- nixos/tests/xmpp/ejabberd.nix | 21 ++++++++++++++++++--- 1 file changed, 18 insertions(+), 3 deletions(-) diff --git a/nixos/tests/xmpp/ejabberd.nix b/nixos/tests/xmpp/ejabberd.nix index 8af378322aa93..a9dcdab805184 100644 --- a/nixos/tests/xmpp/ejabberd.nix +++ b/nixos/tests/xmpp/ejabberd.nix @@ -2,7 +2,7 @@ let cert = pkgs: pkgs.runCommand "selfSignedCerts" { buildInputs = [ pkgs.openssl ]; } '' - openssl req -x509 -newkey rsa:4096 -keyout key.pem -out cert.pem -nodes -subj '/CN=example.com/CN=muc.example.com' -days 36500 + openssl req -x509 -newkey rsa:4096 -keyout key.pem -out cert.pem -nodes -subj '/CN=example.com/CN=muc.example.com/CN=matrix.example.com' -days 36500 mkdir -p $out cp key.pem cert.pem $out ''; @@ -20,12 +20,12 @@ import ../make-test-python.nix ( { security.pki.certificateFiles = [ "${cert pkgs}/cert.pem" ]; networking.extraHosts = '' - ${nodes.server.config.networking.primaryIPAddress} example.com + ${nodes.server.networking.primaryIPAddress} example.com ''; environment.systemPackages = [ (pkgs.callPackage ./xmpp-sendmessage.nix { - connectTo = nodes.server.config.networking.primaryIPAddress; + connectTo = nodes.server.networking.primaryIPAddress; }) ]; }; @@ -35,6 +35,7 @@ import ../make-test-python.nix ( security.pki.certificateFiles = [ "${cert pkgs}/cert.pem" ]; networking.extraHosts = '' ${config.networking.primaryIPAddress} example.com + ${config.networking.primaryIPAddress} matrix.example.com ''; services.ejabberd = { @@ -65,6 +66,12 @@ import ../make-test-python.nix ( port: 5269 ip: "::" module: ejabberd_s2s_in + - + port: 8448 + module: ejabberd_http + tls: true + request_handlers: + "/_matrix": mod_matrix_gw - port: 5347 ip: "127.0.0.1" @@ -275,9 +282,15 @@ import ../make-test-python.nix ( plugins: - "pep" mod_push: {} + mod_matrix_gw: + key_name: key1 + key: MATRIX_SECRET ''; }; + systemd.services.ejabberd.serviceConfig.EnvironmentFile = pkgs.writeText "ejabberd.env" '' + EJABBERD_MACRO_MATRIX_SECRET=SU4mu/j8b8A1i1EdyxIcKlFlrp+eSRBIlZwGyHP7Mfo= + ''; networking.firewall.enable = false; }; }; @@ -291,6 +304,8 @@ import ../make-test-python.nix ( assert "status: started" in server.succeed(ejabberd_prefix + "status") + server.succeed("curl https://matrix.example.com:8448/_matrix/key/v2/server") + server.succeed( ejabberd_prefix + "register azurediamond example.com hunter2", ejabberd_prefix + "register cthon98 example.com nothunter2", From bbc6b219b947b299af4c8ce38d6664512a67d36f Mon Sep 17 00:00:00 2001 From: Chuang Zhu Date: Wed, 15 Jan 2025 05:08:35 +0800 Subject: [PATCH 078/174] ejabberd: fix mod_matrix_gw --- pkgs/by-name/ej/ejabberd/package.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pkgs/by-name/ej/ejabberd/package.nix b/pkgs/by-name/ej/ejabberd/package.nix index 5a2b939eff67c..de16727c3bf63 100644 --- a/pkgs/by-name/ej/ejabberd/package.nix +++ b/pkgs/by-name/ej/ejabberd/package.nix @@ -19,6 +19,7 @@ gawk, fetchFromGitHub, fetchgit, + fetchpatch2, beamPackages, nixosTests, withMysql ? false, @@ -172,6 +173,14 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-9TyIgsinUpUbirwqg61EYnPB/OyE5vhl3MBMRihqAtE="; }; + patches = [ + # Fix json_encode_with_kv_list used in mod_matrix_gw + (fetchpatch2 { + url = "https://github.com/processone/ejabberd/commit/056635119c8b9f169f1c59cccbf81faab88a6712.patch?full_index=1"; + hash = "sha256-53NMT/SwPtaeo8zaJ1JHW6HUZrxkITi731UOdsFAlJ4="; + }) + ]; + passthru.tests = { inherit (nixosTests) ejabberd; }; From 4bd7ffca9b3b3bf3dd81c8c4a01d31dfc03e6ada Mon Sep 17 00:00:00 2001 From: seth Date: Tue, 14 Jan 2025 20:06:54 +0000 Subject: [PATCH 079/174] mpris-timer: 2.0.3 -> 2.0.5 Diff: https://github.com/efogdev/mpris-timer/compare/2.0.3...2.0.5 Changelog: https://github.com/efogdev/mpris-timer/releases/tag/2.0.5 --- pkgs/by-name/mp/mpris-timer/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/mp/mpris-timer/package.nix b/pkgs/by-name/mp/mpris-timer/package.nix index 1d0b25d13a6f9..e957925af3a8d 100644 --- a/pkgs/by-name/mp/mpris-timer/package.nix +++ b/pkgs/by-name/mp/mpris-timer/package.nix @@ -14,16 +14,16 @@ buildGoModule rec { pname = "mpris-timer"; - version = "2.0.3"; + version = "2.0.5"; src = fetchFromGitHub { owner = "efogdev"; repo = "mpris-timer"; tag = version; - hash = "sha256-N2F7eTNDHL9ABIq6ExjIj7uhYBkrRXDAeKwy1f4arYE="; + hash = "sha256-LNaf+nTQHpHOvUXdNzKexXGa0petWp+26UeLqfmjpZw="; }; - vendorHash = "sha256-BYOmlV3x+SXMOyAfBktVThG4vog0mWSsIU2caOFYc5A="; + vendorHash = "sha256-vCzQiQsljNyI7nBYvq+C/dv0T186Lsj7rOq5xHMs3c0="; strictDeps = true; From bce0bcd2f0ad68ceef53e77fa89caeb1f8d492cb Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 14 Jan 2025 21:50:34 +0000 Subject: [PATCH 080/174] parlay: 0.6.4 -> 0.7.0 --- pkgs/by-name/pa/parlay/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/pa/parlay/package.nix b/pkgs/by-name/pa/parlay/package.nix index 5af76a212b7aa..f953b5f86b68d 100644 --- a/pkgs/by-name/pa/parlay/package.nix +++ b/pkgs/by-name/pa/parlay/package.nix @@ -7,13 +7,13 @@ buildGoModule rec { pname = "parlay"; - version = "0.6.4"; + version = "0.7.0"; src = fetchFromGitHub { owner = "snyk"; repo = "parlay"; rev = "v${version}"; - hash = "sha256-g0gTsfdt1/BwWFBPyNuBf58gypdeZib6GUDPnPaFepA="; + hash = "sha256-rpzCwbF2M6zfNVHLaSPgX30ti+XtJ645HqoDJvx8lg8="; }; vendorHash = "sha256-kxN2uBXjCnyVbypDOrOAXoSa6Pb7Fmk487ael4aI9Uw="; From a9d6a0a3f188f580f0909da9cbe766a46a9a9f49 Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Tue, 14 Jan 2025 17:14:41 -0500 Subject: [PATCH 081/174] terraform-providers.keycloak: 4.4.0 -> 5.0.0 --- .../cluster/terraform-providers/providers.json | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index fd83133630b7c..08d256fad31cb 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -705,13 +705,13 @@ "vendorHash": "sha256-rGujp6FsQnkznRfjrSSB+4lLC3wAv6yvL/jAoWOiST0=" }, "keycloak": { - "hash": "sha256-2Z7nQ5NKS18OtoXXLm/P1n64NAxLR8nfMGyS2y17lag=", - "homepage": "https://registry.terraform.io/providers/mrparkers/keycloak", - "owner": "mrparkers", + "hash": "sha256-hdTZ+UEpmv4T8Kxk8cf1QACUKyOoRbD1X3OxwhmrRiI=", + "homepage": "https://registry.terraform.io/providers/keycloak/keycloak", + "owner": "keycloak", "repo": "terraform-provider-keycloak", - "rev": "v4.4.0", - "spdx": "MIT", - "vendorHash": "sha256-F78OR8EG0Vy3WVJWTOlAsIBazsSXGD6KeceYuGnBqjQ=" + "rev": "v5.0.0", + "spdx": "Apache-2.0", + "vendorHash": "sha256-51sFU6P4Ynyu9NpQxlbSV7EoB/Lk1da4O0bOuoeMujI=" }, "kubectl": { "hash": "sha256-UQ/xvhs7II+EGH5bKdrVC47hp5dhLqQZeqSBz06ho1s=", From ffa7d8c8f1762204eebcdb6dea0020d6c73611f7 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 14 Jan 2025 22:58:06 +0000 Subject: [PATCH 082/174] strawberry: 1.2.3 -> 1.2.4 --- pkgs/applications/audio/strawberry/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/strawberry/default.nix b/pkgs/applications/audio/strawberry/default.nix index 98b2f1311a00d..0ffda870d8f5b 100644 --- a/pkgs/applications/audio/strawberry/default.nix +++ b/pkgs/applications/audio/strawberry/default.nix @@ -40,13 +40,13 @@ let in stdenv.mkDerivation rec { pname = "strawberry"; - version = "1.2.3"; + version = "1.2.4"; src = fetchFromGitHub { owner = "jonaski"; repo = pname; rev = version; - hash = "sha256-90gnPw21oBHrRslJmB2hUId0WI7Gf+I4bvdS+dvAHdI="; + hash = "sha256-acTFJS8E0hQNbiiOi8DfPyTiUcKjXwg5trk3Q2mYYmQ="; }; # the big strawberry shown in the context menu is *very* much in your face, so use the grey version instead From 98533256dbb0d0490477513ea1dfdf9171d6f1f0 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 14 Jan 2025 23:05:15 +0000 Subject: [PATCH 083/174] autosuspend: 7.0.3 -> 7.1.0 --- pkgs/by-name/au/autosuspend/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/au/autosuspend/package.nix b/pkgs/by-name/au/autosuspend/package.nix index 706c013197739..69227ec5db960 100644 --- a/pkgs/by-name/au/autosuspend/package.nix +++ b/pkgs/by-name/au/autosuspend/package.nix @@ -7,7 +7,7 @@ python3.pkgs.buildPythonApplication rec { pname = "autosuspend"; - version = "7.0.3"; + version = "7.1.0"; pyproject = true; disabled = python3.pythonOlder "3.10"; @@ -16,7 +16,7 @@ python3.pkgs.buildPythonApplication rec { owner = "languitar"; repo = pname; tag = "v${version}"; - hash = "sha256-ePQiP7NeRBPVHkd8rvbxno/NBX95e9d97F8TIazCUH4="; + hash = "sha256-Sug42L4D9lgtc7AWIOcgC+e9WCHfmqB4O1Gez/sR6jE="; }; build-system = with python3.pkgs; [ From 9c305643d2ff4b2b2826ea660290f6350eb6f741 Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Tue, 14 Jan 2025 22:39:32 +0100 Subject: [PATCH 084/174] python313Packages.uarray: 0.9.1 -> 0.9.2 diff: https://github.com/Quansight-Labs/uarray/compare/0.9.1...0.9.2 --- pkgs/development/python-modules/uarray/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/uarray/default.nix b/pkgs/development/python-modules/uarray/default.nix index ed7968ebd9f2e..aff3471aa9328 100644 --- a/pkgs/development/python-modules/uarray/default.nix +++ b/pkgs/development/python-modules/uarray/default.nix @@ -18,14 +18,14 @@ buildPythonPackage rec { pname = "uarray"; - version = "0.9.1"; + version = "0.9.2"; pyproject = true; src = fetchFromGitHub { owner = "Quansight-Labs"; repo = pname; tag = version; - hash = "sha256-6dOi7+quWvASl2RHetULK5zixHFJlj/D6667o99ceSs="; + hash = "sha256-eCrmmP+9TI+T8Km8MOz0EqseneFwPizlnZloK5yNLcM="; }; build-system = [ From 80e601a8ea5169924718504cd9211f96d9aa5eb8 Mon Sep 17 00:00:00 2001 From: seth Date: Tue, 14 Jan 2025 19:09:09 -0500 Subject: [PATCH 085/174] cargo-tauri: 2.2.1 -> 2.2.2 Diff: https://github.com/tauri-apps/tauri/compare/refs/tags/tauri-v2.2.1...tauri-v2.2.2 Changelog: https://github.com/tauri-apps/tauri/releases/tag/tauri-v2.2.2 --- pkgs/by-name/ca/cargo-tauri/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ca/cargo-tauri/package.nix b/pkgs/by-name/ca/cargo-tauri/package.nix index e28826dc4bb6f..b824763c4bf78 100644 --- a/pkgs/by-name/ca/cargo-tauri/package.nix +++ b/pkgs/by-name/ca/cargo-tauri/package.nix @@ -13,17 +13,17 @@ rustPlatform.buildRustPackage rec { pname = "tauri"; - version = "2.2.1"; + version = "2.2.2"; src = fetchFromGitHub { owner = "tauri-apps"; repo = "tauri"; tag = "tauri-v${version}"; - hash = "sha256-v9o+oqs6OZWhHv+PExo9juzTt7W80YOTkynzwvxpHGM="; + hash = "sha256-agmY/39tkz71kCSksIyrbxDrvnOJpBSYCdygjd4rOBY="; }; useFetchCargoVendor = true; - cargoHash = "sha256-SmM3G0WpNcb+B5uo+2Nczg/Htx5eY5JnxF0Tkwz8k0M="; + cargoHash = "sha256-i4ACVFWVEs866kJHNE49fnFj87GZbJIg5p1J3eVLRwE="; nativeBuildInputs = [ pkg-config ]; From 10f670ab7e043c252459f6e7a4bcc47008bdb602 Mon Sep 17 00:00:00 2001 From: Oliver Schmidt Date: Tue, 14 Jan 2025 15:41:34 +0100 Subject: [PATCH 086/174] nixos/matomo: better check for database being set up Since matomo-5.2.0, the config.php.ini is already created when first accessing the installer page without completing it. This breaks our discovery of whether to run database migrations. Attempting to run DB migrations without provided database credentials causes a crash -> causing matomo-setup-update.service to fail -> causing phpfpm-matomo.service to fail. --- nixos/modules/services/web-apps/matomo.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/nixos/modules/services/web-apps/matomo.nix b/nixos/modules/services/web-apps/matomo.nix index a4bc04edf0640..73f93778bf0bd 100644 --- a/nixos/modules/services/web-apps/matomo.nix +++ b/nixos/modules/services/web-apps/matomo.nix @@ -183,7 +183,10 @@ in { chmod -R u+rwX,g+rwX,o-rwx "${dataDir}" # check whether user setup has already been done - if test -f "${dataDir}/config/config.ini.php"; then + if test -f "${dataDir}/config/config.ini.php" && + # since matomo-5.2.0, the config.ini.php is already created at first + # installer page access https://github.com/matomo-org/matomo/issues/22932 + grep -q -F "[database]" "${dataDir}/config/config.ini.php"; then # then execute possibly pending database upgrade matomo-console core:update --yes fi From fc6d9cc539f4bd0df99466dce003d141b17ae528 Mon Sep 17 00:00:00 2001 From: Oliver Schmidt Date: Tue, 14 Jan 2025 16:01:30 +0100 Subject: [PATCH 087/174] nixosTests.matomo: extend test coverage --- nixos/tests/matomo.nix | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/nixos/tests/matomo.nix b/nixos/tests/matomo.nix index 35c71aa088538..1a40fa93a5578 100644 --- a/nixos/tests/matomo.nix +++ b/nixos/tests/matomo.nix @@ -37,11 +37,25 @@ let machine.wait_for_unit("phpfpm-matomo.service") machine.wait_for_unit("nginx.service") + with subtest("matomo.js reachable via HTTP"): + machine.succeed("curl -sSfk http://machine/matomo.js") + + with subtest("js/piwik.js reachable via HTTP"): + machine.succeed("curl -sSfk http://machine/js/piwik.js") + + with subtest("matomo.php (API) reachable via HTTP"): + machine.succeed("curl -sSfk http://machine/matomo.php") + # without the grep the command does not produce valid utf-8 for some reason with subtest("welcome screen loads"): machine.succeed( "curl -sSfL http://localhost/ | grep 'Matomo[^<]*Installation'" ) + + with subtest("killing the phpfpm process should trigger an automatic restart"): + machine.succeed("systemctl kill -s KILL phpfpm-matomo") + machine.sleep(1) + machine.wait_for_unit("phpfpm-matomo.service") ''; }; in From 6d32447bfc49e5c8e1c3eaa08a7098881f5aeeac Mon Sep 17 00:00:00 2001 From: "R. Ryantm" <ryantm-bot@ryantm.com> Date: Wed, 15 Jan 2025 00:51:32 +0000 Subject: [PATCH 088/174] kustomize: 5.5.0 -> 5.6.0 --- pkgs/development/tools/kustomize/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/kustomize/default.nix b/pkgs/development/tools/kustomize/default.nix index de256650c25f7..fec68830047f5 100644 --- a/pkgs/development/tools/kustomize/default.nix +++ b/pkgs/development/tools/kustomize/default.nix @@ -7,7 +7,7 @@ buildGoModule rec { pname = "kustomize"; - version = "5.5.0"; + version = "5.6.0"; ldflags = let @@ -23,13 +23,13 @@ buildGoModule rec { owner = "kubernetes-sigs"; repo = pname; rev = "kustomize/v${version}"; - hash = "sha256-7mtnSrQQPQnG0COqnzrT5DXFEbTeoc3+GZ2fFhB/lW8="; + hash = "sha256-KsdOosKDT+wWWLzeph5NfCOx96D7GncM0qDSBJxAzJ8="; }; # avoid finding test and development commands modRoot = "kustomize"; proxyVendor = true; - vendorHash = "sha256-ddARfbjuSIn2aNFILL4LA28swGBvH6kOqlg4qkw+NGw="; + vendorHash = "sha256-ZYDrYhEWUEJFxFWj/LLrW8epLX2hJNqQ1CteShEbQ+M="; nativeBuildInputs = [ installShellFiles ]; From 8059fa142bc15cedf8c2375146b9aad6355a5852 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" <ryantm-bot@ryantm.com> Date: Wed, 15 Jan 2025 01:08:41 +0000 Subject: [PATCH 089/174] frei: 0.1.0 -> 0.1.1 --- pkgs/by-name/fr/frei/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/fr/frei/package.nix b/pkgs/by-name/fr/frei/package.nix index b5db9f95635ce..30850885167c9 100644 --- a/pkgs/by-name/fr/frei/package.nix +++ b/pkgs/by-name/fr/frei/package.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "frei"; - version = "0.1.0"; + version = "0.1.1"; src = fetchFromGitHub { owner = "alexcoder04"; repo = "frei"; rev = "v${version}"; - sha256 = "sha256-9CV6B7fRHXl73uI2JRv3RiaFczLHHBOd7/8UoCAwK6w="; + sha256 = "sha256-289idsn/PhLK2FOUTQj6eS4O73LgX5v5qn3ZRvn/XRo="; }; - vendorHash = null; + vendorHash = "sha256-N5k/2wB46oRfM4ShjVQ23tAgCMmyBaGfIslUqYUJYrc="; meta = with lib; { description = "Modern replacement for free"; From de38eac6c2e3d45cb5af97412fb016fc42abd30d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" <ryantm-bot@ryantm.com> Date: Wed, 15 Jan 2025 01:27:43 +0000 Subject: [PATCH 090/174] mendeley: 2.128.0 -> 2.129.0 --- pkgs/applications/office/mendeley/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/office/mendeley/default.nix b/pkgs/applications/office/mendeley/default.nix index 799fdb587ec32..5db268a26a332 100644 --- a/pkgs/applications/office/mendeley/default.nix +++ b/pkgs/applications/office/mendeley/default.nix @@ -8,13 +8,13 @@ let pname = "mendeley"; - version = "2.128.0"; + version = "2.129.0"; executableName = "${pname}-reference-manager"; src = fetchurl { url = "https://static.mendeley.com/bin/desktop/mendeley-reference-manager-${version}-x86_64.AppImage"; - hash = "sha256-V0UF52EVvxqFtBWOshiLO923osiKd0KJPc4gDadkta0="; + hash = "sha256-lA3ald0pgNd6az7nP5MPMrs12EEvJaHpEypXFfCvKCQ="; }; appimageContents = appimageTools.extractType2 { From b91bbdbeb2f0d56ce5b1d6fff028aeede30bd7e7 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" <ryantm-bot@ryantm.com> Date: Wed, 15 Jan 2025 01:52:58 +0000 Subject: [PATCH 091/174] prometheus-gitlab-ci-pipelines-exporter: 0.5.9 -> 0.5.10 --- .../monitoring/prometheus/gitlab-ci-pipelines-exporter.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/monitoring/prometheus/gitlab-ci-pipelines-exporter.nix b/pkgs/servers/monitoring/prometheus/gitlab-ci-pipelines-exporter.nix index e8b8bcab6fad4..21feb543c9d43 100644 --- a/pkgs/servers/monitoring/prometheus/gitlab-ci-pipelines-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/gitlab-ci-pipelines-exporter.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "gitlab-ci-pipelines-exporter"; - version = "0.5.9"; + version = "0.5.10"; src = fetchFromGitHub { owner = "mvisonneau"; repo = pname; rev = "v${version}"; - sha256 = "sha256-KbEmRMqv2IjJ/7sQHDfXtr92xNXmUCaD7fnJdq1FEtk="; + sha256 = "sha256-G298u9bitEst8QzZd1/B6PTCNpGqq88Z8W8w67/cVkQ="; }; subPackages = [ "cmd/${pname}" ]; @@ -21,7 +21,7 @@ buildGoModule rec { "-X main.version=v${version}" ]; - vendorHash = "sha256-DaNLahrmRTkI0QxEDLJH0juDbHXs2Y/t5JNx9ulcK84="; + vendorHash = "sha256-LPS0paXtzNAOFW8FUAFbcEcVTtp3WFh6N/f6tuFPT50="; doCheck = true; meta = with lib; { From 10536f040a65131778ef20f4cde6a7f8123623fc Mon Sep 17 00:00:00 2001 From: "R. Ryantm" <ryantm-bot@ryantm.com> Date: Wed, 15 Jan 2025 02:02:40 +0000 Subject: [PATCH 092/174] automatic-timezoned: 2.0.44 -> 2.0.45 --- pkgs/by-name/au/automatic-timezoned/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/au/automatic-timezoned/package.nix b/pkgs/by-name/au/automatic-timezoned/package.nix index 0af6e6ce554ce..18a7ff55a86ca 100644 --- a/pkgs/by-name/au/automatic-timezoned/package.nix +++ b/pkgs/by-name/au/automatic-timezoned/package.nix @@ -5,16 +5,16 @@ rustPlatform.buildRustPackage rec { pname = "automatic-timezoned"; - version = "2.0.44"; + version = "2.0.45"; src = fetchFromGitHub { owner = "maxbrunet"; repo = pname; rev = "v${version}"; - sha256 = "sha256-+DLuvB6jOgZwZVjztsTpZ5z8tQDlpWDQvtM6yW1y/O0="; + sha256 = "sha256-8fgOhmjFXC0nMs7oTfJWbn1DOmOU9RtTgR+xmV/nZ9g="; }; - cargoHash = "sha256-73aBnRdcxdcYBuk8oe8AvAQ1T9GELniHqBMsuF3PJog="; + cargoHash = "sha256-4WytstmBjd0FCSxY4omrZZhcSq1xSPQKFz7S4jZukVA="; meta = with lib; { description = "Automatically update system timezone based on location"; From eda46c008e2761d37e4aa5bb18560a8f119cc41f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" <ryantm-bot@ryantm.com> Date: Wed, 15 Jan 2025 02:03:45 +0000 Subject: [PATCH 093/174] sendme: 0.21.0 -> 0.22.0 --- pkgs/by-name/se/sendme/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/se/sendme/package.nix b/pkgs/by-name/se/sendme/package.nix index a86f9527e44d4..5ad4b74439bea 100644 --- a/pkgs/by-name/se/sendme/package.nix +++ b/pkgs/by-name/se/sendme/package.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage rec { pname = "sendme"; - version = "0.21.0"; + version = "0.22.0"; src = fetchFromGitHub { owner = "n0-computer"; repo = pname; rev = "v${version}"; - hash = "sha256-t6861ct4zGqm4MuQGVIyGUlRY+ZhojKpbCYbip6Uoec="; + hash = "sha256-f3OgG6PTv9UUT5Gn1hBTHRIATrlvzBz1pjJ6fuWiCXM="; }; - cargoHash = "sha256-nYdJbuBwW66uZs3gK05cRlQni0vT3BNlohaysYmddhQ="; + cargoHash = "sha256-lWir4B3zGi7GBp5Of01GeGMV0SXzMjxcPBFipnoRRRk="; buildInputs = lib.optionals stdenv.hostPlatform.isDarwin ( with darwin.apple_sdk.frameworks; From 09e30c8be15dbc65bb435b077fb60be4f7d1eb37 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" <ryantm-bot@ryantm.com> Date: Wed, 15 Jan 2025 02:04:10 +0000 Subject: [PATCH 094/174] dumbpipe: 0.22.0 -> 0.23.0 --- pkgs/by-name/du/dumbpipe/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/du/dumbpipe/package.nix b/pkgs/by-name/du/dumbpipe/package.nix index 91e2e870081be..7b68daf34923d 100644 --- a/pkgs/by-name/du/dumbpipe/package.nix +++ b/pkgs/by-name/du/dumbpipe/package.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage rec { pname = "dumbpipe"; - version = "0.22.0"; + version = "0.23.0"; src = fetchFromGitHub { owner = "n0-computer"; repo = pname; rev = "v${version}"; - hash = "sha256-NNSR8qAikwXC0bJ4jGQQ2gZZmgPin5M6xAaY2YhuBvw="; + hash = "sha256-ZIPvdlE/oBmtdTpWm5GU53wGGYWCc74a9w5Kqpi8tBg="; }; - cargoHash = "sha256-yAz/VjdS4FeKKM9vjOPcASGByNQp2StvrFHwJnk2YUg="; + cargoHash = "sha256-pyVmBGqdWrZ+4Ycg0Cf6sMC6mzPA6/pHMn49/OPYZ/Y="; buildInputs = lib.optionals stdenv.hostPlatform.isDarwin ( with darwin.apple_sdk.frameworks; From 54f484c80eac5c5c4377745e0f4ab577ef076b65 Mon Sep 17 00:00:00 2001 From: Emily <vcs@emily.moe> Date: Wed, 15 Jan 2025 02:04:20 +0000 Subject: [PATCH 095/174] doc/stdenv/platform-notes: fix typo --- doc/stdenv/platform-notes.chapter.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/stdenv/platform-notes.chapter.md b/doc/stdenv/platform-notes.chapter.md index c7b0b664940e2..ac98ec0e105eb 100644 --- a/doc/stdenv/platform-notes.chapter.md +++ b/doc/stdenv/platform-notes.chapter.md @@ -80,7 +80,7 @@ stdenv.mkDerivation { } ``` -Note: It is possible to have multiple, different instances of `darwinMinVerisonHook` in your inputs. +Note: It is possible to have multiple, different instances of `darwinMinVersionHook` in your inputs. When that happens, the one with the highest version is always used. #### Picking an SDK version {#sec-darwin-troubleshooting-picking-sdk-version} From 055d7c5ffcef384bfd959cd3a4f5fa6bf2a78c9a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" <ryantm-bot@ryantm.com> Date: Wed, 15 Jan 2025 02:59:37 +0000 Subject: [PATCH 096/174] step-kms-plugin: 0.11.7 -> 0.11.8 --- pkgs/by-name/st/step-kms-plugin/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/st/step-kms-plugin/package.nix b/pkgs/by-name/st/step-kms-plugin/package.nix index d98ffb7cfe8cc..8f6eb6af9fdb6 100644 --- a/pkgs/by-name/st/step-kms-plugin/package.nix +++ b/pkgs/by-name/st/step-kms-plugin/package.nix @@ -12,16 +12,16 @@ buildGoModule rec { pname = "step-kms-plugin"; - version = "0.11.7"; + version = "0.11.8"; src = fetchFromGitHub { owner = "smallstep"; repo = pname; rev = "v${version}"; - hash = "sha256-68BO4bTieh7nC8M821vbTP8SuFipLRwHOWdWvhCwoCo="; + hash = "sha256-73l+R0Xrvyckt2ifJs12c3k6zSb9AhHV0F9Zk6qIwAg="; }; - vendorHash = "sha256-HOB4ODVD8lWHoejqykfRWx3g48ijMqgy9EPzCKYdIGg="; + vendorHash = "sha256-sXwaxMfBb8zZDCP3g8iZgXL540uDyWtu57cUPia9FzA="; proxyVendor = true; From 9b8558147f2e84b7b80f92f30ce832eb8ecb6525 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" <ryantm-bot@ryantm.com> Date: Wed, 15 Jan 2025 03:21:35 +0000 Subject: [PATCH 097/174] wasmtime: 28.0.0 -> 28.0.1 --- pkgs/development/interpreters/wasmtime/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/interpreters/wasmtime/default.nix b/pkgs/development/interpreters/wasmtime/default.nix index 37fe4bc0781de..a5c67947b08d5 100644 --- a/pkgs/development/interpreters/wasmtime/default.nix +++ b/pkgs/development/interpreters/wasmtime/default.nix @@ -2,19 +2,19 @@ rustPlatform.buildRustPackage rec { pname = "wasmtime"; - version = "28.0.0"; + version = "28.0.1"; src = fetchFromGitHub { owner = "bytecodealliance"; repo = pname; rev = "v${version}"; - hash = "sha256-A5Fr8w2zwo3/BdPFbymwZUH37qhN2fWiIX8Q55icnwA="; + hash = "sha256-bZh9zwP1Sux4aRDD/l3L5gu4iXwMbjJ+6+yJ42lNYtY="; fetchSubmodules = true; }; # Disable cargo-auditable until https://github.com/rust-secure-code/cargo-auditable/issues/124 is solved. auditable = false; - cargoHash = "sha256-SDu2ae9UHsMdfbxfW/C2JjXXsoKQOlSMAmSQAXlvfA4="; + cargoHash = "sha256-h5vSdKETereFCS06HYqQPSExBWPGxJHnWCj8SJNeqE4="; cargoBuildFlags = [ "--package" "wasmtime-cli" "--package" "wasmtime-c-api" ]; outputs = [ "out" "dev" ]; From aa1a096a1cd3a9117b123d8f94b45da5f7e090e5 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" <ryantm-bot@ryantm.com> Date: Wed, 15 Jan 2025 03:38:58 +0000 Subject: [PATCH 098/174] python312Packages.bandit: 1.8.0 -> 1.8.2 --- pkgs/development/python-modules/bandit/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/bandit/default.nix b/pkgs/development/python-modules/bandit/default.nix index 31bf7bbbb09f3..5d8f878a91fee 100644 --- a/pkgs/development/python-modules/bandit/default.nix +++ b/pkgs/development/python-modules/bandit/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "bandit"; - version = "1.8.0"; + version = "1.8.2"; pyproject = true; disabled = pythonOlder "3.9"; src = fetchPypi { inherit pname version; - hash = "sha256-tb/lWglavZ/iAJkXinxsBg+ES/1P5MdtKONeTFK50x4="; + hash = "sha256-4ArVprxnbAlUZp/hOBgCTWa3DkLPWtuXFIDPO2ceg18="; }; nativeBuildInputs = [ pbr ]; From f6976283058deb6d6eaa30967c09b4ee471e3193 Mon Sep 17 00:00:00 2001 From: John Titor <50095635+JohnRTitor@users.noreply.github.com> Date: Wed, 15 Jan 2025 10:19:21 +0530 Subject: [PATCH 099/174] workflows/backport: switch to new variables As per https://github.com/NixOS/org/issues/54, new variables are now NIXPKGS_CI_APP_ID and NIXPKGS_CI_APP_PRIVATE_KEY. --- .github/workflows/backport.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/backport.yml b/.github/workflows/backport.yml index bae29bc9428bc..8e95a9a21a97b 100644 --- a/.github/workflows/backport.yml +++ b/.github/workflows/backport.yml @@ -22,8 +22,8 @@ jobs: - uses: actions/create-github-app-token@c1a285145b9d317df6ced56c09f525b5c2b6f755 # v1.11.1 id: app-token with: - app-id: ${{ vars.BACKPORT_APP_ID }} - private-key: ${{ secrets.BACKPORT_PRIVATE_KEY }} + app-id: ${{ vars.NIXPKGS_CI_APP_ID }} + private-key: ${{ secrets.NIXPKGS_CI_APP_PRIVATE_KEY }} - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 with: From 6ab6314d06d25d77c3052fb00c4bdf3d7a5027a2 Mon Sep 17 00:00:00 2001 From: John Titor <50095635+JohnRTitor@users.noreply.github.com> Date: Wed, 15 Jan 2025 10:29:29 +0530 Subject: [PATCH 100/174] workflows/periodic-merges: use nixpkgs-ci's token --- .github/workflows/periodic-merge-24h.yml | 4 +--- .github/workflows/periodic-merge-6h.yml | 4 +--- .github/workflows/periodic-merge.yml | 11 ++++++++++- 3 files changed, 12 insertions(+), 7 deletions(-) diff --git a/.github/workflows/periodic-merge-24h.yml b/.github/workflows/periodic-merge-24h.yml index 1028b64a91765..c2bae9d5b9b90 100644 --- a/.github/workflows/periodic-merge-24h.yml +++ b/.github/workflows/periodic-merge-24h.yml @@ -14,9 +14,7 @@ on: - cron: '0 0 * * *' workflow_dispatch: -permissions: - contents: write # for devmasx/merge-branch to merge branches - pull-requests: write # for peter-evans/create-or-update-comment to create or update comment +permissions: {} jobs: periodic-merge: diff --git a/.github/workflows/periodic-merge-6h.yml b/.github/workflows/periodic-merge-6h.yml index 9d72539dd02ee..fcdc3994b7f7c 100644 --- a/.github/workflows/periodic-merge-6h.yml +++ b/.github/workflows/periodic-merge-6h.yml @@ -14,9 +14,7 @@ on: - cron: '0 */6 * * *' workflow_dispatch: -permissions: - contents: write # for devmasx/merge-branch to merge branches - pull-requests: write # for peter-evans/create-or-update-comment to create or update comment +permissions: {} jobs: periodic-merge: diff --git a/.github/workflows/periodic-merge.yml b/.github/workflows/periodic-merge.yml index e8307308218c1..91ab0b25f146e 100644 --- a/.github/workflows/periodic-merge.yml +++ b/.github/workflows/periodic-merge.yml @@ -17,6 +17,14 @@ jobs: runs-on: ubuntu-24.04 name: ${{ inputs.from }} → ${{ inputs.into }} steps: + # Use a GitHub App to create the PR so that CI gets triggered + # The App is scoped to Repository > Contents and Pull Requests: write for Nixpkgs + - uses: actions/create-github-app-token@c1a285145b9d317df6ced56c09f525b5c2b6f755 # v1.11.1 + id: app-token + with: + app-id: ${{ vars.NIXPKGS_CI_APP_ID }} + private-key: ${{ secrets.NIXPKGS_CI_APP_PRIVATE_KEY }} + - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 - name: Find merge base between two branches @@ -38,7 +46,7 @@ jobs: type: now from_branch: ${{ steps.merge_base.outputs.merge_base || inputs.from }} target_branch: ${{ inputs.into }} - github_token: ${{ secrets.GITHUB_TOKEN }} + github_token: ${{ steps.app-token.outputs.token }} - name: Comment on failure uses: peter-evans/create-or-update-comment@71345be0265236311c031f5c7866368bd1eff043 # v4.0.0 @@ -47,3 +55,4 @@ jobs: issue-number: 105153 body: | Periodic merge from `${{ inputs.from }}` into `${{ inputs.into }}` has [failed](https://github.com/NixOS/nixpkgs/actions/runs/${{ github.run_id }}). + token: ${{ steps.app-token.outputs.token }} From 38ebbf7c4fc018170ac80582f83eb076694ab010 Mon Sep 17 00:00:00 2001 From: John Titor <50095635+JohnRTitor@users.noreply.github.com> Date: Wed, 15 Jan 2025 11:04:30 +0530 Subject: [PATCH 101/174] workflows/periodic-merges: explicitly inherit the secrets Apparently since we are callling a reusable workflow here, we need to explicitly pass the secrets. :( --- .github/workflows/periodic-merge-24h.yml | 1 + .github/workflows/periodic-merge-6h.yml | 1 + 2 files changed, 2 insertions(+) diff --git a/.github/workflows/periodic-merge-24h.yml b/.github/workflows/periodic-merge-24h.yml index c2bae9d5b9b90..9090eb17a9656 100644 --- a/.github/workflows/periodic-merge-24h.yml +++ b/.github/workflows/periodic-merge-24h.yml @@ -37,3 +37,4 @@ jobs: with: from: ${{ matrix.pairs.from }} into: ${{ matrix.pairs.into }} + secrets: inherit diff --git a/.github/workflows/periodic-merge-6h.yml b/.github/workflows/periodic-merge-6h.yml index fcdc3994b7f7c..f7ffec99a4df2 100644 --- a/.github/workflows/periodic-merge-6h.yml +++ b/.github/workflows/periodic-merge-6h.yml @@ -35,3 +35,4 @@ jobs: with: from: ${{ matrix.pairs.from }} into: ${{ matrix.pairs.into }} + secrets: inherit From 722192e09f72eb4d7411da13d59aafd10c9374b7 Mon Sep 17 00:00:00 2001 From: KSJ2000 <katsho123@outlook.com> Date: Mon, 13 Jan 2025 11:05:44 +0200 Subject: [PATCH 102/174] binwalk: use upstream lock file --- pkgs/by-name/bi/binwalk/Cargo.lock | 1394 --------------------------- pkgs/by-name/bi/binwalk/package.nix | 6 +- 2 files changed, 2 insertions(+), 1398 deletions(-) delete mode 100644 pkgs/by-name/bi/binwalk/Cargo.lock diff --git a/pkgs/by-name/bi/binwalk/Cargo.lock b/pkgs/by-name/bi/binwalk/Cargo.lock deleted file mode 100644 index 5c2bbb45543e6..0000000000000 --- a/pkgs/by-name/bi/binwalk/Cargo.lock +++ /dev/null @@ -1,1394 +0,0 @@ -# This file is automatically @generated by Cargo. -# It is not intended for manual editing. -version = 3 - -[[package]] -name = "adler" -version = "1.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" - -[[package]] -name = "adler2" -version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "512761e0bb2578dd7380c6baaa0f4ce03e84f95e960231d1dec8bf4d7d6e2627" - -[[package]] -name = "aho-corasick" -version = "1.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916" -dependencies = [ - "memchr", -] - -[[package]] -name = "android-tzdata" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e999941b234f3131b00bc13c22d06e8c5ff726d1b6318ac7eb276997bbb4fef0" - -[[package]] -name = "android_system_properties" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "819e7219dbd41043ac279b19830f2efc897156490d7fd6ea916720117ee66311" -dependencies = [ - "libc", -] - -[[package]] -name = "anstream" -version = "0.6.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "64e15c1ab1f89faffbf04a634d5e1962e9074f2741eef6d97f3c4e322426d526" -dependencies = [ - "anstyle", - "anstyle-parse", - "anstyle-query", - "anstyle-wincon", - "colorchoice", - "is_terminal_polyfill", - "utf8parse", -] - -[[package]] -name = "anstyle" -version = "1.0.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1bec1de6f59aedf83baf9ff929c98f2ad654b97c9510f4e70cf6f661d49fd5b1" - -[[package]] -name = "anstyle-parse" -version = "0.2.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb47de1e80c2b463c735db5b217a0ddc39d612e7ac9e2e96a5aed1f57616c1cb" -dependencies = [ - "utf8parse", -] - -[[package]] -name = "anstyle-query" -version = "1.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d36fc52c7f6c869915e99412912f22093507da8d9e942ceaf66fe4b7c14422a" -dependencies = [ - "windows-sys 0.52.0", -] - -[[package]] -name = "anstyle-wincon" -version = "3.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5bf74e1b6e971609db8ca7a9ce79fd5768ab6ae46441c572e46cf596f59e57f8" -dependencies = [ - "anstyle", - "windows-sys 0.52.0", -] - -[[package]] -name = "autocfg" -version = "1.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0" - -[[package]] -name = "base64" -version = "0.22.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6" - -[[package]] -name = "binwalk" -version = "3.1.0" -dependencies = [ - "aho-corasick", - "base64", - "bzip2", - "chrono", - "clap", - "colored", - "crc32-v2", - "crc32c", - "entropy", - "env_logger", - "flate2", - "log", - "plotters", - "serde", - "serde_json", - "termsize", - "threadpool", - "uuid", - "walkdir", - "xxhash-rust", - "xz2", -] - -[[package]] -name = "bitflags" -version = "1.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" - -[[package]] -name = "bitflags" -version = "2.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de" - -[[package]] -name = "bumpalo" -version = "3.16.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c" - -[[package]] -name = "bytemuck" -version = "1.18.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94bbb0ad554ad961ddc5da507a12a29b14e4ae5bda06b19f575a3e6079d2e2ae" - -[[package]] -name = "byteorder" -version = "1.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" - -[[package]] -name = "bzip2" -version = "0.4.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bdb116a6ef3f6c3698828873ad02c3014b3c85cadb88496095628e3ef1e347f8" -dependencies = [ - "bzip2-sys", - "libc", -] - -[[package]] -name = "bzip2-sys" -version = "0.1.11+1.0.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "736a955f3fa7875102d57c82b8cac37ec45224a07fd32d58f9f7a186b6cd4cdc" -dependencies = [ - "cc", - "libc", - "pkg-config", -] - -[[package]] -name = "cc" -version = "1.1.21" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "07b1695e2c7e8fc85310cde85aeaab7e3097f593c91d209d3f9df76c928100f0" -dependencies = [ - "shlex", -] - -[[package]] -name = "cfg-if" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" - -[[package]] -name = "chrono" -version = "0.4.38" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a21f936df1771bf62b77f047b726c4625ff2e8aa607c01ec06e5a05bd8463401" -dependencies = [ - "android-tzdata", - "iana-time-zone", - "js-sys", - "num-traits", - "wasm-bindgen", - "windows-targets 0.52.6", -] - -[[package]] -name = "clap" -version = "4.5.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b0956a43b323ac1afaffc053ed5c4b7c1f1800bacd1683c353aabbb752515dd3" -dependencies = [ - "clap_builder", - "clap_derive", -] - -[[package]] -name = "clap_builder" -version = "4.5.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d72166dd41634086d5803a47eb71ae740e61d84709c36f3c34110173db3961b" -dependencies = [ - "anstream", - "anstyle", - "clap_lex", - "strsim", -] - -[[package]] -name = "clap_derive" -version = "4.5.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ac6a0c7b1a9e9a5186361f67dfa1b88213572f427fb9ab038efb2bd8c582dab" -dependencies = [ - "heck", - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "clap_lex" -version = "0.7.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1462739cb27611015575c0c11df5df7601141071f07518d56fcc1be504cbec97" - -[[package]] -name = "color_quant" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d7b894f5411737b7867f4827955924d7c254fc9f4d91a6aad6b097804b1018b" - -[[package]] -name = "colorchoice" -version = "1.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d3fd119d74b830634cea2a0f58bbd0d54540518a14397557951e79340abc28c0" - -[[package]] -name = "colored" -version = "2.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cbf2150cce219b664a8a70df7a1f933836724b503f8a413af9365b4dcc4d90b8" -dependencies = [ - "lazy_static", - "windows-sys 0.48.0", -] - -[[package]] -name = "core-foundation" -version = "0.9.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91e195e091a93c46f7102ec7818a2aa394e1e1771c3ab4825963fa03e45afb8f" -dependencies = [ - "core-foundation-sys", - "libc", -] - -[[package]] -name = "core-foundation-sys" -version = "0.8.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b" - -[[package]] -name = "core-graphics" -version = "0.23.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c07782be35f9e1140080c6b96f0d44b739e2278479f64e02fdab4e32dfd8b081" -dependencies = [ - "bitflags 1.3.2", - "core-foundation", - "core-graphics-types", - "foreign-types", - "libc", -] - -[[package]] -name = "core-graphics-types" -version = "0.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "45390e6114f68f718cc7a830514a96f903cccd70d02a8f6d9f643ac4ba45afaf" -dependencies = [ - "bitflags 1.3.2", - "core-foundation", - "libc", -] - -[[package]] -name = "core-text" -version = "20.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c9d2790b5c08465d49f8dc05c8bcae9fea467855947db39b0f8145c091aaced5" -dependencies = [ - "core-foundation", - "core-graphics", - "foreign-types", - "libc", -] - -[[package]] -name = "crc32-v2" -version = "0.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f546fcecc3490696c3bea070d8949208279bbc220a5a7738573a10f584cda51" - -[[package]] -name = "crc32c" -version = "0.6.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3a47af21622d091a8f0fb295b88bc886ac74efcc613efc19f5d0b21de5c89e47" -dependencies = [ - "rustc_version", -] - -[[package]] -name = "crc32fast" -version = "1.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a97769d94ddab943e4510d138150169a2758b5ef3eb191a9ee688de3e23ef7b3" -dependencies = [ - "cfg-if", -] - -[[package]] -name = "dirs" -version = "5.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44c45a9d03d6676652bcb5e724c7e988de1acad23a711b5217ab9cbecbec2225" -dependencies = [ - "dirs-sys", -] - -[[package]] -name = "dirs-sys" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "520f05a5cbd335fae5a99ff7a6ab8627577660ee5cfd6a94a6a929b52ff0321c" -dependencies = [ - "libc", - "option-ext", - "redox_users", - "windows-sys 0.48.0", -] - -[[package]] -name = "dlib" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "330c60081dcc4c72131f8eb70510f1ac07223e5d4163db481a04a0befcffa412" -dependencies = [ - "libloading", -] - -[[package]] -name = "dwrote" -version = "0.11.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2da3498378ed373237bdef1eddcc64e7be2d3ba4841f4c22a998e81cadeea83c" -dependencies = [ - "lazy_static", - "libc", - "winapi", - "wio", -] - -[[package]] -name = "entropy" -version = "0.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d68716e45ef572f351be6fad93a7bbf35242b4289a2ff75434032e5d73d74cc2" - -[[package]] -name = "env_filter" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f2c92ceda6ceec50f43169f9ee8424fe2db276791afde7b2cd8bc084cb376ab" -dependencies = [ - "log", - "regex", -] - -[[package]] -name = "env_logger" -version = "0.11.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e13fa619b91fb2381732789fc5de83b45675e882f66623b7d8cb4f643017018d" -dependencies = [ - "anstream", - "anstyle", - "env_filter", - "humantime", - "log", -] - -[[package]] -name = "fdeflate" -version = "0.3.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f9bfee30e4dedf0ab8b422f03af778d9612b63f502710fc500a334ebe2de645" -dependencies = [ - "simd-adler32", -] - -[[package]] -name = "flate2" -version = "1.0.34" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1b589b4dc103969ad3cf85c950899926ec64300a1a46d76c03a6072957036f0" -dependencies = [ - "crc32fast", - "miniz_oxide 0.8.0", -] - -[[package]] -name = "float-ord" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ce81f49ae8a0482e4c55ea62ebbd7e5a686af544c00b9d090bba3ff9be97b3d" - -[[package]] -name = "font-kit" -version = "0.14.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b64b34f4efd515f905952d91bc185039863705592c0c53ae6d979805dd154520" -dependencies = [ - "bitflags 2.6.0", - "byteorder", - "core-foundation", - "core-graphics", - "core-text", - "dirs", - "dwrote", - "float-ord", - "freetype-sys", - "lazy_static", - "libc", - "log", - "pathfinder_geometry", - "pathfinder_simd", - "walkdir", - "winapi", - "yeslogic-fontconfig-sys", -] - -[[package]] -name = "foreign-types" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d737d9aa519fb7b749cbc3b962edcf310a8dd1f4b67c91c4f83975dbdd17d965" -dependencies = [ - "foreign-types-macros", - "foreign-types-shared", -] - -[[package]] -name = "foreign-types-macros" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a5c6c585bc94aaf2c7b51dd4c2ba22680844aba4c687be581871a6f518c5742" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "foreign-types-shared" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa9a19cbb55df58761df49b23516a86d432839add4af60fc256da840f66ed35b" - -[[package]] -name = "freetype-sys" -version = "0.20.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0e7edc5b9669349acfda99533e9e0bcf26a51862ab43b08ee7745c55d28eb134" -dependencies = [ - "cc", - "libc", - "pkg-config", -] - -[[package]] -name = "getrandom" -version = "0.2.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7" -dependencies = [ - "cfg-if", - "libc", - "wasi", -] - -[[package]] -name = "gif" -version = "0.12.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "80792593675e051cf94a4b111980da2ba60d4a83e43e0048c5693baab3977045" -dependencies = [ - "color_quant", - "weezl", -] - -[[package]] -name = "heck" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea" - -[[package]] -name = "hermit-abi" -version = "0.3.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024" - -[[package]] -name = "humantime" -version = "2.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" - -[[package]] -name = "iana-time-zone" -version = "0.1.61" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "235e081f3925a06703c2d0117ea8b91f042756fd6e7a6e5d901e8ca1a996b220" -dependencies = [ - "android_system_properties", - "core-foundation-sys", - "iana-time-zone-haiku", - "js-sys", - "wasm-bindgen", - "windows-core", -] - -[[package]] -name = "iana-time-zone-haiku" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f31827a206f56af32e590ba56d5d2d085f558508192593743f16b2306495269f" -dependencies = [ - "cc", -] - -[[package]] -name = "image" -version = "0.24.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5690139d2f55868e080017335e4b94cb7414274c74f1669c84fb5feba2c9f69d" -dependencies = [ - "bytemuck", - "byteorder", - "color_quant", - "jpeg-decoder", - "num-traits", - "png", -] - -[[package]] -name = "is_terminal_polyfill" -version = "1.70.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7943c866cc5cd64cbc25b2e01621d07fa8eb2a1a23160ee81ce38704e97b8ecf" - -[[package]] -name = "itoa" -version = "1.0.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b" - -[[package]] -name = "jpeg-decoder" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f5d4a7da358eff58addd2877a45865158f0d78c911d43a5784ceb7bbf52833b0" - -[[package]] -name = "js-sys" -version = "0.3.70" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1868808506b929d7b0cfa8f75951347aa71bb21144b7791bae35d9bccfcfe37a" -dependencies = [ - "wasm-bindgen", -] - -[[package]] -name = "lazy_static" -version = "1.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe" - -[[package]] -name = "libc" -version = "0.2.158" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d8adc4bb1803a324070e64a98ae98f38934d91957a99cfb3a43dcbc01bc56439" - -[[package]] -name = "libloading" -version = "0.8.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4979f22fdb869068da03c9f7528f8297c6fd2606bc3a4affe42e6a823fdb8da4" -dependencies = [ - "cfg-if", - "windows-targets 0.52.6", -] - -[[package]] -name = "libredox" -version = "0.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0ff37bd590ca25063e35af745c343cb7a0271906fb7b37e4813e8f79f00268d" -dependencies = [ - "bitflags 2.6.0", - "libc", -] - -[[package]] -name = "log" -version = "0.4.22" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24" - -[[package]] -name = "lzma-sys" -version = "0.1.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5fda04ab3764e6cde78b9974eec4f779acaba7c4e84b36eca3cf77c581b85d27" -dependencies = [ - "cc", - "libc", - "pkg-config", -] - -[[package]] -name = "memchr" -version = "2.7.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3" - -[[package]] -name = "miniz_oxide" -version = "0.7.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b8a240ddb74feaf34a79a7add65a741f3167852fba007066dcac1ca548d89c08" -dependencies = [ - "adler", - "simd-adler32", -] - -[[package]] -name = "miniz_oxide" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2d80299ef12ff69b16a84bb182e3b9df68b5a91574d3d4fa6e41b65deec4df1" -dependencies = [ - "adler2", -] - -[[package]] -name = "num-traits" -version = "0.2.19" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841" -dependencies = [ - "autocfg", -] - -[[package]] -name = "num_cpus" -version = "1.16.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43" -dependencies = [ - "hermit-abi", - "libc", -] - -[[package]] -name = "once_cell" -version = "1.19.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" - -[[package]] -name = "option-ext" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "04744f49eae99ab78e0d5c0b603ab218f515ea8cfe5a456d7629ad883a3b6e7d" - -[[package]] -name = "pathfinder_geometry" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b7b7e7b4ea703700ce73ebf128e1450eb69c3a8329199ffbfb9b2a0418e5ad3" -dependencies = [ - "log", - "pathfinder_simd", -] - -[[package]] -name = "pathfinder_simd" -version = "0.5.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5cf07ef4804cfa9aea3b04a7bbdd5a40031dbb6b4f2cbaf2b011666c80c5b4f2" -dependencies = [ - "rustc_version", -] - -[[package]] -name = "pkg-config" -version = "0.3.30" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec" - -[[package]] -name = "plotters" -version = "0.3.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5aeb6f403d7a4911efb1e33402027fc44f29b5bf6def3effcc22d7bb75f2b747" -dependencies = [ - "chrono", - "font-kit", - "image", - "lazy_static", - "num-traits", - "pathfinder_geometry", - "plotters-backend", - "plotters-bitmap", - "plotters-svg", - "ttf-parser", - "wasm-bindgen", - "web-sys", -] - -[[package]] -name = "plotters-backend" -version = "0.3.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "df42e13c12958a16b3f7f4386b9ab1f3e7933914ecea48da7139435263a4172a" - -[[package]] -name = "plotters-bitmap" -version = "0.3.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72ce181e3f6bf82d6c1dc569103ca7b1bd964c60ba03d7e6cdfbb3e3eb7f7405" -dependencies = [ - "gif", - "image", - "plotters-backend", -] - -[[package]] -name = "plotters-svg" -version = "0.3.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "51bae2ac328883f7acdfea3d66a7c35751187f870bc81f94563733a154d7a670" -dependencies = [ - "plotters-backend", -] - -[[package]] -name = "png" -version = "0.17.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06e4b0d3d1312775e782c86c91a111aa1f910cbb65e1337f9975b5f9a554b5e1" -dependencies = [ - "bitflags 1.3.2", - "crc32fast", - "fdeflate", - "flate2", - "miniz_oxide 0.7.4", -] - -[[package]] -name = "ppv-lite86" -version = "0.2.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77957b295656769bb8ad2b6a6b09d897d94f05c41b069aede1fcdaa675eaea04" -dependencies = [ - "zerocopy", -] - -[[package]] -name = "proc-macro2" -version = "1.0.86" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77" -dependencies = [ - "unicode-ident", -] - -[[package]] -name = "quote" -version = "1.0.37" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af" -dependencies = [ - "proc-macro2", -] - -[[package]] -name = "rand" -version = "0.8.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404" -dependencies = [ - "libc", - "rand_chacha", - "rand_core", -] - -[[package]] -name = "rand_chacha" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88" -dependencies = [ - "ppv-lite86", - "rand_core", -] - -[[package]] -name = "rand_core" -version = "0.6.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" -dependencies = [ - "getrandom", -] - -[[package]] -name = "redox_users" -version = "0.4.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba009ff324d1fc1b900bd1fdb31564febe58a8ccc8a6fdbb93b543d33b13ca43" -dependencies = [ - "getrandom", - "libredox", - "thiserror", -] - -[[package]] -name = "regex" -version = "1.10.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4219d74c6b67a3654a9fbebc4b419e22126d13d2f3c4a07ee0cb61ff79a79619" -dependencies = [ - "aho-corasick", - "memchr", - "regex-automata", - "regex-syntax", -] - -[[package]] -name = "regex-automata" -version = "0.4.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38caf58cc5ef2fed281f89292ef23f6365465ed9a41b7a7754eb4e26496c92df" -dependencies = [ - "aho-corasick", - "memchr", - "regex-syntax", -] - -[[package]] -name = "regex-syntax" -version = "0.8.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a66a03ae7c801facd77a29370b4faec201768915ac14a721ba36f20bc9c209b" - -[[package]] -name = "rustc_version" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cfcb3a22ef46e85b45de6ee7e79d063319ebb6594faafcf1c225ea92ab6e9b92" -dependencies = [ - "semver", -] - -[[package]] -name = "ryu" -version = "1.0.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f" - -[[package]] -name = "same-file" -version = "1.0.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502" -dependencies = [ - "winapi-util", -] - -[[package]] -name = "semver" -version = "1.0.23" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61697e0a1c7e512e84a621326239844a24d8207b4669b41bc18b32ea5cbf988b" - -[[package]] -name = "serde" -version = "1.0.210" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c8e3592472072e6e22e0a54d5904d9febf8508f65fb8552499a1abc7d1078c3a" -dependencies = [ - "serde_derive", -] - -[[package]] -name = "serde_derive" -version = "1.0.210" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "243902eda00fad750862fc144cea25caca5e20d615af0a81bee94ca738f1df1f" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "serde_json" -version = "1.0.128" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ff5456707a1de34e7e37f2a6fd3d3f808c318259cbd01ab6377795054b483d8" -dependencies = [ - "itoa", - "memchr", - "ryu", - "serde", -] - -[[package]] -name = "shlex" -version = "1.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64" - -[[package]] -name = "simd-adler32" -version = "0.3.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d66dc143e6b11c1eddc06d5c423cfc97062865baf299914ab64caa38182078fe" - -[[package]] -name = "strsim" -version = "0.11.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f" - -[[package]] -name = "syn" -version = "2.0.77" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f35bcdf61fd8e7be6caf75f429fdca8beb3ed76584befb503b1569faee373ed" -dependencies = [ - "proc-macro2", - "quote", - "unicode-ident", -] - -[[package]] -name = "termsize" -version = "0.1.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f11ff5c25c172608d5b85e2fb43ee9a6d683a7f4ab7f96ae07b3d8b590368fd" -dependencies = [ - "libc", - "winapi", -] - -[[package]] -name = "thiserror" -version = "1.0.63" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0342370b38b6a11b6cc11d6a805569958d54cfa061a29969c3b5ce2ea405724" -dependencies = [ - "thiserror-impl", -] - -[[package]] -name = "thiserror-impl" -version = "1.0.63" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4558b58466b9ad7ca0f102865eccc95938dca1a74a856f2b57b6629050da261" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "threadpool" -version = "1.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d050e60b33d41c19108b32cea32164033a9013fe3b46cbd4457559bfbf77afaa" -dependencies = [ - "num_cpus", -] - -[[package]] -name = "ttf-parser" -version = "0.20.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17f77d76d837a7830fe1d4f12b7b4ba4192c1888001c7164257e4bc6d21d96b4" - -[[package]] -name = "unicode-ident" -version = "1.0.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe" - -[[package]] -name = "utf8parse" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821" - -[[package]] -name = "uuid" -version = "1.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81dfa00651efa65069b0b6b651f4aaa31ba9e3c3ce0137aaad053604ee7e0314" -dependencies = [ - "getrandom", - "rand", - "uuid-macro-internal", -] - -[[package]] -name = "uuid-macro-internal" -version = "1.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee1cd046f83ea2c4e920d6ee9f7c3537ef928d75dce5d84a87c2c5d6b3999a3a" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "walkdir" -version = "2.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "29790946404f91d9c5d06f9874efddea1dc06c5efe94541a7d6863108e3a5e4b" -dependencies = [ - "same-file", - "winapi-util", -] - -[[package]] -name = "wasi" -version = "0.11.0+wasi-snapshot-preview1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" - -[[package]] -name = "wasm-bindgen" -version = "0.2.93" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a82edfc16a6c469f5f44dc7b571814045d60404b55a0ee849f9bcfa2e63dd9b5" -dependencies = [ - "cfg-if", - "once_cell", - "wasm-bindgen-macro", -] - -[[package]] -name = "wasm-bindgen-backend" -version = "0.2.93" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9de396da306523044d3302746f1208fa71d7532227f15e347e2d93e4145dd77b" -dependencies = [ - "bumpalo", - "log", - "once_cell", - "proc-macro2", - "quote", - "syn", - "wasm-bindgen-shared", -] - -[[package]] -name = "wasm-bindgen-macro" -version = "0.2.93" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "585c4c91a46b072c92e908d99cb1dcdf95c5218eeb6f3bf1efa991ee7a68cccf" -dependencies = [ - "quote", - "wasm-bindgen-macro-support", -] - -[[package]] -name = "wasm-bindgen-macro-support" -version = "0.2.93" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "afc340c74d9005395cf9dd098506f7f44e38f2b4a21c6aaacf9a105ea5e1e836" -dependencies = [ - "proc-macro2", - "quote", - "syn", - "wasm-bindgen-backend", - "wasm-bindgen-shared", -] - -[[package]] -name = "wasm-bindgen-shared" -version = "0.2.93" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c62a0a307cb4a311d3a07867860911ca130c3494e8c2719593806c08bc5d0484" - -[[package]] -name = "web-sys" -version = "0.3.70" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26fdeaafd9bd129f65e7c031593c24d62186301e0c72c8978fa1678be7d532c0" -dependencies = [ - "js-sys", - "wasm-bindgen", -] - -[[package]] -name = "weezl" -version = "0.1.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53a85b86a771b1c87058196170769dd264f66c0782acf1ae6cc51bfd64b39082" - -[[package]] -name = "winapi" -version = "0.3.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" -dependencies = [ - "winapi-i686-pc-windows-gnu", - "winapi-x86_64-pc-windows-gnu", -] - -[[package]] -name = "winapi-i686-pc-windows-gnu" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" - -[[package]] -name = "winapi-util" -version = "0.1.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf221c93e13a30d793f7645a0e7762c55d169dbb0a49671918a2319d289b10bb" -dependencies = [ - "windows-sys 0.59.0", -] - -[[package]] -name = "winapi-x86_64-pc-windows-gnu" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" - -[[package]] -name = "windows-core" -version = "0.52.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9" -dependencies = [ - "windows-targets 0.52.6", -] - -[[package]] -name = "windows-sys" -version = "0.48.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" -dependencies = [ - "windows-targets 0.48.5", -] - -[[package]] -name = "windows-sys" -version = "0.52.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" -dependencies = [ - "windows-targets 0.52.6", -] - -[[package]] -name = "windows-sys" -version = "0.59.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b" -dependencies = [ - "windows-targets 0.52.6", -] - -[[package]] -name = "windows-targets" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c" -dependencies = [ - "windows_aarch64_gnullvm 0.48.5", - "windows_aarch64_msvc 0.48.5", - "windows_i686_gnu 0.48.5", - "windows_i686_msvc 0.48.5", - "windows_x86_64_gnu 0.48.5", - "windows_x86_64_gnullvm 0.48.5", - "windows_x86_64_msvc 0.48.5", -] - -[[package]] -name = "windows-targets" -version = "0.52.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973" -dependencies = [ - "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]] -name = "windows_aarch64_gnullvm" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" - -[[package]] -name = "windows_aarch64_gnullvm" -version = "0.52.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3" - -[[package]] -name = "windows_aarch64_msvc" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" - -[[package]] -name = "windows_aarch64_msvc" -version = "0.52.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469" - -[[package]] -name = "windows_i686_gnu" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" - -[[package]] -name = "windows_i686_gnu" -version = "0.52.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -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" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" - -[[package]] -name = "windows_i686_msvc" -version = "0.52.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66" - -[[package]] -name = "windows_x86_64_gnu" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" - -[[package]] -name = "windows_x86_64_gnu" -version = "0.52.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78" - -[[package]] -name = "windows_x86_64_gnullvm" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" - -[[package]] -name = "windows_x86_64_gnullvm" -version = "0.52.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d" - -[[package]] -name = "windows_x86_64_msvc" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" - -[[package]] -name = "windows_x86_64_msvc" -version = "0.52.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" - -[[package]] -name = "wio" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d129932f4644ac2396cb456385cbf9e63b5b30c6e8dc4820bdca4eb082037a5" -dependencies = [ - "winapi", -] - -[[package]] -name = "xxhash-rust" -version = "0.8.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a5cbf750400958819fb6178eaa83bee5cd9c29a26a40cc241df8c70fdd46984" - -[[package]] -name = "xz2" -version = "0.1.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "388c44dc09d76f1536602ead6d325eb532f5c122f17782bd57fb47baeeb767e2" -dependencies = [ - "lzma-sys", -] - -[[package]] -name = "yeslogic-fontconfig-sys" -version = "6.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "503a066b4c037c440169d995b869046827dbc71263f6e8f3be6d77d4f3229dbd" -dependencies = [ - "dlib", - "once_cell", - "pkg-config", -] - -[[package]] -name = "zerocopy" -version = "0.7.35" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b9b4fd18abc82b8136838da5d50bae7bdea537c574d8dc1a34ed098d6c166f0" -dependencies = [ - "byteorder", - "zerocopy-derive", -] - -[[package]] -name = "zerocopy-derive" -version = "0.7.35" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] diff --git a/pkgs/by-name/bi/binwalk/package.nix b/pkgs/by-name/bi/binwalk/package.nix index dbbed1d7d7127..5765c47ef07d5 100644 --- a/pkgs/by-name/bi/binwalk/package.nix +++ b/pkgs/by-name/bi/binwalk/package.nix @@ -15,13 +15,11 @@ rustPlatform.buildRustPackage rec { src = fetchFromGitHub { owner = "ReFirmLabs"; repo = "binwalk"; - rev = "refs/tags/v${version}"; + tag = "v${version}"; hash = "sha256-em+jOnhCZH5EEJrhXTHmxiwpMcBr5oNU1+5IJ1H/oco="; }; - cargoLock = { - lockFile = ./Cargo.lock; - }; + cargoHash = "sha256-7+2TdlfCHJHXn0+q74JhmY3/lC0WfCG2FFmQFQNf4k8="; nativeBuildInputs = [ pkg-config ]; From f723903b640a88b4a689ddbff5eaac440ae891ba Mon Sep 17 00:00:00 2001 From: KSJ2000 <katsho123@outlook.com> Date: Mon, 13 Jan 2025 11:57:12 +0200 Subject: [PATCH 103/174] binwalk: add versionCheckHook --- pkgs/by-name/bi/binwalk/package.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/by-name/bi/binwalk/package.nix b/pkgs/by-name/bi/binwalk/package.nix index 5765c47ef07d5..b897fe4a5ba3d 100644 --- a/pkgs/by-name/bi/binwalk/package.nix +++ b/pkgs/by-name/bi/binwalk/package.nix @@ -6,6 +6,7 @@ fontconfig, bzip2, stdenv, + versionCheckHook, }: rustPlatform.buildRustPackage rec { @@ -51,6 +52,10 @@ rustPlatform.buildRustPackage rec { "--skip=extractors::common::Chroot::make_executable" ]; + nativeInstallCheckInputs = [ versionCheckHook ]; + doInstallCheck = true; + versionCheckProgramArg = "-V"; + meta = { description = "Firmware Analysis Tool"; homepage = "https://github.com/ReFirmLabs/binwalk"; From a816427ee208a1105a0a3866056f7b1e6b1c10be Mon Sep 17 00:00:00 2001 From: KSJ2000 <katsho123@outlook.com> Date: Mon, 13 Jan 2025 11:59:18 +0200 Subject: [PATCH 104/174] binwalk: add missing dependencies --- pkgs/by-name/bi/binwalk/package.nix | 69 ++++++++++++++++++++++++++--- 1 file changed, 62 insertions(+), 7 deletions(-) diff --git a/pkgs/by-name/bi/binwalk/package.nix b/pkgs/by-name/bi/binwalk/package.nix index b897fe4a5ba3d..6609c60d92359 100644 --- a/pkgs/by-name/bi/binwalk/package.nix +++ b/pkgs/by-name/bi/binwalk/package.nix @@ -1,12 +1,39 @@ { - lib, - rustPlatform, + bzip2, + cabextract, + dmg2img, + dtc, + dumpifs, + enableUnfree ? false, fetchFromGitHub, - pkg-config, fontconfig, - bzip2, + gnutar, + jefferson, + lib, + lzfse, + lzo, + lzop, + lz4, + openssl_3, + pkg-config, + python3, + rustPlatform, + sasquatch, + sleuthkit, + srec2bin, stdenv, + ubi_reader, + ucl, + uefi-firmware-parser, + unrar, + unyaffs, + unzip, versionCheckHook, + vmlinux-to-elf, + xz, + zlib, + zstd, + _7zz, }: rustPlatform.buildRustPackage rec { @@ -24,10 +51,36 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ pkg-config ]; + # https://github.com/ReFirmLabs/binwalk/commits/master/dependencies buildInputs = [ - fontconfig bzip2 - ]; + cabextract + dmg2img + dtc + dumpifs + fontconfig + gnutar + jefferson + lzfse + lzo + lzop + lz4 + openssl_3 + python3.pkgs.python-lzo + sasquatch + sleuthkit + srec2bin + ubi_reader + ucl + uefi-firmware-parser + unyaffs + unzip + vmlinux-to-elf + xz + zlib + zstd + _7zz + ] ++ lib.optionals enableUnfree [ unrar ]; # skip broken tests checkFlags = @@ -59,11 +112,13 @@ rustPlatform.buildRustPackage rec { meta = { description = "Firmware Analysis Tool"; homepage = "https://github.com/ReFirmLabs/binwalk"; - changelog = "https://github.com/ReFirmLabs/binwalk/releases/tag/${src.rev}"; + changelog = "https://github.com/ReFirmLabs/binwalk/releases/tag/v${version}"; license = lib.licenses.mit; + platforms = lib.platforms.unix; maintainers = with lib.maintainers; [ koral felbinger ]; + mainProgram = "binwalk"; }; } From 00c56bc4ecdf86ddd280cb235f9855667a976987 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" <ryantm-bot@ryantm.com> Date: Wed, 15 Jan 2025 07:35:00 +0000 Subject: [PATCH 105/174] python312Packages.kneaddata: 0.7.7-alpha -> 0.12.1 --- pkgs/development/python-modules/kneaddata/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/kneaddata/default.nix b/pkgs/development/python-modules/kneaddata/default.nix index f63218afaa423..310d3ad10164f 100644 --- a/pkgs/development/python-modules/kneaddata/default.nix +++ b/pkgs/development/python-modules/kneaddata/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "kneaddata"; - version = "0.7.7-alpha"; + version = "0.12.1"; pyproject = true; dependencies = [ setuptools ]; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "biobakery"; repo = "kneaddata"; tag = version; - hash = "sha256-8pXabwMGNZETEXP0A31SInj37pvogyKpJAaAY7aTyns="; + hash = "sha256-biZ6lS0a81CBAAhTOb1Ol38/YagLqXA3AbMr2nBmSEw="; }; nativeCheckInputs = [ unittestCheckHook ]; From 49e22ef4aa5090ba9a7bea50b4fa37ec7196e9fa Mon Sep 17 00:00:00 2001 From: Fabian Affolter <mail@fabian-affolter.ch> Date: Wed, 15 Jan 2025 09:43:22 +0100 Subject: [PATCH 106/174] python312Packages.django-cors-headers: 4.4.0 -> 4.6.0 Diff: https://github.com/adamchainz/django-cors-headers/compare/4.4.0...4.6.0 --- .../python-modules/django-cors-headers/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/django-cors-headers/default.nix b/pkgs/development/python-modules/django-cors-headers/default.nix index 6271f6ade6f41..ab6026814d42c 100644 --- a/pkgs/development/python-modules/django-cors-headers/default.nix +++ b/pkgs/development/python-modules/django-cors-headers/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "django-cors-headers"; - version = "4.4.0"; + version = "4.6.0"; pyproject = true; src = fetchFromGitHub { owner = "adamchainz"; repo = pname; rev = version; - hash = "sha256-/uTQ09zIjRV1Ilb/mXyr4zn5tJI/mNFHpfql2ptuER4="; + hash = "sha256-Dvsuj+U1YFC9jT5qkh2h1aL71JkRsAyXW4rxhLzEbOw="; }; build-system = [ setuptools ]; From 61990dca898042a691060e0a6ccf5fe71ab881ba Mon Sep 17 00:00:00 2001 From: linsui <36977733+linsui@users.noreply.github.com> Date: Wed, 15 Jan 2025 16:43:13 +0800 Subject: [PATCH 107/174] showtime: add gst-libav --- pkgs/by-name/sh/showtime/package.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/by-name/sh/showtime/package.nix b/pkgs/by-name/sh/showtime/package.nix index 68945b8c27ab7..64613e6b3ac02 100644 --- a/pkgs/by-name/sh/showtime/package.nix +++ b/pkgs/by-name/sh/showtime/package.nix @@ -52,6 +52,7 @@ python3Packages.buildPythonApplication rec { gst_all_1.gst-plugins-good gst_all_1.gst-plugins-rs gst_all_1.gst-plugins-ugly + gst_all_1.gst-libav gst_all_1.gstreamer libadwaita ]; From 503c51fbb88a167ae34efff6d4aa14f6be031533 Mon Sep 17 00:00:00 2001 From: Andreas Skielboe <andreas@skielboe.com> Date: Tue, 14 Jan 2025 23:48:22 +0100 Subject: [PATCH 108/174] vvenc: Fix build on Darwin --- pkgs/by-name/vv/vvenc/package.nix | 2 ++ pkgs/by-name/vv/vvenc/unset-darwin-cmake-flags.patch | 9 +++++++++ 2 files changed, 11 insertions(+) create mode 100644 pkgs/by-name/vv/vvenc/unset-darwin-cmake-flags.patch diff --git a/pkgs/by-name/vv/vvenc/package.nix b/pkgs/by-name/vv/vvenc/package.nix index 51bcd961d412e..9efe72fd7f7d0 100644 --- a/pkgs/by-name/vv/vvenc/package.nix +++ b/pkgs/by-name/vv/vvenc/package.nix @@ -24,6 +24,8 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-9fWKunafTniBsY9hK09+xYwvB7IgGPhZmgqauPHgB/g="; }; + patches = [ ./unset-darwin-cmake-flags.patch ]; + env.NIX_CFLAGS_COMPILE = toString ( lib.optionals stdenv.cc.isGNU [ "-Wno-maybe-uninitialized" diff --git a/pkgs/by-name/vv/vvenc/unset-darwin-cmake-flags.patch b/pkgs/by-name/vv/vvenc/unset-darwin-cmake-flags.patch new file mode 100644 index 0000000000000..e9b5b5b54c395 --- /dev/null +++ b/pkgs/by-name/vv/vvenc/unset-darwin-cmake-flags.patch @@ -0,0 +1,9 @@ +--- a/source/Lib/vvenc/CMakeLists.txt 2025-01-14 23:26:14 ++++ b/source/Lib/vvenc/CMakeLists.txt 2025-01-14 23:26:43 +@@ -174,6 +174,4 @@ + set_target_properties( ${LIB_NAME} PROPERTIES + VERSION ${PROJECT_VERSION} + SOVERSION ${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR} +- INSTALL_NAME_DIR ${CMAKE_INSTALL_PREFIX}/lib +- MACOSX_RPATH FALSE + FOLDER lib ) From f112d204e18aafce8b78852ef26f19054739bb05 Mon Sep 17 00:00:00 2001 From: Fabian Affolter <mail@fabian-affolter.ch> Date: Wed, 15 Jan 2025 09:45:25 +0100 Subject: [PATCH 109/174] python312Packages.django-cors-headers: refactor --- .../django-cors-headers/default.nix | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/django-cors-headers/default.nix b/pkgs/development/python-modules/django-cors-headers/default.nix index ab6026814d42c..c175f21bc01bf 100644 --- a/pkgs/development/python-modules/django-cors-headers/default.nix +++ b/pkgs/development/python-modules/django-cors-headers/default.nix @@ -1,11 +1,13 @@ { lib, - fetchFromGitHub, + asgiref, buildPythonPackage, - setuptools, django, + fetchFromGitHub, pytest-django, pytestCheckHook, + pythonOlder, + setuptools, }: buildPythonPackage rec { @@ -13,16 +15,21 @@ buildPythonPackage rec { version = "4.6.0"; pyproject = true; + disabled = pythonOlder "3.9"; + src = fetchFromGitHub { owner = "adamchainz"; - repo = pname; - rev = version; + repo = "django-cors-headers"; + tag = version; hash = "sha256-Dvsuj+U1YFC9jT5qkh2h1aL71JkRsAyXW4rxhLzEbOw="; }; build-system = [ setuptools ]; - dependencies = [ django ]; + dependencies = [ + asgiref + django + ]; nativeCheckInputs = [ pytest-django @@ -34,6 +41,7 @@ buildPythonPackage rec { meta = with lib; { description = "Django app for handling server Cross-Origin Resource Sharing (CORS) headers"; homepage = "https://github.com/OttoYiu/django-cors-headers"; + changelog = "https://github.com/adamchainz/django-cors-headers/blob/${version}/CHANGELOG.rst"; license = licenses.mit; maintainers = [ ]; }; From 1187945fcd30d12a6904555e233fd6660bef30fc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gutyina=20Gerg=C5=91?= <gutyina.gergo.2@gmail.com> Date: Tue, 7 Jan 2025 15:56:47 +0100 Subject: [PATCH 110/174] pnpm_10: init at 10.0.0 --- pkgs/development/tools/pnpm/default.nix | 4 ++++ pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/development/tools/pnpm/default.nix b/pkgs/development/tools/pnpm/default.nix index 3d7cd0280b00f..d449a81d8eeed 100644 --- a/pkgs/development/tools/pnpm/default.nix +++ b/pkgs/development/tools/pnpm/default.nix @@ -15,6 +15,10 @@ let version = "9.15.3"; hash = "sha256-wdpDcnzLwe1Cr/T9a9tLHpHmWoGObv/1skD78HC6Tq8="; }; + "10" = { + version = "10.0.0"; + hash = "sha256-Q6v25yD7e8U8WRsIYmBcfTI9Cp0t0zvKwHsGLhPPSUg="; + }; }; callPnpm = variant: callPackage ./generic.nix { inherit (variant) version hash; }; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 01119dedd5df1..90aad332c39fa 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4760,7 +4760,7 @@ with pkgs; }; inherit (callPackage ../development/tools/pnpm { }) - pnpm_8 pnpm_9; + pnpm_8 pnpm_9 pnpm_10; pnpm = pnpm_9; po4a = perlPackages.Po4a; From bfc5cf386f953f083dfca8f5857c112519e7647e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" <ryantm-bot@ryantm.com> Date: Wed, 15 Jan 2025 09:04:23 +0000 Subject: [PATCH 111/174] python312Packages.recipe-scrapers: 15.3.3 -> 15.4.0 --- pkgs/development/python-modules/recipe-scrapers/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/recipe-scrapers/default.nix b/pkgs/development/python-modules/recipe-scrapers/default.nix index 2686138caa44d..097ff6f693f34 100644 --- a/pkgs/development/python-modules/recipe-scrapers/default.nix +++ b/pkgs/development/python-modules/recipe-scrapers/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "recipe-scrapers"; - version = "15.3.3"; + version = "15.4.0"; pyproject = true; disabled = pythonOlder "3.9"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "hhursev"; repo = "recipe-scrapers"; tag = version; - hash = "sha256-rIQ6OfxsVczidLYVvXtkfpBk/KGLgDo+h4kqKXXSD80="; + hash = "sha256-IAsa/GjTydKZq9Nh9MSVRb2DujICVQT38hMPTjzQyBw="; }; nativeBuildInputs = [ setuptools ]; From a619bff47c813718f1dde591ce39c171100ced7d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gutyina=20Gerg=C5=91?= <gutyina.gergo.2@gmail.com> Date: Wed, 15 Jan 2025 10:03:13 +0100 Subject: [PATCH 112/174] pnpm: pnpm_9 -> pnpm_10 --- nixos/doc/manual/release-notes/rl-2505.section.md | 2 ++ .../virtualization/podman-desktop/default.nix | 6 +++--- pkgs/by-name/ap/apache-answer/package.nix | 6 +++--- pkgs/by-name/as/astro-language-server/package.nix | 6 +++--- pkgs/by-name/cl/clash-verge-rev/webui.nix | 6 +++--- pkgs/by-name/da/daed/package.nix | 6 +++--- pkgs/by-name/fl/flood/package.nix | 6 +++--- pkgs/by-name/fo/follow/package.nix | 6 +++--- pkgs/by-name/fr/froide/package.nix | 6 +++--- pkgs/by-name/gi/gitify/package.nix | 6 +++--- pkgs/by-name/go/goofcord/package.nix | 4 ++-- pkgs/by-name/gu/gui-for-clash/package.nix | 6 +++--- pkgs/by-name/gu/gui-for-singbox/package.nix | 6 +++--- pkgs/by-name/ho/homebox/package.nix | 8 ++++---- pkgs/by-name/ho/homer/package.nix | 6 +++--- pkgs/by-name/le/legcord/package.nix | 6 +++--- pkgs/by-name/me/metacubexd/package.nix | 6 +++--- pkgs/by-name/mi/misskey/package.nix | 10 +++++----- pkgs/by-name/mo/moonfire-nvr/package.nix | 6 +++--- pkgs/by-name/n8/n8n/package.nix | 6 +++--- pkgs/by-name/oc/ocis/package.nix | 6 +++--- pkgs/by-name/oc/ocis/web.nix | 6 +++--- pkgs/by-name/ov/overlayed/webui.nix | 6 +++--- pkgs/by-name/pa/parca/package.nix | 6 +++--- pkgs/by-name/pg/pgrok/package.nix | 6 +++--- pkgs/by-name/pi/piped/package.nix | 6 +++--- pkgs/by-name/rq/rquickshare/package.nix | 6 +++--- pkgs/by-name/rs/rsshub/package.nix | 6 +++--- pkgs/by-name/sk/sketchybar-app-font/package.nix | 6 +++--- pkgs/by-name/su/surrealist/package.nix | 6 +++--- pkgs/by-name/sy/synchrony/package.nix | 6 +++--- pkgs/by-name/ta/tabby-agent/package.nix | 6 +++--- .../by-name/ta/tailwindcss-language-server/package.nix | 6 +++--- pkgs/by-name/ta/taler-wallet-core/package.nix | 6 +++--- pkgs/by-name/ve/vencord/package.nix | 6 +++--- pkgs/by-name/we/wealthfolio/package.nix | 6 +++--- pkgs/by-name/za/zammad/package.nix | 6 +++--- .../python-modules/django-filingcabinet/default.nix | 6 +++--- pkgs/games/heroic/default.nix | 6 +++--- pkgs/top-level/all-packages.nix | 3 ++- 40 files changed, 120 insertions(+), 117 deletions(-) diff --git a/nixos/doc/manual/release-notes/rl-2505.section.md b/nixos/doc/manual/release-notes/rl-2505.section.md index fca105e284f4f..5111d9881fc37 100644 --- a/nixos/doc/manual/release-notes/rl-2505.section.md +++ b/nixos/doc/manual/release-notes/rl-2505.section.md @@ -182,6 +182,8 @@ - `linuxPackages.nvidiaPackages.dc_520` has been removed since it is marked broken and there are better newer alternatives. +- `pnpm` was updated to version 10. If your project is incompatible, you can install the previous version from the package attribute `pnpm_9`. + - `programs.less.lessopen` is now null by default. To restore the previous behaviour, set it to `''|${lib.getExe' pkgs.lesspipe "lesspipe.sh"} %s''`. - `hardware.pulseaudio` has been renamed to `services.pulseaudio`. The deprecated option names will continue to work, but causes a warning. diff --git a/pkgs/applications/virtualization/podman-desktop/default.nix b/pkgs/applications/virtualization/podman-desktop/default.nix index 8cab09d6a8608..c25dcc390f911 100644 --- a/pkgs/applications/virtualization/podman-desktop/default.nix +++ b/pkgs/applications/virtualization/podman-desktop/default.nix @@ -5,7 +5,7 @@ , copyDesktopItems , electron , nodejs -, pnpm +, pnpm_9 , makeDesktopItem , autoSignDarwinBinariesHook , nix-update-script @@ -24,7 +24,7 @@ stdenv.mkDerivation (finalAttrs: { sha256 = "sha256-07lf9jy22JUT+Vc5y9Tu1nkWaXU5RTdu3GibcvQsSs8="; }; - pnpmDeps = pnpm.fetchDeps { + pnpmDeps = pnpm_9.fetchDeps { inherit (finalAttrs) pname version src; hash = "sha256-LPsNRd1c/cQeyBn3LZKnKeAsZ981sOkLYTnXIZL82LA="; }; @@ -46,7 +46,7 @@ stdenv.mkDerivation (finalAttrs: { ELECTRON_SKIP_BINARY_DOWNLOAD = "1"; nativeBuildInputs = [ - makeWrapper nodejs pnpm.configHook + makeWrapper nodejs pnpm_9.configHook ] ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ copyDesktopItems ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ diff --git a/pkgs/by-name/ap/apache-answer/package.nix b/pkgs/by-name/ap/apache-answer/package.nix index 2a39d54a2494b..efa453863614c 100644 --- a/pkgs/by-name/ap/apache-answer/package.nix +++ b/pkgs/by-name/ap/apache-answer/package.nix @@ -2,7 +2,7 @@ buildGoModule, lib, fetchFromGitHub, - pnpm, + pnpm_9, nodejs, fetchpatch, stdenv, @@ -25,14 +25,14 @@ buildGoModule rec { sourceRoot = "${src.name}/ui"; - pnpmDeps = pnpm.fetchDeps { + pnpmDeps = pnpm_9.fetchDeps { inherit src version pname; sourceRoot = "${src.name}/ui"; hash = "sha256-/se6IWeHdazqS7PzOpgtT4IxCJ1WptqBzZ/BdmGb4BA="; }; nativeBuildInputs = [ - pnpm.configHook + pnpm_9.configHook nodejs ]; diff --git a/pkgs/by-name/as/astro-language-server/package.nix b/pkgs/by-name/as/astro-language-server/package.nix index 4efdc6e54719d..0d30d9ccdb648 100644 --- a/pkgs/by-name/as/astro-language-server/package.nix +++ b/pkgs/by-name/as/astro-language-server/package.nix @@ -2,7 +2,7 @@ lib, stdenv, fetchFromGitHub, - pnpm, + pnpm_9, nodejs_22, }: @@ -17,7 +17,7 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-NBLUeg1WqxTXtu8eg1fihQSfm8koYAEWhfXAj/fIdC8="; }; - pnpmDeps = pnpm.fetchDeps { + pnpmDeps = pnpm_9.fetchDeps { inherit (finalAttrs) pname version @@ -30,7 +30,7 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ nodejs_22 - pnpm.configHook + pnpm_9.configHook ]; buildInputs = [ nodejs_22 ]; diff --git a/pkgs/by-name/cl/clash-verge-rev/webui.nix b/pkgs/by-name/cl/clash-verge-rev/webui.nix index 7cd35cd6c368d..d8cdc4f80b1b6 100644 --- a/pkgs/by-name/cl/clash-verge-rev/webui.nix +++ b/pkgs/by-name/cl/clash-verge-rev/webui.nix @@ -2,7 +2,7 @@ version, src, pname, - pnpm, + pnpm_9, nodejs, stdenv, meta, @@ -11,14 +11,14 @@ stdenv.mkDerivation { inherit version src meta; pname = "${pname}-webui"; - pnpmDeps = pnpm.fetchDeps { + pnpmDeps = pnpm_9.fetchDeps { inherit pname version src; hash = npm-hash; }; nativeBuildInputs = [ nodejs - pnpm.configHook + pnpm_9.configHook ]; postPatch = '' diff --git a/pkgs/by-name/da/daed/package.nix b/pkgs/by-name/da/daed/package.nix index 0a04f2eb2a0b4..3143b3c33a760 100644 --- a/pkgs/by-name/da/daed/package.nix +++ b/pkgs/by-name/da/daed/package.nix @@ -1,5 +1,5 @@ { - pnpm, + pnpm_9, nodejs, stdenv, clang, @@ -22,14 +22,14 @@ let web = stdenv.mkDerivation { inherit pname version src; - pnpmDeps = pnpm.fetchDeps { + pnpmDeps = pnpm_9.fetchDeps { inherit pname version src; hash = "sha256-vqkiZzd5WOeJem0zUyMsJd6/aHHAjlsIQMkNf+SUvHY="; }; nativeBuildInputs = [ nodejs - pnpm.configHook + pnpm_9.configHook ]; buildPhase = '' diff --git a/pkgs/by-name/fl/flood/package.nix b/pkgs/by-name/fl/flood/package.nix index 7e8dd89694fb6..26fd8b7a29e1c 100644 --- a/pkgs/by-name/fl/flood/package.nix +++ b/pkgs/by-name/fl/flood/package.nix @@ -2,7 +2,7 @@ , buildNpmPackage , fetchFromGitHub , nixosTests -, pnpm +, pnpm_9 , nix-update-script }: @@ -17,9 +17,9 @@ buildNpmPackage rec { hash = "sha256-lm+vPo7V99OSUAVEvdiTNMlD/+iHGPIyPLc1WzO1aTU="; }; - npmConfigHook = pnpm.configHook; + npmConfigHook = pnpm_9.configHook; npmDeps = pnpmDeps; - pnpmDeps = pnpm.fetchDeps { + pnpmDeps = pnpm_9.fetchDeps { inherit pname version src; hash = "sha256-NuU9O3bEboxmuEuk1WSUeZRNgVK5cwFiUAN3+7vACGw="; }; diff --git a/pkgs/by-name/fo/follow/package.nix b/pkgs/by-name/fo/follow/package.nix index 9add047a1c983..fed49a03069b8 100644 --- a/pkgs/by-name/fo/follow/package.nix +++ b/pkgs/by-name/fo/follow/package.nix @@ -6,7 +6,7 @@ makeDesktopItem, makeWrapper, nodejs, - pnpm, + pnpm_9, stdenv, }: stdenv.mkDerivation rec { @@ -23,12 +23,12 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ nodejs - pnpm.configHook + pnpm_9.configHook makeWrapper imagemagick ]; - pnpmDeps = pnpm.fetchDeps { + pnpmDeps = pnpm_9.fetchDeps { inherit pname version src; hash = "sha256-FzMjN0rIjYxexf6tix4qi3mnuPkadjKihhN0Pj5y2nU="; }; diff --git a/pkgs/by-name/fr/froide/package.nix b/pkgs/by-name/fr/froide/package.nix index e33a08bfb9daf..2c0927aca9b5a 100644 --- a/pkgs/by-name/fr/froide/package.nix +++ b/pkgs/by-name/fr/froide/package.nix @@ -5,7 +5,7 @@ makeWrapper, gdal, geos, - pnpm, + pnpm_9, nodejs, postgresql, postgresqlTestHook, @@ -42,7 +42,7 @@ python.pkgs.buildPythonApplication rec { nativeBuildInputs = [ makeWrapper nodejs - pnpm.configHook + pnpm_9.configHook ]; dependencies = with python.pkgs; [ @@ -99,7 +99,7 @@ python.pkgs.buildPythonApplication rec { websockets ]; - pnpmDeps = pnpm.fetchDeps { + pnpmDeps = pnpm_9.fetchDeps { inherit pname version src; hash = "sha256-DMoaXNm5S64XBERHFnFM6IKBkzXRGDEYWSTruccK9Hc="; }; diff --git a/pkgs/by-name/gi/gitify/package.nix b/pkgs/by-name/gi/gitify/package.nix index 94277985556ea..3d807ba7b9ad8 100644 --- a/pkgs/by-name/gi/gitify/package.nix +++ b/pkgs/by-name/gi/gitify/package.nix @@ -2,7 +2,7 @@ lib, stdenv, fetchFromGitHub, - pnpm, + pnpm_9, nodejs, electron, makeDesktopItem, @@ -25,13 +25,13 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ nodejs - pnpm.configHook + pnpm_9.configHook copyDesktopItems imagemagick makeWrapper ]; - pnpmDeps = pnpm.fetchDeps { + pnpmDeps = pnpm_9.fetchDeps { inherit (finalAttrs) pname version src; hash = "sha256-I78AvOBdDd59eVJJ51xxNwVvMnNvLdJJpFEtE/I1H8U="; }; diff --git a/pkgs/by-name/go/goofcord/package.nix b/pkgs/by-name/go/goofcord/package.nix index 45287af656f1e..95e7d9824df84 100644 --- a/pkgs/by-name/go/goofcord/package.nix +++ b/pkgs/by-name/go/goofcord/package.nix @@ -2,7 +2,7 @@ lib, stdenv, fetchFromGitHub, - pnpm, + pnpm_9, nodejs_22, nix-update-script, electron, @@ -14,7 +14,7 @@ }: let - pnpm' = pnpm.override { nodejs = nodejs_22; }; + pnpm' = pnpm_9.override { nodejs = nodejs_22; }; in stdenv.mkDerivation (finalAttrs: { pname = "goofcord"; diff --git a/pkgs/by-name/gu/gui-for-clash/package.nix b/pkgs/by-name/gu/gui-for-clash/package.nix index 9bd8c3b9f9e5f..402e3ba6cb4e5 100644 --- a/pkgs/by-name/gu/gui-for-clash/package.nix +++ b/pkgs/by-name/gu/gui-for-clash/package.nix @@ -1,7 +1,7 @@ { stdenv, nodejs, - pnpm, + pnpm_9, fetchFromGitHub, buildGoModule, lib, @@ -30,10 +30,10 @@ let nativeBuildInputs = [ nodejs - pnpm.configHook + pnpm_9.configHook ]; - pnpmDeps = pnpm.fetchDeps { + pnpmDeps = pnpm_9.fetchDeps { inherit (finalAttrs) pname version src; sourceRoot = "${finalAttrs.src.name}/frontend"; hash = "sha256-mG8b16PP876EyaX3Sc4WM41Yc/oDGZDiilZPaxPvvuQ="; diff --git a/pkgs/by-name/gu/gui-for-singbox/package.nix b/pkgs/by-name/gu/gui-for-singbox/package.nix index be491136b5b94..08620f978925b 100644 --- a/pkgs/by-name/gu/gui-for-singbox/package.nix +++ b/pkgs/by-name/gu/gui-for-singbox/package.nix @@ -1,7 +1,7 @@ { stdenv, nodejs, - pnpm, + pnpm_9, fetchFromGitHub, buildGoModule, lib, @@ -30,10 +30,10 @@ let nativeBuildInputs = [ nodejs - pnpm.configHook + pnpm_9.configHook ]; - pnpmDeps = pnpm.fetchDeps { + pnpmDeps = pnpm_9.fetchDeps { inherit (finalAttrs) pname version src; sourceRoot = "${finalAttrs.src.name}/frontend"; hash = "sha256-dLI1YMzs9lLk9lJBkBgc6cpirM79khy0g5VaOVEzUAc="; diff --git a/pkgs/by-name/ho/homebox/package.nix b/pkgs/by-name/ho/homebox/package.nix index 48d4b62bf80fc..3139f8f8f5d5e 100644 --- a/pkgs/by-name/ho/homebox/package.nix +++ b/pkgs/by-name/ho/homebox/package.nix @@ -2,7 +2,7 @@ lib, buildGo123Module, fetchFromGitHub, - pnpm, + pnpm_9, nodejs, go_1_23, git, @@ -35,7 +35,7 @@ buildGo123Module { preBuild = ""; }; - pnpmDeps = pnpm.fetchDeps { + pnpmDeps = pnpm_9.fetchDeps { inherit pname version; src = "${src}/frontend"; hash = "sha256-x7sWSH84UJEXNRLCgEgXc4NrTRsn6OplANi+XGtIN9Y="; @@ -56,8 +56,8 @@ buildGo123Module { ''; nativeBuildInputs = [ - pnpm - pnpm.configHook + pnpm_9 + pnpm_9.configHook nodejs ]; diff --git a/pkgs/by-name/ho/homer/package.nix b/pkgs/by-name/ho/homer/package.nix index 221c015814b2e..50fe5bf1fc595 100644 --- a/pkgs/by-name/ho/homer/package.nix +++ b/pkgs/by-name/ho/homer/package.nix @@ -2,7 +2,7 @@ lib, stdenvNoCC, fetchFromGitHub, - pnpm, + pnpm_9, nodejs, dart-sass, nix-update-script, @@ -17,7 +17,7 @@ stdenvNoCC.mkDerivation rec { hash = "sha256-nOhovVqWlHPunwruJrgqFhhDxccKBp/iEyB3Y3C5Cz8="; }; - pnpmDeps = pnpm.fetchDeps { + pnpmDeps = pnpm_9.fetchDeps { inherit pname version @@ -33,7 +33,7 @@ stdenvNoCC.mkDerivation rec { nativeBuildInputs = [ nodejs dart-sass - pnpm.configHook + pnpm_9.configHook ]; buildPhase = '' diff --git a/pkgs/by-name/le/legcord/package.nix b/pkgs/by-name/le/legcord/package.nix index ae70d077a298e..a6bd478b084ab 100644 --- a/pkgs/by-name/le/legcord/package.nix +++ b/pkgs/by-name/le/legcord/package.nix @@ -2,7 +2,7 @@ lib, stdenv, fetchFromGitHub, - pnpm, + pnpm_9, nodejs, electron_32, makeWrapper, @@ -22,13 +22,13 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ - pnpm.configHook + pnpm_9.configHook nodejs makeWrapper copyDesktopItems ]; - pnpmDeps = pnpm.fetchDeps { + pnpmDeps = pnpm_9.fetchDeps { inherit pname version src; hash = "sha256-QTePf/QE85OzXIcnwLJsCJJyRxwoV+FNef2Z9nAt35E="; }; diff --git a/pkgs/by-name/me/metacubexd/package.nix b/pkgs/by-name/me/metacubexd/package.nix index 37ffb48eb4c9b..916f7b43a2b4e 100644 --- a/pkgs/by-name/me/metacubexd/package.nix +++ b/pkgs/by-name/me/metacubexd/package.nix @@ -3,7 +3,7 @@ fetchFromGitHub, nix-update-script, nodejs, - pnpm, + pnpm_9, stdenv, }: stdenv.mkDerivation (finalAttrs: { @@ -18,11 +18,11 @@ stdenv.mkDerivation (finalAttrs: { }; nativeBuildInputs = [ - pnpm.configHook + pnpm_9.configHook nodejs ]; - pnpmDeps = pnpm.fetchDeps { + pnpmDeps = pnpm_9.fetchDeps { inherit (finalAttrs) pname version src; hash = "sha256-aw8Sh4BecQ09rC0OLWebdWc7D/LE8vPs9uqh6w5G/FM="; }; diff --git a/pkgs/by-name/mi/misskey/package.nix b/pkgs/by-name/mi/misskey/package.nix index 51e444d3c5cd2..8343793050280 100644 --- a/pkgs/by-name/mi/misskey/package.nix +++ b/pkgs/by-name/mi/misskey/package.nix @@ -4,7 +4,7 @@ nixosTests, fetchFromGitHub, nodejs, - pnpm, + pnpm_9, makeWrapper, python3, bash, @@ -30,13 +30,13 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ nodejs - pnpm.configHook + pnpm_9.configHook makeWrapper python3 ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ xcbuild.xcrun ]; # https://nixos.org/manual/nixpkgs/unstable/#javascript-pnpm - pnpmDeps = pnpm.fetchDeps { + pnpmDeps = pnpm_9.fetchDeps { inherit (finalAttrs) pname version src; hash = "sha256-YWZhm5eKjB6JGP45WC3UrIkr7vuBUI4Q3oiK8Lst3dI="; }; @@ -87,7 +87,7 @@ stdenv.mkDerivation (finalAttrs: { # Otherwise, maybe somehow bindmount a writable directory into <package>/data/files. ln -s /var/lib/misskey $out/data/files - makeWrapper ${pnpm}/bin/pnpm $out/bin/misskey \ + makeWrapper ${pnpm_9}/bin/pnpm $out/bin/misskey \ --run "${checkEnvVarScript} || exit" \ --chdir $out/data \ --add-flags run \ @@ -95,7 +95,7 @@ stdenv.mkDerivation (finalAttrs: { --prefix PATH : ${ lib.makeBinPath [ nodejs - pnpm + pnpm_9 bash ] } \ diff --git a/pkgs/by-name/mo/moonfire-nvr/package.nix b/pkgs/by-name/mo/moonfire-nvr/package.nix index fb5951e96d71b..4d3f462d69d23 100644 --- a/pkgs/by-name/mo/moonfire-nvr/package.nix +++ b/pkgs/by-name/mo/moonfire-nvr/package.nix @@ -10,7 +10,7 @@ moonfire-nvr, darwin, nodejs, - pnpm, + pnpm_9, }: let @@ -28,9 +28,9 @@ let sourceRoot = "${src.name}/ui"; nativeBuildInputs = [ nodejs - pnpm.configHook + pnpm_9.configHook ]; - pnpmDeps = pnpm.fetchDeps { + pnpmDeps = pnpm_9.fetchDeps { inherit (finalAttrs) pname version src; sourceRoot = "${finalAttrs.src.name}/ui"; hash = "sha256-7fMhUFlV5lz+A9VG8IdWoc49C2CTdLYQlEgBSBqJvtw="; diff --git a/pkgs/by-name/n8/n8n/package.nix b/pkgs/by-name/n8/n8n/package.nix index a339597e28965..dce70e681e974 100644 --- a/pkgs/by-name/n8/n8n/package.nix +++ b/pkgs/by-name/n8/n8n/package.nix @@ -4,7 +4,7 @@ nixosTests, fetchFromGitHub, nodejs, - pnpm, + pnpm_9, python3, node-gyp, xcbuild, @@ -25,13 +25,13 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-gPdJKVOZlizdS0o+2nBgCImnIhtHzRjE2xk0zJA52go="; }; - pnpmDeps = pnpm.fetchDeps { + pnpmDeps = pnpm_9.fetchDeps { inherit (finalAttrs) pname version src; hash = "sha256-Am9R2rfQiw1IPd22/UraqzEqvVeB5XuSrrLSYXWsWfU="; }; nativeBuildInputs = [ - pnpm.configHook + pnpm_9.configHook python3 # required to build sqlite3 bindings node-gyp # required to build sqlite3 bindings makeWrapper diff --git a/pkgs/by-name/oc/ocis/package.nix b/pkgs/by-name/oc/ocis/package.nix index 174c36d5771de..41669e7cf9f87 100644 --- a/pkgs/by-name/oc/ocis/package.nix +++ b/pkgs/by-name/oc/ocis/package.nix @@ -5,7 +5,7 @@ buildGoModule, callPackage, gnumake, - pnpm, + pnpm_9, nodejs, ocis, }: @@ -44,10 +44,10 @@ buildGoModule rec { nativeBuildInputs = [ gnumake nodejs - pnpm.configHook + pnpm_9.configHook ]; - pnpmDeps = pnpm.fetchDeps { + pnpmDeps = pnpm_9.fetchDeps { inherit pname version src; sourceRoot = "${src.name}/services/idp"; hash = "sha256-gNlN+u/bobnTsXrsOmkDcWs67D/trH3inT5AVQs3Brs="; diff --git a/pkgs/by-name/oc/ocis/web.nix b/pkgs/by-name/oc/ocis/web.nix index eb8175b6dc926..def8a16b351d6 100644 --- a/pkgs/by-name/oc/ocis/web.nix +++ b/pkgs/by-name/oc/ocis/web.nix @@ -2,7 +2,7 @@ lib, stdenvNoCC, nodejs, - pnpm, + pnpm_9, fetchFromGitHub, }: stdenvNoCC.mkDerivation rec { @@ -18,7 +18,7 @@ stdenvNoCC.mkDerivation rec { nativeBuildInputs = [ nodejs - pnpm.configHook + pnpm_9.configHook ]; buildPhase = '' @@ -34,7 +34,7 @@ stdenvNoCC.mkDerivation rec { runHook postInstall ''; - pnpmDeps = pnpm.fetchDeps { + pnpmDeps = pnpm_9.fetchDeps { inherit pname version src; hash = "sha256-3Erva6srdkX1YQ727trx34Ufx524nz19MUyaDQToz6M="; }; diff --git a/pkgs/by-name/ov/overlayed/webui.nix b/pkgs/by-name/ov/overlayed/webui.nix index 085b3436a9ca7..482aeba5f2f4f 100644 --- a/pkgs/by-name/ov/overlayed/webui.nix +++ b/pkgs/by-name/ov/overlayed/webui.nix @@ -4,21 +4,21 @@ version, stdenv, nodejs, - pnpm, + pnpm_9, }: stdenv.mkDerivation (finalAttrs: { inherit version src meta; pname = "overlayed-webui"; - pnpmDeps = pnpm.fetchDeps { + pnpmDeps = pnpm_9.fetchDeps { inherit (finalAttrs) src pname version; hash = "sha256-+yyxoodcDfqJ2pkosd6sMk77/71RDsGthedo1Oigwto="; }; nativeBuildInputs = [ nodejs - pnpm.configHook + pnpm_9.configHook ]; buildPhase = '' diff --git a/pkgs/by-name/pa/parca/package.nix b/pkgs/by-name/pa/parca/package.nix index 5ff206041ef41..3c9758e81100c 100644 --- a/pkgs/by-name/pa/parca/package.nix +++ b/pkgs/by-name/pa/parca/package.nix @@ -4,7 +4,7 @@ fetchFromGitHub, lib, nodejs, - pnpm, + pnpm_9, stdenv, }: let @@ -22,7 +22,7 @@ let pname = "parca-ui"; src = "${parca-src}/ui"; - pnpmDeps = pnpm.fetchDeps { + pnpmDeps = pnpm_9.fetchDeps { inherit (finalAttrs) pname src version; hash = "sha256-MVNO24Oksy/qRUmEUoWoviQEo6Eimb18ZnDj5Z1vJkY="; }; @@ -30,7 +30,7 @@ let nativeBuildInputs = [ faketty nodejs - pnpm.configHook + pnpm_9.configHook ]; # faketty is required to work around a bug in nx. diff --git a/pkgs/by-name/pg/pgrok/package.nix b/pkgs/by-name/pg/pgrok/package.nix index 360aeea556192..675d7a0bb50af 100644 --- a/pkgs/by-name/pg/pgrok/package.nix +++ b/pkgs/by-name/pg/pgrok/package.nix @@ -4,7 +4,7 @@ fetchFromGitHub, nix-update-script, nodejs, - pnpm, + pnpm_9, }: let @@ -28,10 +28,10 @@ buildGoModule { nativeBuildInputs = [ nodejs - pnpm.configHook + pnpm_9.configHook ]; - pnpmDeps = pnpm.fetchDeps { + pnpmDeps = pnpm_9.fetchDeps { inherit pname version src; hash = "sha256-xObDEkNGMXcUqX9thAJoE45yzd7f15k2odDWv9X3RRE="; }; diff --git a/pkgs/by-name/pi/piped/package.nix b/pkgs/by-name/pi/piped/package.nix index 83d721aa63fe9..3502f59f4f378 100644 --- a/pkgs/by-name/pi/piped/package.nix +++ b/pkgs/by-name/pi/piped/package.nix @@ -1,7 +1,7 @@ { lib, buildNpmPackage, - pnpm, + pnpm_9, fetchFromGitHub, unstableGitUpdater, }: @@ -17,7 +17,7 @@ buildNpmPackage rec { hash = "sha256-o3TwE0s5rim+0VKR+oW9Rv3/eQRf2dgRQK4xjZ9pqCE="; }; - npmConfigHook = pnpm.configHook; + npmConfigHook = pnpm_9.configHook; installPhase = '' runHook preInstall @@ -26,7 +26,7 @@ buildNpmPackage rec { ''; npmDeps = pnpmDeps; - pnpmDeps = pnpm.fetchDeps { + pnpmDeps = pnpm_9.fetchDeps { inherit pname version src; hash = "sha256-WtZfRZFRV9I1iBlAoV69GGFjdiQhTSBG/iiEadPVcys="; }; diff --git a/pkgs/by-name/rq/rquickshare/package.nix b/pkgs/by-name/rq/rquickshare/package.nix index 578a3f5a240e5..1cd300f6ba0a2 100644 --- a/pkgs/by-name/rq/rquickshare/package.nix +++ b/pkgs/by-name/rq/rquickshare/package.nix @@ -12,7 +12,7 @@ openssl, perl, pkg-config, - pnpm, + pnpm_9, protobuf, rustPlatform, stdenv, @@ -55,7 +55,7 @@ rustPlatform.buildRustPackage rec { ''; pnpmRoot = "app/${app-type}"; - pnpmDeps = pnpm.fetchDeps { + pnpmDeps = pnpm_9.fetchDeps { inherit pname version src; sourceRoot = "${src.name}/app/${app-type}"; @@ -73,7 +73,7 @@ rustPlatform.buildRustPackage rec { # Setup pnpm nodejs - pnpm.configHook + pnpm_9.configHook # Make sure we can find our libraries perl diff --git a/pkgs/by-name/rs/rsshub/package.nix b/pkgs/by-name/rs/rsshub/package.nix index 147c0bbb680d4..38ad570f53c2b 100644 --- a/pkgs/by-name/rs/rsshub/package.nix +++ b/pkgs/by-name/rs/rsshub/package.nix @@ -3,7 +3,7 @@ fetchFromGitHub, makeBinaryWrapper, nodejs, - pnpm, + pnpm_9, replaceVars, stdenv, }: @@ -24,7 +24,7 @@ stdenv.mkDerivation (finalAttrs: { }) ]; - pnpmDeps = pnpm.fetchDeps { + pnpmDeps = pnpm_9.fetchDeps { inherit (finalAttrs) pname version src; hash = "sha256-mAAo4SdJ8cj8aqnbm+azcnxq8lFBvOy3BlSEKz9MA0Q="; }; @@ -32,7 +32,7 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ makeBinaryWrapper nodejs - pnpm.configHook + pnpm_9.configHook ]; buildPhase = '' diff --git a/pkgs/by-name/sk/sketchybar-app-font/package.nix b/pkgs/by-name/sk/sketchybar-app-font/package.nix index 3790f8a00b110..299e84863efad 100644 --- a/pkgs/by-name/sk/sketchybar-app-font/package.nix +++ b/pkgs/by-name/sk/sketchybar-app-font/package.nix @@ -1,7 +1,7 @@ { fetchFromGitHub, lib, - pnpm, + pnpm_9, stdenvNoCC, nodejs, nix-update-script, @@ -18,14 +18,14 @@ stdenvNoCC.mkDerivation (finalAttrs: { hash = "sha256-8SWN22pjHnXWM+RUEYNux0ZWhRUVMib3M7r2SlI33tQ="; }; - pnpmDeps = pnpm.fetchDeps { + pnpmDeps = pnpm_9.fetchDeps { inherit (finalAttrs) pname version src; hash = "sha256-NGAgueJ+cuK/csjdf94KNklu+Xf91BHoWKVgEctX6eA="; }; nativeBuildInputs = [ nodejs - pnpm.configHook + pnpm_9.configHook ]; buildPhase = '' diff --git a/pkgs/by-name/su/surrealist/package.nix b/pkgs/by-name/su/surrealist/package.nix index 8f0cc06876ec5..371dcab6dbe55 100644 --- a/pkgs/by-name/su/surrealist/package.nix +++ b/pkgs/by-name/su/surrealist/package.nix @@ -17,7 +17,7 @@ openssl, pango, pkg-config, - pnpm, + pnpm_9, rustc, rustPlatform, stdenv, @@ -76,7 +76,7 @@ stdenv.mkDerivation (finalAttrs: { patchFlags = [ "-p2" ]; }; - pnpmDeps = pnpm.fetchDeps { + pnpmDeps = pnpm_9.fetchDeps { inherit (finalAttrs) pname version src; hash = "sha256-JwOY6Z8UjbrodSQ3csnT+puftbQUDF3NIK7o6rSpl2o="; }; @@ -90,7 +90,7 @@ stdenv.mkDerivation (finalAttrs: { moreutils nodejs pkg-config - pnpm.configHook + pnpm_9.configHook rustc rustPlatform.cargoSetupHook ]; diff --git a/pkgs/by-name/sy/synchrony/package.nix b/pkgs/by-name/sy/synchrony/package.nix index 9027cc93e593f..fdc86661cbfb1 100644 --- a/pkgs/by-name/sy/synchrony/package.nix +++ b/pkgs/by-name/sy/synchrony/package.nix @@ -3,7 +3,7 @@ stdenv, fetchFromGitHub, nodejs, - pnpm, + pnpm_9, nix-update-script, fetchurl, runCommand, @@ -22,10 +22,10 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ nodejs - pnpm.configHook + pnpm_9.configHook ]; - pnpmDeps = pnpm.fetchDeps { + pnpmDeps = pnpm_9.fetchDeps { inherit (finalAttrs) pname version src; hash = "sha256-+hS4UK7sncCxv6o5Yl72AeY+LSGLnUTnKosAYB6QsP0="; }; diff --git a/pkgs/by-name/ta/tabby-agent/package.nix b/pkgs/by-name/ta/tabby-agent/package.nix index 67c8719669077..d260b626d0db8 100644 --- a/pkgs/by-name/ta/tabby-agent/package.nix +++ b/pkgs/by-name/ta/tabby-agent/package.nix @@ -4,7 +4,7 @@ fetchFromGitHub, nix-update-script, nodejs, - pnpm, + pnpm_9, wrapGAppsHook3, }: stdenv.mkDerivation (finalAttrs: { @@ -19,7 +19,7 @@ stdenv.mkDerivation (finalAttrs: { }; nativeBuildInputs = [ - pnpm.configHook + pnpm_9.configHook wrapGAppsHook3 ]; @@ -46,7 +46,7 @@ stdenv.mkDerivation (finalAttrs: { runHook postInstall ''; - pnpmDeps = pnpm.fetchDeps { + pnpmDeps = pnpm_9.fetchDeps { inherit (finalAttrs) pname version src; hash = "sha256-fpzl2w0o5bJhppVUl6vRNqAVQNMPLK0+JX/KYEtUGGA="; }; diff --git a/pkgs/by-name/ta/tailwindcss-language-server/package.nix b/pkgs/by-name/ta/tailwindcss-language-server/package.nix index 6a532b2cab56f..fd56c58586af5 100644 --- a/pkgs/by-name/ta/tailwindcss-language-server/package.nix +++ b/pkgs/by-name/ta/tailwindcss-language-server/package.nix @@ -3,7 +3,7 @@ stdenv, fetchFromGitHub, nodejs_22, - pnpm, + pnpm_9, }: let @@ -20,7 +20,7 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-FphKiGMTMQj/tBmrwkPVlb+dEGjf+N4EgZtOVg7iL2M="; }; - pnpmDeps = pnpm.fetchDeps { + pnpmDeps = pnpm_9.fetchDeps { inherit (finalAttrs) pname version @@ -33,7 +33,7 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ nodejs_22 - pnpm.configHook + pnpm_9.configHook ]; buildInputs = [ nodejs_22 ]; diff --git a/pkgs/by-name/ta/taler-wallet-core/package.nix b/pkgs/by-name/ta/taler-wallet-core/package.nix index 0d2330553fb2b..34ecb9fcfdd24 100644 --- a/pkgs/by-name/ta/taler-wallet-core/package.nix +++ b/pkgs/by-name/ta/taler-wallet-core/package.nix @@ -8,7 +8,7 @@ srcOnly, removeReferencesTo, nodejs, - pnpm, + pnpm_9, python3, git, jq, @@ -48,13 +48,13 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ customPython nodejs - pnpm.configHook + pnpm_9.configHook git jq zip ]; - pnpmDeps = pnpm.fetchDeps { + pnpmDeps = pnpm_9.fetchDeps { inherit (finalAttrs) pname version src; hash = "sha256-BVVmv0VVvQ2YhL0zOKiM1oVKJKvqwMGNR47DkcCj874="; }; diff --git a/pkgs/by-name/ve/vencord/package.nix b/pkgs/by-name/ve/vencord/package.nix index 6dba2492e2422..08f504b91a867 100644 --- a/pkgs/by-name/ve/vencord/package.nix +++ b/pkgs/by-name/ve/vencord/package.nix @@ -7,7 +7,7 @@ lib, nix-update, nodejs, - pnpm, + pnpm_9, stdenv, writeShellScript, buildWebExtension ? false, @@ -23,7 +23,7 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-sU2eJUUw7crvzMGGBQP6rbxISkL+S5nmT3QspyYXlRQ="; }; - pnpmDeps = pnpm.fetchDeps { + pnpmDeps = pnpm_9.fetchDeps { inherit (finalAttrs) pname src; hash = "sha256-vVzERis1W3QZB/i6SQR9dQR56yDWadKWvFr+nLTQY9Y="; @@ -32,7 +32,7 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ git nodejs - pnpm.configHook + pnpm_9.configHook ]; env = { diff --git a/pkgs/by-name/we/wealthfolio/package.nix b/pkgs/by-name/we/wealthfolio/package.nix index 37b9c0a125edf..9898d6a0e4067 100644 --- a/pkgs/by-name/we/wealthfolio/package.nix +++ b/pkgs/by-name/we/wealthfolio/package.nix @@ -9,7 +9,7 @@ nodejs, openssl, pkg-config, - pnpm, + pnpm_9, rustPlatform, webkitgtk_4_1, wrapGAppsHook3, @@ -27,7 +27,7 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-2g5zfRRxRm7/pCyut7weC4oTegwxCbvYpWSC2+qfcR8="; }; - pnpmDeps = pnpm.fetchDeps { + pnpmDeps = pnpm_9.fetchDeps { inherit (finalAttrs) src pname version; hash = "sha256-CNk4zysIIDzDxozCrUnsR63eme28mDsBkRVB/1tXnJI="; }; @@ -47,7 +47,7 @@ stdenv.mkDerivation (finalAttrs: { moreutils nodejs pkg-config - pnpm.configHook + pnpm_9.configHook rustPlatform.cargoSetupHook wrapGAppsHook3 ]; diff --git a/pkgs/by-name/za/zammad/package.nix b/pkgs/by-name/za/zammad/package.nix index da0d0bdab660e..452af8ef5c94c 100644 --- a/pkgs/by-name/za/zammad/package.nix +++ b/pkgs/by-name/za/zammad/package.nix @@ -14,7 +14,7 @@ jq, moreutils, nodejs, - pnpm, + pnpm_9, cacert, redis, dataDir ? "/var/lib/zammad", @@ -94,7 +94,7 @@ stdenvNoCC.mkDerivation { nativeBuildInputs = [ redis postgresql - pnpm.configHook + pnpm_9.configHook nodejs procps cacert @@ -102,7 +102,7 @@ stdenvNoCC.mkDerivation { env.RAILS_ENV = "production"; - pnpmDeps = pnpm.fetchDeps { + pnpmDeps = pnpm_9.fetchDeps { inherit pname src; hash = "sha256-bdm1nkJnXE7oZZhG2uBnk3fYhITaMROHGKPbf0G3bFs="; diff --git a/pkgs/development/python-modules/django-filingcabinet/default.nix b/pkgs/development/python-modules/django-filingcabinet/default.nix index bbace0ec1af96..689a554c6da86 100644 --- a/pkgs/development/python-modules/django-filingcabinet/default.nix +++ b/pkgs/development/python-modules/django-filingcabinet/default.nix @@ -28,7 +28,7 @@ poppler_utils, pytest-playwright, playwright-driver, - pnpm, + pnpm_9, nodejs, }: @@ -55,7 +55,7 @@ buildPythonPackage rec { nativeBuildInputs = [ nodejs - pnpm.configHook + pnpm_9.configHook ]; dependencies = [ @@ -85,7 +85,7 @@ buildPythonPackage rec { #annotate = [ fcdocs-annotate ]; }; - pnpmDeps = pnpm.fetchDeps { + pnpmDeps = pnpm_9.fetchDeps { inherit pname version src; hash = "sha256-32kOhB2+37DD4hKXKep08iDxhXpasKPfcv9fkwISxeU="; }; diff --git a/pkgs/games/heroic/default.nix b/pkgs/games/heroic/default.nix index db33d84856844..c14915ccdbd8c 100644 --- a/pkgs/games/heroic/default.nix +++ b/pkgs/games/heroic/default.nix @@ -3,7 +3,7 @@ stdenv, fetchFromGitHub, nix-update-script, - pnpm, + pnpm_9, nodejs, python3, makeWrapper, @@ -26,14 +26,14 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-AndJqk1VAUdC4pOTRzyfhdxmzJMskGF6pUiqPs3fIy4="; }; - pnpmDeps = pnpm.fetchDeps { + pnpmDeps = pnpm_9.fetchDeps { inherit (finalAttrs) pname version src; hash = "sha256-/7JIeQZt3QsKrjujSucRLiHfhfSllK7FeumNA4eHqSY="; }; nativeBuildInputs = [ nodejs - pnpm.configHook + pnpm_9.configHook python3 makeWrapper ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 90aad332c39fa..e6b9fb893d959 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1634,6 +1634,7 @@ with pkgs; authelia = callPackage ../servers/authelia { buildGoModule = buildGo123Module; + pnpm = pnpm_9; }; authentik-outposts = recurseIntoAttrs (callPackages ../by-name/au/authentik/outposts.nix { }); @@ -4761,7 +4762,7 @@ with pkgs; inherit (callPackage ../development/tools/pnpm { }) pnpm_8 pnpm_9 pnpm_10; - pnpm = pnpm_9; + pnpm = pnpm_10; po4a = perlPackages.Po4a; From 5da8a1aebd158464e4349832e78c869781f7fba9 Mon Sep 17 00:00:00 2001 From: Jasper Chan <jasperchan515@gmail.com> Date: Wed, 15 Jan 2025 08:45:12 +0000 Subject: [PATCH 113/174] python313Packages.django-q2: fix hiredis override (fixes #373982) --- pkgs/development/python-modules/django-q2/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/django-q2/default.nix b/pkgs/development/python-modules/django-q2/default.nix index c9ec30eba2e5a..3f83d115764ff 100644 --- a/pkgs/development/python-modules/django-q2/default.nix +++ b/pkgs/development/python-modules/django-q2/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "django-q2"; repo = "django-q2"; - rev = "refs/tags/v${version}"; + tag = "v${version}"; hash = "sha256-mp/IZkfT64xW42B1TEO6lSHxvLQbeH4td8vqZH7wUxM="; }; @@ -53,7 +53,7 @@ buildPythonPackage rec { new: old: { version = "3.1.0"; src = old.src.override { - rev = "refs/tags/v${new.version}"; + tag = "v${new.version}"; hash = "sha256-ID5OJdARd2N2GYEpcYOpxenpZlhWnWr5fAClAgqEgGg="; }; } From 28d233678536c44e2849fecebdff89c83342beae Mon Sep 17 00:00:00 2001 From: sund3RRR <evenquantity@gmail.com> Date: Tue, 24 Dec 2024 20:18:32 +0300 Subject: [PATCH 114/174] amneziaVPN: init at 4.8.2.3; nixos/programs/amneziaVPN: init --- .../manual/release-notes/rl-2505.section.md | 2 + nixos/modules/module-list.nix | 1 + nixos/modules/programs/amnezia-vpn.nix | 27 +++ pkgs/by-name/am/amnezia-vpn/package.nix | 157 ++++++++++++++++++ pkgs/by-name/am/amnezia-vpn/router.patch | 54 ++++++ 5 files changed, 241 insertions(+) create mode 100644 nixos/modules/programs/amnezia-vpn.nix create mode 100644 pkgs/by-name/am/amnezia-vpn/package.nix create mode 100644 pkgs/by-name/am/amnezia-vpn/router.patch diff --git a/nixos/doc/manual/release-notes/rl-2505.section.md b/nixos/doc/manual/release-notes/rl-2505.section.md index 1caa762d4ebf1..e18d3a2eaf833 100644 --- a/nixos/doc/manual/release-notes/rl-2505.section.md +++ b/nixos/doc/manual/release-notes/rl-2505.section.md @@ -29,6 +29,8 @@ <!-- To avoid merge conflicts, consider adding your item at an arbitrary place in the list instead. --> +- [AmneziaVPN](https://amnezia.org/en), an open-source VPN client, with a key feature that enables you to deploy your own VPN server on your server. Available as [programs.amnezia-vpn](#opt-programs.amnezia-vpn.enable). + - [Bazecor](https://github.com/Dygmalab/Bazecor), the graphical configurator for Dygma Products. - [Bonsai](https://git.sr.ht/~stacyharper/bonsai), a general-purpose event mapper/state machine primarily used to create complex key shortcuts, and as part of the [SXMO](https://sxmo.org/) desktop environment. Available as [services.bonsaid](#opt-services.bonsaid.enable). diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 9fe8e3be6477d..467a25decb72d 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -149,6 +149,7 @@ ./programs/_1password.nix ./programs/adb.nix ./programs/alvr.nix + ./programs/amnezia-vpn.nix ./programs/appgate-sdp.nix ./programs/appimage.nix ./programs/arp-scan.nix diff --git a/nixos/modules/programs/amnezia-vpn.nix b/nixos/modules/programs/amnezia-vpn.nix new file mode 100644 index 0000000000000..e2b49ebb6e7bb --- /dev/null +++ b/nixos/modules/programs/amnezia-vpn.nix @@ -0,0 +1,27 @@ +{ + config, + lib, + pkgs, + ... +}: +let + cfg = config.programs.amnezia-vpn; +in +{ + options.programs.amnezia-vpn = { + enable = lib.mkEnableOption "The AmneziaVPN client"; + }; + + config = lib.mkIf cfg.enable { + environment.systemPackages = [ pkgs.amnezia-vpn ]; + services.dbus.packages = [ pkgs.amnezia-vpn ]; + services.resolved.enable = true; + + systemd = { + packages = [ pkgs.amnezia-vpn ]; + services."AmneziaVPN".wantedBy = [ "multi-user.target" ]; + }; + }; + + meta.maintainers = with lib.maintainers; [ sund3RRR ]; +} diff --git a/pkgs/by-name/am/amnezia-vpn/package.nix b/pkgs/by-name/am/amnezia-vpn/package.nix new file mode 100644 index 0000000000000..865b4a94526b6 --- /dev/null +++ b/pkgs/by-name/am/amnezia-vpn/package.nix @@ -0,0 +1,157 @@ +{ + lib, + stdenv, + fetchFromGitHub, + cmake, + pkg-config, + kdePackages, + qt6, + libsecret, + xdg-utils, + amneziawg-go, + openvpn, + shadowsocks-rust, + cloak-pt, + wireguard-tools, + procps, + iproute2, + sudo, + libssh, + zlib, + tun2socks, + xray, +}: +let + amnezia-tun2socks = tun2socks.overrideAttrs ( + finalAttrs: prevAttrs: { + pname = "amnezia-tun2socks"; + version = "2.5.4"; + + src = fetchFromGitHub { + owner = "amnezia-vpn"; + repo = "amnezia-tun2socks"; + tag = "v${finalAttrs.version}"; + hash = "sha256-lHo7WtcqccBSHly6neuksh1gC7RCKxbFNX9KSKNNeK8="; + }; + + vendorHash = "sha256-VvOaTJ6dBFlbGZGxnHy2sCtds1tyhu6VsPewYpsDBiM="; + + ldflags = [ + "-w" + "-s" + "-X github.com/amnezia-vpn/amnezia-tun2socks/v2/internal/version.Version=v${finalAttrs.version}" + "-X github.com/amnezia-vpn/amnezia-tun2socks/v2/internal/version.GitCommit=v${finalAttrs.version}" + ]; + } + ); + + amnezia-xray = xray.overrideAttrs ( + finalAttrs: prevAttrs: { + pname = "amnezia-xray"; + version = "1.8.13"; + + src = fetchFromGitHub { + owner = "amnezia-vpn"; + repo = "amnezia-xray-core"; + tag = "v${finalAttrs.version}"; + hash = "sha256-7XYdogoUEv3kTPTOQwRCohsPtfSDf+aRdI28IkTjvPk="; + }; + + vendorHash = "sha256-zArdGj5yeRxU0X4jNgT5YBI9SJUyrANDaqNPAPH3d5M="; + } + ); +in +stdenv.mkDerivation (finalAttrs: { + pname = "amnezia-vpn"; + version = "4.8.2.3"; + + src = fetchFromGitHub { + owner = "amnezia-vpn"; + repo = "amnezia-client"; + tag = finalAttrs.version; + hash = "sha256-bCWPyRW2xnnopcwfPHgQrdP85Ct0CDufJRQ1PvCAiDE="; + fetchSubmodules = true; + }; + + patches = [ ./router.patch ]; + + postPatch = + '' + substituteInPlace client/platforms/linux/daemon/wireguardutilslinux.cpp \ + --replace-fail 'm_tunnel.start(appPath.filePath("../../client/bin/wireguard-go"), wgArgs);' 'm_tunnel.start("${amneziawg-go}/bin/amneziawg-go", wgArgs);' + substituteInPlace client/utilities.cpp \ + --replace-fail 'return Utils::executable("../../client/bin/openvpn", true);' 'return Utils::executable("${openvpn}/bin/openvpn", false);' \ + --replace-fail 'return Utils::executable("../../client/bin/tun2socks", true);' 'return Utils::executable("${amnezia-tun2socks}/bin/amnezia-tun2socks", false);' \ + --replace-fail 'return Utils::usrExecutable("wg-quick");' 'return Utils::executable("${wireguard-tools}/bin/wg-quick", false);' \ + --replace-fail 'QProcess::execute(QString("pkill %1").arg(name));' 'return QProcess::execute(QString("pkill -f %1").arg(name)) == 0;' + substituteInPlace client/protocols/xrayprotocol.cpp \ + --replace-fail 'return Utils::executable(QString("xray"), true);' 'return Utils::executable(QString("${amnezia-xray}/bin/xray"), false);' + substituteInPlace client/protocols/openvpnovercloakprotocol.cpp \ + --replace-fail 'return Utils::executable(QString("/ck-client"), true);' 'return Utils::executable(QString("${cloak-pt}/bin/ck-client"), false);' + substituteInPlace client/protocols/shadowsocksvpnprotocol.cpp \ + --replace-fail 'return Utils::executable(QString("/ss-local"), true);' 'return Utils::executable(QString("${shadowsocks-rust}/bin/sslocal"), false);' + substituteInPlace client/configurators/openvpn_configurator.cpp \ + --replace-fail ".arg(qApp->applicationDirPath());" ".arg(\"$out/local/bin\");" + substituteInPlace client/ui/qautostart.cpp \ + --replace-fail "/usr/share/pixmaps/AmneziaVPN.png" "$out/share/pixmaps/AmneziaVPN.png" + substituteInPlace deploy/installer/config/AmneziaVPN.desktop.in \ + --replace-fail "#!/usr/bin/env xdg-open" "#!${xdg-utils}/bin/xdg-open" \ + --replace-fail "/usr/share/pixmaps/AmneziaVPN.png" "$out/share/pixmaps/AmneziaVPN.png" + substituteInPlace deploy/data/linux/AmneziaVPN.service \ + --replace-fail "ExecStart=/opt/AmneziaVPN/service/AmneziaVPN-service.sh" "ExecStart=$out/bin/AmneziaVPN-service" \ + --replace-fail "Environment=LD_LIBRARY_PATH=/opt/AmneziaVPN/client/lib" "" + '' + + (lib.optionalString (stdenv.hostPlatform.isAarch64 && stdenv.hostPlatform.isLinux) '' + substituteInPlace client/cmake/3rdparty.cmake \ + --replace-fail 'set(LIBSSH_LIB_PATH "''${LIBSSH_ROOT_DIR}/linux/x86_64/libssh.a")' 'set(LIBSSH_LIB_PATH "${libssh}/lib/libssh.so")' \ + --replace-fail 'set(ZLIB_LIB_PATH "''${LIBSSH_ROOT_DIR}/linux/x86_64/libz.a")' 'set(ZLIB_LIB_PATH "${zlib}/lib/libz.so")' \ + --replace-fail 'set(OPENSSL_LIB_SSL_PATH "''${OPENSSL_ROOT_DIR}/linux/x86_64/libssl.a")' 'set(OPENSSL_LIB_SSL_PATH "''${OPENSSL_ROOT_DIR}/linux/arm64/libssl.a")' \ + --replace-fail 'set(OPENSSL_LIB_CRYPTO_PATH "''${OPENSSL_ROOT_DIR}/linux/x86_64/libcrypto.a")' 'set(OPENSSL_LIB_CRYPTO_PATH "''${OPENSSL_ROOT_DIR}/linux/arm64/libcrypto.a")' + ''); + + strictDeps = true; + + nativeBuildInputs = [ + cmake + pkg-config + qt6.wrapQtAppsHook + ]; + + buildInputs = [ + libsecret + qt6.qtbase + qt6.qttools + kdePackages.qtremoteobjects + kdePackages.qtsvg + kdePackages.qt5compat + ]; + + qtWrapperArgs = [ + ''--prefix PATH : ${ + lib.makeBinPath [ + procps + iproute2 + sudo + ] + }'' + ]; + + postInstall = '' + mkdir -p $out/bin $out/local/bin $out/share/applications $out/share/pixmaps $out/lib/systemd/system + cp client/AmneziaVPN service/server/AmneziaVPN-service $out/bin/ + cp ../deploy/data/linux/client/bin/update-resolv-conf.sh $out/local/bin/ + cp ../AppDir/AmneziaVPN.desktop $out/share/applications/ + cp ../deploy/data/linux/AmneziaVPN.png $out/share/pixmaps/ + cp ../deploy/data/linux/AmneziaVPN.service $out/lib/systemd/system/ + ''; + + meta = with lib; { + description = "Amnezia VPN Client"; + downloadPage = "https://amnezia.org/en/downloads"; + homepage = "https://amnezia.org/en"; + license = licenses.gpl3; + mainProgram = "AmneziaVPN"; + maintainers = with maintainers; [ sund3RRR ]; + platforms = platforms.unix; + }; +}) diff --git a/pkgs/by-name/am/amnezia-vpn/router.patch b/pkgs/by-name/am/amnezia-vpn/router.patch new file mode 100644 index 0000000000000..3f78af405af20 --- /dev/null +++ b/pkgs/by-name/am/amnezia-vpn/router.patch @@ -0,0 +1,54 @@ +--- a/service/server/router_linux.cpp 2025-01-01 11:36:27.615658613 +0300 ++++ b/service/server/router_linux.cpp 2025-01-01 18:07:57.300178080 +0300 +@@ -19,9 +19,27 @@ + #include <stdio.h> + #include <unistd.h> + #include <QFileInfo> ++#include <QStringList> ++#include <QString> + + #include <core/networkUtilities.h> + ++bool isServiceActive(const QString &serviceName) { ++ QProcess process; ++ process.start("systemctl", { "list-units", "--type=service", "--state=running", "--no-legend" }); ++ process.waitForFinished(); ++ ++ QString output = process.readAllStandardOutput(); ++ QStringList services = output.split('\n', Qt::SkipEmptyParts); ++ ++ for (const QString &service : services) { ++ if (service.contains(serviceName)) { ++ return true; ++ } ++ } ++ return false; ++} ++ + RouterLinux &RouterLinux::Instance() + { + static RouterLinux s; +@@ -158,15 +176,14 @@ + p.setProcessChannelMode(QProcess::MergedChannels); + + //check what the dns manager use +- if (QFileInfo::exists("/usr/bin/nscd") +- || QFileInfo::exists("/usr/sbin/nscd") +- || QFileInfo::exists("/usr/lib/systemd/system/nscd.service")) +- { +- p.start("systemctl restart nscd"); +- } +- else +- { +- p.start("systemctl restart systemd-resolved"); ++ if (isServiceActive("nscd.service")) { ++ qDebug() << "Restarting nscd.service"; ++ p.start("systemctl", { "restart", "nscd" }); ++ } else if (isServiceActive("systemd-resolved.service")) { ++ qDebug() << "Restarting systemd-resolved.service"; ++ p.start("systemctl", { "restart", "systemd-resolved" }); ++ } else { ++ qDebug() << "No suitable DNS manager found."; + } + + p.waitForFinished(); From da10909dbb37fda0dfb02d5f1c6c08fd465ea8dc Mon Sep 17 00:00:00 2001 From: aleksana <me@aleksana.moe> Date: Wed, 15 Jan 2025 18:25:40 +0800 Subject: [PATCH 115/174] baidupcs-go: 3.9.5-unstable-2024-06-23 -> 3.9.7 --- pkgs/by-name/ba/baidupcs-go/package.nix | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/ba/baidupcs-go/package.nix b/pkgs/by-name/ba/baidupcs-go/package.nix index fbd1861e7c50b..f939d674d7033 100644 --- a/pkgs/by-name/ba/baidupcs-go/package.nix +++ b/pkgs/by-name/ba/baidupcs-go/package.nix @@ -1,20 +1,23 @@ { fetchFromGitHub, - buildGo122Module, + buildGoModule, lib, versionCheckHook, }: -buildGo122Module rec { + +buildGoModule rec { pname = "baidupcs-go"; - version = "3.9.5-unstable-2024-06-23"; + version = "3.9.7"; + src = fetchFromGitHub { owner = "qjfoidnh"; repo = "BaiduPCS-Go"; - rev = "5612fc337b9556ed330274987a2f876961639cff"; - hash = "sha256-4mCJ5gVHjjvR6HNo47NTJvQEu7cdZZMfO8qQA7Kqzqo="; + rev = "v${version}"; + hash = "sha256-C88q2tNNuX+tIvYKHbRE76xfPe81UHqfezyRXzrxzlc="; }; vendorHash = "sha256-msTlXtidxLTe3xjxTOWCqx/epFT0XPdwGPantDJUGpc="; + doCheck = false; ldflags = [ From 16dfaee047067df5de40a0bc2ee32838bf1d7434 Mon Sep 17 00:00:00 2001 From: aucub <78630225+aucub@users.noreply.github.com> Date: Wed, 15 Jan 2025 18:37:39 +0800 Subject: [PATCH 116/174] bloomeetunes: add update script --- pkgs/by-name/bl/bloomeetunes/package.nix | 2 ++ pkgs/by-name/bl/bloomeetunes/update.sh | 24 ++++++++++++++++++++++++ 2 files changed, 26 insertions(+) create mode 100755 pkgs/by-name/bl/bloomeetunes/update.sh diff --git a/pkgs/by-name/bl/bloomeetunes/package.nix b/pkgs/by-name/bl/bloomeetunes/package.nix index 6265ac86e7442..8be833d08832d 100644 --- a/pkgs/by-name/bl/bloomeetunes/package.nix +++ b/pkgs/by-name/bl/bloomeetunes/package.nix @@ -51,6 +51,8 @@ flutter324.buildFlutterApplication rec { }" ''; + passthru.updateScript = ./update.sh; + meta = { description = "Cross-platform music app designed to bring you ad-free tunes from various sources"; homepage = "https://github.com/HemantKArya/BloomeeTunes"; diff --git a/pkgs/by-name/bl/bloomeetunes/update.sh b/pkgs/by-name/bl/bloomeetunes/update.sh new file mode 100755 index 0000000000000..d038f3c9b5954 --- /dev/null +++ b/pkgs/by-name/bl/bloomeetunes/update.sh @@ -0,0 +1,24 @@ +#!/usr/bin/env nix-shell +#!nix-shell -I nixpkgs=./. -i bash -p curl gnused jq yq nixVersions.latest bash coreutils common-updater-scripts + +set -eou pipefail + +ROOT="$(dirname "$(readlink -f "$0")")" + +latestTag=$(curl ${GITHUB_TOKEN:+-u ":$GITHUB_TOKEN"} -sL https://api.github.com/repos/HemantKArya/BloomeeTunes/releases/latest | jq --raw-output .tag_name) +latestVersion=$(echo "$latestTag" | sed 's/^v//' | grep -o '^[^+]*') +RunNumber=$(echo "$latestTag" | grep -o '[^+]*$') + +currentVersion=$(nix-instantiate --eval -E "with import ./. {}; bloomeetunes.version or (lib.getVersion bloomeetunes)" | tr -d '"') + +if [[ "$currentVersion" == "$latestVersion" ]]; then + echo "package is up-to-date: $currentVersion" + exit 0 +fi + +sed -i "s/\(tag = \"v\${version}+\)[0-9]\+/\1${RunNumber}/" "$ROOT/package.nix" + +hash=$(nix hash convert --hash-algo sha256 --to sri $(nix-prefetch-url --unpack "https://github.com/HemantKArya/BloomeeTunes/archive/refs/tags/${latestTag}.tar.gz")) +update-source-version bloomeetunes $latestVersion $hash + +curl https://raw.githubusercontent.com/HemantKArya/BloomeeTunes/${latestTag}/pubspec.lock | yq . >$ROOT/pubspec.lock.json From 197b44a0bdb13505e96bc596f1be4829eeabb84f Mon Sep 17 00:00:00 2001 From: aucub <78630225+aucub@users.noreply.github.com> Date: Wed, 15 Jan 2025 18:42:07 +0800 Subject: [PATCH 117/174] bloomeetunes: 2.10.9 -> 2.10.13 --- pkgs/by-name/bl/bloomeetunes/package.nix | 27 ++++----- .../by-name/bl/bloomeetunes/pubspec.lock.json | 60 ++++++++++++------- pkgs/by-name/bl/bloomeetunes/update.sh | 2 +- 3 files changed, 53 insertions(+), 36 deletions(-) diff --git a/pkgs/by-name/bl/bloomeetunes/package.nix b/pkgs/by-name/bl/bloomeetunes/package.nix index 8be833d08832d..20f6ff95a3033 100644 --- a/pkgs/by-name/bl/bloomeetunes/package.nix +++ b/pkgs/by-name/bl/bloomeetunes/package.nix @@ -4,24 +4,28 @@ fetchFromGitHub, flutter324, mpv, - pkg-config, makeDesktopItem, - wrapGAppsHook3, copyDesktopItems, }: + flutter324.buildFlutterApplication rec { pname = "bloomeetunes"; - version = "2.10.9"; + version = "2.10.13"; src = fetchFromGitHub { owner = "HemantKArya"; repo = "BloomeeTunes"; - rev = "v${version}+152"; - hash = "sha256-Yv0aSq2eBcHKpy4PPjAhx194UW8Gm0UJlE+F+onZYFM="; + tag = "v${version}+157"; + hash = "sha256-cLhcuk4rLHFg3al+MkZnOWMG8n6r61idBSmDyP6ez+g="; }; pubspecLock = lib.importJSON ./pubspec.lock.json; + nativeBuildInputs = [ + autoPatchelfHook + copyDesktopItems + ]; + desktopItems = [ (makeDesktopItem { name = "bloomeetunes"; @@ -32,23 +36,16 @@ flutter324.buildFlutterApplication rec { }) ]; - nativeBuildInputs = [ - pkg-config - autoPatchelfHook - wrapGAppsHook3 - copyDesktopItems - ]; - postInstall = '' - install -Dm644 ./assets/icons/bloomee_new_logo_c.png $out/share/pixmaps/bloomeetunes.png + install -Dm644 assets/icons/bloomee_new_logo_c.png $out/share/pixmaps/bloomeetunes.png ''; extraWrapProgramArgs = '' - --prefix LD_LIBRARY_PATH : "$out/app/bloomeetunes/lib:${ + --prefix LD_LIBRARY_PATH : $out/app/bloomeetunes/lib:${ lib.makeLibraryPath [ mpv ] - }" + } ''; passthru.updateScript = ./update.sh; diff --git a/pkgs/by-name/bl/bloomeetunes/pubspec.lock.json b/pkgs/by-name/bl/bloomeetunes/pubspec.lock.json index 934dde3f014a7..1a69512ace506 100644 --- a/pkgs/by-name/bl/bloomeetunes/pubspec.lock.json +++ b/pkgs/by-name/bl/bloomeetunes/pubspec.lock.json @@ -54,31 +54,31 @@ "dependency": "direct main", "description": { "name": "audio_service", - "sha256": "9dd5ba7e77567b290c35908b1950d61485b4dfdd3a0ac398e98cfeec04651b75", + "sha256": "f6c8191bef6b843da34675dd0731ad11d06094c36b691ffcf3148a4feb2e585f", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.18.15" + "version": "0.18.16" }, "audio_service_mpris": { "dependency": "direct main", "description": { "name": "audio_service_mpris", - "sha256": "b16db3584a4b2464c0bfd575c1a21765723d257931222f8adfcb0511f940d352", + "sha256": "fdab1ae1f659c6db36d5cc396e46e4ee9663caefa6153f8453fcd01d57567c08", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.1.5" + "version": "0.2.0" }, "audio_service_platform_interface": { "dependency": "transitive", "description": { "name": "audio_service_platform_interface", - "sha256": "8431a455dac9916cc9ee6f7da5620a666436345c906ad2ebb7fa41d18b3c1bf4", + "sha256": "6283782851f6c8b501b60904a32fc7199dc631172da0629d7301e66f672ab777", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.1.1" + "version": "0.1.3" }, "audio_service_web": { "dependency": "transitive", @@ -94,11 +94,11 @@ "dependency": "direct main", "description": { "name": "audio_session", - "sha256": "343e83bc7809fbda2591a49e525d6b63213ade10c76f15813be9aed6657b3261", + "sha256": "b2a26ba8b7efa1790d6460e82971fde3e398cfbe2295df9dea22f3499d2c12a7", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.1.21" + "version": "0.1.23" }, "audio_video_progress_bar": { "dependency": "direct main", @@ -464,11 +464,11 @@ "dependency": "direct main", "description": { "name": "equatable", - "sha256": "c2b87cb7756efdf69892005af546c56c0b5037f54d2a88269b4f347a505e3ca2", + "sha256": "567c64b3cb4cf82397aac55f4f0cbd3ca20d77c6c03bedbc4ceaddc08904aef7", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.0.5" + "version": "2.0.7" }, "extended_image": { "dependency": "direct main", @@ -882,21 +882,21 @@ "dependency": "direct main", "description": { "name": "just_audio", - "sha256": "d8e8aaf417d33e345299c17f6457f72bd4ba0c549dc34607abb5183a354edc4d", + "sha256": "1a1eb86e7d81e69a1d36943f2b3efd62dece3dad2cafd9ec2e62e6db7c04d9b7", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.9.40" + "version": "0.9.43" }, "just_audio_media_kit": { "dependency": "direct main", "description": { "name": "just_audio_media_kit", - "sha256": "7f57d317fafa04cb3e70b924e8f632ffb7eca7a97a369e1e44738ed89fbd5da1", + "sha256": "9f3517213dfc7bbaf6980656feb66c35600f114c7efc0b5b3f4476cd5c18b45e", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.0.5" + "version": "2.0.6" }, "just_audio_platform_interface": { "dependency": "transitive", @@ -922,11 +922,11 @@ "dependency": "direct main", "description": { "name": "just_audio_windows", - "sha256": "48ab2dec79cf6097550602fe07b1a644f341450e138dc8fdc23e42ce0ed2d928", + "sha256": "b1ba5305d841c0e3883644e20fc11aaa23f28cfdd43ec20236d1e119a402ef29", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.2.1" + "version": "0.2.2" }, "leak_tracker": { "dependency": "transitive", @@ -968,6 +968,16 @@ "source": "hosted", "version": "2.1.1" }, + "lists": { + "dependency": "transitive", + "description": { + "name": "lists", + "sha256": "4ca5c19ae4350de036a7e996cdd1ee39c93ac0a2b840f4915459b7d0a7d4ab27", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.0.1" + }, "logging": { "dependency": "direct main", "description": { @@ -1012,11 +1022,11 @@ "dependency": "transitive", "description": { "name": "media_kit", - "sha256": "3289062540e3b8b9746e5c50d95bd78a9289826b7227e253dff806d002b9e67a", + "sha256": "1f1deee148533d75129a6f38251ff8388e33ee05fc2d20a6a80e57d6051b7b62", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.1.10+1" + "version": "1.1.11" }, "media_kit_libs_linux": { "dependency": "direct main", @@ -1644,6 +1654,16 @@ "source": "hosted", "version": "1.3.2" }, + "unicode": { + "dependency": "transitive", + "description": { + "name": "unicode", + "sha256": "0f69e46593d65245774d4f17125c6084d2c20b4e473a983f6e21b7d7762218f1", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.3.1" + }, "universal_platform": { "dependency": "transitive", "description": { @@ -1898,11 +1918,11 @@ "dependency": "direct main", "description": { "name": "youtube_explode_dart", - "sha256": "28dca07fefb4b6518beab95f0c1ef81031f921ed0fe87ebcd9c51378546edfee", + "sha256": "51ca5b2c03bf56060143d4f87df90ec3227592d7ae8a8003532533ae019d4291", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.2.3" + "version": "2.3.6" } }, "sdks": { diff --git a/pkgs/by-name/bl/bloomeetunes/update.sh b/pkgs/by-name/bl/bloomeetunes/update.sh index d038f3c9b5954..1d7d1f316cc9c 100755 --- a/pkgs/by-name/bl/bloomeetunes/update.sh +++ b/pkgs/by-name/bl/bloomeetunes/update.sh @@ -1,5 +1,5 @@ #!/usr/bin/env nix-shell -#!nix-shell -I nixpkgs=./. -i bash -p curl gnused jq yq nixVersions.latest bash coreutils common-updater-scripts +#!nix-shell -I nixpkgs=./. -i bash -p curl gnused jq yq nix bash coreutils common-updater-scripts set -eou pipefail From f8f1384ae8f72723609499330156dc5f93e5e66f Mon Sep 17 00:00:00 2001 From: Fabian Affolter <mail@fabian-affolter.ch> Date: Wed, 15 Jan 2025 11:49:40 +0100 Subject: [PATCH 118/174] arp-scan-rs: init at 0.14.0 ARP scan tool for fast local network scans https://github.com/kongbytes/arp-scan-rs --- pkgs/by-name/ar/arp-scan-rs/package.nix | 46 +++++++++++++++++++++++++ 1 file changed, 46 insertions(+) create mode 100644 pkgs/by-name/ar/arp-scan-rs/package.nix diff --git a/pkgs/by-name/ar/arp-scan-rs/package.nix b/pkgs/by-name/ar/arp-scan-rs/package.nix new file mode 100644 index 0000000000000..76cc1472edaf9 --- /dev/null +++ b/pkgs/by-name/ar/arp-scan-rs/package.nix @@ -0,0 +1,46 @@ +{ + lib, + fetchFromGitHub, + gitUpdater, + rustPlatform, + versionCheckHook, +}: + +rustPlatform.buildRustPackage rec { + pname = "arp-scan-rs"; + version = "0.14.0"; + + src = fetchFromGitHub { + owner = "kongbytes"; + repo = "arp-scan-rs"; + tag = "v${version}"; + hash = "sha256-CLxeT2olrxRCJ12IZ1PvLW7ZuX0HPsoNuFyxmGBhB8w="; + }; + + cargoHash = "sha256-+Ph5k3qaK4USggTnZqyOdH6oKv5Xr2/NeQ9C0Q6g5sQ="; + + nativeInstallCheckInputs = [ versionCheckHook ]; + + preCheck = '' + # Test fails + substituteInPlace src/network.rs \ + --replace-fail 'Some("one.one.one.one".to_string())' 'None' + ''; + + versionCheckProgram = [ "${placeholder "out"}/bin/arp-scan" ]; + + versionCheckProgramArg = "--version"; + + doInstallCheck = true; + + passthru.updateScript = gitUpdater { }; + + meta = { + description = "ARP scan tool for fast local network scans"; + homepage = "https://github.com/kongbytes/arp-scan-rs"; + changelog = "https://github.com/kongbytes/arp-scan-rs/releases/tag/v${version}"; + license = lib.licenses.agpl3Only; + maintainers = with lib.maintainers; [ fab ]; + mainProgram = "arp-scan"; + }; +} From 0cfead9f56efdd9be8c2cfdaa343769b9d050a68 Mon Sep 17 00:00:00 2001 From: Fabian Affolter <mail@fabian-affolter.ch> Date: Wed, 15 Jan 2025 11:55:22 +0100 Subject: [PATCH 119/174] python312Packages.recipe-scrapers: add optional-dependencies --- .../python-modules/recipe-scrapers/default.nix | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/recipe-scrapers/default.nix b/pkgs/development/python-modules/recipe-scrapers/default.nix index 097ff6f693f34..9da9db72da9be 100644 --- a/pkgs/development/python-modules/recipe-scrapers/default.nix +++ b/pkgs/development/python-modules/recipe-scrapers/default.nix @@ -29,17 +29,20 @@ buildPythonPackage rec { hash = "sha256-IAsa/GjTydKZq9Nh9MSVRb2DujICVQT38hMPTjzQyBw="; }; - nativeBuildInputs = [ setuptools ]; + build-system = [ setuptools ]; - propagatedBuildInputs = [ + dependencies = [ beautifulsoup4 extruct isodate language-tags regex - requests ]; + optional-dependencies = { + online = [ requests ]; + }; + nativeCheckInputs = [ pytestCheckHook responses From 9f8a8df9c5aa5f0ffb24442c59f2d607436ec6de Mon Sep 17 00:00:00 2001 From: Fabian Affolter <mail@fabian-affolter.ch> Date: Wed, 15 Jan 2025 11:57:15 +0100 Subject: [PATCH 120/174] python312Packages.typst: init at 0.12.2 Python binding to typst https://github.com/messense/typst-py --- .../python-modules/typst/default.nix | 60 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 62 insertions(+) create mode 100644 pkgs/development/python-modules/typst/default.nix diff --git a/pkgs/development/python-modules/typst/default.nix b/pkgs/development/python-modules/typst/default.nix new file mode 100644 index 0000000000000..02d3cb375582d --- /dev/null +++ b/pkgs/development/python-modules/typst/default.nix @@ -0,0 +1,60 @@ +{ + lib, + stdenv, + buildPythonPackage, + cargo, + fetchFromGitHub, + openssl, + pkg-config, + pythonOlder, + rustc, + rustPlatform, +}: + +buildPythonPackage rec { + pname = "typst"; + version = "0.12.2"; + pyproject = true; + + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "messense"; + repo = "typst-py"; + tag = "v${version}"; + hash = "sha256-vK55LoEc5BaS2tQwuLhXDnv8xiSOgk/ngU/gtbhZR2k="; + }; + + cargoDeps = rustPlatform.fetchCargoTarball { + inherit src; + name = "${pname}-${version}"; + hash = "sha256-01kSin3da58rPTHRmjyj62nf6HshmD6ARbhUd3eBfV0="; + }; + + build-system = [ + cargo + pkg-config + rustPlatform.cargoSetupHook + rustPlatform.maturinBuildHook + rustc + ]; + + buildInputs = [ openssl ]; + + pythonImportsCheck = [ "typst" ]; + + env = { + OPENSSL_NO_VENDOR = true; + }; + + # Module has no tests + doCheck = false; + + meta = { + description = "Python binding to typst"; + homepage = "https://github.com/messense/typst-py"; + changelog = "https://github.com/messense/typst-py/releases/tag/v${version}"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 8d3a99d79a728..e6451bca9f8c5 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -17412,6 +17412,8 @@ self: super: with self; { typogrify = callPackage ../development/python-modules/typogrify { }; + typst = callPackage ../development/python-modules/typst { }; + tzdata = callPackage ../development/python-modules/tzdata { }; tzlocal = callPackage ../development/python-modules/tzlocal { }; From 986d780f6bc8573450db39cf579121242317626c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" <ryantm-bot@ryantm.com> Date: Wed, 15 Jan 2025 10:59:20 +0000 Subject: [PATCH 121/174] python312Packages.goslide-api: 0.7.3 -> 0.7.4 --- pkgs/development/python-modules/goslide-api/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/goslide-api/default.nix b/pkgs/development/python-modules/goslide-api/default.nix index 20972a6575624..008eb0ea3ab5c 100644 --- a/pkgs/development/python-modules/goslide-api/default.nix +++ b/pkgs/development/python-modules/goslide-api/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "goslide-api"; - version = "0.7.3"; + version = "0.7.4"; pyproject = true; src = fetchFromGitHub { owner = "ualex73"; repo = "goslide-api"; tag = version; - hash = "sha256-s8MtOBNieg0o8U6pkf0e/EF8GtVkb7BgQBP6n/xmKJk="; + hash = "sha256-Z3+GijoI+351zV7IpLSBQu6LE2OhhXho4ygNMVbg2xs="; }; build-system = [ setuptools ]; From d24593e0424afe4ba2a32708d0662113772a71e7 Mon Sep 17 00:00:00 2001 From: Fabian Affolter <mail@fabian-affolter.ch> Date: Wed, 15 Jan 2025 12:00:34 +0100 Subject: [PATCH 122/174] python313Packages.netbox-qrcode: add missing inputs --- .../python-modules/netbox-qrcode/default.nix | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/netbox-qrcode/default.nix b/pkgs/development/python-modules/netbox-qrcode/default.nix index d2dacfa5ec848..39b29b9b6fedd 100644 --- a/pkgs/development/python-modules/netbox-qrcode/default.nix +++ b/pkgs/development/python-modules/netbox-qrcode/default.nix @@ -1,13 +1,15 @@ { lib, buildPythonPackage, + django, fetchFromGitHub, - setuptools, - wheel, + netaddr, + netbox, pillow, qrcode, - netbox, + setuptools, }: + buildPythonPackage rec { pname = "netbox-qrcode"; version = "0.0.15"; @@ -16,7 +18,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "netbox-community"; repo = "netbox-qrcode"; - rev = "v${version}"; + tag = "v${version}"; hash = "sha256-gEBOjmX7dcLjiy0u6raAtAaqZUVYsPz3YhupjRRqVDE="; }; @@ -27,7 +29,11 @@ buildPythonPackage rec { pillow ]; - nativeCheckInputs = [ netbox ]; + nativeCheckInputs = [ + django + netaddr + netbox + ]; preFixup = '' export PYTHONPATH=${netbox}/opt/netbox/netbox:$PYTHONPATH From 5f97081028148ca95ef29c8a25514dbfb2a1ea86 Mon Sep 17 00:00:00 2001 From: a-kenji <aks.kenji@protonmail.com> Date: Wed, 15 Jan 2025 12:09:58 +0100 Subject: [PATCH 123/174] cosmic-icons: 1.0.0-alpha.3 -> 1.0.0-alpha.5.1 --- pkgs/by-name/co/cosmic-icons/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/co/cosmic-icons/package.nix b/pkgs/by-name/co/cosmic-icons/package.nix index 842d182b278c4..0ca07cecdecfe 100644 --- a/pkgs/by-name/co/cosmic-icons/package.nix +++ b/pkgs/by-name/co/cosmic-icons/package.nix @@ -9,13 +9,13 @@ }: stdenvNoCC.mkDerivation { pname = "cosmic-icons"; - version = "1.0.0-alpha.3"; + version = "1.0.0-alpha.5.1"; src = fetchFromGitHub { owner = "pop-os"; repo = "cosmic-icons"; - rev = "epoch-1.0.0-alpha.3"; - hash = "sha256-7gWCRBiE+XJX1JSjopyPN4bIIgZih6ZKGVSA7wBq3i0="; + rev = "epoch-1.0.0-alpha.5.1"; + hash = "sha256-j5H2+BOWxq2jShN15QCvj9rY6OK+vlUbyR9R07Ka2rA="; }; nativeBuildInputs = [ just ]; From a6d25c3f18af36d706a4d3b3bfa879769dcd43f6 Mon Sep 17 00:00:00 2001 From: Leona Maroni <dev@leona.is> Date: Wed, 15 Jan 2025 12:03:58 +0100 Subject: [PATCH 124/174] keycloak: 26.0.8 -> 26.1.0 https://github.com/keycloak/keycloak/releases/tag/26.1.0 --- pkgs/by-name/ke/keycloak/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ke/keycloak/package.nix b/pkgs/by-name/ke/keycloak/package.nix index a4683642c4be3..47db9dc25fb84 100644 --- a/pkgs/by-name/ke/keycloak/package.nix +++ b/pkgs/by-name/ke/keycloak/package.nix @@ -24,11 +24,11 @@ let in stdenv.mkDerivation rec { pname = "keycloak"; - version = "26.0.8"; + version = "26.1.0"; src = fetchzip { url = "https://github.com/keycloak/keycloak/releases/download/${version}/keycloak-${version}.zip"; - hash = "sha256-o4Yken4PlitebEBNI+BrQqYM+RtsURj0LvYFBSjuQIE="; + hash = "sha256-5Us/cBH10SnO6wiggmwg6V7u4FKoLd1V0x8Z4GNDaXc="; }; nativeBuildInputs = [ From e0e7faaa6814fd6865376dac5fbeb1939c8fc563 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" <ryantm-bot@ryantm.com> Date: Wed, 15 Jan 2025 11:29:06 +0000 Subject: [PATCH 125/174] youki: 0.4.1 -> 0.5.0 --- pkgs/by-name/yo/youki/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/yo/youki/package.nix b/pkgs/by-name/yo/youki/package.nix index 1117098180de9..9967168f4face 100644 --- a/pkgs/by-name/yo/youki/package.nix +++ b/pkgs/by-name/yo/youki/package.nix @@ -13,13 +13,13 @@ rustPlatform.buildRustPackage rec { pname = "youki"; - version = "0.4.1"; + version = "0.5.0"; src = fetchFromGitHub { owner = "containers"; repo = pname; rev = "v${version}"; - hash = "sha256-vXYoLjmPiK2f6Yg5YGTp76hmawnbfcnMOOppsWwKtAk="; + hash = "sha256-UKdl6+NHDriQYDgZzdWnH07xneLB/40tpCKhaRhzriA="; }; nativeBuildInputs = [ @@ -53,7 +53,7 @@ rustPlatform.buildRustPackage rec { "youki" ]; - cargoHash = "sha256-s8L/L3be5fRahDiLKnHQcU52F+AJVr7Q3uL8mcloVv8="; + cargoHash = "sha256-3a6KlDTQCKXIPaz6134MVmFYvwUk/t6H/jeBFDH+FrA="; meta = with lib; { description = "Container runtime written in Rust"; From ca5e3c30751802ef7b0fcc2cdf1d92cd4d4023c0 Mon Sep 17 00:00:00 2001 From: a-kenji <aks.kenji@protonmail.com> Date: Wed, 15 Jan 2025 12:45:52 +0100 Subject: [PATCH 126/174] cosmic-bg: 1.0.0-alpha.2 -> 1.0.0-alpha.5.1 --- pkgs/by-name/co/cosmic-bg/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/co/cosmic-bg/package.nix b/pkgs/by-name/co/cosmic-bg/package.nix index 627247a66e8bf..c0f7d3c27d95b 100644 --- a/pkgs/by-name/co/cosmic-bg/package.nix +++ b/pkgs/by-name/co/cosmic-bg/package.nix @@ -12,17 +12,17 @@ rustPlatform.buildRustPackage rec { pname = "cosmic-bg"; - version = "1.0.0-alpha.2"; + version = "1.0.0-alpha.5.1"; src = fetchFromGitHub { owner = "pop-os"; repo = pname; rev = "epoch-${version}"; - hash = "sha256-lAFAZBo5FnXgJV3MrZhaYmBxqtH1E7+Huj53ho/hPik="; + hash = "sha256-bmcMZIURozlptsR4si62NTmexqaCX1Yj5bYj49GDehQ="; }; useFetchCargoVendor = true; - cargoHash = "sha256-up3yNsKxTC9YrRuTPsGlCHTp9S/woDXPc5HcYcEY9Xc="; + cargoHash = "sha256-GLXooTjcGq4MsBNnlpHBBUJGNs5UjKMQJGJuj9UO2wk="; postPatch = '' substituteInPlace justfile --replace-fail '#!/usr/bin/env' "#!$(command -v env)" From 186e7cbc8830351c2edb1c04660037c66d1ac93f Mon Sep 17 00:00:00 2001 From: Nobody_alias_N <165517462+Nobody-alias-N@users.noreply.github.com> Date: Wed, 15 Jan 2025 13:51:43 +0200 Subject: [PATCH 127/174] jitsi-meet-electron: 2024.6.0 -> 2025.1.0 --- pkgs/by-name/ji/jitsi-meet-electron/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ji/jitsi-meet-electron/package.nix b/pkgs/by-name/ji/jitsi-meet-electron/package.nix index 956e97365bcc8..55edb988668d2 100644 --- a/pkgs/by-name/ji/jitsi-meet-electron/package.nix +++ b/pkgs/by-name/ji/jitsi-meet-electron/package.nix @@ -25,13 +25,13 @@ let in buildNpmPackage rec { pname = "jitsi-meet-electron"; - version = "2024.6.0"; + version = "2025.1.0"; src = fetchFromGitHub { owner = "jitsi"; repo = "jitsi-meet-electron"; rev = "v${version}"; - hash = "sha256-jnt+aHkCnIj4GGFbAk6AlVhg0rvzFhGCELAaYMCZx88="; + hash = "sha256-o65UPPyGgmFe8+HANmnyVgPITk8gY7uvIzx7QZUluBU="; }; nativeBuildInputs = @@ -58,7 +58,7 @@ buildNpmPackage rec { OpenGL ]; - npmDepsHash = "sha256-zmnxNJdalspZib1PGZN0YBIauJ+gaxs6Iir94cPRNtU="; + npmDepsHash = "sha256-16yWCI408tkkzvrx2fBPSNSUa9dRej9LrnNpqobwfl8="; makeCacheWritable = true; From 63befedc42be22c16945205f237b32c7774b5d44 Mon Sep 17 00:00:00 2001 From: Fabian Affolter <mail@fabian-affolter.ch> Date: Wed, 15 Jan 2025 12:59:37 +0100 Subject: [PATCH 128/174] python312Packages.python-box: 7.3.0 -> 7.3.1 Diff: https://github.com/cdgriffith/Box/compare/refs/tags/7.3.0...7.3.1 Changelog: https://github.com/cdgriffith/Box/blob/7.3.1/CHANGES.rst --- pkgs/development/python-modules/python-box/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/python-box/default.nix b/pkgs/development/python-modules/python-box/default.nix index cc1dbee0eff3c..af805c3367819 100644 --- a/pkgs/development/python-modules/python-box/default.nix +++ b/pkgs/development/python-modules/python-box/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "python-box"; - version = "7.3.0"; + version = "7.3.1"; pyproject = true; disabled = pythonOlder "3.9"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "cdgriffith"; repo = "Box"; tag = version; - hash = "sha256-0vUPXZEyolI03N5RQ5GKTvSHUuFpimHZwQAYwGHJydU="; + hash = "sha256-id1gLT26jETRQ0fyVNTIhSZqM+fDmpaVbB56GxPhYr8="; }; build-system = [ From 854921d5896df2fdab647bd31552117292b3de52 Mon Sep 17 00:00:00 2001 From: FliegendeWurst <arne.keller@posteo.de> Date: Tue, 14 Jan 2025 20:00:44 +0100 Subject: [PATCH 129/174] patheon.switchboard-plug-mouse-touchpad: fix strictDeps build --- .../pantheon/apps/switchboard-plugs/mouse-touchpad/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/mouse-touchpad/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/mouse-touchpad/default.nix index 4f0d896dc2904..e36eba828f7f2 100644 --- a/pkgs/desktops/pantheon/apps/switchboard-plugs/mouse-touchpad/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/mouse-touchpad/default.nix @@ -13,6 +13,7 @@ granite7, gtk4, switchboard, + gettext, gnome-settings-daemon, glib, gala, # needed for gestures support @@ -38,6 +39,7 @@ stdenv.mkDerivation rec { ]; nativeBuildInputs = [ + gettext # msgfmt meson ninja pkg-config From 7faef2e782e80f01532708c9d6496868a73a53c3 Mon Sep 17 00:00:00 2001 From: a-kenji <aks.kenji@protonmail.com> Date: Wed, 15 Jan 2025 13:13:52 +0100 Subject: [PATCH 130/174] cosmic-randr: 1.0.0-alpha.3 -> 1.0.0-alpha.5.1 --- pkgs/by-name/co/cosmic-randr/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/co/cosmic-randr/package.nix b/pkgs/by-name/co/cosmic-randr/package.nix index d898ae8733fd1..63c495956c78c 100644 --- a/pkgs/by-name/co/cosmic-randr/package.nix +++ b/pkgs/by-name/co/cosmic-randr/package.nix @@ -10,17 +10,17 @@ rustPlatform.buildRustPackage rec { pname = "cosmic-randr"; - version = "1.0.0-alpha.3"; + version = "1.0.0-alpha.5.1"; src = fetchFromGitHub { owner = "pop-os"; repo = "cosmic-randr"; rev = "epoch-${version}"; - hash = "sha256-xakK4APhlNKuWbCMP6nJXLyOaQ0hFCvzOht3P8CkV/0="; + hash = "sha256-mPi6TVUWKlHqLzGL84vSBZYuCjdThVVYc7hv9vq7zho="; }; useFetchCargoVendor = true; - cargoHash = "sha256-S5zvh/pJA3JMwQ3K5RPPHuHKLQA9g1Ae7NLWgy9b5FA="; + cargoHash = "sha256-3I4ZyZvV9ELBNCvYVYBUHbh9bGw7B/RrwUlam5fdLxU="; nativeBuildInputs = [ just From f5c60f7b89613ce4890acc5bf12c3b7b81bb3aed Mon Sep 17 00:00:00 2001 From: a-kenji <aks.kenji@protonmail.com> Date: Wed, 15 Jan 2025 13:21:43 +0100 Subject: [PATCH 131/174] cosmic-screenshot: 1.0.0-alpha.2 -> 1.0.0-alpha.5.1 --- pkgs/by-name/co/cosmic-screenshot/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/co/cosmic-screenshot/package.nix b/pkgs/by-name/co/cosmic-screenshot/package.nix index fb6a4218ada14..dc7313e881290 100644 --- a/pkgs/by-name/co/cosmic-screenshot/package.nix +++ b/pkgs/by-name/co/cosmic-screenshot/package.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage rec { pname = "cosmic-screenshot"; - version = "1.0.0-alpha.2"; + version = "1.0.0-alpha.5.1"; src = fetchFromGitHub { owner = "pop-os"; repo = pname; rev = "epoch-${version}"; - hash = "sha256-+yHpRbK+AWnpcGrC5U0wKbt0u8tm3CFGjKTCDQpb3G0="; + hash = "sha256-/sGYF+XWmPraNGlBVUcN/nokDB9JwWViEAL9gVH3ZaI="; }; - cargoHash = "sha256-fzIVyxzNknEjGJoR9sgXkY+gyuTC0T4Sy513X8umbWA="; + cargoHash = "sha256-E03MeHSEjVAlKiqW7UQh0cZ5UHKfMtXVwUynpUHexbs="; nativeBuildInputs = [ just From 570d8932cd71e76e3025f3d6e0d71d85bfa1bd43 Mon Sep 17 00:00:00 2001 From: savalet <savinien.petitjean@gmail.com> Date: Wed, 15 Jan 2025 13:26:17 +0100 Subject: [PATCH 132/174] winbox4: 4.0beta14 -> 4.0beta16 --- pkgs/by-name/wi/winbox4/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/wi/winbox4/package.nix b/pkgs/by-name/wi/winbox4/package.nix index 99576d8244e67..8c2a74aa6af7a 100644 --- a/pkgs/by-name/wi/winbox4/package.nix +++ b/pkgs/by-name/wi/winbox4/package.nix @@ -18,12 +18,12 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "winbox"; - version = "4.0beta14"; + version = "4.0beta16"; src = fetchurl { name = "WinBox_Linux-${finalAttrs.version}.zip"; url = "https://download.mikrotik.com/routeros/winbox/${finalAttrs.version}/WinBox_Linux.zip"; - hash = "sha256-QfjF36OMP8fH6R2jIOOWFtheySYGiqtjA7Q4nV3EdZU="; + hash = "sha256-RZpsKew3BaId6+tcwUV6fniUpCH4wIP9ab6P5oE7OAk="; }; sourceRoot = "."; From 466ee4da6255a77b822505b983467a1274b1ccb2 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" <ryantm-bot@ryantm.com> Date: Wed, 15 Jan 2025 12:30:14 +0000 Subject: [PATCH 133/174] uptimed: 0.4.6 -> 0.4.7 --- pkgs/by-name/up/uptimed/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/up/uptimed/package.nix b/pkgs/by-name/up/uptimed/package.nix index af792b1b79367..adfdb5b0e3348 100644 --- a/pkgs/by-name/up/uptimed/package.nix +++ b/pkgs/by-name/up/uptimed/package.nix @@ -7,10 +7,10 @@ stdenv.mkDerivation rec { pname = "uptimed"; - version = "0.4.6"; + version = "0.4.7"; src = fetchFromGitHub { - sha256 = "sha256-aYP20O/8QotmnpryiFnFAfrpyk5f+0OkbkGxWf2Ug9w="; + sha256 = "sha256-gP6Syzu54/co4L+UCPikUhXDpxpfAB4jO/5ZF/9RdN0="; rev = "v${version}"; repo = "uptimed"; owner = "rpodgorny"; From c1b86c7423f5c8f34f6a14a6f26f4fd3877a4d11 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" <ryantm-bot@ryantm.com> Date: Wed, 15 Jan 2025 12:37:20 +0000 Subject: [PATCH 134/174] octopus: 14.1 -> 15.1 --- pkgs/by-name/oc/octopus/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/oc/octopus/package.nix b/pkgs/by-name/oc/octopus/package.nix index fbb2c30694e38..199e729221b98 100644 --- a/pkgs/by-name/oc/octopus/package.nix +++ b/pkgs/by-name/oc/octopus/package.nix @@ -31,13 +31,13 @@ assert (blas.isILP64 == arpack.isILP64); stdenv.mkDerivation rec { pname = "octopus"; - version = "14.1"; + version = "15.1"; src = fetchFromGitLab { owner = "octopus-code"; repo = "octopus"; rev = version; - hash = "sha256-8wZR+bYdxJFsUPMWbIGYxRdNzjLgHm+KFLjY7fSN7io="; + hash = "sha256-vG1HUkuNUZkhBumoJJy3AyFU6cZOo1YGmaOYcU6bPOM="; }; nativeBuildInputs = [ From 57e6060a4467bd1f2540f7f218312f7e9502f219 Mon Sep 17 00:00:00 2001 From: Martin Weinelt <hexa@darmstadt.ccc.de> Date: Wed, 15 Jan 2025 02:15:25 +0100 Subject: [PATCH 135/174] servo: 0-unstable-2024-09-09 -> 0-unstable-2025-01-14 --- pkgs/by-name/se/servo/Cargo.lock | 8766 ----------------------------- pkgs/by-name/se/servo/package.nix | 108 +- 2 files changed, 54 insertions(+), 8820 deletions(-) delete mode 100644 pkgs/by-name/se/servo/Cargo.lock diff --git a/pkgs/by-name/se/servo/Cargo.lock b/pkgs/by-name/se/servo/Cargo.lock deleted file mode 100644 index 754f6fdf97fb2..0000000000000 --- a/pkgs/by-name/se/servo/Cargo.lock +++ /dev/null @@ -1,8766 +0,0 @@ -# This file is automatically @generated by Cargo. -# It is not intended for manual editing. -version = 3 - -[[package]] -name = "ab_glyph" -version = "0.2.28" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "79faae4620f45232f599d9bc7b290f88247a0834162c4495ab2f02d60004adfb" -dependencies = [ - "ab_glyph_rasterizer", - "owned_ttf_parser", -] - -[[package]] -name = "ab_glyph_rasterizer" -version = "0.1.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c71b1793ee61086797f5c80b6efa2b8ffa6d5dd703f118545808a7f2e27f7046" - -[[package]] -name = "accountable-refcell" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f6e2bba6f21fcf0ae382750eb6d9387c42807761fa7329d3a05fcd1334e8c3f2" -dependencies = [ - "backtrace", -] - -[[package]] -name = "addr2line" -version = "0.22.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e4503c46a5c0c7844e948c9a4d6acd9f50cccb4de1c48eb9e291ea17470c678" -dependencies = [ - "gimli", -] - -[[package]] -name = "adler" -version = "1.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" - -[[package]] -name = "adler2" -version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "512761e0bb2578dd7380c6baaa0f4ce03e84f95e960231d1dec8bf4d7d6e2627" - -[[package]] -name = "adler32" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aae1277d39aeec15cb388266ecc24b11c80469deae6067e17a1a7aa9e5c1f234" - -[[package]] -name = "ahash" -version = "0.8.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e89da841a80418a9b391ebaea17f5c112ffaaa96f621d2c285b5174da76b9011" -dependencies = [ - "cfg-if", - "getrandom", - "once_cell", - "version_check", - "zerocopy", -] - -[[package]] -name = "aho-corasick" -version = "1.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916" -dependencies = [ - "memchr", -] - -[[package]] -name = "alloc-no-stdlib" -version = "2.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc7bb162ec39d46ab1ca8c77bf72e890535becd1751bb45f64c597edb4c8c6b3" - -[[package]] -name = "alloc-stdlib" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94fb8275041c72129eb51b7d0322c29b8387a0386127718b096429201a5d6ece" -dependencies = [ - "alloc-no-stdlib", -] - -[[package]] -name = "allocator-api2" -version = "0.2.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c6cb57a04249c6480766f7f7cef5467412af1490f8d1e243141daddada3264f" - -[[package]] -name = "android-activity" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee91c0c2905bae44f84bfa4e044536541df26b7703fd0888deeb9060fcc44289" -dependencies = [ - "android-properties", - "bitflags 2.6.0", - "cc", - "cesu8", - "jni", - "jni-sys", - "libc", - "log", - "ndk", - "ndk-context", - "ndk-sys", - "num_enum", - "thiserror", -] - -[[package]] -name = "android-properties" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fc7eb209b1518d6bb87b283c20095f5228ecda460da70b44f0802523dea6da04" - -[[package]] -name = "android-tzdata" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e999941b234f3131b00bc13c22d06e8c5ff726d1b6318ac7eb276997bbb4fef0" - -[[package]] -name = "android_log-sys" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ecc8056bf6ab9892dcd53216c83d1597487d7dacac16c8df6b877d127df9937" - -[[package]] -name = "android_logger" -version = "0.14.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05b07e8e73d720a1f2e4b6014766e6039fd2e96a4fa44e2a78d0e1fa2ff49826" -dependencies = [ - "android_log-sys", - "env_filter", - "log", -] - -[[package]] -name = "android_system_properties" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "819e7219dbd41043ac279b19830f2efc897156490d7fd6ea916720117ee66311" -dependencies = [ - "libc", -] - -[[package]] -name = "anyhow" -version = "1.0.86" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b3d1d046238990b9cf5bcde22a3fb3584ee5cf65fb2765f454ed428c7a0063da" - -[[package]] -name = "app_units" -version = "0.7.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d3a46058e45b48cf55b729e4ae34007fa904ea70cfcf2a0fa21dacf1441e521c" -dependencies = [ - "num-traits", - "serde", -] - -[[package]] -name = "arboard" -version = "3.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2041f1943049c7978768d84e6d0fd95de98b76d6c4727b09e78ec253d29fa58" -dependencies = [ - "clipboard-win", - "core-graphics", - "image", - "log", - "objc", - "objc-foundation", - "objc_id", - "parking_lot", - "thiserror", - "windows-sys 0.48.0", - "x11rb", -] - -[[package]] -name = "arrayref" -version = "0.3.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d151e35f61089500b617991b791fc8bfd237ae50cd5950803758a179b41e67a" - -[[package]] -name = "arrayvec" -version = "0.7.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7c02d123df017efcdfbd739ef81735b36c5ba83ec3c59c80a9d7ecc718f92e50" -dependencies = [ - "serde", -] - -[[package]] -name = "as-raw-xcb-connection" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "175571dd1d178ced59193a6fc02dde1b972eb0bc56c892cde9beeceac5bf0f6b" - -[[package]] -name = "ash" -version = "0.38.0+1.3.281" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0bb44936d800fea8f016d7f2311c6a4f97aebd5dc86f09906139ec848cf3a46f" -dependencies = [ - "libloading", -] - -[[package]] -name = "async-recursion" -version = "1.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b43422f69d8ff38f95f1b2bb76517c91589a924d1559a0e935d7c8ce0274c11" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "async-stream" -version = "0.3.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd56dd203fef61ac097dd65721a419ddccb106b2d2b70ba60a6b529f03961a51" -dependencies = [ - "async-stream-impl", - "futures-core", - "pin-project-lite", -] - -[[package]] -name = "async-stream-impl" -version = "0.3.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "16e62a023e7c117e27523144c5d2459f4397fcc3cab0085af8e2224f643a0193" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "async-tungstenite" -version = "0.23.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1e9efbe14612da0a19fb983059a0b621e9cf6225d7018ecab4f9988215540dc" -dependencies = [ - "futures-io", - "futures-util", - "log", - "pin-project-lite", - "tokio", - "tokio-rustls", - "tungstenite", - "webpki-roots", -] - -[[package]] -name = "atomic-waker" -version = "1.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0" - -[[package]] -name = "atomic_refcell" -version = "0.1.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41e67cd8309bbd06cd603a9e693a784ac2e5d1e955f11286e355089fcab3047c" - -[[package]] -name = "autocfg" -version = "1.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0" - -[[package]] -name = "background_hang_monitor" -version = "0.0.1" -dependencies = [ - "background_hang_monitor_api", - "backtrace", - "base", - "crossbeam-channel", - "ipc-channel", - "libc", - "log", - "mach2", - "nix", - "serde_json", - "unwind-sys", -] - -[[package]] -name = "background_hang_monitor_api" -version = "0.0.1" -dependencies = [ - "base", - "ipc-channel", - "malloc_size_of", - "malloc_size_of_derive", - "parking_lot", - "serde", - "size_of_test", - "webrender_api", -] - -[[package]] -name = "backtrace" -version = "0.3.73" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5cc23269a4f8976d0a4d2e7109211a419fe30e8d88d677cd60b6bc79c5732e0a" -dependencies = [ - "addr2line", - "cc", - "cfg-if", - "libc", - "miniz_oxide 0.7.4", - "object", - "rustc-demangle", -] - -[[package]] -name = "base" -version = "0.0.1" -dependencies = [ - "crossbeam-channel", - "ipc-channel", - "libc", - "mach2", - "malloc_size_of", - "malloc_size_of_derive", - "parking_lot", - "serde", - "size_of_test", - "time 0.3.36", - "webrender_api", - "windows-sys 0.59.0", -] - -[[package]] -name = "base64" -version = "0.21.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567" - -[[package]] -name = "bincode" -version = "1.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1f45e9417d87227c7a56d22e471c6206462cba514c7590c09aff4cf6d1ddcad" -dependencies = [ - "serde", -] - -[[package]] -name = "bindgen" -version = "0.69.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a00dc851838a2120612785d195287475a3ac45514741da670b735818822129a0" -dependencies = [ - "bitflags 2.6.0", - "cexpr", - "clang-sys", - "itertools 0.10.5", - "lazy_static", - "lazycell", - "proc-macro2", - "quote", - "regex", - "rustc-hash", - "shlex", - "syn", - "which", -] - -[[package]] -name = "bit-set" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08807e080ed7f9d5433fa9b275196cfc35414f66a0c79d864dc51a0d825231a3" -dependencies = [ - "bit-vec", -] - -[[package]] -name = "bit-vec" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e764a1d40d510daf35e07be9eb06e75770908c27d411ee6c92109c9840eaaf7" - -[[package]] -name = "bit_field" -version = "0.10.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc827186963e592360843fb5ba4b973e145841266c1357f7180c43526f2e5b61" - -[[package]] -name = "bitflags" -version = "1.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" - -[[package]] -name = "bitflags" -version = "2.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de" -dependencies = [ - "serde", -] - -[[package]] -name = "block" -version = "0.1.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d8c1fef690941d3e7788d328517591fecc684c084084702d6ff1641e993699a" - -[[package]] -name = "block-buffer" -version = "0.10.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3078c7629b62d3f0439517fa394996acacc5cbc91c5a20d8c658e77abd503a71" -dependencies = [ - "generic-array", -] - -[[package]] -name = "block-sys" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae85a0696e7ea3b835a453750bf002770776609115e6d25c6d2ff28a8200f7e7" -dependencies = [ - "objc-sys", -] - -[[package]] -name = "block2" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "15b55663a85f33501257357e6421bb33e769d5c9ffb5ba0921c975a123e35e68" -dependencies = [ - "block-sys", - "objc2", -] - -[[package]] -name = "bluetooth" -version = "0.0.1" -dependencies = [ - "bitflags 2.6.0", - "bluetooth_traits", - "blurdroid", - "blurmac", - "blurmock", - "blurz", - "embedder_traits", - "ipc-channel", - "log", - "servo_config", - "servo_rand", - "uuid", -] - -[[package]] -name = "bluetooth_traits" -version = "0.0.1" -dependencies = [ - "embedder_traits", - "ipc-channel", - "regex", - "serde", -] - -[[package]] -name = "blurdroid" -version = "0.1.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "19b23557dd27704797128f9db2816416bef20dad62d4a9768714eeb65f07d296" - -[[package]] -name = "blurmac" -version = "0.1.0" -dependencies = [ - "log", - "objc", -] - -[[package]] -name = "blurmock" -version = "0.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c150fd617830fd121919bbd500a784507e8af1bae744efcf587591c65c375d4" -dependencies = [ - "hex", -] - -[[package]] -name = "blurz" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f6dae8337ff67fe8ead29a28a0115605753e6a5205d4b6017e9f42f198c3c50a" -dependencies = [ - "dbus", - "hex", -] - -[[package]] -name = "brotli" -version = "3.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d640d25bc63c50fb1f0b545ffd80207d2e10a4c965530809b40ba3386825c391" -dependencies = [ - "alloc-no-stdlib", - "alloc-stdlib", - "brotli-decompressor", -] - -[[package]] -name = "brotli-decompressor" -version = "2.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e2e4afe60d7dd600fdd3de8d0f08c2b7ec039712e3b6137ff98b7004e82de4f" -dependencies = [ - "alloc-no-stdlib", - "alloc-stdlib", -] - -[[package]] -name = "build-parallel" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b8e3ff9db740167616e528c509b3618046fc05d337f8f3182d300f4aa977d2bb" -dependencies = [ - "crossbeam-utils", - "jobserver", - "num_cpus", -] - -[[package]] -name = "bumpalo" -version = "3.16.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c" - -[[package]] -name = "byte-slice-cast" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "28346c117b50270785fbc123bd6e4ecad20d0c6d5f43d081dc80a3abcc62be64" - -[[package]] -name = "bytemuck" -version = "1.18.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94bbb0ad554ad961ddc5da507a12a29b14e4ae5bda06b19f575a3e6079d2e2ae" -dependencies = [ - "bytemuck_derive", -] - -[[package]] -name = "bytemuck_derive" -version = "1.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0cc8b54b395f2fcfbb3d90c47b01c7f444d94d05bdeb775811dec868ac3bbc26" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "byteorder" -version = "1.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" - -[[package]] -name = "bytes" -version = "1.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8318a53db07bb3f8dca91a600466bdb3f2eaadeedfdbcf02e1accbad9271ba50" - -[[package]] -name = "calendrical_calculations" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cec493b209a1b81fa32312d7ceca1b547d341c7b5f16a3edbf32b1d8b455bbdf" -dependencies = [ - "core_maths", - "displaydoc", -] - -[[package]] -name = "calloop" -version = "0.12.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fba7adb4dd5aa98e5553510223000e7148f621165ec5f9acd7113f6ca4995298" -dependencies = [ - "bitflags 2.6.0", - "log", - "polling", - "rustix", - "slab", - "thiserror", -] - -[[package]] -name = "calloop-wayland-source" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f0ea9b9476c7fad82841a8dbb380e2eae480c21910feba80725b46931ed8f02" -dependencies = [ - "calloop", - "rustix", - "wayland-backend", - "wayland-client", -] - -[[package]] -name = "canvas" -version = "0.0.1" -dependencies = [ - "app_units", - "bitflags 2.6.0", - "byteorder", - "canvas_traits", - "crossbeam-channel", - "cssparser", - "euclid", - "fnv", - "font-kit", - "fonts", - "half", - "ipc-channel", - "log", - "lyon_geom", - "net_traits", - "num-traits", - "parking_lot", - "pathfinder_geometry", - "pixels", - "range", - "raqote", - "servo_arc", - "sparkle", - "style", - "style_traits", - "surfman", - "unicode-script", - "webrender", - "webrender_api", - "webrender_traits", - "webxr", - "webxr-api", -] - -[[package]] -name = "canvas_traits" -version = "0.0.1" -dependencies = [ - "base", - "crossbeam-channel", - "euclid", - "ipc-channel", - "malloc_size_of", - "malloc_size_of_derive", - "pixels", - "serde", - "serde_bytes", - "servo_config", - "sparkle", - "style", - "webrender_api", - "webxr-api", -] - -[[package]] -name = "cc" -version = "1.1.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e9d013ecb737093c0e86b151a7b837993cf9ec6c502946cfb44bedc392421e0b" -dependencies = [ - "jobserver", - "libc", - "shlex", -] - -[[package]] -name = "cesu8" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d43a04d8753f35258c91f8ec639f792891f748a1edbd759cf1dcea3382ad83c" - -[[package]] -name = "cexpr" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6fac387a98bb7c37292057cffc56d62ecb629900026402633ae9160df93a8766" -dependencies = [ - "nom", -] - -[[package]] -name = "cfg-expr" -version = "0.15.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d067ad48b8650848b989a59a86c6c36a995d02d2bf778d45c3c5d57bc2718f02" -dependencies = [ - "smallvec", - "target-lexicon", -] - -[[package]] -name = "cfg-if" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" - -[[package]] -name = "cfg_aliases" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd16c4719339c4530435d38e511904438d07cce7950afa3718a84ac36c10e89e" - -[[package]] -name = "cfg_aliases" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "613afe47fcd5fac7ccf1db93babcb082c5994d996f20b8b159f2ad1658eb5724" - -[[package]] -name = "cgl" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ced0551234e87afee12411d535648dd89d2e7f34c78b753395567aff3d447ff" -dependencies = [ - "libc", -] - -[[package]] -name = "chrono" -version = "0.4.38" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a21f936df1771bf62b77f047b726c4625ff2e8aa607c01ec06e5a05bd8463401" -dependencies = [ - "android-tzdata", - "iana-time-zone", - "js-sys", - "num-traits", - "serde", - "wasm-bindgen", - "windows-targets 0.52.6", -] - -[[package]] -name = "clang-sys" -version = "1.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a483f3cbf7cec2e153d424d0e92329d816becc6421389bd494375c6065921b9b" -dependencies = [ - "glob", - "libc", - "libloading", -] - -[[package]] -name = "clipboard-win" -version = "5.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "15efe7a882b08f34e38556b14f2fb3daa98769d06c7f0c1b076dfd0d983bc892" -dependencies = [ - "error-code", -] - -[[package]] -name = "cmake" -version = "0.1.51" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb1e43aa7fd152b1f968787f7dbcdeb306d1867ff373c69955211876c053f91a" -dependencies = [ - "cc", -] - -[[package]] -name = "cocoa" -version = "0.25.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f6140449f97a6e97f9511815c5632d84c8aacf8ac271ad77c559218161a1373c" -dependencies = [ - "bitflags 1.3.2", - "block", - "cocoa-foundation", - "core-foundation", - "core-graphics", - "foreign-types 0.5.0", - "libc", - "objc", -] - -[[package]] -name = "cocoa-foundation" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c6234cbb2e4c785b456c0644748b1ac416dd045799740356f8363dfe00c93f7" -dependencies = [ - "bitflags 1.3.2", - "block", - "core-foundation", - "core-graphics-types", - "libc", - "objc", -] - -[[package]] -name = "codespan-reporting" -version = "0.11.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3538270d33cc669650c4b093848450d380def10c331d38c768e34cac80576e6e" -dependencies = [ - "termcolor", - "unicode-width", -] - -[[package]] -name = "color_quant" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d7b894f5411737b7867f4827955924d7c254fc9f4d91a6aad6b097804b1018b" - -[[package]] -name = "colored" -version = "2.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cbf2150cce219b664a8a70df7a1f933836724b503f8a413af9365b4dcc4d90b8" -dependencies = [ - "lazy_static", - "windows-sys 0.48.0", -] - -[[package]] -name = "combine" -version = "4.6.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba5a308b75df32fe02788e748662718f03fde005016435c444eea572398219fd" -dependencies = [ - "bytes", - "memchr", -] - -[[package]] -name = "compiletest_rs" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b0f4b0a27f9efcea6a012305682f0f7c5691df7097b9eaf6abb50b75c89a8af" -dependencies = [ - "diff", - "filetime", - "getopts", - "lazy_static", - "libc", - "log", - "miow", - "regex", - "rustfix", - "serde", - "serde_derive", - "serde_json", - "tempfile", - "tester", - "winapi", -] - -[[package]] -name = "compositing" -version = "0.0.1" -dependencies = [ - "base", - "canvas", - "compositing_traits", - "crossbeam-channel", - "embedder_traits", - "euclid", - "fnv", - "fonts", - "fonts_traits", - "gleam", - "image", - "ipc-channel", - "keyboard-types", - "libc", - "log", - "net", - "net_traits", - "pixels", - "profile_traits", - "script_traits", - "servo-media", - "servo_config", - "servo_geometry", - "servo_url", - "style_traits", - "surfman", - "time 0.1.45", - "tracing", - "webrender", - "webrender_api", - "webrender_traits", - "webxr", -] - -[[package]] -name = "compositing_traits" -version = "0.0.1" -dependencies = [ - "base", - "crossbeam-channel", - "embedder_traits", - "euclid", - "fonts_traits", - "ipc-channel", - "keyboard-types", - "log", - "pixels", - "script_traits", - "servo_url", - "style_traits", - "webrender_api", - "webrender_traits", -] - -[[package]] -name = "concurrent-queue" -version = "2.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ca0197aee26d1ae37445ee532fefce43251d24cc7c166799f4d46817f1d3973" -dependencies = [ - "crossbeam-utils", -] - -[[package]] -name = "constellation" -version = "0.0.1" -dependencies = [ - "background_hang_monitor", - "background_hang_monitor_api", - "backtrace", - "base", - "bluetooth_traits", - "canvas_traits", - "compositing_traits", - "crossbeam-channel", - "devtools_traits", - "embedder_traits", - "euclid", - "fonts", - "fonts_traits", - "gaol", - "http", - "ipc-channel", - "keyboard-types", - "log", - "media", - "net", - "net_traits", - "parking_lot", - "profile_traits", - "script_layout_interface", - "script_traits", - "serde", - "servo_config", - "servo_rand", - "servo_url", - "style_traits", - "tracing", - "webgpu", - "webrender", - "webrender_api", - "webrender_traits", - "webxr-api", -] - -[[package]] -name = "content-security-policy" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf7225464dae1993d0045c023d0975f44d63337f35f85faddb998ff9abdfcd0f" -dependencies = [ - "base64", - "bitflags 2.6.0", - "once_cell", - "percent-encoding", - "regex", - "serde", - "sha2", - "url", -] - -[[package]] -name = "convert_case" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec182b0ca2f35d8fc196cf3404988fd8b8c739a4d270ff118a398feb0cbec1ca" -dependencies = [ - "unicode-segmentation", -] - -[[package]] -name = "cookie" -version = "0.16.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e859cd57d0710d9e06c381b550c06e76992472a8c6d527aecd2fc673dcc231fb" -dependencies = [ - "time 0.3.36", - "version_check", -] - -[[package]] -name = "cookie" -version = "0.18.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ddef33a339a91ea89fb53151bd0a4689cfce27055c291dfa69945475d22c747" -dependencies = [ - "time 0.3.36", - "version_check", -] - -[[package]] -name = "core-foundation" -version = "0.9.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91e195e091a93c46f7102ec7818a2aa394e1e1771c3ab4825963fa03e45afb8f" -dependencies = [ - "core-foundation-sys", - "libc", -] - -[[package]] -name = "core-foundation-sys" -version = "0.8.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b" - -[[package]] -name = "core-graphics" -version = "0.23.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c07782be35f9e1140080c6b96f0d44b739e2278479f64e02fdab4e32dfd8b081" -dependencies = [ - "bitflags 1.3.2", - "core-foundation", - "core-graphics-types", - "foreign-types 0.5.0", - "libc", -] - -[[package]] -name = "core-graphics-types" -version = "0.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "45390e6114f68f718cc7a830514a96f903cccd70d02a8f6d9f643ac4ba45afaf" -dependencies = [ - "bitflags 1.3.2", - "core-foundation", - "libc", -] - -[[package]] -name = "core-text" -version = "20.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c9d2790b5c08465d49f8dc05c8bcae9fea467855947db39b0f8145c091aaced5" -dependencies = [ - "core-foundation", - "core-graphics", - "foreign-types 0.5.0", - "libc", -] - -[[package]] -name = "core_maths" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3b02505ccb8c50b0aa21ace0fc08c3e53adebd4e58caa18a36152803c7709a3" -dependencies = [ - "libm", -] - -[[package]] -name = "cpufeatures" -version = "0.2.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "608697df725056feaccfa42cffdaeeec3fccc4ffc38358ecd19b243e716a78e0" -dependencies = [ - "libc", -] - -[[package]] -name = "crc32fast" -version = "1.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a97769d94ddab943e4510d138150169a2758b5ef3eb191a9ee688de3e23ef7b3" -dependencies = [ - "cfg-if", -] - -[[package]] -name = "crossbeam-channel" -version = "0.5.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "33480d6946193aa8033910124896ca395333cae7e2d1113d1fef6c3272217df2" -dependencies = [ - "crossbeam-utils", -] - -[[package]] -name = "crossbeam-deque" -version = "0.8.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "613f8cc01fe9cf1a3eb3d7f488fd2fa8388403e97039e2f73692932e291a770d" -dependencies = [ - "crossbeam-epoch", - "crossbeam-utils", -] - -[[package]] -name = "crossbeam-epoch" -version = "0.9.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b82ac4a3c2ca9c3460964f020e1402edd5753411d7737aa39c3714ad1b5420e" -dependencies = [ - "crossbeam-utils", -] - -[[package]] -name = "crossbeam-utils" -version = "0.8.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22ec99545bb0ed0ea7bb9b8e1e9122ea386ff8a48c0922e43f36d45ab09e0e80" - -[[package]] -name = "crown" -version = "0.0.1" -dependencies = [ - "compiletest_rs", -] - -[[package]] -name = "crunchy" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7" - -[[package]] -name = "crypto-common" -version = "0.1.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3" -dependencies = [ - "generic-array", - "typenum", -] - -[[package]] -name = "cssparser" -version = "0.34.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b7c66d1cd8ed61bf80b38432613a7a2f09401ab8d0501110655f8b341484a3e3" -dependencies = [ - "cssparser-macros", - "dtoa-short", - "itoa", - "phf 0.11.2", - "serde", - "smallvec", -] - -[[package]] -name = "cssparser-macros" -version = "0.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "13b588ba4ac1a99f7f2964d24b3d896ddc6bf847ee3855dbd4366f058cfcd331" -dependencies = [ - "quote", - "syn", -] - -[[package]] -name = "ctor" -version = "0.2.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "edb49164822f3ee45b17acd4a208cfc1251410cf0cad9a833234c9890774dd9f" -dependencies = [ - "quote", - "syn", -] - -[[package]] -name = "cursor-icon" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96a6ac251f4a2aca6b3f91340350eab87ae57c3f127ffeb585e92bd336717991" - -[[package]] -name = "darling" -version = "0.20.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f63b86c8a8826a49b8c21f08a2d07338eec8d900540f8630dc76284be802989" -dependencies = [ - "darling_core", - "darling_macro", -] - -[[package]] -name = "darling_core" -version = "0.20.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95133861a8032aaea082871032f5815eb9e98cef03fa916ab4500513994df9e5" -dependencies = [ - "fnv", - "ident_case", - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "darling_macro" -version = "0.20.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d336a2a514f6ccccaa3e09b02d41d35330c07ddf03a62165fcec10bb561c7806" -dependencies = [ - "darling_core", - "quote", - "syn", -] - -[[package]] -name = "data-encoding" -version = "2.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8566979429cf69b49a5c740c60791108e86440e8be149bbea4fe54d2c32d6e2" - -[[package]] -name = "data-url" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c297a1c74b71ae29df00c3e22dd9534821d60eb9af5a0192823fa2acea70c2a" - -[[package]] -name = "dbus" -version = "0.6.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "48b5f0f36f1eebe901b0e6bee369a77ed3396334bf3f09abd46454a576f71819" -dependencies = [ - "libc", - "libdbus-sys", -] - -[[package]] -name = "deny_public_fields" -version = "0.0.1" -dependencies = [ - "syn", - "synstructure", -] - -[[package]] -name = "deny_public_fields_tests" -version = "0.0.1" -dependencies = [ - "deny_public_fields", -] - -[[package]] -name = "deranged" -version = "0.3.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b42b6fa04a440b495c8b04d0e71b707c585f83cb9cb28cf8cd0d976c315e31b4" -dependencies = [ - "powerfmt", - "serde", -] - -[[package]] -name = "derive_common" -version = "0.0.1" -source = "git+https://github.com/servo/stylo?branch=2024-07-16#65f8d1316a0966401bcfb9fa7dd5e3659a1605b2" -dependencies = [ - "darling", - "proc-macro2", - "quote", - "syn", - "synstructure", -] - -[[package]] -name = "derive_more" -version = "0.99.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f33878137e4dafd7fa914ad4e259e18a4e8e532b9617a2d0150262bf53abfce" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "devtools" -version = "0.0.1" -dependencies = [ - "base", - "chrono", - "crossbeam-channel", - "devtools_traits", - "embedder_traits", - "headers", - "http", - "ipc-channel", - "log", - "serde", - "serde_json", - "servo_config", - "servo_rand", - "servo_url", - "uuid", -] - -[[package]] -name = "devtools_traits" -version = "0.0.1" -dependencies = [ - "base", - "bitflags 2.6.0", - "http", - "ipc-channel", - "malloc_size_of", - "malloc_size_of_derive", - "serde", - "servo_url", - "time 0.1.45", - "uuid", -] - -[[package]] -name = "diff" -version = "0.1.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56254986775e3233ffa9c4d7d3faaf6d36a2c09d30b20687e9f88bc8bafc16c8" - -[[package]] -name = "digest" -version = "0.10.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292" -dependencies = [ - "block-buffer", - "crypto-common", -] - -[[package]] -name = "diplomat" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3137c640d2bac491dbfca7f9945c948f888dd8c95bdf7ee6b164fbdfa5d3efc2" -dependencies = [ - "diplomat_core", - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "diplomat-runtime" -version = "0.8.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "29f9efe348e178ba77b6035bc6629138486f8b461654e7ac7ad8afaa61bd4d98" -dependencies = [ - "log", -] - -[[package]] -name = "diplomat_core" -version = "0.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd7aca1d8f9e7b73ad61785beedc9556ad79f84b15c15abaa7041377e42284c1" -dependencies = [ - "lazy_static", - "proc-macro2", - "quote", - "serde", - "smallvec", - "strck_ident", - "syn", -] - -[[package]] -name = "dirs" -version = "5.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44c45a9d03d6676652bcb5e724c7e988de1acad23a711b5217ab9cbecbec2225" -dependencies = [ - "dirs-sys", -] - -[[package]] -name = "dirs-next" -version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b98cf8ebf19c3d1b223e151f99a4f9f0690dca41414773390fc824184ac833e1" -dependencies = [ - "cfg-if", - "dirs-sys-next", -] - -[[package]] -name = "dirs-sys" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "520f05a5cbd335fae5a99ff7a6ab8627577660ee5cfd6a94a6a929b52ff0321c" -dependencies = [ - "libc", - "option-ext", - "redox_users", - "windows-sys 0.48.0", -] - -[[package]] -name = "dirs-sys-next" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ebda144c4fe02d1f7ea1a7d9641b6fc6b580adcfa024ae48797ecdeb6825b4d" -dependencies = [ - "libc", - "redox_users", - "winapi", -] - -[[package]] -name = "dispatch" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd0c93bb4b0c6d9b77f4435b0ae98c24d17f1c45b2ff844c6151a07256ca923b" - -[[package]] -name = "displaydoc" -version = "0.2.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "dlib" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "330c60081dcc4c72131f8eb70510f1ac07223e5d4163db481a04a0befcffa412" -dependencies = [ - "libloading", -] - -[[package]] -name = "document-features" -version = "0.2.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb6969eaabd2421f8a2775cfd2471a2b634372b4a25d41e3bd647b79912850a0" -dependencies = [ - "litrs", -] - -[[package]] -name = "dom" -version = "0.0.1" -source = "git+https://github.com/servo/stylo?branch=2024-07-16#65f8d1316a0966401bcfb9fa7dd5e3659a1605b2" -dependencies = [ - "bitflags 2.6.0", -] - -[[package]] -name = "dom_struct" -version = "0.0.1" -dependencies = [ - "quote", - "syn", -] - -[[package]] -name = "domobject_derive" -version = "0.0.1" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "downcast-rs" -version = "1.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "75b325c5dbd37f80359721ad39aca5a29fb04c89279657cffdda8736d0c0b9d2" - -[[package]] -name = "dtoa" -version = "1.0.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dcbb2bf8e87535c23f7a8a321e364ce21462d0ff10cb6407820e8e96dfff6653" - -[[package]] -name = "dtoa-short" -version = "0.3.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd1511a7b6a56299bd043a9c167a6d2bfb37bf84a6dfceaba651168adfb43c87" -dependencies = [ - "dtoa", -] - -[[package]] -name = "dwrote" -version = "0.11.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2da3498378ed373237bdef1eddcc64e7be2d3ba4841f4c22a998e81cadeea83c" -dependencies = [ - "lazy_static", - "libc", - "serde", - "serde_derive", - "winapi", - "wio", -] - -[[package]] -name = "ecolor" -version = "0.28.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2e6b451ff1143f6de0f33fc7f1b68fecfd2c7de06e104de96c4514de3f5396f8" -dependencies = [ - "bytemuck", - "emath", -] - -[[package]] -name = "egui" -version = "0.28.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "20c97e70a2768de630f161bb5392cbd3874fcf72868f14df0e002e82e06cb798" -dependencies = [ - "ahash", - "emath", - "epaint", - "log", - "nohash-hasher", -] - -[[package]] -name = "egui-winit" -version = "0.28.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fac4e066af341bf92559f60dbdf2020b2a03c963415349af5f3f8d79ff7a4926" -dependencies = [ - "ahash", - "arboard", - "egui", - "log", - "raw-window-handle", - "smithay-clipboard", - "web-time", - "winit", -] - -[[package]] -name = "egui_glow" -version = "0.28.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e2bdc8b38cfa17cc712c4ae079e30c71c00cd4c2763c9e16dc7860a02769103" -dependencies = [ - "ahash", - "bytemuck", - "egui", - "egui-winit", - "glow 0.13.1", - "log", - "memoffset", - "wasm-bindgen", - "web-sys", - "winit", -] - -[[package]] -name = "either" -version = "1.13.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "60b1af1c220855b6ceac025d3f6ecdd2b7c4894bfe9cd9bda4fbb4bc7c0d4cf0" - -[[package]] -name = "emath" -version = "0.28.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0a6a21708405ea88f63d8309650b4d77431f4bc28fb9d8e6f77d3963b51249e6" -dependencies = [ - "bytemuck", -] - -[[package]] -name = "embedder_traits" -version = "0.0.1" -dependencies = [ - "base", - "cfg-if", - "crossbeam-channel", - "ipc-channel", - "keyboard-types", - "log", - "num-derive", - "num-traits", - "serde", - "servo_url", - "webrender_api", - "webxr-api", -] - -[[package]] -name = "encoding_c" -version = "0.9.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9af727805f3b0d79956bde5b35732669fb5c5d45a94893798e7b7e70cfbf9cc1" -dependencies = [ - "encoding_rs", -] - -[[package]] -name = "encoding_c_mem" -version = "0.2.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3a80a16821fe8c7cab96e0c67b57cd7090e021e9615e6ce6ab0cf866c44ed1f0" -dependencies = [ - "encoding_rs", -] - -[[package]] -name = "encoding_rs" -version = "0.8.34" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b45de904aa0b010bce2ab45264d0631681847fa7b6f2eaa7dab7619943bc4f59" -dependencies = [ - "cfg-if", -] - -[[package]] -name = "env_filter" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f2c92ceda6ceec50f43169f9ee8424fe2db276791afde7b2cd8bc084cb376ab" -dependencies = [ - "log", - "regex", -] - -[[package]] -name = "env_logger" -version = "0.8.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a19187fea3ac7e84da7dacf48de0c45d63c6a76f9490dae389aead16c243fce3" -dependencies = [ - "log", - "regex", -] - -[[package]] -name = "env_logger" -version = "0.10.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4cd405aab171cb85d6735e5c8d9db038c17d3ca007a4d2c25f337935c3d90580" -dependencies = [ - "humantime", - "is-terminal", - "log", - "regex", - "termcolor", -] - -[[package]] -name = "epaint" -version = "0.28.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f0dcc0a0771e7500e94cd1cb797bd13c9f23b9409bdc3c824e2cbc562b7fa01" -dependencies = [ - "ab_glyph", - "ahash", - "bytemuck", - "ecolor", - "emath", - "log", - "nohash-hasher", - "parking_lot", -] - -[[package]] -name = "equivalent" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" - -[[package]] -name = "errno" -version = "0.3.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "534c5cf6194dfab3db3242765c03bbe257cf92f22b38f6bc0c58d59108a820ba" -dependencies = [ - "libc", - "windows-sys 0.52.0", -] - -[[package]] -name = "error-code" -version = "3.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a0474425d51df81997e2f90a21591180b38eccf27292d755f3e30750225c175b" - -[[package]] -name = "etagere" -version = "0.2.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0e2f1e3be19fb10f549be8c1bf013e8675b4066c445e36eb76d2ebb2f54ee495" -dependencies = [ - "euclid", - "serde", - "svg_fmt", -] - -[[package]] -name = "euclid" -version = "0.22.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad9cdb4b747e485a12abb0e6566612956c7a1bafa3bdb8d682c5b6d403589e48" -dependencies = [ - "num-traits", - "serde", -] - -[[package]] -name = "exr" -version = "1.72.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "887d93f60543e9a9362ef8a21beedd0a833c5d9610e18c67abe15a5963dcb1a4" -dependencies = [ - "bit_field", - "flume", - "half", - "lebe", - "miniz_oxide 0.7.4", - "rayon-core", - "smallvec", - "zune-inflate", -] - -[[package]] -name = "fastrand" -version = "2.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8c02a5121d4ea3eb16a80748c74f5549a5665e4c21333c6098f283870fbdea6" - -[[package]] -name = "fdeflate" -version = "0.3.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f9bfee30e4dedf0ab8b422f03af778d9612b63f502710fc500a334ebe2de645" -dependencies = [ - "simd-adler32", -] - -[[package]] -name = "filetime" -version = "0.2.25" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "35c0522e981e68cbfa8c3f978441a5f34b30b96e146b33cd3359176b50fe8586" -dependencies = [ - "cfg-if", - "libc", - "libredox 0.1.3", - "windows-sys 0.59.0", -] - -[[package]] -name = "fixed_decimal" -version = "0.5.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0febbeb1118a9ecdee6e4520ead6b54882e843dd0592ad233247dbee84c53db8" -dependencies = [ - "displaydoc", - "ryu", - "smallvec", - "writeable", -] - -[[package]] -name = "fixedbitset" -version = "0.1.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86d4de0081402f5e88cdac65c8dcdcc73118c1a7a465e2a05f0da05843a8ea33" - -[[package]] -name = "fixedbitset" -version = "0.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80" - -[[package]] -name = "flate2" -version = "1.0.33" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "324a1be68054ef05ad64b861cc9eaf1d623d2d8cb25b4bf2cb9cdd902b4bf253" -dependencies = [ - "crc32fast", - "miniz_oxide 0.8.0", -] - -[[package]] -name = "float-ord" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ce81f49ae8a0482e4c55ea62ebbd7e5a686af544c00b9d090bba3ff9be97b3d" - -[[package]] -name = "flume" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "55ac459de2512911e4b674ce33cf20befaba382d05b62b008afc1c8b57cbf181" -dependencies = [ - "spin", -] - -[[package]] -name = "fnv" -version = "1.0.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" - -[[package]] -name = "font-kit" -version = "0.14.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b64b34f4efd515f905952d91bc185039863705592c0c53ae6d979805dd154520" -dependencies = [ - "bitflags 2.6.0", - "byteorder", - "core-foundation", - "core-graphics", - "core-text", - "dirs", - "dwrote", - "float-ord", - "freetype-sys", - "lazy_static", - "libc", - "log", - "pathfinder_geometry", - "pathfinder_simd", - "walkdir", - "winapi", - "yeslogic-fontconfig-sys", -] - -[[package]] -name = "fonts" -version = "0.0.1" -dependencies = [ - "app_units", - "atomic_refcell", - "base", - "bitflags 2.6.0", - "byteorder", - "core-foundation", - "core-graphics", - "core-text", - "crossbeam-channel", - "cssparser", - "dwrote", - "euclid", - "fnv", - "fonts_traits", - "fontsan", - "freetype-sys", - "harfbuzz-sys", - "ipc-channel", - "itertools 0.13.0", - "libc", - "log", - "malloc_size_of", - "malloc_size_of_derive", - "net_traits", - "parking_lot", - "range", - "serde", - "servo_allocator", - "servo_arc", - "servo_atoms", - "servo_config", - "servo_url", - "smallvec", - "style", - "surfman", - "truetype", - "unicode-bidi", - "unicode-properties", - "unicode-script", - "url", - "webrender_api", - "webrender_traits", - "xi-unicode", - "xml-rs", - "yeslogic-fontconfig-sys", -] - -[[package]] -name = "fonts_traits" -version = "0.0.1" -dependencies = [ - "ipc-channel", - "malloc_size_of", - "malloc_size_of_derive", - "range", - "serde", - "webrender_api", -] - -[[package]] -name = "fontsan" -version = "0.5.2" -source = "git+https://github.com/servo/fontsan#8fbc406506cfd1f8ab60e625d1e926a0e72e1d8a" -dependencies = [ - "cc", - "glob", - "libc", - "miniz-sys", -] - -[[package]] -name = "foreign-types" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1" -dependencies = [ - "foreign-types-shared 0.1.1", -] - -[[package]] -name = "foreign-types" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d737d9aa519fb7b749cbc3b962edcf310a8dd1f4b67c91c4f83975dbdd17d965" -dependencies = [ - "foreign-types-macros", - "foreign-types-shared 0.3.1", -] - -[[package]] -name = "foreign-types-macros" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a5c6c585bc94aaf2c7b51dd4c2ba22680844aba4c687be581871a6f518c5742" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "foreign-types-shared" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" - -[[package]] -name = "foreign-types-shared" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa9a19cbb55df58761df49b23516a86d432839add4af60fc256da840f66ed35b" - -[[package]] -name = "form_urlencoded" -version = "1.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e13624c2627564efccf4934284bdd98cbaa14e79b0b5a141218e507b3a823456" -dependencies = [ - "percent-encoding", -] - -[[package]] -name = "freetype" -version = "0.7.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a440748e063798e4893ceb877151e84acef9bea9a8c6800645cf3f1b3a7806e" -dependencies = [ - "freetype-sys", - "libc", -] - -[[package]] -name = "freetype-sys" -version = "0.20.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0e7edc5b9669349acfda99533e9e0bcf26a51862ab43b08ee7745c55d28eb134" -dependencies = [ - "cc", - "libc", - "pkg-config", -] - -[[package]] -name = "futf" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "df420e2e84819663797d1ec6544b13c5be84629e7bb00dc960d6917db2987843" -dependencies = [ - "mac", - "new_debug_unreachable", -] - -[[package]] -name = "futures" -version = "0.1.31" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3a471a38ef8ed83cd6e40aa59c1ffe17db6855c18e3604d9c4ed8c08ebc28678" - -[[package]] -name = "futures" -version = "0.3.30" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "645c6916888f6cb6350d2550b80fb63e734897a8498abe35cfb732b6487804b0" -dependencies = [ - "futures-channel", - "futures-core", - "futures-executor", - "futures-io", - "futures-sink", - "futures-task", - "futures-util", -] - -[[package]] -name = "futures-channel" -version = "0.3.30" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eac8f7d7865dcb88bd4373ab671c8cf4508703796caa2b1985a9ca867b3fcb78" -dependencies = [ - "futures-core", - "futures-sink", -] - -[[package]] -name = "futures-core" -version = "0.3.30" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dfc6580bb841c5a68e9ef15c77ccc837b40a7504914d52e47b8b0e9bbda25a1d" - -[[package]] -name = "futures-executor" -version = "0.3.30" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a576fc72ae164fca6b9db127eaa9a9dda0d61316034f33a0a0d4eda41f02b01d" -dependencies = [ - "futures-core", - "futures-task", - "futures-util", -] - -[[package]] -name = "futures-io" -version = "0.3.30" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a44623e20b9681a318efdd71c299b6b222ed6f231972bfe2f224ebad6311f0c1" - -[[package]] -name = "futures-macro" -version = "0.3.30" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "futures-sink" -version = "0.3.30" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9fb8e00e87438d937621c1c6269e53f536c14d3fbd6a042bb24879e57d474fb5" - -[[package]] -name = "futures-task" -version = "0.3.30" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38d84fa142264698cdce1a9f9172cf383a0c82de1bddcf3092901442c4097004" - -[[package]] -name = "futures-util" -version = "0.3.30" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d6401deb83407ab3da39eba7e33987a73c3df0c82b4bb5813ee871c19c41d48" -dependencies = [ - "futures 0.1.31", - "futures-channel", - "futures-core", - "futures-io", - "futures-macro", - "futures-sink", - "futures-task", - "memchr", - "pin-project-lite", - "pin-utils", - "slab", -] - -[[package]] -name = "fxhash" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c31b6d751ae2c7f11320402d34e41349dd1016f8d5d45e48c4312bc8625af50c" -dependencies = [ - "byteorder", -] - -[[package]] -name = "gaol" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "061957ca7a966a39a79ebca393a9a6c7babda10bf9dd6f11d00041558d929c22" -dependencies = [ - "libc", - "log", -] - -[[package]] -name = "generic-array" -version = "0.14.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a" -dependencies = [ - "typenum", - "version_check", -] - -[[package]] -name = "gethostname" -version = "0.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0176e0459c2e4a1fe232f984bca6890e681076abb9934f6cea7c326f3fc47818" -dependencies = [ - "libc", - "windows-targets 0.48.5", -] - -[[package]] -name = "getopts" -version = "0.2.21" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14dbbfd5c71d70241ecf9e6f13737f7b5ce823821063188d7e46c41d371eebd5" -dependencies = [ - "unicode-width", -] - -[[package]] -name = "getrandom" -version = "0.2.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7" -dependencies = [ - "cfg-if", - "libc", - "wasi 0.11.0+wasi-snapshot-preview1", -] - -[[package]] -name = "gif" -version = "0.13.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fb2d69b19215e18bb912fa30f7ce15846e301408695e44e0ef719f1da9e19f2" -dependencies = [ - "color_quant", - "weezl", -] - -[[package]] -name = "gilrs" -version = "0.10.6" -source = "git+https://gitlab.com/gilrs-project/gilrs?rev=eafb7f2ef488874188c5d75adce9aef486be9d4e#eafb7f2ef488874188c5d75adce9aef486be9d4e" -dependencies = [ - "fnv", - "gilrs-core", - "log", - "uuid", - "vec_map", -] - -[[package]] -name = "gilrs-core" -version = "0.5.12" -source = "git+https://gitlab.com/gilrs-project/gilrs?rev=eafb7f2ef488874188c5d75adce9aef486be9d4e#eafb7f2ef488874188c5d75adce9aef486be9d4e" -dependencies = [ - "core-foundation", - "inotify", - "io-kit-sys", - "js-sys", - "libc", - "libudev-sys", - "log", - "nix", - "uuid", - "vec_map", - "wasm-bindgen", - "web-sys", - "windows 0.48.0", -] - -[[package]] -name = "gimli" -version = "0.29.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "40ecd4077b5ae9fd2e9e169b102c6c330d0605168eb0e8bf79952b256dbefffd" - -[[package]] -name = "gio-sys" -version = "0.19.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2cd743ba4714d671ad6b6234e8ab2a13b42304d0e13ab7eba1dcdd78a7d6d4ef" -dependencies = [ - "glib-sys", - "gobject-sys", - "libc", - "system-deps", - "windows-sys 0.52.0", -] - -[[package]] -name = "git2" -version = "0.19.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b903b73e45dc0c6c596f2d37eccece7c1c8bb6e4407b001096387c63d0d93724" -dependencies = [ - "bitflags 2.6.0", - "libc", - "libgit2-sys", - "log", - "url", -] - -[[package]] -name = "gl_generator" -version = "0.14.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a95dfc23a2b4a9a2f5ab41d194f8bfda3cabec42af4e39f08c339eb2a0c124d" -dependencies = [ - "khronos_api", - "log", - "xml-rs", -] - -[[package]] -name = "gleam" -version = "0.15.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0173481f2bb6e809bf4985de2e86c83876d84d2805830e3301cd37355e897f0f" -dependencies = [ - "gl_generator", -] - -[[package]] -name = "glib" -version = "0.19.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39650279f135469465018daae0ba53357942a5212137515777d5fdca74984a44" -dependencies = [ - "bitflags 2.6.0", - "futures-channel", - "futures-core", - "futures-executor", - "futures-task", - "futures-util", - "gio-sys", - "glib-macros", - "glib-sys", - "gobject-sys", - "libc", - "memchr", - "smallvec", - "thiserror", -] - -[[package]] -name = "glib-macros" -version = "0.19.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4429b0277a14ae9751350ad9b658b1be0abb5b54faa5bcdf6e74a3372582fad7" -dependencies = [ - "heck", - "proc-macro-crate", - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "glib-sys" -version = "0.19.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c2dc18d3a82b0006d470b13304fbbb3e0a9bd4884cf985a60a7ed733ac2c4a5" -dependencies = [ - "libc", - "system-deps", -] - -[[package]] -name = "glob" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" - -[[package]] -name = "glow" -version = "0.13.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd348e04c43b32574f2de31c8bb397d96c9fcfa1371bd4ca6d8bdc464ab121b1" -dependencies = [ - "js-sys", - "slotmap", - "wasm-bindgen", - "web-sys", -] - -[[package]] -name = "glow" -version = "0.14.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f865cbd94bd355b89611211e49508da98a1fce0ad755c1e8448fb96711b24528" -dependencies = [ - "js-sys", - "slotmap", - "wasm-bindgen", - "web-sys", -] - -[[package]] -name = "glslopt" -version = "0.1.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "913662ae8335df058d56e00f11340b20fa82e03e0276587797ef325ab01e50d4" -dependencies = [ - "cc", -] - -[[package]] -name = "glutin_wgl_sys" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0a4e1951bbd9434a81aa496fe59ccc2235af3820d27b85f9314e279609211e2c" -dependencies = [ - "gl_generator", -] - -[[package]] -name = "gobject-sys" -version = "0.19.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2e697e252d6e0416fd1d9e169bda51c0f1c926026c39ca21fbe8b1bb5c3b8b9e" -dependencies = [ - "glib-sys", - "libc", - "system-deps", -] - -[[package]] -name = "gpu-alloc" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fbcd2dba93594b227a1f57ee09b8b9da8892c34d55aa332e034a228d0fe6a171" -dependencies = [ - "bitflags 2.6.0", - "gpu-alloc-types", -] - -[[package]] -name = "gpu-alloc-types" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "98ff03b468aa837d70984d55f5d3f846f6ec31fe34bbb97c4f85219caeee1ca4" -dependencies = [ - "bitflags 2.6.0", -] - -[[package]] -name = "gpu-allocator" -version = "0.27.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c151a2a5ef800297b4e79efa4f4bec035c5f51d5ae587287c9b952bdf734cacd" -dependencies = [ - "log", - "presser", - "thiserror", - "windows 0.58.0", -] - -[[package]] -name = "gpu-descriptor" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c08c1f623a8d0b722b8b99f821eb0ba672a1618f0d3b16ddbee1cedd2dd8557" -dependencies = [ - "bitflags 2.6.0", - "gpu-descriptor-types", - "hashbrown", -] - -[[package]] -name = "gpu-descriptor-types" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fdf242682df893b86f33a73828fb09ca4b2d3bb6cc95249707fc684d27484b91" -dependencies = [ - "bitflags 2.6.0", -] - -[[package]] -name = "gstreamer" -version = "0.22.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ca0b90646bb67fccf80d228f5333f2a0745526818ccefbf5a97326c76d30e4d" -dependencies = [ - "cfg-if", - "futures-channel", - "futures-core", - "futures-util", - "glib", - "gstreamer-sys", - "itertools 0.13.0", - "libc", - "muldiv", - "num-integer", - "num-rational", - "once_cell", - "option-operations", - "paste", - "pin-project-lite", - "smallvec", - "thiserror", -] - -[[package]] -name = "gstreamer-app" -version = "0.22.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1363313eb1931d66ac0b82c9b477fdd066af9dc118ea844966f85b6d99f261fd" -dependencies = [ - "futures-core", - "futures-sink", - "glib", - "gstreamer", - "gstreamer-app-sys", - "gstreamer-base", - "libc", -] - -[[package]] -name = "gstreamer-app-sys" -version = "0.22.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed667453517b47754b9f9d28c096074e5d565f1cc48c6fa2483b1ea10d7688d3" -dependencies = [ - "glib-sys", - "gstreamer-base-sys", - "gstreamer-sys", - "libc", - "system-deps", -] - -[[package]] -name = "gstreamer-audio" -version = "0.22.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3cae69bbfce34108009117803fb808b1ef4d88d476c9e3e2f5f536aab1f6ae75" -dependencies = [ - "cfg-if", - "glib", - "gstreamer", - "gstreamer-audio-sys", - "gstreamer-base", - "libc", - "once_cell", - "smallvec", -] - -[[package]] -name = "gstreamer-audio-sys" -version = "0.22.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b11267dce74a92bad96fbd58c37c43e330113dc460a0771283f7d6c390b827b7" -dependencies = [ - "glib-sys", - "gobject-sys", - "gstreamer-base-sys", - "gstreamer-sys", - "libc", - "system-deps", -] - -[[package]] -name = "gstreamer-base" -version = "0.22.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39d55668b23fc69f1843daa42b43d289c00fe38e9586c5453b134783d2dd75a3" -dependencies = [ - "atomic_refcell", - "cfg-if", - "glib", - "gstreamer", - "gstreamer-base-sys", - "libc", -] - -[[package]] -name = "gstreamer-base-sys" -version = "0.22.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5448abb00c197e3ad306710293bf757303cbeab4036b5ccad21c7642b8bf00c9" -dependencies = [ - "glib-sys", - "gobject-sys", - "gstreamer-sys", - "libc", - "system-deps", -] - -[[package]] -name = "gstreamer-gl" -version = "0.22.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2776369ce07de81b1e6f52786caec898db5be5d4678a8104e8fcbffdae68332d" -dependencies = [ - "glib", - "gstreamer", - "gstreamer-base", - "gstreamer-gl-sys", - "gstreamer-video", - "libc", - "once_cell", -] - -[[package]] -name = "gstreamer-gl-egl" -version = "0.22.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be51a7ceaeabf411ba01a2de5af163ea2b8d79f157d0d924b4682fd217182c15" -dependencies = [ - "glib", - "gstreamer", - "gstreamer-gl", - "gstreamer-gl-egl-sys", - "libc", -] - -[[package]] -name = "gstreamer-gl-egl-sys" -version = "0.22.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "45bc9d114f161ec27822c203f28e43c88b6523f31cbde29b4cb8d8378a3825a4" -dependencies = [ - "glib-sys", - "gstreamer-gl-sys", - "libc", - "system-deps", -] - -[[package]] -name = "gstreamer-gl-sys" -version = "0.22.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "050a2cf158354bd5633079baf73d12767a5c90efc6377b4f9507aca082734286" -dependencies = [ - "glib-sys", - "gobject-sys", - "gstreamer-base-sys", - "gstreamer-sys", - "gstreamer-video-sys", - "libc", - "system-deps", -] - -[[package]] -name = "gstreamer-gl-x11" -version = "0.22.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e4867cfe9333b04ee14672001e914ea995707a8b02d7b12c1b6f3e9f4a5c4f0d" -dependencies = [ - "glib", - "gstreamer", - "gstreamer-gl", - "gstreamer-gl-x11-sys", - "libc", -] - -[[package]] -name = "gstreamer-gl-x11-sys" -version = "0.22.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c628a2a3d216df2f85d37923f65a4e0fdafe4652f7cd06c9432f8c8ce8199aa9" -dependencies = [ - "glib-sys", - "gstreamer-gl-sys", - "libc", - "system-deps", -] - -[[package]] -name = "gstreamer-player" -version = "0.22.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2811897ea4e664f508cb6eda94b42944e12a33915d10830270b4626862c44a9" -dependencies = [ - "glib", - "gstreamer", - "gstreamer-player-sys", - "gstreamer-video", - "libc", -] - -[[package]] -name = "gstreamer-player-sys" -version = "0.22.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "786cfe2543b8a985bbc16fb8d0595a12aeac6edb92453b30eb36631f7e34a696" -dependencies = [ - "glib-sys", - "gobject-sys", - "gstreamer-sys", - "gstreamer-video-sys", - "libc", - "system-deps", -] - -[[package]] -name = "gstreamer-sdp" -version = "0.22.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca3358eda88536ae1540b933d70ba8efaa6e5c9e5260322021b0b47a797b2075" -dependencies = [ - "glib", - "gstreamer", - "gstreamer-sdp-sys", -] - -[[package]] -name = "gstreamer-sdp-sys" -version = "0.22.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "19d0bc7f3e5cfdca6c9c5b9e9e15f47975c951a83e32b6e4b53b0c6dc5850487" -dependencies = [ - "glib-sys", - "gstreamer-sys", - "libc", - "system-deps", -] - -[[package]] -name = "gstreamer-sys" -version = "0.22.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "71f147e7c6bc9313d5569eb15da61f6f64026ec69791922749de230583a07286" -dependencies = [ - "glib-sys", - "gobject-sys", - "libc", - "system-deps", -] - -[[package]] -name = "gstreamer-video" -version = "0.22.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "25acba301f86b02584a642de0f224317be2bd0ceec3acda49a0ef111cbced98c" -dependencies = [ - "cfg-if", - "futures-channel", - "glib", - "gstreamer", - "gstreamer-base", - "gstreamer-video-sys", - "libc", - "once_cell", - "thiserror", -] - -[[package]] -name = "gstreamer-video-sys" -version = "0.22.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f2ec210495f94cabaa45d08003081b550095c2d4ab12d5320f64856a91f3f01c" -dependencies = [ - "glib-sys", - "gobject-sys", - "gstreamer-base-sys", - "gstreamer-sys", - "libc", - "system-deps", -] - -[[package]] -name = "gstreamer-webrtc" -version = "0.22.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cfd1a55fc34cd2ba2be1dc694a49cf3be71c67cbcd28e80213123eebeb9b2b9f" -dependencies = [ - "glib", - "gstreamer", - "gstreamer-sdp", - "gstreamer-webrtc-sys", - "libc", -] - -[[package]] -name = "gstreamer-webrtc-sys" -version = "0.22.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49c3bdbed1d328b7823f05a079b1319eea7b452c4b6a3e6776a1788827dad96c" -dependencies = [ - "glib-sys", - "gstreamer-sdp-sys", - "gstreamer-sys", - "libc", - "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", - "slab", - "tokio", - "tokio-util", - "tracing", -] - -[[package]] -name = "half" -version = "2.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6dd08c532ae367adf81c312a4580bc67f1d0fe8bc9c460520283f4c0ff277888" -dependencies = [ - "cfg-if", - "crunchy", -] - -[[package]] -name = "harfbuzz-sys" -version = "0.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb86e2fef3ba40cebffb8fa2cba811f06aa5c5fd296a4e469473e5398d166594" -dependencies = [ - "cc", - "core-graphics", - "core-text", - "foreign-types 0.5.0", - "freetype-sys", - "pkg-config", - "winapi", -] - -[[package]] -name = "hashbrown" -version = "0.14.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1" -dependencies = [ - "ahash", - "allocator-api2", -] - -[[package]] -name = "headers" -version = "0.3.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06683b93020a07e3dbcf5f8c0f6d40080d725bea7936fc01ad345c01b97dc270" -dependencies = [ - "base64", - "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.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea" - -[[package]] -name = "hermit-abi" -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.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "805026a5d0141ffc30abb3be3173848ad46a1b1664fe632428479619a3644d77" - -[[package]] -name = "hexf-parse" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dfa686283ad6dd069f105e5ab091b04c62850d3e4cf5d67debad1933f55023df" - -[[package]] -name = "hilog" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d5646a745e293209c82e88f05b40bb596479cd84738408410ea16d5242e7ad0" -dependencies = [ - "env_filter", - "hilog-sys", - "log", -] - -[[package]] -name = "hilog-sys" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0de0e35e8534a70b5af5ccc943ffa3e2dcfe481b2b983c9fd514d7421a46b69e" -dependencies = [ - "log", -] - -[[package]] -name = "home" -version = "0.5.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3d1354bf6b7235cb4a0576c2619fd4ed18183f689b12b006a0ee7329eeff9a5" -dependencies = [ - "windows-sys 0.52.0", -] - -[[package]] -name = "html5ever" -version = "0.28.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ff6858c1f7e2a470c5403091866fa95b36fe0dbac5d771f932c15e5ff1ee501" -dependencies = [ - "log", - "mac", - "markup5ever", - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "http" -version = "0.2.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "601cbb57e577e2f5ef5be8e7b83f0f63994f25aa94d673e54a92d5c516d101f1" -dependencies = [ - "bytes", - "fnv", - "itoa", -] - -[[package]] -name = "http-body" -version = "0.4.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ceab25649e9960c0311ea418d17bee82c0dcec1bd053b5f9a66e265a693bed2" -dependencies = [ - "bytes", - "http", - "pin-project-lite", -] - -[[package]] -name = "httparse" -version = "1.9.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fcc0b4a115bf80b728eb8ea024ad5bd707b615bfed49e0665b6e0f86fd082d9" - -[[package]] -name = "httpdate" -version = "1.0.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "df3b46402a9d5adb4c86a0cf463f42e19994e3ee891101b1841f30a545cb49a9" - -[[package]] -name = "humantime" -version = "2.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" - -[[package]] -name = "hyper" -version = "0.14.30" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a152ddd61dfaec7273fe8419ab357f33aee0d914c5f4efbf0d96fa749eea5ec9" -dependencies = [ - "bytes", - "futures-channel", - "futures-core", - "futures-util", - "h2", - "http", - "http-body", - "httparse", - "httpdate", - "itoa", - "pin-project-lite", - "socket2", - "tokio", - "tower-service", - "tracing", - "want", -] - -[[package]] -name = "hyper-rustls" -version = "0.24.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec3efd23720e2049821a693cbc7e65ea87c72f1c58ff2f9522ff332b1491e590" -dependencies = [ - "futures-util", - "http", - "hyper", - "log", - "rustls", - "tokio", - "tokio-rustls", - "webpki-roots", -] - -[[package]] -name = "hyper_serde" -version = "0.13.2" -dependencies = [ - "cookie 0.18.1", - "headers", - "http", - "hyper", - "mime", - "serde", - "serde_bytes", - "serde_test", -] - -[[package]] -name = "iana-time-zone" -version = "0.1.60" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7ffbb5a1b541ea2561f8c41c087286cc091e21e556a4f09a8f6cbf17b69b141" -dependencies = [ - "android_system_properties", - "core-foundation-sys", - "iana-time-zone-haiku", - "js-sys", - "wasm-bindgen", - "windows-core 0.52.0", -] - -[[package]] -name = "iana-time-zone-haiku" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f31827a206f56af32e590ba56d5d2d085f558508192593743f16b2306495269f" -dependencies = [ - "cc", -] - -[[package]] -name = "icrate" -version = "0.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "99d3aaff8a54577104bafdf686ff18565c3b6903ca5782a2026ef06e2c7aa319" -dependencies = [ - "block2", - "dispatch", - "objc2", -] - -[[package]] -name = "icu_calendar" -version = "1.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7265b2137f9a36f7634a308d91f984574bbdba8cfd95ceffe1c345552275a8ff" -dependencies = [ - "calendrical_calculations", - "displaydoc", - "icu_calendar_data", - "icu_locid", - "icu_locid_transform", - "icu_provider", - "tinystr", - "writeable", - "zerovec", -] - -[[package]] -name = "icu_calendar_data" -version = "1.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e009b7f0151ee6fb28c40b1283594397e0b7183820793e9ace3dcd13db126d0" - -[[package]] -name = "icu_capi" -version = "1.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f73a82a8307633c08ca119631cd90b006e448009da2d4466f7d76ca8fedf3b1" -dependencies = [ - "diplomat", - "diplomat-runtime", - "fixed_decimal", - "icu_calendar", - "icu_casemap", - "icu_collator", - "icu_collections", - "icu_datetime", - "icu_decimal", - "icu_experimental", - "icu_list", - "icu_locid", - "icu_locid_transform", - "icu_normalizer", - "icu_plurals", - "icu_properties", - "icu_provider", - "icu_provider_adapters", - "icu_segmenter", - "icu_timezone", - "log", - "simple_logger", - "tinystr", - "unicode-bidi", - "writeable", -] - -[[package]] -name = "icu_casemap" -version = "1.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ff0c8ae9f8d31b12e27fc385ff9ab1f3cd9b17417c665c49e4ec958c37da75f" -dependencies = [ - "displaydoc", - "icu_casemap_data", - "icu_collections", - "icu_locid", - "icu_properties", - "icu_provider", - "writeable", - "zerovec", -] - -[[package]] -name = "icu_casemap_data" -version = "1.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d57966d5ab748f74513be4046867f9a20e801e2775d41f91d04a0f560b61f08" - -[[package]] -name = "icu_collator" -version = "1.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d370371887d31d56f361c3eaa15743e54f13bc677059c9191c77e099ed6966b2" -dependencies = [ - "displaydoc", - "icu_collator_data", - "icu_collections", - "icu_locid_transform", - "icu_normalizer", - "icu_properties", - "icu_provider", - "smallvec", - "utf16_iter", - "utf8_iter", - "zerovec", -] - -[[package]] -name = "icu_collator_data" -version = "1.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ee3f88741364b7d6269cce6827a3e6a8a2cf408a78f766c9224ab479d5e4ae5" - -[[package]] -name = "icu_collections" -version = "1.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db2fa452206ebee18c4b5c2274dbf1de17008e874b4dc4f0aea9d01ca79e4526" -dependencies = [ - "displaydoc", - "yoke", - "zerofrom", - "zerovec", -] - -[[package]] -name = "icu_datetime" -version = "1.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d115efb85e08df3fd77e77f52e7e087545a783fffba8be80bfa2102f306b1780" -dependencies = [ - "displaydoc", - "either", - "fixed_decimal", - "icu_calendar", - "icu_datetime_data", - "icu_decimal", - "icu_locid", - "icu_locid_transform", - "icu_plurals", - "icu_provider", - "icu_timezone", - "smallvec", - "tinystr", - "writeable", - "zerovec", -] - -[[package]] -name = "icu_datetime_data" -version = "1.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2ba7e7f7a01269b9afb0a39eff4f8676f693b55f509b3120e43a0350a9f88bea" - -[[package]] -name = "icu_decimal" -version = "1.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb8fd98f86ec0448d85e1edf8884e4e318bb2e121bd733ec929a05c0a5e8b0eb" -dependencies = [ - "displaydoc", - "fixed_decimal", - "icu_decimal_data", - "icu_locid_transform", - "icu_provider", - "writeable", -] - -[[package]] -name = "icu_decimal_data" -version = "1.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8d424c994071c6f5644f999925fc868c85fec82295326e75ad5017bc94b41523" - -[[package]] -name = "icu_experimental" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "844ad7b682a165c758065d694bc4d74ac67f176da1c499a04d85d492c0f193b7" -dependencies = [ - "displaydoc", - "fixed_decimal", - "icu_collections", - "icu_decimal", - "icu_experimental_data", - "icu_locid", - "icu_locid_transform", - "icu_normalizer", - "icu_pattern", - "icu_plurals", - "icu_properties", - "icu_provider", - "litemap", - "num-bigint", - "num-rational", - "num-traits", - "smallvec", - "tinystr", - "writeable", - "zerofrom", - "zerotrie", - "zerovec", -] - -[[package]] -name = "icu_experimental_data" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c178b9a34083fca5bd70d61f647575335e9c197d0f30c38e8ccd187babc69d0" - -[[package]] -name = "icu_list" -version = "1.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbfeda1d7775b6548edd4e8b7562304a559a91ed56ab56e18961a053f367c365" -dependencies = [ - "displaydoc", - "icu_list_data", - "icu_locid_transform", - "icu_provider", - "regex-automata 0.2.0", - "writeable", -] - -[[package]] -name = "icu_list_data" -version = "1.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e1825170d2c6679cb20dbd96a589d034e49f698aed9a2ef4fafc9a0101ed298f" - -[[package]] -name = "icu_locid" -version = "1.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "13acbb8371917fc971be86fc8057c41a64b521c184808a698c02acc242dbf637" -dependencies = [ - "displaydoc", - "litemap", - "tinystr", - "writeable", - "zerovec", -] - -[[package]] -name = "icu_locid_transform" -version = "1.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "01d11ac35de8e40fdeda00d9e1e9d92525f3f9d887cdd7aa81d727596788b54e" -dependencies = [ - "displaydoc", - "icu_locid", - "icu_locid_transform_data", - "icu_provider", - "tinystr", - "zerovec", -] - -[[package]] -name = "icu_locid_transform_data" -version = "1.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fdc8ff3388f852bede6b579ad4e978ab004f139284d7b28715f773507b946f6e" - -[[package]] -name = "icu_normalizer" -version = "1.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "19ce3e0da2ec68599d193c93d088142efd7f9c5d6fc9b803774855747dc6a84f" -dependencies = [ - "displaydoc", - "icu_collections", - "icu_normalizer_data", - "icu_properties", - "icu_provider", - "smallvec", - "utf16_iter", - "utf8_iter", - "write16", - "zerovec", -] - -[[package]] -name = "icu_normalizer_data" -version = "1.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8cafbf7aa791e9b22bec55a167906f9e1215fd475cd22adfcf660e03e989516" - -[[package]] -name = "icu_pattern" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb7f36aafd098d6717de34e668a8120822275c1fba22b936e757b7de8a2fd7e4" -dependencies = [ - "displaydoc", - "either", - "writeable", - "yoke", - "zerofrom", -] - -[[package]] -name = "icu_plurals" -version = "1.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba5a70e7c025dbd5c501b0a5c188cd11666a424f0dadcd4f0a95b7dafde3b114" -dependencies = [ - "displaydoc", - "fixed_decimal", - "icu_locid_transform", - "icu_plurals_data", - "icu_provider", - "zerovec", -] - -[[package]] -name = "icu_plurals_data" -version = "1.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e3e8f775b215d45838814a090a2227247a7431d74e9156407d9c37f6ef0f208" - -[[package]] -name = "icu_properties" -version = "1.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93d6020766cfc6302c15dbbc9c8778c37e62c14427cb7f6e601d849e092aeef5" -dependencies = [ - "displaydoc", - "icu_collections", - "icu_locid_transform", - "icu_properties_data", - "icu_provider", - "tinystr", - "unicode-bidi", - "zerovec", -] - -[[package]] -name = "icu_properties_data" -version = "1.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67a8effbc3dd3e4ba1afa8ad918d5684b8868b3b26500753effea8d2eed19569" - -[[package]] -name = "icu_provider" -version = "1.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ed421c8a8ef78d3e2dbc98a973be2f3770cb42b606e3ab18d6237c4dfde68d9" -dependencies = [ - "displaydoc", - "icu_locid", - "icu_provider_macros", - "log", - "stable_deref_trait", - "tinystr", - "writeable", - "yoke", - "zerofrom", - "zerovec", -] - -[[package]] -name = "icu_provider_adapters" -version = "1.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d6324dfd08348a8e0374a447ebd334044d766b1839bb8d5ccf2482a99a77c0bc" -dependencies = [ - "icu_locid", - "icu_locid_transform", - "icu_provider", - "tinystr", - "zerovec", -] - -[[package]] -name = "icu_provider_macros" -version = "1.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ec89e9337638ecdc08744df490b221a7399bf8d164eb52a665454e60e075ad6" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "icu_segmenter" -version = "1.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a717725612346ffc2d7b42c94b820db6908048f39434504cb130e8b46256b0de" -dependencies = [ - "core_maths", - "displaydoc", - "icu_collections", - "icu_locid", - "icu_provider", - "icu_segmenter_data", - "utf8_iter", - "zerovec", -] - -[[package]] -name = "icu_segmenter_data" -version = "1.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f739ee737260d955e330bc83fdeaaf1631f7fb7ed218761d3c04bb13bb7d79df" - -[[package]] -name = "icu_timezone" -version = "1.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa91ba6a585939a020c787235daa8aee856d9bceebd6355e283c0c310bc6de96" -dependencies = [ - "displaydoc", - "icu_calendar", - "icu_provider", - "icu_timezone_data", - "tinystr", - "zerotrie", - "zerovec", -] - -[[package]] -name = "icu_timezone_data" -version = "1.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c588878c508a3e2ace333b3c50296053e6483c6a7541251b546cc59dcd6ced8e" - -[[package]] -name = "ident_case" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39" - -[[package]] -name = "idna" -version = "1.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd69211b9b519e98303c015e21a007e293db403b6c85b9b124e133d25e242cdd" -dependencies = [ - "icu_normalizer", - "icu_properties", - "smallvec", - "utf8_iter", -] - -[[package]] -name = "image" -version = "0.24.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5690139d2f55868e080017335e4b94cb7414274c74f1669c84fb5feba2c9f69d" -dependencies = [ - "bytemuck", - "byteorder", - "color_quant", - "exr", - "gif", - "jpeg-decoder", - "num-traits", - "png", - "qoi", - "tiff", -] - -[[package]] -name = "imsz" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76a49eaebc8750bcba241df1e1e47ebb51b81eb35c65e8f11ffa0aebac353f7f" - -[[package]] -name = "indexmap" -version = "2.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68b900aa2f7301e21c36462b170ee99994de34dff39a4a6a528e80e7376d07e5" -dependencies = [ - "equivalent", - "hashbrown", - "serde", -] - -[[package]] -name = "inotify" -version = "0.10.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fdd168d97690d0b8c412d6b6c10360277f4d7ee495c5d0d5d5fe0854923255cc" -dependencies = [ - "bitflags 1.3.2", - "inotify-sys", - "libc", -] - -[[package]] -name = "inotify-sys" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e05c02b5e89bff3b946cedeca278abc628fe811e604f027c45a8aa3cf793d0eb" -dependencies = [ - "libc", -] - -[[package]] -name = "io-kit-sys" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "617ee6cf8e3f66f3b4ea67a4058564628cde41901316e19f559e14c7c72c5e7b" -dependencies = [ - "core-foundation-sys", - "mach2", -] - -[[package]] -name = "io-surface" -version = "0.15.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "861c6093cbc05599e66436aedf380bb0a23cec2180738393d3a340b80dd135ef" -dependencies = [ - "cgl", - "core-foundation", - "leaky-cow", - "libc", -] - -[[package]] -name = "ipc-channel" -version = "0.18.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e46231d1db8ea8f874012b1b87efb9e968f763c577220372a9c7caadce1448da" -dependencies = [ - "bincode", - "crossbeam-channel", - "fnv", - "lazy_static", - "libc", - "mio", - "rand", - "serde", - "tempfile", - "uuid", - "windows 0.48.0", -] - -[[package]] -name = "is-terminal" -version = "0.4.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "261f68e344040fbd0edea105bef17c66edf46f984ddb1115b775ce31be948f4b" -dependencies = [ - "hermit-abi 0.4.0", - "libc", - "windows-sys 0.52.0", -] - -[[package]] -name = "itertools" -version = "0.10.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b0fd2260e829bddf4cb6ea802289de2f86d6a7a690192fbe91b3f46e0f2c8473" -dependencies = [ - "either", -] - -[[package]] -name = "itertools" -version = "0.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 = "jni" -version = "0.21.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a87aa2bb7d2af34197c04845522473242e1aa17c12f4935d5856491a7fb8c97" -dependencies = [ - "cesu8", - "cfg-if", - "combine", - "jni-sys", - "log", - "thiserror", - "walkdir", - "windows-sys 0.45.0", -] - -[[package]] -name = "jni-sys" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8eaf4bc02d17cbdd7ff4c7438cafcdf7fb9a4613313ad11b4f8fefe7d3fa0130" - -[[package]] -name = "jobserver" -version = "0.1.32" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "48d1dbcbbeb6a7fec7e059840aa538bd62aaccf972c7346c4d9d2059312853d0" -dependencies = [ - "libc", -] - -[[package]] -name = "jpeg-decoder" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f5d4a7da358eff58addd2877a45865158f0d78c911d43a5784ceb7bbf52833b0" -dependencies = [ - "rayon", -] - -[[package]] -name = "js-sys" -version = "0.3.70" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1868808506b929d7b0cfa8f75951347aa71bb21144b7791bae35d9bccfcfe37a" -dependencies = [ - "wasm-bindgen", -] - -[[package]] -name = "jstraceable_derive" -version = "0.0.1" -dependencies = [ - "proc-macro2", - "syn", - "synstructure", -] - -[[package]] -name = "keyboard-types" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b750dcadc39a09dbadd74e118f6dd6598df77fa01df0cfcdc52c28dece74528a" -dependencies = [ - "bitflags 2.6.0", - "serde", - "unicode-segmentation", -] - -[[package]] -name = "khronos-egl" -version = "6.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6aae1df220ece3c0ada96b8153459b67eebe9ae9212258bb0134ae60416fdf76" -dependencies = [ - "libc", - "libloading", - "pkg-config", -] - -[[package]] -name = "khronos_api" -version = "3.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2db585e1d738fc771bf08a151420d3ed193d9d895a36df7f6f8a9456b911ddc" - -[[package]] -name = "layout_2013" -version = "0.0.1" -dependencies = [ - "app_units", - "atomic_refcell", - "base", - "bitflags 2.6.0", - "canvas_traits", - "embedder_traits", - "euclid", - "fnv", - "fonts", - "fonts_traits", - "html5ever", - "ipc-channel", - "log", - "malloc_size_of", - "malloc_size_of_derive", - "net_traits", - "parking_lot", - "pixels", - "profile_traits", - "range", - "rayon", - "script_layout_interface", - "script_traits", - "serde", - "serde_json", - "servo_arc", - "servo_atoms", - "servo_config", - "servo_geometry", - "servo_url", - "size_of_test", - "smallvec", - "style", - "style_traits", - "unicode-bidi", - "unicode-script", - "webrender_api", - "webrender_traits", - "xi-unicode", -] - -[[package]] -name = "layout_2020" -version = "0.0.1" -dependencies = [ - "app_units", - "atomic_refcell", - "base", - "bitflags 2.6.0", - "canvas_traits", - "data-url", - "embedder_traits", - "euclid", - "fnv", - "fonts", - "fonts_traits", - "fxhash", - "html5ever", - "icu_segmenter", - "ipc-channel", - "itertools 0.13.0", - "log", - "net_traits", - "parking_lot", - "pixels", - "quickcheck", - "range", - "rayon", - "script_layout_interface", - "script_traits", - "serde", - "serde_json", - "servo_arc", - "servo_config", - "servo_geometry", - "servo_url", - "style", - "style_traits", - "unicode-bidi", - "unicode-script", - "url", - "webrender_api", - "webrender_traits", - "xi-unicode", -] - -[[package]] -name = "layout_thread_2013" -version = "0.0.1" -dependencies = [ - "app_units", - "base", - "crossbeam-channel", - "embedder_traits", - "euclid", - "fnv", - "fonts", - "fonts_traits", - "fxhash", - "ipc-channel", - "layout_2013", - "log", - "malloc_size_of", - "metrics", - "net_traits", - "parking_lot", - "profile_traits", - "rayon", - "script", - "script_layout_interface", - "script_traits", - "serde_json", - "servo_allocator", - "servo_arc", - "servo_atoms", - "servo_config", - "servo_url", - "style", - "style_traits", - "time 0.3.36", - "url", - "webrender_api", - "webrender_traits", -] - -[[package]] -name = "layout_thread_2020" -version = "0.0.1" -dependencies = [ - "app_units", - "base", - "embedder_traits", - "euclid", - "fnv", - "fonts", - "fonts_traits", - "fxhash", - "ipc-channel", - "layout_2020", - "log", - "malloc_size_of", - "metrics", - "net_traits", - "parking_lot", - "profile_traits", - "script", - "script_layout_interface", - "script_traits", - "servo_allocator", - "servo_arc", - "servo_atoms", - "servo_config", - "servo_url", - "style", - "style_traits", - "url", - "webrender_api", - "webrender_traits", -] - -[[package]] -name = "lazy_static" -version = "1.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe" - -[[package]] -name = "lazycell" -version = "1.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55" - -[[package]] -name = "leak" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd100e01f1154f2908dfa7d02219aeab25d0b9c7fa955164192e3245255a0c73" - -[[package]] -name = "leaky-cow" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "40a8225d44241fd324a8af2806ba635fc7c8a7e9a7de4d5cf3ef54e71f5926fc" -dependencies = [ - "leak", -] - -[[package]] -name = "lebe" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "03087c2bad5e1034e8cace5926dec053fb3790248370865f5117a7d0213354c8" - -[[package]] -name = "libc" -version = "0.2.158" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d8adc4bb1803a324070e64a98ae98f38934d91957a99cfb3a43dcbc01bc56439" - -[[package]] -name = "libdbus-sys" -version = "0.2.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06085512b750d640299b79be4bad3d2fa90a9c00b1fd9e1b46364f66f0485c72" -dependencies = [ - "pkg-config", -] - -[[package]] -name = "libflate" -version = "0.1.27" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9135df43b1f5d0e333385cb6e7897ecd1a43d7d11b91ac003f4d2c2d2401fdd" -dependencies = [ - "adler32", - "crc32fast", - "rle-decode-fast", - "take_mut", -] - -[[package]] -name = "libgit2-sys" -version = "0.17.0+1.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "10472326a8a6477c3c20a64547b0059e4b0d086869eee31e6d7da728a8eb7224" -dependencies = [ - "cc", - "libc", - "libz-sys", - "pkg-config", -] - -[[package]] -name = "libloading" -version = "0.8.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4979f22fdb869068da03c9f7528f8297c6fd2606bc3a4affe42e6a823fdb8da4" -dependencies = [ - "cfg-if", - "windows-targets 0.52.6", -] - -[[package]] -name = "libm" -version = "0.2.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ec2a862134d2a7d32d7983ddcdd1c4923530833c9f2ea1a44fc5fa473989058" - -[[package]] -name = "libredox" -version = "0.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3af92c55d7d839293953fcd0fda5ecfe93297cfde6ffbdec13b41d99c0ba6607" -dependencies = [ - "bitflags 2.6.0", - "libc", - "redox_syscall 0.4.1", -] - -[[package]] -name = "libredox" -version = "0.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0ff37bd590ca25063e35af745c343cb7a0271906fb7b37e4813e8f79f00268d" -dependencies = [ - "bitflags 2.6.0", - "libc", - "redox_syscall 0.5.1", -] - -[[package]] -name = "libservo" -version = "0.0.1" -dependencies = [ - "background_hang_monitor", - "base", - "bluetooth", - "bluetooth_traits", - "canvas", - "canvas_traits", - "cfg-if", - "compositing", - "compositing_traits", - "constellation", - "crossbeam-channel", - "devtools", - "devtools_traits", - "embedder_traits", - "env_logger 0.10.2", - "euclid", - "fonts", - "fonts_traits", - "gaol", - "gleam", - "gstreamer", - "ipc-channel", - "keyboard-types", - "layout_thread_2013", - "layout_thread_2020", - "log", - "media", - "mozangle", - "net", - "net_traits", - "profile", - "profile_traits", - "script", - "script_layout_interface", - "script_traits", - "servo-media", - "servo-media-dummy", - "servo-media-gstreamer", - "servo_config", - "servo_geometry", - "servo_url", - "sparkle", - "style", - "style_traits", - "surfman", - "tracing", - "webdriver_server", - "webgpu", - "webrender", - "webrender_api", - "webrender_traits", - "webxr", - "webxr-api", -] - -[[package]] -name = "libudev-sys" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c8469b4a23b962c1396b9b451dda50ef5b283e8dd309d69033475fa9b334324" -dependencies = [ - "libc", - "pkg-config", -] - -[[package]] -name = "libz-sys" -version = "1.1.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2d16453e800a8cf6dd2fc3eb4bc99b786a9b90c663b8559a5b1a041bf89e472" -dependencies = [ - "cc", - "libc", - "pkg-config", - "vcpkg", -] - -[[package]] -name = "linux-raw-sys" -version = "0.4.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89" - -[[package]] -name = "litemap" -version = "0.7.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "643cb0b8d4fcc284004d5fd0d67ccf61dfffadb7f75e1e71bc420f4688a3a704" - -[[package]] -name = "litrs" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4ce301924b7887e9d637144fdade93f9dfff9b60981d4ac161db09720d39aa5" - -[[package]] -name = "lock_api" -version = "0.4.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "07af8b9cdd281b7915f413fa73f29ebd5d55d0d3f0155584dade1ff18cea1b17" -dependencies = [ - "autocfg", - "scopeguard", -] - -[[package]] -name = "log" -version = "0.4.22" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24" - -[[package]] -name = "lyon_geom" -version = "1.0.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "edecfb8d234a2b0be031ab02ebcdd9f3b9ee418fb35e265f7a540a48d197bff9" -dependencies = [ - "arrayvec", - "euclid", - "num-traits", -] - -[[package]] -name = "mac" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c41e0c4fef86961ac6d6f8a82609f55f31b05e4fce149ac5710e439df7619ba4" - -[[package]] -name = "mach2" -version = "0.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "19b955cdeb2a02b9117f121ce63aa52d08ade45de53e48fe6a38b39c10f6f709" -dependencies = [ - "libc", -] - -[[package]] -name = "malloc_buf" -version = "0.0.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62bb907fe88d54d8d9ce32a3cceab4218ed2f6b7d35617cafe9adf84e43919cb" -dependencies = [ - "libc", -] - -[[package]] -name = "malloc_size_of" -version = "0.0.1" -source = "git+https://github.com/servo/stylo?branch=2024-07-16#65f8d1316a0966401bcfb9fa7dd5e3659a1605b2" -dependencies = [ - "accountable-refcell", - "app_units", - "content-security-policy", - "crossbeam-channel", - "cssparser", - "dom", - "euclid", - "http", - "indexmap", - "keyboard-types", - "selectors", - "serde", - "serde_bytes", - "servo_arc", - "smallbitvec", - "smallvec", - "string_cache", - "thin-vec", - "time 0.1.45", - "tokio", - "url", - "uuid", - "void", - "webrender_api", - "xml5ever", -] - -[[package]] -name = "malloc_size_of_derive" -version = "0.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f44db74bde26fdf427af23f1d146c211aed857c59e3be750cf2617f6b0b05c94" -dependencies = [ - "proc-macro2", - "syn", - "synstructure", -] - -[[package]] -name = "malloc_size_of_tests" -version = "0.0.1" -dependencies = [ - "malloc_size_of", - "servo_arc", -] - -[[package]] -name = "markup5ever" -version = "0.13.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d581ff8be69d08a2efa23a959d81aa22b739073f749f067348bd4f4ba4b69195" -dependencies = [ - "log", - "phf 0.11.2", - "phf_codegen", - "string_cache", - "string_cache_codegen", - "tendril", -] - -[[package]] -name = "matches" -version = "0.1.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2532096657941c2fea9c289d370a250971c689d4f143798ff67113ec042024a5" - -[[package]] -name = "media" -version = "0.0.1" -dependencies = [ - "euclid", - "fnv", - "ipc-channel", - "log", - "serde", - "servo-media", - "servo_config", - "webrender_api", - "webrender_traits", -] - -[[package]] -name = "memchr" -version = "2.7.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3" - -[[package]] -name = "memmap2" -version = "0.9.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fe751422e4a8caa417e13c3ea66452215d7d63e19e604f4980461212f3ae1322" -dependencies = [ - "libc", -] - -[[package]] -name = "memoffset" -version = "0.9.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "488016bfae457b036d996092f6cb448677611ce4449e970ceaf42695203f218a" -dependencies = [ - "autocfg", -] - -[[package]] -name = "metal" -version = "0.24.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "de11355d1f6781482d027a3b4d4de7825dcedb197bf573e0596d00008402d060" -dependencies = [ - "bitflags 1.3.2", - "block", - "core-graphics-types", - "foreign-types 0.3.2", - "log", - "objc", -] - -[[package]] -name = "metal" -version = "0.29.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ecfd3296f8c56b7c1f6fbac3c71cefa9d78ce009850c45000015f206dc7fa21" -dependencies = [ - "bitflags 2.6.0", - "block", - "core-graphics-types", - "foreign-types 0.5.0", - "log", - "objc", - "paste", -] - -[[package]] -name = "metrics" -version = "0.0.1" -dependencies = [ - "base", - "fonts_traits", - "ipc-channel", - "log", - "malloc_size_of", - "malloc_size_of_derive", - "profile_traits", - "script_traits", - "servo_config", - "servo_url", -] - -[[package]] -name = "metrics_tests" -version = "0.0.1" -dependencies = [ - "base", - "fonts_traits", - "ipc-channel", - "metrics", - "profile_traits", - "servo_url", - "time 0.1.45", -] - -[[package]] -name = "mime" -version = "0.3.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a" - -[[package]] -name = "mime_guess" -version = "2.0.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f7c44f8e672c00fe5308fa235f821cb4198414e1c77935c1ab6948d3fd78550e" -dependencies = [ - "mime", - "unicase", -] - -[[package]] -name = "minimal-lexical" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" - -[[package]] -name = "miniz-sys" -version = "0.1.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e9e3ae51cea1576ceba0dde3d484d30e6e5b86dee0b2d412fe3a16a15c98202" -dependencies = [ - "cc", - "libc", -] - -[[package]] -name = "miniz_oxide" -version = "0.7.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b8a240ddb74feaf34a79a7add65a741f3167852fba007066dcac1ca548d89c08" -dependencies = [ - "adler", - "simd-adler32", -] - -[[package]] -name = "miniz_oxide" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2d80299ef12ff69b16a84bb182e3b9df68b5a91574d3d4fa6e41b65deec4df1" -dependencies = [ - "adler2", -] - -[[package]] -name = "mio" -version = "1.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "80e04d1dcff3aae0704555fe5fee3bcfaf3d1fdf8a7e521d5b9d2b42acb52cec" -dependencies = [ - "hermit-abi 0.3.9", - "libc", - "log", - "wasi 0.11.0+wasi-snapshot-preview1", - "windows-sys 0.52.0", -] - -[[package]] -name = "miow" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "52ffbca2f655e33c08be35d87278e5b18b89550a37dbd598c20db92f6a471123" -dependencies = [ - "windows-sys 0.42.0", -] - -[[package]] -name = "mozangle" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b14af7d1a65278923835af94ac23d4c3662478001ac6e78075fe1210a7067e4b" -dependencies = [ - "bindgen", - "cc", - "gl_generator", - "lazy_static", - "libz-sys", - "walkdir", -] - -[[package]] -name = "mozjs" -version = "0.14.1" -source = "git+https://github.com/servo/mozjs#d90edd169aae1e16c1ef8b7bd4b2e0d93dda8ba2" -dependencies = [ - "bindgen", - "cc", - "lazy_static", - "libc", - "log", - "mozjs_sys", -] - -[[package]] -name = "mozjs_sys" -version = "0.128.0-9" -source = "git+https://github.com/servo/mozjs#d90edd169aae1e16c1ef8b7bd4b2e0d93dda8ba2" -dependencies = [ - "bindgen", - "cc", - "encoding_c", - "encoding_c_mem", - "flate2", - "icu_capi", - "libc", - "libz-sys", - "tar", - "walkdir", -] - -[[package]] -name = "muldiv" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "956787520e75e9bd233246045d19f42fb73242759cc57fba9611d940ae96d4b0" - -[[package]] -name = "multimap" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "defc4c55412d89136f966bbb339008b474350e5e6e78d2714439c386b3137a03" - -[[package]] -name = "naga" -version = "22.0.0" -source = "git+https://github.com/gfx-rs/wgpu?rev=0e352f5b3448236b6cbebcd146d0606b00cb3806#0e352f5b3448236b6cbebcd146d0606b00cb3806" -dependencies = [ - "arrayvec", - "bit-set", - "bitflags 2.6.0", - "cfg_aliases 0.1.1", - "codespan-reporting", - "hexf-parse", - "indexmap", - "log", - "rustc-hash", - "serde", - "spirv", - "termcolor", - "thiserror", - "unicode-xid", -] - -[[package]] -name = "napi-derive-backend-ohos" -version = "0.0.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f6b18d697bedddd2d4c9f8f76b49fe65bd81ed1c55a7eec21ba40c176c236ddc" -dependencies = [ - "convert_case", - "once_cell", - "proc-macro2", - "quote", - "regex", - "syn", -] - -[[package]] -name = "napi-derive-ohos" -version = "0.0.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8462d74a2d6c7a671bd610f99f9ba34c739aadd2da4d8dd9f109a7e666cc2ad2" -dependencies = [ - "cfg-if", - "convert_case", - "napi-derive-backend-ohos", - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "napi-ohos" -version = "0.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad5a3bbb2ae61f345b8c11776f2e79fc2bb71d1901af9a5f81f03c9238a05d86" -dependencies = [ - "bitflags 2.6.0", - "ctor", - "napi-sys-ohos", - "once_cell", -] - -[[package]] -name = "napi-sys-ohos" -version = "0.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f101404db01422d034db5afa63eefff6d9c8f66c0894278bc456b4c30954e166" -dependencies = [ - "libloading", -] - -[[package]] -name = "ndk" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2076a31b7010b17a38c01907c45b945e8f11495ee4dd588309718901b1f7a5b7" -dependencies = [ - "bitflags 2.6.0", - "jni-sys", - "log", - "ndk-sys", - "num_enum", - "raw-window-handle", - "thiserror", -] - -[[package]] -name = "ndk-context" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "27b02d87554356db9e9a873add8782d4ea6e3e58ea071a9adb9a2e8ddb884a8b" - -[[package]] -name = "ndk-sys" -version = "0.5.0+25.2.9519653" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c196769dd60fd4f363e11d948139556a344e79d451aeb2fa2fd040738ef7691" -dependencies = [ - "jni-sys", -] - -[[package]] -name = "net" -version = "0.0.1" -dependencies = [ - "async-recursion", - "async-tungstenite", - "base", - "base64", - "brotli", - "bytes", - "chrono", - "content-security-policy", - "cookie 0.18.1", - "crossbeam-channel", - "data-url", - "devtools_traits", - "embedder_traits", - "flate2", - "futures 0.3.30", - "generic-array", - "headers", - "http", - "hyper", - "hyper-rustls", - "hyper_serde", - "imsz", - "ipc-channel", - "libflate", - "log", - "malloc_size_of", - "malloc_size_of_derive", - "mime", - "mime_guess", - "net_traits", - "percent-encoding", - "pixels", - "profile_traits", - "rayon", - "rustls", - "rustls-pemfile", - "serde", - "serde_json", - "servo_allocator", - "servo_arc", - "servo_config", - "servo_url", - "sha2", - "time 0.1.45", - "tokio", - "tokio-rustls", - "tokio-stream", - "tokio-test", - "tungstenite", - "url", - "uuid", - "webpki-roots", - "webrender_api", - "webrender_traits", -] - -[[package]] -name = "net_traits" -version = "0.0.1" -dependencies = [ - "base", - "content-security-policy", - "cookie 0.18.1", - "embedder_traits", - "headers", - "http", - "hyper", - "hyper_serde", - "image", - "ipc-channel", - "log", - "malloc_size_of", - "malloc_size_of_derive", - "mime", - "num-traits", - "percent-encoding", - "pixels", - "rustls", - "serde", - "servo_arc", - "servo_rand", - "servo_url", - "url", - "uuid", - "webrender_api", - "webrender_traits", -] - -[[package]] -name = "new_debug_unreachable" -version = "1.0.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "650eef8c711430f1a879fdd01d4745a7deea475becfb90269c06775983bbf086" - -[[package]] -name = "nix" -version = "0.29.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "71e2746dc3a24dd78b3cfcb7be93368c6de9963d30f43a6a73998a9cf4b17b46" -dependencies = [ - "bitflags 2.6.0", - "cfg-if", - "cfg_aliases 0.2.1", - "libc", -] - -[[package]] -name = "nohash-hasher" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2bf50223579dc7cdcfb3bfcacf7069ff68243f8c363f62ffa99cf000a6b9c451" - -[[package]] -name = "nom" -version = "7.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d273983c5a657a70a3e8f2a01329822f3b8c8172b73826411a55751e404a0a4a" -dependencies = [ - "memchr", - "minimal-lexical", -] - -[[package]] -name = "nu-ansi-term" -version = "0.46.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77a8165726e8236064dbb45459242600304b42a5ea24ee2948e18e023bf7ba84" -dependencies = [ - "overload", - "winapi", -] - -[[package]] -name = "num-bigint" -version = "0.4.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a5e44f723f1133c9deac646763579fdb3ac745e418f2a7af9cd0c431da1f20b9" -dependencies = [ - "num-integer", - "num-traits", -] - -[[package]] -name = "num-complex" -version = "0.2.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6b19411a9719e753aff12e5187b74d60d3dc449ec3f4dc21e3989c3f554bc95" -dependencies = [ - "autocfg", - "num-traits", -] - -[[package]] -name = "num-conv" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9" - -[[package]] -name = "num-derive" -version = "0.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed3955f1a9c7c0c15e092f9c887db08b1fc683305fdf6eb6684f22555355e202" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "num-integer" -version = "0.1.46" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7969661fd2958a5cb096e56c8e1ad0444ac2bbcd0061bd28660485a44879858f" -dependencies = [ - "num-traits", -] - -[[package]] -name = "num-rational" -version = "0.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f83d14da390562dca69fc84082e73e548e1ad308d24accdedd2720017cb37824" -dependencies = [ - "num-bigint", - "num-integer", - "num-traits", -] - -[[package]] -name = "num-traits" -version = "0.2.19" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841" -dependencies = [ - "autocfg", - "libm", -] - -[[package]] -name = "num_cpus" -version = "1.16.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43" -dependencies = [ - "hermit-abi 0.3.9", - "libc", -] - -[[package]] -name = "num_enum" -version = "0.7.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e613fc340b2220f734a8595782c551f1250e969d87d3be1ae0579e8d4065179" -dependencies = [ - "num_enum_derive", -] - -[[package]] -name = "num_enum_derive" -version = "0.7.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af1844ef2428cc3e1cb900be36181049ef3d3193c63e43026cfe202983b27a56" -dependencies = [ - "proc-macro-crate", - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "num_threads" -version = "0.1.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c7398b9c8b70908f6371f47ed36737907c87c52af34c268fed0bf0ceb92ead9" -dependencies = [ - "libc", -] - -[[package]] -name = "objc" -version = "0.2.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "915b1b472bc21c53464d6c8461c9d3af805ba1ef837e1cac254428f4a77177b1" -dependencies = [ - "malloc_buf", - "objc_exception", -] - -[[package]] -name = "objc-foundation" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1add1b659e36c9607c7aab864a76c7a4c2760cd0cd2e120f3fb8b952c7e22bf9" -dependencies = [ - "block", - "objc", - "objc_id", -] - -[[package]] -name = "objc-sys" -version = "0.3.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cdb91bdd390c7ce1a8607f35f3ca7151b65afc0ff5ff3b34fa350f7d7c7e4310" - -[[package]] -name = "objc2" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "559c5a40fdd30eb5e344fbceacf7595a81e242529fb4e21cf5f43fb4f11ff98d" -dependencies = [ - "objc-sys", - "objc2-encode", -] - -[[package]] -name = "objc2-encode" -version = "3.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d079845b37af429bfe5dfa76e6d087d788031045b25cfc6fd898486fd9847666" - -[[package]] -name = "objc_exception" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad970fb455818ad6cba4c122ad012fae53ae8b4795f86378bce65e4f6bab2ca4" -dependencies = [ - "cc", -] - -[[package]] -name = "objc_id" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c92d4ddb4bd7b50d730c215ff871754d0da6b2178849f8a2a2ab69712d0c073b" -dependencies = [ - "objc", -] - -[[package]] -name = "object" -version = "0.36.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "084f1a5821ac4c651660a94a7153d27ac9d8a53736203f58b31945ded098070a" -dependencies = [ - "memchr", -] - -[[package]] -name = "ohos-sys" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "491c77f0fe6b4336266f9da68b8dffb15d3bbe19c32ac0145b861851af3c8e41" - -[[package]] -name = "ohos-vsync" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5871e38034a33e8d43c711a40d39e24fd3500f43b61b9269b8586f608a70aec3" -dependencies = [ - "ohos-sys", -] - -[[package]] -name = "once_cell" -version = "1.19.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" - -[[package]] -name = "openxr" -version = "0.19.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a2d6934d2508f94fd4cbda6c2a326f111f60ce59fd9136df6d478564397dd40" -dependencies = [ - "libc", - "libloading", - "ndk-context", - "openxr-sys", -] - -[[package]] -name = "openxr-sys" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f10e7e38c47f2175fc39363713b656db899fa0b4a14341029702cbdfa6f44d05" -dependencies = [ - "libc", -] - -[[package]] -name = "option-ext" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "04744f49eae99ab78e0d5c0b603ab218f515ea8cfe5a456d7629ad883a3b6e7d" - -[[package]] -name = "option-operations" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7c26d27bb1aeab65138e4bf7666045169d1717febcc9ff870166be8348b223d0" -dependencies = [ - "paste", -] - -[[package]] -name = "orbclient" -version = "0.3.47" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "52f0d54bde9774d3a51dcf281a5def240c71996bc6ca05d2c847ec8b2b216166" -dependencies = [ - "libredox 0.0.2", -] - -[[package]] -name = "ordermap" -version = "0.3.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a86ed3f5f244b372d6b1a00b72ef7f8876d0bc6a78a4c9985c53614041512063" - -[[package]] -name = "overload" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39" - -[[package]] -name = "owned_ttf_parser" -version = "0.24.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "490d3a563d3122bf7c911a59b0add9389e5ec0f5f0c3ac6b91ff235a0e6a7f90" -dependencies = [ - "ttf-parser", -] - -[[package]] -name = "parking_lot" -version = "0.12.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1bf18183cf54e8d6059647fc3063646a1801cf30896933ec2311622cc4b9a27" -dependencies = [ - "lock_api", - "parking_lot_core", -] - -[[package]] -name = "parking_lot_core" -version = "0.9.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e401f977ab385c9e4e3ab30627d6f26d00e2c73eef317493c4ec6d468726cf8" -dependencies = [ - "cfg-if", - "libc", - "redox_syscall 0.5.1", - "smallvec", - "windows-targets 0.52.6", -] - -[[package]] -name = "paste" -version = "1.0.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57c0d7b74b563b49d38dae00a0c37d4d6de9b432382b2892f0574ddcae73fd0a" - -[[package]] -name = "pathfinder_geometry" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b7b7e7b4ea703700ce73ebf128e1450eb69c3a8329199ffbfb9b2a0418e5ad3" -dependencies = [ - "log", - "pathfinder_simd", -] - -[[package]] -name = "pathfinder_simd" -version = "0.5.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5cf07ef4804cfa9aea3b04a7bbdd5a40031dbb6b4f2cbaf2b011666c80c5b4f2" -dependencies = [ - "rustc_version", -] - -[[package]] -name = "peek-poke" -version = "0.3.0" -source = "git+https://github.com/servo/webrender?branch=0.65#8468e81608b00d83c62466f1c0f5ef73d44fda76" -dependencies = [ - "euclid", - "peek-poke-derive", -] - -[[package]] -name = "peek-poke-derive" -version = "0.3.0" -source = "git+https://github.com/servo/webrender?branch=0.65#8468e81608b00d83c62466f1c0f5ef73d44fda76" -dependencies = [ - "proc-macro2", - "quote", - "syn", - "synstructure", - "unicode-xid", -] - -[[package]] -name = "percent-encoding" -version = "2.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" - -[[package]] -name = "petgraph" -version = "0.4.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c3659d1ee90221741f65dd128d9998311b0e40c5d3c23a62445938214abce4f" -dependencies = [ - "fixedbitset 0.1.9", - "ordermap", -] - -[[package]] -name = "petgraph" -version = "0.6.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4c5cc86750666a3ed20bdaf5ca2a0344f9c67674cae0515bec2da16fbaa47db" -dependencies = [ - "fixedbitset 0.4.2", - "indexmap", -] - -[[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" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ade2d8b8f33c7333b51bcf0428d37e217e9f32192ae4772156f65063b8ce03dc" -dependencies = [ - "phf_macros", - "phf_shared 0.11.2", -] - -[[package]] -name = "phf_codegen" -version = "0.11.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8d39688d359e6b34654d328e262234662d16cc0f60ec8dcbe5e718709342a5a" -dependencies = [ - "phf_generator 0.11.2", - "phf_shared 0.11.2", -] - -[[package]] -name = "phf_generator" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d5285893bb5eb82e6aaf5d59ee909a06a16737a8970984dd7746ba9283498d6" -dependencies = [ - "phf_shared 0.10.0", - "rand", -] - -[[package]] -name = "phf_generator" -version = "0.11.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "48e4cc64c2ad9ebe670cb8fd69dd50ae301650392e81c05f9bfcb2d5bdbc24b0" -dependencies = [ - "phf_shared 0.11.2", - "rand", -] - -[[package]] -name = "phf_macros" -version = "0.11.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3444646e286606587e49f3bcf1679b8cef1dc2c5ecc29ddacaffc305180d464b" -dependencies = [ - "phf_generator 0.11.2", - "phf_shared 0.11.2", - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "phf_shared" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6796ad771acdc0123d2a88dc428b5e38ef24456743ddb1744ed628f9815c096" -dependencies = [ - "siphasher", -] - -[[package]] -name = "phf_shared" -version = "0.11.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90fcb95eef784c2ac79119d1dd819e162b5da872ce6f3c3abe1e8ca1c082f72b" -dependencies = [ - "siphasher", -] - -[[package]] -name = "pin-project" -version = "1.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6bf43b791c5b9e34c3d182969b4abb522f9343702850a2e57f460d00d09b4b3" -dependencies = [ - "pin-project-internal", -] - -[[package]] -name = "pin-project-internal" -version = "1.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "pin-project-lite" -version = "0.2.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bda66fc9667c18cb2758a2ac84d1167245054bcf85d5d1aaa6923f45801bdd02" - -[[package]] -name = "pin-utils" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" - -[[package]] -name = "pixels" -version = "0.0.1" -dependencies = [ - "euclid", - "image", - "ipc-channel", - "log", - "malloc_size_of", - "malloc_size_of_derive", - "serde", - "webrender_api", -] - -[[package]] -name = "pkg-config" -version = "0.3.30" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec" - -[[package]] -name = "plane-split" -version = "0.18.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c1f7d82649829ecdef8e258790b0587acf0a8403f0ce963473d8e918acc1643" -dependencies = [ - "euclid", - "log", - "smallvec", -] - -[[package]] -name = "png" -version = "0.17.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06e4b0d3d1312775e782c86c91a111aa1f910cbb65e1337f9975b5f9a554b5e1" -dependencies = [ - "bitflags 1.3.2", - "crc32fast", - "fdeflate", - "flate2", - "miniz_oxide 0.7.4", -] - -[[package]] -name = "polling" -version = "3.7.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc2790cd301dec6cd3b7a025e4815cf825724a51c98dccfe6a3e55f05ffb6511" -dependencies = [ - "cfg-if", - "concurrent-queue", - "hermit-abi 0.4.0", - "pin-project-lite", - "rustix", - "tracing", - "windows-sys 0.59.0", -] - -[[package]] -name = "powerfmt" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391" - -[[package]] -name = "ppv-lite86" -version = "0.2.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77957b295656769bb8ad2b6a6b09d897d94f05c41b069aede1fcdaa675eaea04" -dependencies = [ - "zerocopy", -] - -[[package]] -name = "precomputed-hash" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "925383efa346730478fb4838dbe9137d2a47675ad789c546d150a6e1dd4ab31c" - -[[package]] -name = "presser" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8cf8e6a8aa66ce33f63993ffc4ea4271eb5b0530a9002db8455ea6050c77bfa" - -[[package]] -name = "prettyplease" -version = "0.2.22" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "479cf940fbbb3426c32c5d5176f62ad57549a0bb84773423ba8be9d089f5faba" -dependencies = [ - "proc-macro2", - "syn", -] - -[[package]] -name = "proc-macro-crate" -version = "3.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d37c51ca738a55da99dc0c4a34860fd675453b8b36209178c2249bb13651284" -dependencies = [ - "toml_edit", -] - -[[package]] -name = "proc-macro2" -version = "1.0.86" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77" -dependencies = [ - "unicode-ident", -] - -[[package]] -name = "profile" -version = "0.0.1" -dependencies = [ - "base", - "ipc-channel", - "libc", - "profile_traits", - "regex", - "serde", - "serde_json", - "servo_config", - "task_info", - "tikv-jemalloc-sys", - "time 0.3.36", -] - -[[package]] -name = "profile_tests" -version = "0.0.1" -dependencies = [ - "ipc-channel", - "profile", - "profile_traits", - "servo_config", - "time 0.3.36", -] - -[[package]] -name = "profile_traits" -version = "0.0.1" -dependencies = [ - "base", - "crossbeam-channel", - "ipc-channel", - "log", - "serde", - "servo_config", - "signpost", - "time 0.3.36", -] - -[[package]] -name = "profiling" -version = "1.0.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43d84d1d7a6ac92673717f9f6d1518374ef257669c24ebc5ac25d5033828be58" - -[[package]] -name = "prost" -version = "0.12.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "deb1435c188b76130da55f17a466d252ff7b1418b2ad3e037d127b94e3411f29" -dependencies = [ - "bytes", - "prost-derive", -] - -[[package]] -name = "prost-build" -version = "0.12.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22505a5c94da8e3b7c2996394d1c933236c4d743e81a410bcca4e6989fc066a4" -dependencies = [ - "bytes", - "heck", - "itertools 0.10.5", - "log", - "multimap", - "once_cell", - "petgraph 0.6.5", - "prettyplease", - "prost", - "prost-types", - "regex", - "syn", - "tempfile", -] - -[[package]] -name = "prost-derive" -version = "0.12.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81bddcdb20abf9501610992b6759a4c888aef7d1a7247ef75e2404275ac24af1" -dependencies = [ - "anyhow", - "itertools 0.10.5", - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "prost-types" -version = "0.12.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9091c90b0a32608e984ff2fa4091273cbdd755d54935c51d520887f4a1dbd5b0" -dependencies = [ - "prost", -] - -[[package]] -name = "protobuf-src" -version = "2.1.0+27.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7edafa3bcc668fa93efafcbdf58d7821bbda0f4b458ac7fae3d57ec0fec8167" -dependencies = [ - "cmake", -] - -[[package]] -name = "qoi" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f6d64c71eb498fe9eae14ce4ec935c555749aef511cca85b5568910d6e48001" -dependencies = [ - "bytemuck", -] - -[[package]] -name = "quick-xml" -version = "0.36.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96a05e2e8efddfa51a84ca47cec303fac86c8541b686d37cac5efc0e094417bc" -dependencies = [ - "memchr", -] - -[[package]] -name = "quickcheck" -version = "1.0.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "588f6378e4dd99458b60ec275b4477add41ce4fa9f64dcba6f15adccb19b50d6" -dependencies = [ - "env_logger 0.8.4", - "log", - "rand", -] - -[[package]] -name = "quote" -version = "1.0.37" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af" -dependencies = [ - "proc-macro2", -] - -[[package]] -name = "rand" -version = "0.8.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404" -dependencies = [ - "libc", - "rand_chacha", - "rand_core", -] - -[[package]] -name = "rand_chacha" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88" -dependencies = [ - "ppv-lite86", - "rand_core", -] - -[[package]] -name = "rand_core" -version = "0.6.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" -dependencies = [ - "getrandom", -] - -[[package]] -name = "rand_isaac" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fac4373cd91b4f55722c553fb0f286edbb81ef3ff6eec7b99d1898a4110a0b28" -dependencies = [ - "rand_core", -] - -[[package]] -name = "range" -version = "0.0.1" -dependencies = [ - "malloc_size_of", - "malloc_size_of_derive", - "num-traits", - "serde", -] - -[[package]] -name = "range-alloc" -version = "0.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c8a99fddc9f0ba0a85884b8d14e3592853e787d581ca1816c91349b10e4eeab" - -[[package]] -name = "raqote" -version = "0.8.5" -source = "git+https://github.com/jrmuizel/raqote?rev=64716c8#64716c8d68436451ca151bb0c70ba300fd964f42" -dependencies = [ - "euclid", - "font-kit", - "lyon_geom", - "pathfinder_geometry", - "png", - "sw-composite", - "typed-arena", -] - -[[package]] -name = "raw-window-handle" -version = "0.6.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "20675572f6f24e9e76ef639bc5552774ed45f1c30e2951e1e99c59888861c539" - -[[package]] -name = "rayon" -version = "1.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b418a60154510ca1a002a752ca9714984e21e4241e804d32555251faf8b78ffa" -dependencies = [ - "either", - "rayon-core", -] - -[[package]] -name = "rayon-core" -version = "1.12.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1465873a3dfdaa8ae7cb14b4383657caab0b3e8a0aa9ae8e04b044854c8dfce2" -dependencies = [ - "crossbeam-deque", - "crossbeam-utils", -] - -[[package]] -name = "redox_syscall" -version = "0.3.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29" -dependencies = [ - "bitflags 1.3.2", -] - -[[package]] -name = "redox_syscall" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4722d768eff46b75989dd134e5c353f0d6296e5aaa3132e776cbdb56be7731aa" -dependencies = [ - "bitflags 1.3.2", -] - -[[package]] -name = "redox_syscall" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "469052894dcb553421e483e4209ee581a45100d31b4018de03e5a7ad86374a7e" -dependencies = [ - "bitflags 2.6.0", -] - -[[package]] -name = "redox_users" -version = "0.4.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba009ff324d1fc1b900bd1fdb31564febe58a8ccc8a6fdbb93b543d33b13ca43" -dependencies = [ - "getrandom", - "libredox 0.1.3", - "thiserror", -] - -[[package]] -name = "ref_filter_map" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b5ceb840e4009da4841ed22a15eb49f64fdd00a2138945c5beacf506b2fb5ed" - -[[package]] -name = "regex" -version = "1.10.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4219d74c6b67a3654a9fbebc4b419e22126d13d2f3c4a07ee0cb61ff79a79619" -dependencies = [ - "aho-corasick", - "memchr", - "regex-automata 0.4.7", - "regex-syntax", -] - -[[package]] -name = "regex-automata" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e9368763f5a9b804326f3af749e16f9abf378d227bcdee7634b13d8f17793782" -dependencies = [ - "memchr", -] - -[[package]] -name = "regex-automata" -version = "0.4.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38caf58cc5ef2fed281f89292ef23f6365465ed9a41b7a7754eb4e26496c92df" -dependencies = [ - "aho-corasick", - "memchr", - "regex-syntax", -] - -[[package]] -name = "regex-syntax" -version = "0.8.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a66a03ae7c801facd77a29370b4faec201768915ac14a721ba36f20bc9c209b" - -[[package]] -name = "ring" -version = "0.17.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c17fa4cb658e3583423e915b9f3acc01cceaee1860e33d59ebae66adc3a2dc0d" -dependencies = [ - "cc", - "cfg-if", - "getrandom", - "libc", - "spin", - "untrusted", - "windows-sys 0.52.0", -] - -[[package]] -name = "rle-decode-fast" -version = "1.0.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3582f63211428f83597b51b2ddb88e2a91a9d52d12831f9d08f5e624e8977422" - -[[package]] -name = "ron" -version = "0.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b91f7eff05f748767f183df4320a63d6936e9c6107d97c9e6bdd9784f4289c94" -dependencies = [ - "base64", - "bitflags 2.6.0", - "serde", - "serde_derive", -] - -[[package]] -name = "rustc-demangle" -version = "0.1.24" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "719b953e2095829ee67db738b3bfa9fa368c94900df327b3f07fe6e794d2fe1f" - -[[package]] -name = "rustc-hash" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" - -[[package]] -name = "rustc_version" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cfcb3a22ef46e85b45de6ee7e79d063319ebb6594faafcf1c225ea92ab6e9b92" -dependencies = [ - "semver", -] - -[[package]] -name = "rustfix" -version = "0.8.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70f5b7fc8060f4f8373f9381a630304b42e1183535d9beb1d3f596b236c9106a" -dependencies = [ - "serde", - "serde_json", - "thiserror", - "tracing", -] - -[[package]] -name = "rustix" -version = "0.38.36" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f55e80d50763938498dd5ebb18647174e0c76dc38c5505294bb224624f30f36" -dependencies = [ - "bitflags 2.6.0", - "errno", - "libc", - "linux-raw-sys", - "windows-sys 0.52.0", -] - -[[package]] -name = "rustls" -version = "0.21.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f56a14d1f48b391359b22f731fd4bd7e43c97f3c50eee276f3aa09c94784d3e" -dependencies = [ - "log", - "ring", - "rustls-webpki", - "sct", -] - -[[package]] -name = "rustls-pemfile" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1c74cae0a4cf6ccbbf5f359f08efdf8ee7e1dc532573bf0db71968cb56b1448c" -dependencies = [ - "base64", -] - -[[package]] -name = "rustls-webpki" -version = "0.101.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b6275d1ee7a1cd780b64aca7726599a1dbc893b1e64144529e55c3c2f745765" -dependencies = [ - "ring", - "untrusted", -] - -[[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.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f" - -[[package]] -name = "same-file" -version = "1.0.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502" -dependencies = [ - "winapi-util", -] - -[[package]] -name = "scoped-tls" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e1cf6437eb19a8f4a6cc0f7dca544973b0b78843adbfeb3683d1a94a0024a294" - -[[package]] -name = "scopeguard" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" - -[[package]] -name = "script" -version = "0.0.1" -dependencies = [ - "accountable-refcell", - "app_units", - "arrayvec", - "atomic_refcell", - "background_hang_monitor_api", - "backtrace", - "base", - "base64", - "bincode", - "bitflags 2.6.0", - "bluetooth_traits", - "canvas_traits", - "chrono", - "content-security-policy", - "cookie 0.18.1", - "crossbeam-channel", - "cssparser", - "data-url", - "deny_public_fields", - "devtools_traits", - "dom", - "dom_struct", - "domobject_derive", - "embedder_traits", - "encoding_rs", - "euclid", - "fnv", - "fonts", - "fonts_traits", - "fxhash", - "headers", - "html5ever", - "http", - "hyper_serde", - "image", - "indexmap", - "ipc-channel", - "itertools 0.13.0", - "jstraceable_derive", - "keyboard-types", - "libc", - "log", - "malloc_size_of", - "malloc_size_of_derive", - "media", - "metrics", - "mime", - "mime_guess", - "mozangle", - "mozjs", - "net_traits", - "num-traits", - "num_cpus", - "parking_lot", - "percent-encoding", - "phf 0.10.1", - "phf_codegen", - "phf_shared 0.11.2", - "pixels", - "profile_traits", - "range", - "ref_filter_map", - "regex", - "script_layout_interface", - "script_traits", - "selectors", - "serde", - "serde_json", - "servo-media", - "servo_allocator", - "servo_arc", - "servo_atoms", - "servo_config", - "servo_geometry", - "servo_rand", - "servo_url", - "smallvec", - "sparkle", - "style", - "style_traits", - "swapper", - "tempfile", - "tendril", - "time 0.1.45", - "time 0.3.36", - "unicode-bidi", - "unicode-segmentation", - "url", - "utf-8", - "uuid", - "webdriver", - "webgpu", - "webrender_api", - "webrender_traits", - "webxr-api", - "xml5ever", -] - -[[package]] -name = "script_layout_interface" -version = "0.0.1" -dependencies = [ - "app_units", - "atomic_refcell", - "base", - "canvas_traits", - "crossbeam-channel", - "euclid", - "fonts", - "fonts_traits", - "html5ever", - "ipc-channel", - "libc", - "malloc_size_of", - "malloc_size_of_derive", - "metrics", - "net_traits", - "pixels", - "profile_traits", - "range", - "script_traits", - "selectors", - "serde", - "servo_arc", - "servo_atoms", - "servo_url", - "style", - "style_traits", - "webrender_api", - "webrender_traits", -] - -[[package]] -name = "script_tests" -version = "0.0.1" -dependencies = [ - "euclid", - "keyboard-types", - "script", - "servo_url", -] - -[[package]] -name = "script_traits" -version = "0.0.1" -dependencies = [ - "background_hang_monitor_api", - "base", - "bitflags 2.6.0", - "bluetooth_traits", - "canvas_traits", - "cookie 0.18.1", - "crossbeam-channel", - "devtools_traits", - "embedder_traits", - "euclid", - "fonts_traits", - "http", - "hyper_serde", - "ipc-channel", - "keyboard-types", - "libc", - "log", - "malloc_size_of", - "malloc_size_of_derive", - "media", - "net_traits", - "pixels", - "profile_traits", - "serde", - "servo_atoms", - "servo_url", - "smallvec", - "style_traits", - "uuid", - "webdriver", - "webgpu", - "webrender_api", - "webrender_traits", - "webxr-api", -] - -[[package]] -name = "sct" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da046153aa2352493d6cb7da4b6e5c0c057d8a1d0a9aa8560baffdd945acd414" -dependencies = [ - "ring", - "untrusted", -] - -[[package]] -name = "sctk-adwaita" -version = "0.8.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70b31447ca297092c5a9916fc3b955203157b37c19ca8edde4f52e9843e602c7" -dependencies = [ - "ab_glyph", - "log", - "memmap2", - "smithay-client-toolkit", - "tiny-skia", -] - -[[package]] -name = "selectors" -version = "0.24.0" -source = "git+https://github.com/servo/stylo?branch=2024-07-16#65f8d1316a0966401bcfb9fa7dd5e3659a1605b2" -dependencies = [ - "bitflags 2.6.0", - "cssparser", - "derive_more", - "fxhash", - "log", - "new_debug_unreachable", - "phf 0.11.2", - "phf_codegen", - "precomputed-hash", - "servo_arc", - "size_of_test", - "smallvec", - "to_shmem", - "to_shmem_derive", -] - -[[package]] -name = "semver" -version = "1.0.23" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61697e0a1c7e512e84a621326239844a24d8207b4669b41bc18b32ea5cbf988b" - -[[package]] -name = "serde" -version = "1.0.209" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "99fce0ffe7310761ca6bf9faf5115afbc19688edd00171d81b1bb1b116c63e09" -dependencies = [ - "serde_derive", -] - -[[package]] -name = "serde_bytes" -version = "0.11.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "387cc504cb06bb40a96c8e04e951fe01854cf6bc921053c954e4a606d9675c6a" -dependencies = [ - "serde", -] - -[[package]] -name = "serde_derive" -version = "1.0.209" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a5831b979fd7b5439637af1752d535ff49f4860c0f341d1baeb6faf0f4242170" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "serde_json" -version = "1.0.128" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ff5456707a1de34e7e37f2a6fd3d3f808c318259cbd01ab6377795054b483d8" -dependencies = [ - "itoa", - "memchr", - "ryu", - "serde", -] - -[[package]] -name = "serde_spanned" -version = "0.6.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb5b1b31579f3811bf615c144393417496f152e12ac8b7663bf664f4a815306d" -dependencies = [ - "serde", -] - -[[package]] -name = "serde_test" -version = "1.0.177" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f901ee573cab6b3060453d2d5f0bae4e6d628c23c0a962ff9b5f1d7c8d4f1ed" -dependencies = [ - "serde", -] - -[[package]] -name = "serde_urlencoded" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d3491c14715ca2294c4d6a88f15e84739788c1d030eed8c110436aafdaa2f3fd" -dependencies = [ - "form_urlencoded", - "itoa", - "ryu", - "serde", -] - -[[package]] -name = "servo-display-link" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d1060be2a0bbc35e712ec35ae98119b8def1071a5f2edbe392fd4c899bc2a5f4" -dependencies = [ - "foreign-types 0.3.2", - "objc", - "objc-foundation", - "thiserror", - "time-point", -] - -[[package]] -name = "servo-media" -version = "0.1.0" -source = "git+https://github.com/servo/media#ed1d4c7c11c93e7e66afc0224fc15f70d6b1fe83" -dependencies = [ - "once_cell", - "servo-media-audio", - "servo-media-player", - "servo-media-streams", - "servo-media-traits", - "servo-media-webrtc", -] - -[[package]] -name = "servo-media-audio" -version = "0.2.0" -source = "git+https://github.com/servo/media#ed1d4c7c11c93e7e66afc0224fc15f70d6b1fe83" -dependencies = [ - "byte-slice-cast", - "euclid", - "log", - "num-complex", - "num-traits", - "petgraph 0.4.13", - "serde", - "serde_derive", - "servo-media-derive", - "servo-media-player", - "servo-media-streams", - "servo-media-traits", - "smallvec", - "speexdsp-resampler", -] - -[[package]] -name = "servo-media-derive" -version = "0.1.0" -source = "git+https://github.com/servo/media#ed1d4c7c11c93e7e66afc0224fc15f70d6b1fe83" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "servo-media-dummy" -version = "0.1.0" -source = "git+https://github.com/servo/media#ed1d4c7c11c93e7e66afc0224fc15f70d6b1fe83" -dependencies = [ - "ipc-channel", - "servo-media", - "servo-media-audio", - "servo-media-player", - "servo-media-streams", - "servo-media-traits", - "servo-media-webrtc", -] - -[[package]] -name = "servo-media-gstreamer" -version = "0.1.0" -source = "git+https://github.com/servo/media#ed1d4c7c11c93e7e66afc0224fc15f70d6b1fe83" -dependencies = [ - "byte-slice-cast", - "glib", - "glib-sys", - "gstreamer", - "gstreamer-app", - "gstreamer-audio", - "gstreamer-base", - "gstreamer-player", - "gstreamer-sdp", - "gstreamer-sys", - "gstreamer-video", - "gstreamer-webrtc", - "ipc-channel", - "lazy_static", - "log", - "mime", - "once_cell", - "servo-media", - "servo-media-audio", - "servo-media-gstreamer-render", - "servo-media-gstreamer-render-android", - "servo-media-gstreamer-render-unix", - "servo-media-player", - "servo-media-streams", - "servo-media-traits", - "servo-media-webrtc", - "url", -] - -[[package]] -name = "servo-media-gstreamer-render" -version = "0.1.0" -source = "git+https://github.com/servo/media#ed1d4c7c11c93e7e66afc0224fc15f70d6b1fe83" -dependencies = [ - "gstreamer", - "gstreamer-video", - "servo-media-player", -] - -[[package]] -name = "servo-media-gstreamer-render-android" -version = "0.1.0" -source = "git+https://github.com/servo/media#ed1d4c7c11c93e7e66afc0224fc15f70d6b1fe83" -dependencies = [ - "glib", - "gstreamer", - "gstreamer-gl", - "gstreamer-gl-egl", - "gstreamer-video", - "servo-media-gstreamer-render", - "servo-media-player", -] - -[[package]] -name = "servo-media-gstreamer-render-unix" -version = "0.1.0" -source = "git+https://github.com/servo/media#ed1d4c7c11c93e7e66afc0224fc15f70d6b1fe83" -dependencies = [ - "glib", - "gstreamer", - "gstreamer-gl", - "gstreamer-gl-egl", - "gstreamer-gl-x11", - "gstreamer-video", - "servo-media-gstreamer-render", - "servo-media-player", -] - -[[package]] -name = "servo-media-player" -version = "0.1.0" -source = "git+https://github.com/servo/media#ed1d4c7c11c93e7e66afc0224fc15f70d6b1fe83" -dependencies = [ - "ipc-channel", - "serde", - "serde_derive", - "servo-media-streams", - "servo-media-traits", -] - -[[package]] -name = "servo-media-streams" -version = "0.1.0" -source = "git+https://github.com/servo/media#ed1d4c7c11c93e7e66afc0224fc15f70d6b1fe83" -dependencies = [ - "lazy_static", - "uuid", -] - -[[package]] -name = "servo-media-traits" -version = "0.1.0" -source = "git+https://github.com/servo/media#ed1d4c7c11c93e7e66afc0224fc15f70d6b1fe83" - -[[package]] -name = "servo-media-webrtc" -version = "0.1.0" -source = "git+https://github.com/servo/media#ed1d4c7c11c93e7e66afc0224fc15f70d6b1fe83" -dependencies = [ - "lazy_static", - "log", - "servo-media-streams", - "uuid", -] - -[[package]] -name = "servo_allocator" -version = "0.0.1" -dependencies = [ - "libc", - "tikv-jemalloc-sys", - "tikv-jemallocator", - "windows-sys 0.59.0", -] - -[[package]] -name = "servo_arc" -version = "0.2.0" -source = "git+https://github.com/servo/stylo?branch=2024-07-16#65f8d1316a0966401bcfb9fa7dd5e3659a1605b2" -dependencies = [ - "serde", - "stable_deref_trait", -] - -[[package]] -name = "servo_atoms" -version = "0.0.1" -source = "git+https://github.com/servo/stylo?branch=2024-07-16#65f8d1316a0966401bcfb9fa7dd5e3659a1605b2" -dependencies = [ - "string_cache", - "string_cache_codegen", -] - -[[package]] -name = "servo_config" -version = "0.0.1" -dependencies = [ - "dirs", - "embedder_traits", - "euclid", - "getopts", - "log", - "num_cpus", - "serde", - "serde_json", - "servo_config_plugins", - "servo_geometry", - "servo_url", - "style_config", - "url", -] - -[[package]] -name = "servo_config_plugins" -version = "0.0.1" -dependencies = [ - "itertools 0.13.0", - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "servo_geometry" -version = "0.0.1" -dependencies = [ - "app_units", - "euclid", - "malloc_size_of", - "malloc_size_of_derive", - "webrender_api", -] - -[[package]] -name = "servo_rand" -version = "0.0.1" -dependencies = [ - "log", - "rand", - "rand_core", - "rand_isaac", - "uuid", -] - -[[package]] -name = "servo_url" -version = "0.0.1" -dependencies = [ - "malloc_size_of", - "malloc_size_of_derive", - "serde", - "servo_arc", - "servo_rand", - "to_shmem", - "url", - "uuid", -] - -[[package]] -name = "servoshell" -version = "0.0.1" -dependencies = [ - "android_logger", - "arboard", - "backtrace", - "cc", - "cfg-if", - "egui", - "egui-winit", - "egui_glow", - "env_filter", - "euclid", - "getopts", - "gilrs", - "gl_generator", - "gleam", - "glow 0.13.1", - "headers", - "hilog", - "http", - "image", - "ipc-channel", - "jni", - "keyboard-types", - "libc", - "libloading", - "libservo", - "log", - "mime_guess", - "napi-derive-ohos", - "napi-ohos", - "net", - "net_traits", - "nix", - "ohos-sys", - "ohos-vsync", - "raw-window-handle", - "serde_json", - "servo-media", - "servo_allocator", - "shellwords", - "sig", - "surfman", - "tinyfiledialogs", - "tokio", - "tracing", - "tracing-perfetto", - "tracing-subscriber", - "url", - "vergen", - "webxr", - "windows-sys 0.59.0", - "winit", - "winres", -] - -[[package]] -name = "sha1" -version = "0.10.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3bf829a2d51ab4a5ddf1352d8470c140cadc8301b2ae1789db023f01cedd6ba" -dependencies = [ - "cfg-if", - "cpufeatures", - "digest", -] - -[[package]] -name = "sha2" -version = "0.10.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "793db75ad2bcafc3ffa7c68b215fee268f537982cd901d132f89c6343f3a3dc8" -dependencies = [ - "cfg-if", - "cpufeatures", - "digest", -] - -[[package]] -name = "sharded-slab" -version = "0.1.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f40ca3c46823713e0d4209592e8d6e826aa57e928f09752619fc696c499637f6" -dependencies = [ - "lazy_static", -] - -[[package]] -name = "shellwords" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89e515aa4699a88148ed5ef96413ceef0048ce95b43fbc955a33bde0a70fcae6" -dependencies = [ - "lazy_static", - "regex", -] - -[[package]] -name = "shlex" -version = "1.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64" - -[[package]] -name = "sig" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6567e29578f9bfade6a5d94a32b9a4256348358d2a3f448cab0021f9a02614a2" -dependencies = [ - "libc", -] - -[[package]] -name = "signpost" -version = "0.1.0" -source = "git+https://github.com/pcwalton/signpost.git#7ed712507f343c38646b9d1fefd049166f9c9a18" - -[[package]] -name = "simd-adler32" -version = "0.3.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d66dc143e6b11c1eddc06d5c423cfc97062865baf299914ab64caa38182078fe" - -[[package]] -name = "simple_logger" -version = "4.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e7e46c8c90251d47d08b28b8a419ffb4aede0f87c2eea95e17d1d5bacbf3ef1" -dependencies = [ - "colored", - "log", - "time 0.3.36", - "windows-sys 0.48.0", -] - -[[package]] -name = "siphasher" -version = "0.3.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38b58827f4464d87d377d175e90bf58eb00fd8716ff0a62f80356b5e61555d0d" - -[[package]] -name = "size_of_test" -version = "0.0.1" -source = "git+https://github.com/servo/stylo?branch=2024-07-16#65f8d1316a0966401bcfb9fa7dd5e3659a1605b2" -dependencies = [ - "static_assertions", -] - -[[package]] -name = "slab" -version = "0.4.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f92a496fb766b417c996b9c5e57daf2f7ad3b0bebe1ccfca4856390e3d3bb67" -dependencies = [ - "autocfg", -] - -[[package]] -name = "slotmap" -version = "1.0.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dbff4acf519f630b3a3ddcfaea6c06b42174d9a44bc70c620e9ed1649d58b82a" -dependencies = [ - "version_check", -] - -[[package]] -name = "smallbitvec" -version = "2.5.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fcc3fc564a4b53fd1e8589628efafe57602d91bde78be18186b5f61e8faea470" - -[[package]] -name = "smallvec" -version = "1.13.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67" -dependencies = [ - "serde", -] - -[[package]] -name = "smithay-client-toolkit" -version = "0.18.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "922fd3eeab3bd820d76537ce8f582b1cf951eceb5475c28500c7457d9d17f53a" -dependencies = [ - "bitflags 2.6.0", - "calloop", - "calloop-wayland-source", - "cursor-icon", - "libc", - "log", - "memmap2", - "rustix", - "thiserror", - "wayland-backend", - "wayland-client", - "wayland-csd-frame", - "wayland-cursor", - "wayland-protocols", - "wayland-protocols-wlr", - "wayland-scanner", - "xkeysym", -] - -[[package]] -name = "smithay-clipboard" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c091e7354ea8059d6ad99eace06dd13ddeedbb0ac72d40a9a6e7ff790525882d" -dependencies = [ - "libc", - "smithay-client-toolkit", - "wayland-backend", -] - -[[package]] -name = "smol_str" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd538fb6910ac1099850255cf94a94df6551fbdd602454387d0adb2d1ca6dead" -dependencies = [ - "serde", -] - -[[package]] -name = "socket2" -version = "0.5.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce305eb0b4296696835b71df73eb912e0f1ffd2556a501fcede6e0c50349191c" -dependencies = [ - "libc", - "windows-sys 0.52.0", -] - -[[package]] -name = "sparkle" -version = "0.1.26" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "74fc6c6346da9177de9894230716709c223c62adbf910a5c1e6096b2ee2e58e0" -dependencies = [ - "gl_generator", -] - -[[package]] -name = "speexdsp-resampler" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b72d540d5c565dbe1f891d7e21ceb21d2649508306782f1066989fccb0b363d3" - -[[package]] -name = "spin" -version = "0.9.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67" -dependencies = [ - "lock_api", -] - -[[package]] -name = "spirv" -version = "0.3.0+sdk-1.3.268.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eda41003dc44290527a59b13432d4a0379379fa074b70174882adfbdfd917844" -dependencies = [ - "bitflags 2.6.0", -] - -[[package]] -name = "stable_deref_trait" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3" - -[[package]] -name = "static_assertions" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" - -[[package]] -name = "static_prefs" -version = "0.1.0" -source = "git+https://github.com/servo/stylo?branch=2024-07-16#65f8d1316a0966401bcfb9fa7dd5e3659a1605b2" - -[[package]] -name = "strck" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be91090ded9d8f979d9fe921777342d37e769e0b6b7296843a7a38247240e917" - -[[package]] -name = "strck_ident" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e1c3802b169b3858a44667f221c9a0b3136e6019936ea926fc97fbad8af77202" -dependencies = [ - "strck", - "unicode-ident", -] - -[[package]] -name = "strict-num" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6637bab7722d379c8b41ba849228d680cc12d0a45ba1fa2b48f2a30577a06731" - -[[package]] -name = "string_cache" -version = "0.8.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f91138e76242f575eb1d3b38b4f1362f10d3a43f47d182a5b359af488a02293b" -dependencies = [ - "new_debug_unreachable", - "once_cell", - "parking_lot", - "phf_shared 0.10.0", - "precomputed-hash", - "serde", -] - -[[package]] -name = "string_cache_codegen" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6bb30289b722be4ff74a408c3cc27edeaad656e06cb1fe8fa9231fa59c728988" -dependencies = [ - "phf_generator 0.10.0", - "phf_shared 0.10.0", - "proc-macro2", - "quote", -] - -[[package]] -name = "style" -version = "0.0.1" -source = "git+https://github.com/servo/stylo?branch=2024-07-16#65f8d1316a0966401bcfb9fa7dd5e3659a1605b2" -dependencies = [ - "app_units", - "arrayvec", - "atomic_refcell", - "bitflags 2.6.0", - "byteorder", - "cssparser", - "derive_more", - "dom", - "encoding_rs", - "euclid", - "fxhash", - "icu_segmenter", - "indexmap", - "itertools 0.10.5", - "itoa", - "lazy_static", - "log", - "malloc_size_of", - "malloc_size_of_derive", - "markup5ever", - "matches", - "mime", - "new_debug_unreachable", - "num-derive", - "num-integer", - "num-traits", - "num_cpus", - "parking_lot", - "precomputed-hash", - "rayon", - "rayon-core", - "selectors", - "serde", - "servo_arc", - "servo_atoms", - "smallbitvec", - "smallvec", - "static_assertions", - "static_prefs", - "string_cache", - "style_config", - "style_derive", - "style_traits", - "thin-vec", - "time 0.1.45", - "to_shmem", - "to_shmem_derive", - "uluru", - "unicode-bidi", - "url", - "void", - "walkdir", -] - -[[package]] -name = "style_config" -version = "0.0.1" -source = "git+https://github.com/servo/stylo?branch=2024-07-16#65f8d1316a0966401bcfb9fa7dd5e3659a1605b2" -dependencies = [ - "lazy_static", -] - -[[package]] -name = "style_derive" -version = "0.0.1" -source = "git+https://github.com/servo/stylo?branch=2024-07-16#65f8d1316a0966401bcfb9fa7dd5e3659a1605b2" -dependencies = [ - "darling", - "derive_common", - "proc-macro2", - "quote", - "syn", - "synstructure", -] - -[[package]] -name = "style_tests" -version = "0.0.1" -dependencies = [ - "app_units", - "cssparser", - "euclid", - "html5ever", - "rayon", - "selectors", - "serde_json", - "servo_arc", - "servo_atoms", - "style", - "style_traits", - "url", -] - -[[package]] -name = "style_traits" -version = "0.0.1" -source = "git+https://github.com/servo/stylo?branch=2024-07-16#65f8d1316a0966401bcfb9fa7dd5e3659a1605b2" -dependencies = [ - "app_units", - "bitflags 2.6.0", - "cssparser", - "euclid", - "lazy_static", - "malloc_size_of", - "malloc_size_of_derive", - "selectors", - "serde", - "servo_arc", - "servo_atoms", - "size_of_test", - "thin-vec", - "to_shmem", - "to_shmem_derive", - "url", - "webrender_api", -] - -[[package]] -name = "surfman" -version = "0.9.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb5f2d85c044920e1f2aaf5ad3795ae3b935025297271f2eadb021931571b4c3" -dependencies = [ - "bitflags 2.6.0", - "cfg_aliases 0.2.1", - "cgl", - "cocoa", - "core-foundation", - "core-graphics", - "euclid", - "fnv", - "gl_generator", - "io-surface", - "lazy_static", - "libc", - "log", - "mach2", - "metal 0.24.0", - "objc", - "raw-window-handle", - "servo-display-link", - "sparkle", - "wayland-sys 0.30.1", - "winapi", - "wio", - "x11", -] - -[[package]] -name = "svg_fmt" -version = "0.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "20e16a0f46cf5fd675563ef54f26e83e20f2366bcf027bcb3cc3ed2b98aaf2ca" - -[[package]] -name = "sw-composite" -version = "0.7.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ac8fb7895b4afa060ad731a32860db8755da3449a47e796d5ecf758db2671d4" - -[[package]] -name = "swapper" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e454d048db5527d000bfddb77bd072bbf3a1e2ae785f16d9bd116e07c2ab45eb" - -[[package]] -name = "syn" -version = "2.0.77" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f35bcdf61fd8e7be6caf75f429fdca8beb3ed76584befb503b1569faee373ed" -dependencies = [ - "proc-macro2", - "quote", - "unicode-ident", -] - -[[package]] -name = "synstructure" -version = "0.13.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c8af7666ab7b6390ab78131fb5b0fce11d6b7a6951602017c35fa82800708971" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "system-deps" -version = "6.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a3e535eb8dded36d55ec13eddacd30dec501792ff23a0b1682c38601b8cf2349" -dependencies = [ - "cfg-expr", - "heck", - "pkg-config", - "toml 0.8.9", - "version-compare", -] - -[[package]] -name = "take_mut" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f764005d11ee5f36500a149ace24e00e3da98b0158b3e2d53a7495660d3f4d60" - -[[package]] -name = "tar" -version = "0.4.41" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb797dad5fb5b76fcf519e702f4a589483b5ef06567f160c392832c1f5e44909" -dependencies = [ - "filetime", - "libc", - "xattr", -] - -[[package]] -name = "target-lexicon" -version = "0.12.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61c41af27dd6d1e27b1b16b489db798443478cef1f06a660c96db617ba5de3b1" - -[[package]] -name = "task_info" -version = "0.0.1" -dependencies = [ - "cc", -] - -[[package]] -name = "tempfile" -version = "3.12.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "04cbcdd0c794ebb0d4cf35e88edd2f7d2c4c3e9a5a6dab322839b321c6a87a64" -dependencies = [ - "cfg-if", - "fastrand", - "once_cell", - "rustix", - "windows-sys 0.59.0", -] - -[[package]] -name = "tendril" -version = "0.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d24a120c5fc464a3458240ee02c299ebcb9d67b5249c8848b09d639dca8d7bb0" -dependencies = [ - "encoding_rs", - "futf", - "mac", - "utf-8", -] - -[[package]] -name = "term" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c59df8ac95d96ff9bede18eb7300b0fda5e5d8d90960e76f8e14ae765eedbf1f" -dependencies = [ - "dirs-next", - "rustversion", - "winapi", -] - -[[package]] -name = "termcolor" -version = "1.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06794f8f6c5c898b3275aebefa6b8a1cb24cd2c6c79397ab15774837a0bc5755" -dependencies = [ - "winapi-util", -] - -[[package]] -name = "tester" -version = "0.9.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89e8bf7e0eb2dd7b4228cc1b6821fc5114cd6841ae59f652a85488c016091e5f" -dependencies = [ - "cfg-if", - "getopts", - "libc", - "num_cpus", - "term", -] - -[[package]] -name = "thin-vec" -version = "0.2.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a38c90d48152c236a3ab59271da4f4ae63d678c5d7ad6b7714d7cb9760be5e4b" - -[[package]] -name = "thiserror" -version = "1.0.63" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0342370b38b6a11b6cc11d6a805569958d54cfa061a29969c3b5ce2ea405724" -dependencies = [ - "thiserror-impl", -] - -[[package]] -name = "thiserror-impl" -version = "1.0.63" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4558b58466b9ad7ca0f102865eccc95938dca1a74a856f2b57b6629050da261" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "thread-id" -version = "4.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cfe8f25bbdd100db7e1d34acf7fd2dc59c4bf8f7483f505eaa7d4f12f76cc0ea" -dependencies = [ - "libc", - "winapi", -] - -[[package]] -name = "thread_local" -version = "1.1.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b9ef9bad013ada3808854ceac7b46812a6465ba368859a37e2100283d2d719c" -dependencies = [ - "cfg-if", - "once_cell", -] - -[[package]] -name = "tiff" -version = "0.9.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba1310fcea54c6a9a4fd1aad794ecc02c31682f6bfbecdf460bf19533eed1e3e" -dependencies = [ - "flate2", - "jpeg-decoder", - "weezl", -] - -[[package]] -name = "tikv-jemalloc-sys" -version = "0.6.0+5.3.0-1-ge13ca993e8ccb9ba9847cc330696e02839f328f7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd3c60906412afa9c2b5b5a48ca6a5abe5736aec9eb48ad05037a677e52e4e2d" -dependencies = [ - "cc", - "libc", -] - -[[package]] -name = "tikv-jemallocator" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4cec5ff18518d81584f477e9bfdf957f5bb0979b0bac3af4ca30b5b3ae2d2865" -dependencies = [ - "libc", - "tikv-jemalloc-sys", -] - -[[package]] -name = "time" -version = "0.1.45" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b797afad3f312d1c66a56d11d0316f916356d11bd158fbc6ca6389ff6bf805a" -dependencies = [ - "libc", - "wasi 0.10.0+wasi-snapshot-preview1", - "winapi", -] - -[[package]] -name = "time" -version = "0.3.36" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885" -dependencies = [ - "deranged", - "itoa", - "libc", - "num-conv", - "num_threads", - "powerfmt", - "serde", - "time-core", - "time-macros", -] - -[[package]] -name = "time-core" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3" - -[[package]] -name = "time-macros" -version = "0.2.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f252a68540fde3a3877aeea552b832b40ab9a69e318efd078774a01ddee1ccf" -dependencies = [ - "num-conv", - "time-core", -] - -[[package]] -name = "time-point" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06535c958d6abe68dc4b4ef9e6845f758fc42fe463d0093d0aca40254f03fb14" - -[[package]] -name = "tiny-skia" -version = "0.11.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "83d13394d44dae3207b52a326c0c85a8bf87f1541f23b0d143811088497b09ab" -dependencies = [ - "arrayref", - "arrayvec", - "bytemuck", - "cfg-if", - "log", - "tiny-skia-path", -] - -[[package]] -name = "tiny-skia-path" -version = "0.11.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c9e7fc0c2e86a30b117d0462aa261b72b7a99b7ebd7deb3a14ceda95c5bdc93" -dependencies = [ - "arrayref", - "bytemuck", - "strict-num", -] - -[[package]] -name = "tinyfiledialogs" -version = "3.3.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "848eb50d6d21430349d82418c2244f611b1ad3e1c52c675320338b3102d06554" -dependencies = [ - "cc", - "libc", -] - -[[package]] -name = "tinystr" -version = "0.7.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9117f5d4db391c1cf6927e7bea3db74b9a1c1add8f7eda9ffd5364f40f57b82f" -dependencies = [ - "displaydoc", - "zerovec", -] - -[[package]] -name = "to_shmem" -version = "0.0.1" -source = "git+https://github.com/servo/stylo?branch=2024-07-16#65f8d1316a0966401bcfb9fa7dd5e3659a1605b2" -dependencies = [ - "cssparser", - "servo_arc", - "smallbitvec", - "smallvec", - "string_cache", - "thin-vec", -] - -[[package]] -name = "to_shmem_derive" -version = "0.0.1" -source = "git+https://github.com/servo/stylo?branch=2024-07-16#65f8d1316a0966401bcfb9fa7dd5e3659a1605b2" -dependencies = [ - "darling", - "derive_common", - "proc-macro2", - "quote", - "syn", - "synstructure", -] - -[[package]] -name = "tokio" -version = "1.40.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2b070231665d27ad9ec9b8df639893f46727666c6767db40317fbe920a5d998" -dependencies = [ - "backtrace", - "bytes", - "libc", - "mio", - "pin-project-lite", - "socket2", - "tokio-macros", - "windows-sys 0.52.0", -] - -[[package]] -name = "tokio-macros" -version = "2.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "693d596312e88961bc67d7f1f97af8a70227d9f90c31bba5806eec004978d752" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "tokio-rustls" -version = "0.24.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c28327cf380ac148141087fbfb9de9d7bd4e84ab5d2c28fbc911d753de8a7081" -dependencies = [ - "rustls", - "tokio", -] - -[[package]] -name = "tokio-stream" -version = "0.1.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f4e6ce100d0eb49a2734f8c0812bcd324cf357d21810932c5df6b96ef2b86f1" -dependencies = [ - "futures-core", - "pin-project-lite", - "tokio", -] - -[[package]] -name = "tokio-test" -version = "0.4.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2468baabc3311435b55dd935f702f42cd1b8abb7e754fb7dfb16bd36aa88f9f7" -dependencies = [ - "async-stream", - "bytes", - "futures-core", - "tokio", - "tokio-stream", -] - -[[package]] -name = "tokio-util" -version = "0.7.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61e7c3654c13bcd040d4a03abee2c75b1d14a37b423cf5a813ceae1cc903ec6a" -dependencies = [ - "bytes", - "futures-core", - "futures-sink", - "pin-project-lite", - "tokio", -] - -[[package]] -name = "toml" -version = "0.5.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4f7f0dd8d50a853a531c426359045b1998f04219d88799810762cd4ad314234" -dependencies = [ - "serde", -] - -[[package]] -name = "toml" -version = "0.8.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c6a4b9e8023eb94392d3dca65d717c53abc5dad49c07cb65bb8fcd87115fa325" -dependencies = [ - "serde", - "serde_spanned", - "toml_datetime", - "toml_edit", -] - -[[package]] -name = "toml_datetime" -version = "0.6.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0dd7358ecb8fc2f8d014bf86f6f638ce72ba252a2c3a2572f2a795f1d23efb41" -dependencies = [ - "serde", -] - -[[package]] -name = "toml_edit" -version = "0.21.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a8534fd7f78b5405e860340ad6575217ce99f38d4d5c8f2442cb5ecb50090e1" -dependencies = [ - "indexmap", - "serde", - "serde_spanned", - "toml_datetime", - "winnow", -] - -[[package]] -name = "topological-sort" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa7c7f42dea4b1b99439786f5633aeb9c14c1b53f75e282803c2ec2ad545873c" - -[[package]] -name = "tower-service" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8df9b6e13f2d32c91b9bd719c00d1958837bc7dec474d94952798cc8e69eeec3" - -[[package]] -name = "tracing" -version = "0.1.40" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef" -dependencies = [ - "log", - "pin-project-lite", - "tracing-attributes", - "tracing-core", -] - -[[package]] -name = "tracing-attributes" -version = "0.1.27" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "tracing-core" -version = "0.1.32" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c06d3da6113f116aaee68e4d601191614c9053067f9ab7f6edbcb161237daa54" -dependencies = [ - "once_cell", - "valuable", -] - -[[package]] -name = "tracing-log" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee855f1f400bd0e5c02d150ae5de3840039a3f54b025156404e34c23c03f47c3" -dependencies = [ - "log", - "once_cell", - "tracing-core", -] - -[[package]] -name = "tracing-perfetto" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd21777b526dfcb57f11f65aa8a2024d83e1db52841993229b6e282e511978b7" -dependencies = [ - "anyhow", - "bytes", - "chrono", - "prost", - "prost-build", - "protobuf-src", - "rand", - "thread-id", - "tracing", - "tracing-subscriber", -] - -[[package]] -name = "tracing-subscriber" -version = "0.3.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad0f048c97dbd9faa9b7df56362b8ebcaa52adb06b498c050d2f4e32f90a7a8b" -dependencies = [ - "nu-ansi-term", - "sharded-slab", - "smallvec", - "thread_local", - "tracing-core", - "tracing-log", -] - -[[package]] -name = "tracy-rs" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce607aae8ab0ab3abf3a2723a9ab6f09bb8639ed83fdd888d857b8e556c868d8" - -[[package]] -name = "truetype" -version = "0.47.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fb887b8a8ee8832e5810114ad4ef84d89f0aae569d198baee7fb7f7363a4ca4" -dependencies = [ - "typeface", -] - -[[package]] -name = "try-lock" -version = "0.2.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b" - -[[package]] -name = "ttf-parser" -version = "0.24.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5be21190ff5d38e8b4a2d3b6a3ae57f612cc39c96e83cedeaf7abc338a8bac4a" - -[[package]] -name = "tungstenite" -version = "0.20.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e3dac10fd62eaf6617d3a904ae222845979aec67c615d1c842b4002c7666fb9" -dependencies = [ - "byteorder", - "bytes", - "data-encoding", - "http", - "httparse", - "log", - "rand", - "rustls", - "sha1", - "thiserror", - "url", - "utf-8", -] - -[[package]] -name = "typed-arena" -version = "2.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6af6ae20167a9ece4bcb41af5b80f8a1f1df981f6391189ce00fd257af04126a" - -[[package]] -name = "typeface" -version = "0.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e1fdbc53aae2bf36c48f1bc36d73a62b84091b6535b08e4e15bca876ce5e8050" - -[[package]] -name = "typenum" -version = "1.17.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825" - -[[package]] -name = "uluru" -version = "3.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7c8a2469e56e6e5095c82ccd3afb98dad95f7af7929aab6d8ba8d6e0f73657da" -dependencies = [ - "arrayvec", -] - -[[package]] -name = "unicase" -version = "2.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f7d2d4dafb69621809a81864c9c1b864479e1235c0dd4e199924b9742439ed89" -dependencies = [ - "version_check", -] - -[[package]] -name = "unicode-bidi" -version = "0.3.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08f95100a766bf4f8f28f90d77e0a5461bbdb219042e7679bebe79004fed8d75" -dependencies = [ - "serde", -] - -[[package]] -name = "unicode-ident" -version = "1.0.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" - -[[package]] -name = "unicode-properties" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "52ea75f83c0137a9b98608359a5f1af8144876eb67bcb1ce837368e906a9f524" - -[[package]] -name = "unicode-script" -version = "0.5.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad8d71f5726e5f285a935e9fe8edfd53f0491eb6e9a5774097fdabee7cd8c9cd" - -[[package]] -name = "unicode-segmentation" -version = "1.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d4c87d22b6e3f4a18d4d40ef354e97c90fcb14dd91d7dc0aa9d8a1172ebf7202" - -[[package]] -name = "unicode-width" -version = "0.1.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0336d538f7abc86d282a4189614dfaa90810dfc2c6f6427eaf88e16311dd225d" - -[[package]] -name = "unicode-xid" -version = "0.2.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "229730647fbc343e3a80e463c1db7f78f3855d3f3739bee0dda773c9a037c90a" - -[[package]] -name = "untrusted" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1" - -[[package]] -name = "unwind-sys" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7a81ba64bc45243d442e9bb2a362f303df152b5078c56ce4a0dc7d813c8df91" -dependencies = [ - "libc", - "pkg-config", -] - -[[package]] -name = "url" -version = "2.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f7c25da092f0a868cdf09e8674cd3b7ef3a7d92a24253e663a2fb85e2496de56" -dependencies = [ - "form_urlencoded", - "idna", - "percent-encoding", - "serde", -] - -[[package]] -name = "utf-8" -version = "0.7.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09cc8ee72d2a9becf2f2febe0205bbed8fc6615b7cb429ad062dc7b7ddd036a9" - -[[package]] -name = "utf16_iter" -version = "1.0.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c8232dd3cdaed5356e0f716d285e4b40b932ac434100fe9b7e0e8e935b9e6246" - -[[package]] -name = "utf8_iter" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6c140620e7ffbb22c2dee59cafe6084a59b5ffc27a8859a5f0d494b5d52b6be" - -[[package]] -name = "uuid" -version = "1.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81dfa00651efa65069b0b6b651f4aaa31ba9e3c3ce0137aaad053604ee7e0314" -dependencies = [ - "getrandom", - "serde", -] - -[[package]] -name = "valuable" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d" - -[[package]] -name = "vcpkg" -version = "0.2.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426" - -[[package]] -name = "vec_map" -version = "0.8.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1bddf1187be692e79c5ffeab891132dfb0f236ed36a43c7ed39f1165ee20191" - -[[package]] -name = "vergen" -version = "8.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2990d9ea5967266ea0ccf413a4aa5c42a93dbcfda9cb49a97de6931726b12566" -dependencies = [ - "anyhow", - "cfg-if", - "git2", - "rustversion", - "time 0.3.36", -] - -[[package]] -name = "version-compare" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "852e951cb7832cb45cb1169900d19760cfa39b82bc0ea9c0e5a14ae88411c98b" - -[[package]] -name = "version_check" -version = "0.9.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a" - -[[package]] -name = "void" -version = "1.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a02e4885ed3bc0f2de90ea6dd45ebcbb66dacffe03547fadbb0eeae2770887d" - -[[package]] -name = "walkdir" -version = "2.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "29790946404f91d9c5d06f9874efddea1dc06c5efe94541a7d6863108e3a5e4b" -dependencies = [ - "same-file", - "winapi-util", -] - -[[package]] -name = "want" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bfa7760aed19e106de2c7c0b581b509f2f25d3dacaf737cb82ac61bc6d760b0e" -dependencies = [ - "try-lock", -] - -[[package]] -name = "warp" -version = "0.3.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4378d202ff965b011c64817db11d5829506d3404edeadb61f190d111da3f231c" -dependencies = [ - "bytes", - "futures-channel", - "futures-util", - "headers", - "http", - "hyper", - "log", - "mime", - "mime_guess", - "percent-encoding", - "pin-project", - "scoped-tls", - "serde", - "serde_json", - "serde_urlencoded", - "tokio", - "tokio-util", - "tower-service", - "tracing", -] - -[[package]] -name = "wasi" -version = "0.10.0+wasi-snapshot-preview1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a143597ca7c7793eff794def352d41792a93c481eb1042423ff7ff72ba2c31f" - -[[package]] -name = "wasi" -version = "0.11.0+wasi-snapshot-preview1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" - -[[package]] -name = "wasm-bindgen" -version = "0.2.93" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a82edfc16a6c469f5f44dc7b571814045d60404b55a0ee849f9bcfa2e63dd9b5" -dependencies = [ - "cfg-if", - "once_cell", - "wasm-bindgen-macro", -] - -[[package]] -name = "wasm-bindgen-backend" -version = "0.2.93" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9de396da306523044d3302746f1208fa71d7532227f15e347e2d93e4145dd77b" -dependencies = [ - "bumpalo", - "log", - "once_cell", - "proc-macro2", - "quote", - "syn", - "wasm-bindgen-shared", -] - -[[package]] -name = "wasm-bindgen-futures" -version = "0.4.43" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61e9300f63a621e96ed275155c108eb6f843b6a26d053f122ab69724559dc8ed" -dependencies = [ - "cfg-if", - "js-sys", - "wasm-bindgen", - "web-sys", -] - -[[package]] -name = "wasm-bindgen-macro" -version = "0.2.93" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "585c4c91a46b072c92e908d99cb1dcdf95c5218eeb6f3bf1efa991ee7a68cccf" -dependencies = [ - "quote", - "wasm-bindgen-macro-support", -] - -[[package]] -name = "wasm-bindgen-macro-support" -version = "0.2.93" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "afc340c74d9005395cf9dd098506f7f44e38f2b4a21c6aaacf9a105ea5e1e836" -dependencies = [ - "proc-macro2", - "quote", - "syn", - "wasm-bindgen-backend", - "wasm-bindgen-shared", -] - -[[package]] -name = "wasm-bindgen-shared" -version = "0.2.93" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c62a0a307cb4a311d3a07867860911ca130c3494e8c2719593806c08bc5d0484" - -[[package]] -name = "wayland-backend" -version = "0.3.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "056535ced7a150d45159d3a8dc30f91a2e2d588ca0b23f70e56033622b8016f6" -dependencies = [ - "cc", - "downcast-rs", - "rustix", - "scoped-tls", - "smallvec", - "wayland-sys 0.31.5", -] - -[[package]] -name = "wayland-client" -version = "0.31.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3f45d1222915ef1fd2057220c1d9d9624b7654443ea35c3877f7a52bd0a5a2d" -dependencies = [ - "bitflags 2.6.0", - "rustix", - "wayland-backend", - "wayland-scanner", -] - -[[package]] -name = "wayland-csd-frame" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "625c5029dbd43d25e6aa9615e88b829a5cad13b2819c4ae129fdbb7c31ab4c7e" -dependencies = [ - "bitflags 2.6.0", - "cursor-icon", - "wayland-backend", -] - -[[package]] -name = "wayland-cursor" -version = "0.31.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3a94697e66e76c85923b0d28a0c251e8f0666f58fc47d316c0f4da6da75d37cb" -dependencies = [ - "rustix", - "wayland-client", - "xcursor", -] - -[[package]] -name = "wayland-protocols" -version = "0.31.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f81f365b8b4a97f422ac0e8737c438024b5951734506b0e1d775c73030561f4" -dependencies = [ - "bitflags 2.6.0", - "wayland-backend", - "wayland-client", - "wayland-scanner", -] - -[[package]] -name = "wayland-protocols-plasma" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23803551115ff9ea9bce586860c5c5a971e360825a0309264102a9495a5ff479" -dependencies = [ - "bitflags 2.6.0", - "wayland-backend", - "wayland-client", - "wayland-protocols", - "wayland-scanner", -] - -[[package]] -name = "wayland-protocols-wlr" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad1f61b76b6c2d8742e10f9ba5c3737f6530b4c243132c2a2ccc8aa96fe25cd6" -dependencies = [ - "bitflags 2.6.0", - "wayland-backend", - "wayland-client", - "wayland-protocols", - "wayland-scanner", -] - -[[package]] -name = "wayland-scanner" -version = "0.31.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "597f2001b2e5fc1121e3d5b9791d3e78f05ba6bfa4641053846248e3a13661c3" -dependencies = [ - "proc-macro2", - "quick-xml", - "quote", -] - -[[package]] -name = "wayland-sys" -version = "0.30.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96b2a02ac608e07132978689a6f9bf4214949c85998c247abadd4f4129b1aa06" -dependencies = [ - "dlib", - "lazy_static", - "log", - "pkg-config", -] - -[[package]] -name = "wayland-sys" -version = "0.31.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "efa8ac0d8e8ed3e3b5c9fc92c7881406a268e11555abe36493efabe649a29e09" -dependencies = [ - "dlib", - "log", - "once_cell", - "pkg-config", -] - -[[package]] -name = "web-sys" -version = "0.3.70" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26fdeaafd9bd129f65e7c031593c24d62186301e0c72c8978fa1678be7d532c0" -dependencies = [ - "js-sys", - "wasm-bindgen", -] - -[[package]] -name = "web-time" -version = "0.2.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa30049b1c872b72c89866d458eae9f20380ab280ffd1b1e18df2d3e2d98cfe0" -dependencies = [ - "js-sys", - "wasm-bindgen", -] - -[[package]] -name = "webdriver" -version = "0.49.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc8773336cf1ad6ffadae7d73fea436e5c4d6345a467292902876cb0f7b72107" -dependencies = [ - "base64", - "bytes", - "cookie 0.16.2", - "http", - "log", - "serde", - "serde_derive", - "serde_json", - "time 0.3.36", - "tokio", - "tokio-stream", - "unicode-segmentation", - "url", - "warp", -] - -[[package]] -name = "webdriver_server" -version = "0.0.1" -dependencies = [ - "base", - "base64", - "compositing_traits", - "cookie 0.18.1", - "crossbeam-channel", - "euclid", - "http", - "image", - "ipc-channel", - "keyboard-types", - "log", - "net_traits", - "pixels", - "script_traits", - "serde", - "serde_json", - "servo_config", - "servo_url", - "style_traits", - "uuid", - "webdriver", -] - -[[package]] -name = "webgpu" -version = "0.0.1" -dependencies = [ - "arrayvec", - "base", - "euclid", - "ipc-channel", - "log", - "malloc_size_of", - "serde", - "servo_config", - "smallvec", - "webrender", - "webrender_api", - "webrender_traits", - "wgpu-core", - "wgpu-types", -] - -[[package]] -name = "webpki-roots" -version = "0.25.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f20c57d8d7db6d3b86154206ae5d8fba62dd39573114de97c2cb0578251f8e1" - -[[package]] -name = "webrender" -version = "0.65.0" -source = "git+https://github.com/servo/webrender?branch=0.65#8468e81608b00d83c62466f1c0f5ef73d44fda76" -dependencies = [ - "bincode", - "bitflags 2.6.0", - "build-parallel", - "byteorder", - "derive_more", - "etagere", - "euclid", - "fxhash", - "gleam", - "glslopt", - "lazy_static", - "log", - "malloc_size_of_derive", - "num-traits", - "peek-poke", - "plane-split", - "rayon", - "ron", - "serde", - "smallvec", - "svg_fmt", - "time 0.1.45", - "topological-sort", - "tracy-rs", - "webrender_api", - "webrender_build", - "wr_glyph_rasterizer", - "wr_malloc_size_of", -] - -[[package]] -name = "webrender_api" -version = "0.65.0" -source = "git+https://github.com/servo/webrender?branch=0.65#8468e81608b00d83c62466f1c0f5ef73d44fda76" -dependencies = [ - "app_units", - "bitflags 2.6.0", - "byteorder", - "crossbeam-channel", - "euclid", - "malloc_size_of_derive", - "peek-poke", - "serde", - "serde_bytes", - "serde_derive", - "time 0.1.45", - "wr_malloc_size_of", -] - -[[package]] -name = "webrender_build" -version = "0.0.2" -source = "git+https://github.com/servo/webrender?branch=0.65#8468e81608b00d83c62466f1c0f5ef73d44fda76" -dependencies = [ - "bitflags 2.6.0", - "lazy_static", -] - -[[package]] -name = "webrender_traits" -version = "0.0.1" -dependencies = [ - "base", - "crossbeam-channel", - "embedder_traits", - "euclid", - "ipc-channel", - "libc", - "log", - "serde", - "surfman", - "webrender_api", -] - -[[package]] -name = "webxr" -version = "0.0.1" -source = "git+https://github.com/servo/webxr#1a2186a5b33ae9e2e0b4fc15e9dc6095ae2e5fd0" -dependencies = [ - "crossbeam-channel", - "euclid", - "log", - "openxr", - "serde", - "sparkle", - "surfman", - "webxr-api", - "winapi", - "wio", -] - -[[package]] -name = "webxr-api" -version = "0.0.1" -source = "git+https://github.com/servo/webxr#1a2186a5b33ae9e2e0b4fc15e9dc6095ae2e5fd0" -dependencies = [ - "euclid", - "ipc-channel", - "log", - "serde", -] - -[[package]] -name = "weezl" -version = "0.1.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53a85b86a771b1c87058196170769dd264f66c0782acf1ae6cc51bfd64b39082" - -[[package]] -name = "wgpu-core" -version = "22.0.0" -source = "git+https://github.com/gfx-rs/wgpu?rev=0e352f5b3448236b6cbebcd146d0606b00cb3806#0e352f5b3448236b6cbebcd146d0606b00cb3806" -dependencies = [ - "arrayvec", - "bit-vec", - "bitflags 2.6.0", - "cfg_aliases 0.1.1", - "document-features", - "indexmap", - "log", - "naga", - "once_cell", - "parking_lot", - "profiling", - "ron", - "rustc-hash", - "serde", - "smallvec", - "thiserror", - "wgpu-hal", - "wgpu-types", -] - -[[package]] -name = "wgpu-hal" -version = "22.0.0" -source = "git+https://github.com/gfx-rs/wgpu?rev=0e352f5b3448236b6cbebcd146d0606b00cb3806#0e352f5b3448236b6cbebcd146d0606b00cb3806" -dependencies = [ - "android_system_properties", - "arrayvec", - "ash", - "bit-set", - "bitflags 2.6.0", - "block", - "cfg_aliases 0.1.1", - "core-graphics-types", - "glow 0.14.0", - "glutin_wgl_sys", - "gpu-alloc", - "gpu-allocator", - "gpu-descriptor", - "js-sys", - "khronos-egl", - "libc", - "libloading", - "log", - "metal 0.29.0", - "naga", - "ndk-sys", - "objc", - "once_cell", - "parking_lot", - "profiling", - "range-alloc", - "raw-window-handle", - "rustc-hash", - "smallvec", - "thiserror", - "wasm-bindgen", - "web-sys", - "wgpu-types", - "windows 0.58.0", - "windows-core 0.58.0", -] - -[[package]] -name = "wgpu-types" -version = "22.0.0" -source = "git+https://github.com/gfx-rs/wgpu?rev=0e352f5b3448236b6cbebcd146d0606b00cb3806#0e352f5b3448236b6cbebcd146d0606b00cb3806" -dependencies = [ - "bitflags 2.6.0", - "js-sys", - "serde", - "web-sys", -] - -[[package]] -name = "which" -version = "4.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87ba24419a2078cd2b0f2ede2691b6c66d8e47836da3b6db8265ebad47afbfc7" -dependencies = [ - "either", - "home", - "once_cell", - "rustix", -] - -[[package]] -name = "winapi" -version = "0.3.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" -dependencies = [ - "winapi-i686-pc-windows-gnu", - "winapi-x86_64-pc-windows-gnu", -] - -[[package]] -name = "winapi-i686-pc-windows-gnu" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" - -[[package]] -name = "winapi-util" -version = "0.1.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf221c93e13a30d793f7645a0e7762c55d169dbb0a49671918a2319d289b10bb" -dependencies = [ - "windows-sys 0.59.0", -] - -[[package]] -name = "winapi-x86_64-pc-windows-gnu" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" - -[[package]] -name = "windows" -version = "0.48.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e686886bc078bc1b0b600cac0147aadb815089b6e4da64016cbd754b6342700f" -dependencies = [ - "windows-targets 0.48.5", -] - -[[package]] -name = "windows" -version = "0.58.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd04d41d93c4992d421894c18c8b43496aa748dd4c081bac0dc93eb0489272b6" -dependencies = [ - "windows-core 0.58.0", - "windows-targets 0.52.6", -] - -[[package]] -name = "windows-core" -version = "0.52.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9" -dependencies = [ - "windows-targets 0.52.6", -] - -[[package]] -name = "windows-core" -version = "0.58.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ba6d44ec8c2591c134257ce647b7ea6b20335bf6379a27dac5f1641fcf59f99" -dependencies = [ - "windows-implement", - "windows-interface", - "windows-result", - "windows-strings", - "windows-targets 0.52.6", -] - -[[package]] -name = "windows-implement" -version = "0.58.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2bbd5b46c938e506ecbce286b6628a02171d56153ba733b6c741fc627ec9579b" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "windows-interface" -version = "0.58.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "053c4c462dc91d3b1504c6fe5a726dd15e216ba718e84a0e46a88fbe5ded3515" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "windows-result" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d1043d8214f791817bab27572aaa8af63732e11bf84aa21a45a78d6c317ae0e" -dependencies = [ - "windows-targets 0.52.6", -] - -[[package]] -name = "windows-strings" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4cd9b125c486025df0eabcb585e62173c6c9eddcec5d117d3b6e8c30e2ee4d10" -dependencies = [ - "windows-result", - "windows-targets 0.52.6", -] - -[[package]] -name = "windows-sys" -version = "0.42.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a3e1820f08b8513f676f7ab6c1f99ff312fb97b553d30ff4dd86f9f15728aa7" -dependencies = [ - "windows_aarch64_gnullvm 0.42.2", - "windows_aarch64_msvc 0.42.2", - "windows_i686_gnu 0.42.2", - "windows_i686_msvc 0.42.2", - "windows_x86_64_gnu 0.42.2", - "windows_x86_64_gnullvm 0.42.2", - "windows_x86_64_msvc 0.42.2", -] - -[[package]] -name = "windows-sys" -version = "0.45.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0" -dependencies = [ - "windows-targets 0.42.2", -] - -[[package]] -name = "windows-sys" -version = "0.48.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" -dependencies = [ - "windows-targets 0.48.5", -] - -[[package]] -name = "windows-sys" -version = "0.52.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" -dependencies = [ - "windows-targets 0.52.6", -] - -[[package]] -name = "windows-sys" -version = "0.59.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b" -dependencies = [ - "windows-targets 0.52.6", -] - -[[package]] -name = "windows-targets" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e5180c00cd44c9b1c88adb3693291f1cd93605ded80c250a75d472756b4d071" -dependencies = [ - "windows_aarch64_gnullvm 0.42.2", - "windows_aarch64_msvc 0.42.2", - "windows_i686_gnu 0.42.2", - "windows_i686_msvc 0.42.2", - "windows_x86_64_gnu 0.42.2", - "windows_x86_64_gnullvm 0.42.2", - "windows_x86_64_msvc 0.42.2", -] - -[[package]] -name = "windows-targets" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c" -dependencies = [ - "windows_aarch64_gnullvm 0.48.5", - "windows_aarch64_msvc 0.48.5", - "windows_i686_gnu 0.48.5", - "windows_i686_msvc 0.48.5", - "windows_x86_64_gnu 0.48.5", - "windows_x86_64_gnullvm 0.48.5", - "windows_x86_64_msvc 0.48.5", -] - -[[package]] -name = "windows-targets" -version = "0.52.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973" -dependencies = [ - "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]] -name = "windows_aarch64_gnullvm" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "597a5118570b68bc08d8d59125332c54f1ba9d9adeedeef5b99b02ba2b0698f8" - -[[package]] -name = "windows_aarch64_gnullvm" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" - -[[package]] -name = "windows_aarch64_gnullvm" -version = "0.52.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3" - -[[package]] -name = "windows_aarch64_msvc" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43" - -[[package]] -name = "windows_aarch64_msvc" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" - -[[package]] -name = "windows_aarch64_msvc" -version = "0.52.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469" - -[[package]] -name = "windows_i686_gnu" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f" - -[[package]] -name = "windows_i686_gnu" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" - -[[package]] -name = "windows_i686_gnu" -version = "0.52.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -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" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060" - -[[package]] -name = "windows_i686_msvc" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" - -[[package]] -name = "windows_i686_msvc" -version = "0.52.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66" - -[[package]] -name = "windows_x86_64_gnu" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36" - -[[package]] -name = "windows_x86_64_gnu" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" - -[[package]] -name = "windows_x86_64_gnu" -version = "0.52.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78" - -[[package]] -name = "windows_x86_64_gnullvm" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26d41b46a36d453748aedef1486d5c7a85db22e56aff34643984ea85514e94a3" - -[[package]] -name = "windows_x86_64_gnullvm" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" - -[[package]] -name = "windows_x86_64_gnullvm" -version = "0.52.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d" - -[[package]] -name = "windows_x86_64_msvc" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0" - -[[package]] -name = "windows_x86_64_msvc" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" - -[[package]] -name = "windows_x86_64_msvc" -version = "0.52.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" - -[[package]] -name = "winit" -version = "0.29.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d59ad965a635657faf09c8f062badd885748428933dad8e8bdd64064d92e5ca" -dependencies = [ - "ahash", - "android-activity", - "atomic-waker", - "bitflags 2.6.0", - "bytemuck", - "calloop", - "cfg_aliases 0.1.1", - "core-foundation", - "core-graphics", - "cursor-icon", - "icrate", - "js-sys", - "libc", - "log", - "memmap2", - "ndk", - "ndk-sys", - "objc2", - "once_cell", - "orbclient", - "percent-encoding", - "raw-window-handle", - "redox_syscall 0.3.5", - "rustix", - "sctk-adwaita", - "smithay-client-toolkit", - "smol_str", - "unicode-segmentation", - "wasm-bindgen", - "wasm-bindgen-futures", - "wayland-backend", - "wayland-client", - "wayland-protocols", - "wayland-protocols-plasma", - "web-sys", - "web-time", - "windows-sys 0.48.0", - "x11-dl", - "x11rb", - "xkbcommon-dl", -] - -[[package]] -name = "winnow" -version = "0.5.40" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f593a95398737aeed53e489c785df13f3618e41dbcd6718c6addbf1395aa6876" -dependencies = [ - "memchr", -] - -[[package]] -name = "winres" -version = "0.1.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b68db261ef59e9e52806f688020631e987592bd83619edccda9c47d42cde4f6c" -dependencies = [ - "toml 0.5.11", -] - -[[package]] -name = "wio" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d129932f4644ac2396cb456385cbf9e63b5b30c6e8dc4820bdca4eb082037a5" -dependencies = [ - "winapi", -] - -[[package]] -name = "wr_glyph_rasterizer" -version = "0.1.0" -source = "git+https://github.com/servo/webrender?branch=0.65#8468e81608b00d83c62466f1c0f5ef73d44fda76" -dependencies = [ - "core-foundation", - "core-graphics", - "core-text", - "dwrote", - "euclid", - "freetype", - "fxhash", - "lazy_static", - "libc", - "log", - "malloc_size_of_derive", - "objc", - "rayon", - "serde", - "smallvec", - "tracy-rs", - "webrender_api", - "wr_malloc_size_of", -] - -[[package]] -name = "wr_malloc_size_of" -version = "0.0.3" -source = "git+https://github.com/servo/webrender?branch=0.65#8468e81608b00d83c62466f1c0f5ef73d44fda76" -dependencies = [ - "app_units", - "euclid", -] - -[[package]] -name = "write16" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d1890f4022759daae28ed4fe62859b1236caebfc61ede2f63ed4e695f3f6d936" - -[[package]] -name = "writeable" -version = "0.5.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e9df38ee2d2c3c5948ea468a8406ff0db0b29ae1ffde1bcf20ef305bcc95c51" -dependencies = [ - "either", -] - -[[package]] -name = "x11" -version = "2.21.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "502da5464ccd04011667b11c435cb992822c2c0dbde1770c988480d312a0db2e" -dependencies = [ - "libc", - "pkg-config", -] - -[[package]] -name = "x11-dl" -version = "2.21.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38735924fedd5314a6e548792904ed8c6de6636285cb9fec04d5b1db85c1516f" -dependencies = [ - "libc", - "once_cell", - "pkg-config", -] - -[[package]] -name = "x11rb" -version = "0.13.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d91ffca73ee7f68ce055750bf9f6eca0780b8c85eff9bc046a3b0da41755e12" -dependencies = [ - "as-raw-xcb-connection", - "gethostname", - "libc", - "libloading", - "once_cell", - "rustix", - "x11rb-protocol", -] - -[[package]] -name = "x11rb-protocol" -version = "0.13.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec107c4503ea0b4a98ef47356329af139c0a4f7750e621cf2973cd3385ebcb3d" - -[[package]] -name = "xattr" -version = "1.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8da84f1a25939b27f6820d92aed108f83ff920fdf11a7b19366c27c4cda81d4f" -dependencies = [ - "libc", - "linux-raw-sys", - "rustix", -] - -[[package]] -name = "xcursor" -version = "0.3.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ef33da6b1660b4ddbfb3aef0ade110c8b8a781a3b6382fa5f2b5b040fd55f61" - -[[package]] -name = "xi-unicode" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a67300977d3dc3f8034dae89778f502b6ba20b269527b3223ba59c0cf393bb8a" - -[[package]] -name = "xkbcommon-dl" -version = "0.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d039de8032a9a8856a6be89cea3e5d12fdd82306ab7c94d74e6deab2460651c5" -dependencies = [ - "bitflags 2.6.0", - "dlib", - "log", - "once_cell", - "xkeysym", -] - -[[package]] -name = "xkeysym" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9cc00251562a284751c9973bace760d86c0276c471b4be569fe6b068ee97a56" - -[[package]] -name = "xml-rs" -version = "0.8.21" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "539a77ee7c0de333dcc6da69b177380a0b81e0dacfa4f7344c465a36871ee601" - -[[package]] -name = "xml5ever" -version = "0.19.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d7b906d34d867d216b2d79fb0e9470aaa7f4948ea86b44c27846efedd596076c" -dependencies = [ - "log", - "mac", - "markup5ever", -] - -[[package]] -name = "yeslogic-fontconfig-sys" -version = "6.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "503a066b4c037c440169d995b869046827dbc71263f6e8f3be6d77d4f3229dbd" -dependencies = [ - "dlib", - "once_cell", - "pkg-config", -] - -[[package]] -name = "yoke" -version = "0.7.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c5b1314b079b0930c31e3af543d8ee1757b1951ae1e1565ec704403a7240ca5" -dependencies = [ - "serde", - "stable_deref_trait", - "yoke-derive", - "zerofrom", -] - -[[package]] -name = "yoke-derive" -version = "0.7.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "28cc31741b18cb6f1d5ff12f5b7523e3d6eb0852bbbad19d73905511d9849b95" -dependencies = [ - "proc-macro2", - "quote", - "syn", - "synstructure", -] - -[[package]] -name = "zerocopy" -version = "0.7.35" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b9b4fd18abc82b8136838da5d50bae7bdea537c574d8dc1a34ed098d6c166f0" -dependencies = [ - "byteorder", - "zerocopy-derive", -] - -[[package]] -name = "zerocopy-derive" -version = "0.7.35" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "zerofrom" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91ec111ce797d0e0784a1116d0ddcdbea84322cd79e5d5ad173daeba4f93ab55" -dependencies = [ - "zerofrom-derive", -] - -[[package]] -name = "zerofrom-derive" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ea7b4a3637ea8669cedf0f1fd5c286a17f3de97b8dd5a70a6c167a1730e63a5" -dependencies = [ - "proc-macro2", - "quote", - "syn", - "synstructure", -] - -[[package]] -name = "zerotrie" -version = "0.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb594dd55d87335c5f60177cee24f19457a5ec10a065e0a3014722ad252d0a1f" -dependencies = [ - "displaydoc", - "yoke", - "zerofrom", -] - -[[package]] -name = "zerovec" -version = "0.10.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa2b893d79df23bfb12d5461018d408ea19dfafe76c2c7ef6d4eba614f8ff079" -dependencies = [ - "yoke", - "zerofrom", - "zerovec-derive", -] - -[[package]] -name = "zerovec-derive" -version = "0.10.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6eafa6dfb17584ea3e2bd6e76e0cc15ad7af12b09abdd1ca55961bed9b1063c6" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "zune-inflate" -version = "0.2.54" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "73ab332fe2f6680068f3582b16a24f90ad7096d5d39b974d1c0aff0125116f02" -dependencies = [ - "simd-adler32", -] diff --git a/pkgs/by-name/se/servo/package.nix b/pkgs/by-name/se/servo/package.nix index 26bac5cf3487a..138fffae6b49a 100644 --- a/pkgs/by-name/se/servo/package.nix +++ b/pkgs/by-name/se/servo/package.nix @@ -8,10 +8,8 @@ cargo-deny, cmake, dbus, - gcc, git, gnumake, - libxkbcommon, llvm, llvmPackages, m4, @@ -20,19 +18,22 @@ pkg-config, python3, taplo, - vulkan-loader, which, yasm, zlib, # runtime deps - darwin, + apple-sdk_14, fontconfig, freetype, gst_all_1, + harfbuzz, + libcxx, libGL, libunwind, + libxkbcommon, udev, + vulkan-loader, wayland, xorg, }: @@ -40,57 +41,46 @@ let customPython = python3.withPackages ( ps: with ps; [ - dbus packaging - pip - six - virtualenv ] ); - runtimePaths = lib.makeLibraryPath [ - xorg.libXcursor - xorg.libXrandr - xorg.libXi - libxkbcommon - vulkan-loader - wayland - libGL - ]; + runtimePaths = lib.makeLibraryPath ( + lib.optionals (stdenv.hostPlatform.isLinux) [ + xorg.libXcursor + xorg.libXrandr + xorg.libXi + libxkbcommon + vulkan-loader + wayland + libGL + ] + ); in rustPlatform.buildRustPackage { pname = "servo"; - version = "0-unstable-2024-09-09"; + version = "0-unstable-2025-01-14"; src = fetchFromGitHub { owner = "servo"; repo = "servo"; - rev = "938fd8c12fc2489303e12538d3e3585bd771141f"; - hash = "sha256-CrpEBFYd8Qd0rxSnT81IvtxxEuYG0jWGJeHISvxalyY="; + rev = "f5ef8aaed32e6a6da3faca3a710e73cd35c31059"; + hash = "sha256-LaAg07Lp/oWNsrtqM6UrqmPAm/ajmPJPZb5O7q9eLO8="; }; - # need to use a `Cargo.lock` as there are git dependencies - cargoLock = { - lockFile = ./Cargo.lock; - outputHashes = { - "derive_common-0.0.1" = "sha256-z0I2fQQlbUqaFU1EX45eYDy5IbZJ4SIget7WHzq4St0="; - "fontsan-0.5.2" = "sha256-4id66xxQ8iu0+OvJKH77WYPUE0eoVa9oUHmr6lRFPa8="; - "gilrs-0.10.6" = "sha256-RIfowFShWTPqgVWliK8Fc4cJw0YKITLvmexmTC0SwQk="; - "mozjs-0.14.1" = "sha256-RMM28Rd0r58VLfNEJzjWw3Ze6oKEi5lC1Edv03tJbfY="; - "peek-poke-0.3.0" = "sha256-WCZYX68vZrPhaAZwpx9/lUp3bVsLMwtmlJSW8wNb2ks="; - "servo-media-0.1.0" = "sha256-+J/6ZJPM9eus6YHJA6ENJD63CBiJTtKZdfORq9n6Nf8="; - "signpost-0.1.0" = "sha256-xRVXwW3Gynace9Yk5r1q7xA60yy6xhC5wLAyMJ6rPRs="; - "webxr-0.0.1" = "sha256-HZ8oWm5BaBLBXo4dS2CbWjpExry7dzeB2ddRLh7+98w="; - "naga-22.0.0" = "sha256-Xi2lWZCv4V2mUbQmwV1aw3pcvIIcyltKvv/C+LVqqDI="; - "raqote-0.8.5" = "sha256-WLsz5q08VNmYBxUhQ0hOn0K0RVFnnjaWF/MuQGkO/Rg="; - }; - }; + useFetchCargoVendor = true; + cargoHash = "sha256-a5Dv/AiPs/fnKcboBej9H7BiRKCIjm0GaQ2ICiH9SpQ="; + + postPatch = '' + # Remap absolute path between modules to include SEMVER + substituteInPlace ../servo-0-unstable-*-vendor/servo_atoms-0.0.1/build.rs --replace-fail \ + "../style/counter_style/predefined.rs" \ + "../style-0.0.1/counter_style/predefined.rs" + ''; - # Remap absolute path between modules to include SEMVER # set `HOME` to a temp dir for write access # Fix invalid option errors during linking (https://github.com/mozilla/nixpkgs-mozilla/commit/c72ff151a3e25f14182569679ed4cd22ef352328) preConfigure = '' - sed -i -e 's/\/style\//\/style-0.0.1\//g' ../cargo-vendor-dir/servo_atoms-0.0.1/build.rs export HOME=$TMPDIR unset AS ''; @@ -100,7 +90,6 @@ rustPlatform.buildRustPackage { cmake customPython dbus - gcc git gnumake llvm @@ -117,21 +106,32 @@ rustPlatform.buildRustPackage { zlib ]; - buildInputs = [ - fontconfig - freetype - gst_all_1.gstreamer - gst_all_1.gst-plugins-base - gst_all_1.gst-plugins-good - gst_all_1.gst-plugins-bad - gst_all_1.gst-plugins-ugly - libunwind - udev - wayland - libGL - xorg.libX11 - xorg.libxcb - ] ++ (lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.AppKit ]); + buildInputs = + [ + fontconfig + freetype + gst_all_1.gstreamer + gst_all_1.gst-plugins-base + gst_all_1.gst-plugins-good + gst_all_1.gst-plugins-bad + gst_all_1.gst-plugins-ugly + harfbuzz + libunwind + libGL + ] + ++ lib.optionals stdenv.hostPlatform.isLinux [ + wayland + xorg.libX11 + xorg.libxcb + udev + vulkan-loader + ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + apple-sdk_14 + libcxx + ]; + + env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.hostPlatform.isDarwin "-I${lib.getDev libcxx}/include/c++/v1"; # copy resources into `$out` to be used during runtime # link runtime libraries From 48401bc349d9cc06f9db0cb7bb162b27758df9aa Mon Sep 17 00:00:00 2001 From: "R. Ryantm" <ryantm-bot@ryantm.com> Date: Wed, 15 Jan 2025 12:50:36 +0000 Subject: [PATCH 136/174] eask-cli: 0.10.2 -> 0.10.3 --- pkgs/by-name/ea/eask-cli/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ea/eask-cli/package.nix b/pkgs/by-name/ea/eask-cli/package.nix index ea70b29d4de71..75c90e3dc604d 100644 --- a/pkgs/by-name/ea/eask-cli/package.nix +++ b/pkgs/by-name/ea/eask-cli/package.nix @@ -6,16 +6,16 @@ buildNpmPackage rec { pname = "eask-cli"; - version = "0.10.2"; + version = "0.10.3"; src = fetchFromGitHub { owner = "emacs-eask"; repo = "cli"; rev = version; - hash = "sha256-G6bJoNKEz0Lpp3vfJJ86r942dWdMhQLJn10YXjUKJtI="; + hash = "sha256-PDWPamX3Jp28VLvyx5ZXtQ8sNTlYcwP3TlVPOgwnek8="; }; - npmDepsHash = "sha256-xZBnjhLHceLvYD9uPz5G9EupBBUAkBghxo5au0GxdWg="; + npmDepsHash = "sha256-1VWTL4BzvSHmVIyteHkjVqLPtbrhD2MMg/I+4mnPBIw="; dontBuild = true; From bd041a3f3da31df43ae1016df8e92faae072b126 Mon Sep 17 00:00:00 2001 From: FliegendeWurst <arne.keller@posteo.de> Date: Tue, 14 Jan 2025 20:00:44 +0100 Subject: [PATCH 137/174] naja: 0-unstable-2024-08-27 -> 0-unstable-2025-01-13 Also fix cross-compiling. --- pkgs/by-name/na/naja/package.nix | 50 ++++++++++++++++++++++++-------- 1 file changed, 38 insertions(+), 12 deletions(-) diff --git a/pkgs/by-name/na/naja/package.nix b/pkgs/by-name/na/naja/package.nix index a64b60b251309..937fe3d2c26aa 100644 --- a/pkgs/by-name/na/naja/package.nix +++ b/pkgs/by-name/na/naja/package.nix @@ -12,16 +12,17 @@ pkg-config, python3, tbb_2021_11, + buildPackages, }: stdenv.mkDerivation { pname = "naja"; - version = "0-unstable-2024-08-27"; + version = "0-unstable-2025-01-13"; src = fetchFromGitHub { owner = "najaeda"; repo = "naja"; - rev = "ca7a544d16abb31d6992e702ccbd97be3a644c08"; - hash = "sha256-lmgXv2nmmjKph0Tf9ZvV3kQBtbiGXYA7jrE77cgM+KU="; + rev = "ffc29daa22e02565b2a0a108f8e65236cdee413a"; + hash = "sha256-XGlgSUHSpHxNrms50pOQ9eoGZ6y79Rbm/sDYW2C4qsg="; fetchSubmodules = true; }; @@ -31,17 +32,32 @@ stdenv.mkDerivation { "dev" ]; + # disable building tests for cross build + postPatch = + lib.optionalString (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' + substituteInPlace CMakeLists.txt \ + --replace-fail 'enable_testing()' "" \ + --replace-fail 'add_subdirectory(test)' "" + substituteInPlace thirdparty/yosys-liberty/CMakeLists.txt \ + --replace-fail 'add_subdirectory(test)' "" + '' + + lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' + patchShebangs --build test/test_utils/diff_files.py + ''; + strictDeps = true; - nativeBuildInputs = [ - bison - capnproto - cmake - doxygen - flex - pkg-config - python3 - ]; + nativeBuildInputs = + [ + bison + cmake + doxygen + flex + pkg-config + ] + ++ lib.optionals (stdenv.buildPlatform.canExecute stdenv.hostPlatform) [ + python3 # test scripts + ]; buildInputs = [ boost @@ -49,15 +65,25 @@ stdenv.mkDerivation { flex # include dir libdwarf-lite tbb_2021_11 + python3 ]; cmakeFlags = [ (lib.cmakeBool "CPPTRACE_USE_EXTERNAL_LIBDWARF" true) (lib.cmakeBool "CPPTRACE_USE_EXTERNAL_ZSTD" true) + # provide correct executables for cross + (lib.cmakeFeature "Python3_EXECUTABLE" (lib.getExe python3.pythonOnBuildForHost)) + # TODO: remove these once capnp cross is fixed properly + (lib.cmakeFeature "CAPNP_EXECUTABLE" (lib.getExe' buildPackages.capnproto "capnp")) + (lib.cmakeFeature "CAPNPC_CXX_EXECUTABLE" (lib.getExe' buildPackages.capnproto "capnpc-c++")) ]; doCheck = true; + postInstall = '' + moveToOutput lib/libnaja_bne.so $lib + ''; + meta = { description = "Structural Netlist API (and more) for EDA post synthesis flow development"; homepage = "https://github.com/najaeda/naja"; From 4c015286133eda9cf668219c799d36270c610df4 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" <ryantm-bot@ryantm.com> Date: Wed, 15 Jan 2025 12:59:06 +0000 Subject: [PATCH 138/174] cloudflare-dynamic-dns: 4.3.13 -> 4.3.14 --- pkgs/by-name/cl/cloudflare-dynamic-dns/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/cl/cloudflare-dynamic-dns/package.nix b/pkgs/by-name/cl/cloudflare-dynamic-dns/package.nix index 11407ac4735e4..079f2c5f9855b 100644 --- a/pkgs/by-name/cl/cloudflare-dynamic-dns/package.nix +++ b/pkgs/by-name/cl/cloudflare-dynamic-dns/package.nix @@ -7,16 +7,16 @@ }: buildGoModule rec { pname = "cloudflare-dynamic-dns"; - version = "4.3.13"; + version = "4.3.14"; src = fetchFromGitHub { owner = "zebradil"; repo = "cloudflare-dynamic-dns"; tag = version; - hash = "sha256-MeVLDgr332B9KWvahlhRz7Yf3R/j2KwR9ROhU3eQnwA="; + hash = "sha256-inxDeATTu2nbKUQ1hUMuVE4Pnn9nY74HnjMg56n5tCg="; }; - vendorHash = "sha256-FzEPvLI6tvyQ/nMgCBXPc1RR8YwDU1cC5f/LSZfF3Bc="; + vendorHash = "sha256-i/hPoBurDv/ya7JCnpmx3NHVcNzakdM65DDueBr5Hh4="; subPackages = "."; From 8037b1e77684c72642a94176d335d3c6dce3af70 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" <ryantm-bot@ryantm.com> Date: Wed, 15 Jan 2025 13:11:12 +0000 Subject: [PATCH 139/174] extism-cli: 1.6.1 -> 1.6.2 --- pkgs/by-name/ex/extism-cli/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ex/extism-cli/package.nix b/pkgs/by-name/ex/extism-cli/package.nix index 0f3d738ec4f9a..4e93a0d1c6b6f 100644 --- a/pkgs/by-name/ex/extism-cli/package.nix +++ b/pkgs/by-name/ex/extism-cli/package.nix @@ -7,13 +7,13 @@ buildGoModule rec { pname = "extism-cli"; - version = "1.6.1"; + version = "1.6.2"; src = fetchFromGitHub { owner = "extism"; repo = "cli"; tag = "v${version}"; - hash = "sha256-txwpFc1FQlZLAxbpO92Ei7z3vhXBrpdIJHAqnrKp9Bg="; + hash = "sha256-VxQ8qj/prGecssbggSKhj0vkZ75/GD73u/g21hUVkSs="; }; vendorHash = "sha256-51/fzq2j55GHmEx2twb0DSi0AmBS4DbViZzo1c5Xn1M="; From 29904fabb3e31ff977404d4dddb6c9837300a7f8 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" <ryantm-bot@ryantm.com> Date: Wed, 15 Jan 2025 13:23:11 +0000 Subject: [PATCH 140/174] ignite-cli: 28.6.1 -> 28.7.0 --- pkgs/by-name/ig/ignite-cli/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ig/ignite-cli/package.nix b/pkgs/by-name/ig/ignite-cli/package.nix index 5c42239569346..a633a49706db0 100644 --- a/pkgs/by-name/ig/ignite-cli/package.nix +++ b/pkgs/by-name/ig/ignite-cli/package.nix @@ -9,13 +9,13 @@ buildGoModule rec { pname = "ignite-cli"; - version = "28.6.1"; + version = "28.7.0"; src = fetchFromGitHub { repo = "cli"; owner = "ignite"; rev = "v${version}"; - hash = "sha256-Ps4OxOPyBYdiW0y1L6z0ymc2/0dIQgsNinuhlRLpGDk="; + hash = "sha256-/gBykwBlZsHUWCJ01rdluU10xuEEmPmCfzSWlO6znW8="; }; vendorHash = "sha256-ks9wZUIwN0dOcXxxRk1Amxd0TPJBbLfKC9lzV4IMdjk="; From 58241945a022274d581d35684b0d2761ea7d1358 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" <ryantm-bot@ryantm.com> Date: Wed, 15 Jan 2025 12:31:34 +0000 Subject: [PATCH 141/174] plzip: 1.11 -> 1.12 --- pkgs/by-name/pl/plzip/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/pl/plzip/package.nix b/pkgs/by-name/pl/plzip/package.nix index 82a8c0b6f3c3a..ca1458bc15419 100644 --- a/pkgs/by-name/pl/plzip/package.nix +++ b/pkgs/by-name/pl/plzip/package.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "plzip"; - version = "1.11"; + version = "1.12"; outputs = [ "out" "man" @@ -18,7 +18,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchurl { url = "mirror://savannah/lzip/plzip/plzip-${finalAttrs.version}.tar.lz"; - hash = "sha256-UfSNM99lm7Ph5+QYJ16SKtdSYVpbyYQTnaCPHm19EP0="; + hash = "sha256-RLvt4rLiOPBbmSEon5194ia3lYKmN2pdEOv8u4dxOoQ="; # hash from release email }; From 43867dde03a34dff3e1f568708090efe0506b00c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" <ryantm-bot@ryantm.com> Date: Wed, 15 Jan 2025 13:25:13 +0000 Subject: [PATCH 142/174] klog-rs: 0.3.2 -> 0.4.0 --- pkgs/by-name/kl/klog-rs/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/kl/klog-rs/package.nix b/pkgs/by-name/kl/klog-rs/package.nix index a448b1b5ca92d..dbb48308f5c9c 100644 --- a/pkgs/by-name/kl/klog-rs/package.nix +++ b/pkgs/by-name/kl/klog-rs/package.nix @@ -7,15 +7,15 @@ rustPlatform.buildRustPackage rec { pname = "klog-rs"; - version = "0.3.2"; + version = "0.4.0"; src = fetchFromGitHub { owner = "tobifroe"; repo = "klog"; rev = version; - hash = "sha256-E9sVFVb+wmhkdGmzkQQGhTh9+MExuq/ftfeI07f906o="; + hash = "sha256-AlXyCDjs5xFqM0TmaBGfzvYn/ZDWAgBzLV/mDPQHflI="; }; - cargoHash = "sha256-BpSLfJTsUpf64sXNgVxX7BtT65+qGVmmFG052sC7AOY="; + cargoHash = "sha256-rJrOCDtWdvrvvQxC49g1wkW9/CrAGkGJQUuPZ2a6+bw="; checkFlags = [ # this integration test depends on a running kubernetes cluster "--skip=k8s::tests::test_get_pod_list" From 6031bdb0bafdb0399f2099b82ea60aa3d5e0315e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" <ryantm-bot@ryantm.com> Date: Wed, 15 Jan 2025 13:41:15 +0000 Subject: [PATCH 143/174] notepad-next: 0.9 -> 0.10 --- pkgs/applications/editors/notepad-next/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/notepad-next/default.nix b/pkgs/applications/editors/notepad-next/default.nix index e7a41ddc482b0..7c35a74dfb49a 100644 --- a/pkgs/applications/editors/notepad-next/default.nix +++ b/pkgs/applications/editors/notepad-next/default.nix @@ -10,13 +10,13 @@ mkDerivation rec { pname = "notepad-next"; - version = "0.9"; + version = "0.10"; src = fetchFromGitHub { owner = "dail8859"; repo = "NotepadNext"; rev = "v${version}"; - hash = "sha256-3BCLPY104zxALd3wFH8e9PitjmFbPcOfKsLqXowXqnY="; + hash = "sha256-DpqFu7Nt7l1rmQoJ7aQnFEGPxo8NDrowHxmyLdKIX4A="; # External dependencies - https://github.com/dail8859/NotepadNext/issues/135 fetchSubmodules = true; }; From 51c5f827d77c203ab74597571e3996ff7d408384 Mon Sep 17 00:00:00 2001 From: kashw2 <supra4keanu@hotmail.com> Date: Wed, 15 Jan 2025 23:48:37 +1000 Subject: [PATCH 144/174] wluma: 4.6.0 -> 4.6.1 --- pkgs/by-name/wl/wluma/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/wl/wluma/package.nix b/pkgs/by-name/wl/wluma/package.nix index 5e1f26096f7f9..076a27af0a791 100644 --- a/pkgs/by-name/wl/wluma/package.nix +++ b/pkgs/by-name/wl/wluma/package.nix @@ -17,13 +17,13 @@ rustPlatform.buildRustPackage rec { pname = "wluma"; - version = "4.6.0"; + version = "4.6.1"; src = fetchFromGitHub { owner = "maximbaz"; repo = "wluma"; rev = version; - sha256 = "sha256-Z4sd2v6Ukr0bLGMiG/oBi0uic87Y1Ag9C3ZgyrR4VmI="; + sha256 = "sha256-ds/qBaQNyZ/HdetI1QdJOZcjVotz4xHgoIIuWI9xOEg="; }; postPatch = '' @@ -39,7 +39,7 @@ rustPlatform.buildRustPackage rec { 'ExecStart=/usr/bin/wluma' 'ExecStart=${placeholder "out"}/bin/wluma' ''; - cargoHash = "sha256-QyRGKhKsCVt6ykzzr+WJdiLpIZHVvL5sRzNucg/3llk="; + cargoHash = "sha256-WUczKF9Mq39HpnQ077AiXWy8jN30IehzOxqCmUFGMh0="; nativeBuildInputs = [ makeWrapper From 82cea8d55bad769bc11bb9e7b0cc2ae1dea3ae43 Mon Sep 17 00:00:00 2001 From: "Adam C. Stephens" <adam@valkor.net> Date: Tue, 14 Jan 2025 23:02:42 -0500 Subject: [PATCH 145/174] ocamlPackages.lsp: 1.19.0 -> 1.21.0 --- pkgs/development/ocaml-modules/ocaml-lsp/jsonrpc.nix | 10 +++++----- pkgs/development/ocaml-modules/ocaml-lsp/lsp.nix | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/development/ocaml-modules/ocaml-lsp/jsonrpc.nix b/pkgs/development/ocaml-modules/ocaml-lsp/jsonrpc.nix index 8b473e650e1f6..aa90b9ac91f33 100644 --- a/pkgs/development/ocaml-modules/ocaml-lsp/jsonrpc.nix +++ b/pkgs/development/ocaml-modules/ocaml-lsp/jsonrpc.nix @@ -9,8 +9,8 @@ lib, ocaml, version ? - if lib.versionAtLeast ocaml.version "5.02" then - "1.19.0" + if lib.versionAtLeast ocaml.version "5.2" then + "1.21.0" else if lib.versionAtLeast ocaml.version "4.14" then "1.18.0" else if lib.versionAtLeast ocaml.version "4.13" then @@ -24,10 +24,10 @@ let params = { - "1.19.0" = { + "1.21.0" = { name = "lsp"; - minimalOCamlVersion = "5.02"; - sha256 = "sha256-54PZ8af4nOG/TJFIqjSiKDaL0Um7zKQ96AtFkiHe5ew="; + minimalOCamlVersion = "5.2"; + sha256 = "sha256-Z4cDN/8j0NK6Q3dL+1io/eBJd+o32k0txQDtC1fO9xc="; }; "1.18.0" = { name = "lsp"; diff --git a/pkgs/development/ocaml-modules/ocaml-lsp/lsp.nix b/pkgs/development/ocaml-modules/ocaml-lsp/lsp.nix index 4c3aaa15c29af..e05c0494515fb 100644 --- a/pkgs/development/ocaml-modules/ocaml-lsp/lsp.nix +++ b/pkgs/development/ocaml-modules/ocaml-lsp/lsp.nix @@ -23,8 +23,8 @@ ocamlformat-rpc-lib, ocaml, version ? - if lib.versionAtLeast ocaml.version "5.02" then - "1.19.0" + if lib.versionAtLeast ocaml.version "5.2" then + "1.21.0" else if lib.versionAtLeast ocaml.version "4.14" then "1.18.0" else if lib.versionAtLeast ocaml.version "4.13" then From d4f73b2e4ef644e15fbce2c091feb107d6b4bc13 Mon Sep 17 00:00:00 2001 From: a-kenji <aks.kenji@protonmail.com> Date: Wed, 15 Jan 2025 12:43:20 +0100 Subject: [PATCH 146/174] xdg-desktop-portal-cosmic: 1.0.0-alpha.4 -> 1.0.0-alpha.5.1 --- pkgs/by-name/xd/xdg-desktop-portal-cosmic/package.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/xd/xdg-desktop-portal-cosmic/package.nix b/pkgs/by-name/xd/xdg-desktop-portal-cosmic/package.nix index b498daaabc892..32802ddbd60bb 100644 --- a/pkgs/by-name/xd/xdg-desktop-portal-cosmic/package.nix +++ b/pkgs/by-name/xd/xdg-desktop-portal-cosmic/package.nix @@ -13,20 +13,20 @@ rustPlatform.buildRustPackage rec { pname = "xdg-desktop-portal-cosmic"; - version = "1.0.0-alpha.4"; + version = "1.0.0-alpha.5.1"; src = fetchFromGitHub { owner = "pop-os"; repo = "xdg-desktop-portal-cosmic"; rev = "epoch-${version}"; - hash = "sha256-4FdgavjxRKbU5/WBw9lcpWYLxCH6IJr7LaGkEXYUGbw="; + hash = "sha256-wff805IIXrXC/kn5l4HrYenxNRTGDYHPmT7qTTtBi/c="; }; - env.VERGEN_GIT_COMMIT_DATE = "2024-10-10"; + env.VERGEN_GIT_COMMIT_DATE = "2025-01-14"; env.VERGEN_GIT_SHA = src.rev; useFetchCargoVendor = true; - cargoHash = "sha256-FgfUkU9sv5mq4+pou2myQn6+DkLzPacjUhQ4pL8hntM="; + cargoHash = "sha256-Dwlow5nUl7qHLfu4Acic2CRCJViylpPLyLBVtBgWd9A="; separateDebugInfo = true; From 9a4f5c671f5f43a317d83ee9799494231f61f852 Mon Sep 17 00:00:00 2001 From: emilylange <git@emilylange.de> Date: Wed, 15 Jan 2025 16:43:03 +0100 Subject: [PATCH 147/174] chromium,chromedriver: 131.0.6778.264 -> 132.0.6834.83 https://chromereleases.googleblog.com/2025/01/stable-channel-update-for-desktop_14.html This update includes 16 security fixes. CVEs: CVE-2025-0434 CVE-2025-0435 CVE-2025-0436 CVE-2025-0437 CVE-2025-0438 CVE-2025-0439 CVE-2025-0440 CVE-2025-0441 CVE-2025-0442 CVE-2025-0443 CVE-2025-0446 CVE-2025-0447 CVE-2025-0448 --- .../networking/browsers/chromium/info.json | 258 +++++++++--------- 1 file changed, 129 insertions(+), 129 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/info.json b/pkgs/applications/networking/browsers/chromium/info.json index 43f33856d4ac8..72c39afafb363 100644 --- a/pkgs/applications/networking/browsers/chromium/info.json +++ b/pkgs/applications/networking/browsers/chromium/info.json @@ -1,26 +1,26 @@ { "chromium": { - "version": "131.0.6778.264", + "version": "132.0.6834.83", "chromedriver": { - "hash_darwin": "sha256-ibvVBD3q+ed1VffgSEZie7VAmSdBT3CJ9bNnjyYzWis=", - "hash_darwin_aarch64": "sha256-Eup+/qrFxMAU9AoYfd5BYTKM+J7CWE7GLGETiYdYorU=" + "hash_darwin": "sha256-gLpWPzuJXnYatvRFDdssgB7rMSUCFv2GIPaV+YRNiZ0=", + "hash_darwin_aarch64": "sha256-8uhDySh2cWogVFX6LzCRTTHTUHTk+vxdbVxyOIHHLxA=" }, "deps": { "depot_tools": { - "rev": "20b9bdcace7ed561d6a75728c85373503473cb6b", - "hash": "sha256-vlBENaVTtbwDJtSswuszcUlx+icZYJeP6ew6MO1cAv0=" + "rev": "41d43a2a2290450aeab946883542f8049b155c87", + "hash": "sha256-m/6b4VZZTUQOeED1mYvZOQCx8Re+Zd4O8SKDMjJ9Djo=" }, "gn": { - "rev": "95b0f8fe31a992a33c040bbe3867901335c12762", - "hash": "sha256-a8yCdBsl0nBMPS+pCLwrkAvQNP/THx/z/GySyOgx4Jk=" + "rev": "feafd1012a32c05ec6095f69ddc3850afb621f3a", + "hash": "sha256-zZoD5Bx7wIEP2KJkHef6wHrxU3px+8Vseq29QcK32bg=" }, - "npmHash": "sha256-b1l8SwjAfoColoa3zhTMPEF/rRuxzT3ATHE77rWU5EA=" + "npmHash": "sha256-H1/h3x+Cgp1x94Ze3UPPHxRVpylZDvpMXMOuS+jk2dw=" }, "DEPS": { "src": { "url": "https://chromium.googlesource.com/chromium/src.git", - "rev": "2d05e31515360f4da764174f7c448b33e36da871", - "hash": "sha256-aAb+lMefY4+zADsVeyLIhNI4AQfGmzu+7Y8o3t2csmU=", + "rev": "03d59cf5ecf1d8444838ff9a1e96231304d4ff9c", + "hash": "sha256-2FuT20iW8Mp4AehdEFT5Ua3La5z8bmT1FdLaUZRL0CE=", "recompress": true }, "src/third_party/clang-format/script": { @@ -30,18 +30,23 @@ }, "src/third_party/libc++/src": { "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libcxx.git", - "rev": "6a68fd412b9aecd515a20a7cf84d11b598bfaf96", - "hash": "sha256-7skqaen0XqbRvAGXQ0/3kea3vRInktdP3DOBeIBiGlQ=" + "rev": "8e31ad42561900383e10dbefc1d3e8f38cedfbe9", + "hash": "sha256-kmhTlz/qjvN0Qlra7Wz05O6X058hPPn0nVvAxFXQDC4=" }, "src/third_party/libc++abi/src": { "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libcxxabi.git", - "rev": "9a1d90c3b412d5ebeb97a6e33d98e1d0dd923221", - "hash": "sha256-zPm+Rif9fITazDvvm6SvLq8gwcPzPbuaXlRbyYqv7JA=" + "rev": "cec7f478354a8c8599f264ed8bb6043b5468f72d", + "hash": "sha256-CwiK9Td8aRS08RywItHKFvibzDAUYYd0YNRKxYPLTD8=" }, "src/third_party/libunwind/src": { "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libunwind.git", - "rev": "efc3baa2d1ece3630fcfa72bef93ed831bcaec4c", - "hash": "sha256-0OBelaxkKdajYXrGgz08nyPZhxqpsnFXiF3m8DGQkDo=" + "rev": "5b01ea4a6f3b666b7d190e7cb7c31db2ed4d94ce", + "hash": "sha256-uA+t5Ecc/iK3mllHR8AMVGRfU/7z1G3yrw0TamPQiOY=" + }, + "src/third_party/llvm-libc/src": { + "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libc.git", + "rev": "ca74a72e2b32ad804522bbef04dfe32560a10206", + "hash": "sha256-av9JdqLOQbezgRS4P8QXmvfB5l47v04WRagNJJgT5u4=" }, "src/chrome/test/data/perf/canvas_bench": { "url": "https://chromium.googlesource.com/chromium/canvas_bench.git", @@ -60,8 +65,8 @@ }, "src/docs/website": { "url": "https://chromium.googlesource.com/website.git", - "rev": "4811f9e01c4cfcbf9c6957015063eaaa0d92be91", - "hash": "sha256-98wwIeMTF2Wg2sJ07U1OUV83wR9nJOjGubp7Vnk3kj8=" + "rev": "be9c3dfd3781964fc0bab0d6c91d9ad117b71b02", + "hash": "sha256-CqveHvjPEcRWnzi8w13xr2OainrmABNO8uj0GzKmQqo=" }, "src/media/cdm/api": { "url": "https://chromium.googlesource.com/chromium/cdm.git", @@ -70,13 +75,13 @@ }, "src/net/third_party/quiche/src": { "url": "https://quiche.googlesource.com/quiche.git", - "rev": "e0175250977c2b2b95087afc0857883538a1386c", - "hash": "sha256-1O+hnZF73AY44jcmajJlpaQY5PV4+x0hYwqf1TtMahY=" + "rev": "9616efc903b7469161996006c8cf963238e26503", + "hash": "sha256-Z2uFWfZDYcY0m4R6mFMZJLnnVHu3/hQOAkCPQ5049SQ=" }, "src/testing/libfuzzer/fuzzers/wasm_corpus": { "url": "https://chromium.googlesource.com/v8/fuzzer_wasm_corpus.git", - "rev": "f650ff816f2ef227f61ea2e9f222aa69708ab367", - "hash": "sha256-qWsGQNUptbz0jYvUuxP7woNf5QQrfn9k3uvr82Yk0QM=" + "rev": "1df5e50a45db9518a56ebb42cb020a94a090258b", + "hash": "sha256-gItDOfNqm1tHlmelz3l2GGdiKi9adu1EpPP6U7+8EQY=" }, "src/third_party/accessibility_test_framework/src": { "url": "https://chromium.googlesource.com/external/github.com/google/Accessibility-Test-Framework-for-Android.git", @@ -85,8 +90,8 @@ }, "src/third_party/angle": { "url": "https://chromium.googlesource.com/angle/angle.git", - "rev": "ac6cda4cbd716102ded6a965f79573b41581898d", - "hash": "sha256-7Zfc262U42G6BUlxnLp6sQ78VlWBt0pTzkYwXY0rqaE=" + "rev": "ce13a00a2b049a1ef5e0e70a3d333ce70838ef7b", + "hash": "sha256-fMIHpa2QFsQQ19LGyhvV3Ihh6Ls8wwwhqTtpLoTEaf4=" }, "src/third_party/angle/third_party/glmark2/src": { "url": "https://chromium.googlesource.com/external/github.com/glmark2/glmark2", @@ -100,8 +105,8 @@ }, "src/third_party/angle/third_party/VK-GL-CTS/src": { "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/VK-GL-CTS", - "rev": "179dd9f858f0f5b0e52b61aefc621dc82e2ad34a", - "hash": "sha256-B7X9PTlMQdolsvEfuCNaKnRFcvsPNZtn5FOcJBY6sCA=" + "rev": "f674555ab03e6355e0981a647c115097e9fe5324", + "hash": "sha256-2ZhG4cJf85zO7x+SGG6RD2qgOxZVosxAIbuZt9GYUKs=" }, "src/third_party/anonymous_tokens/src": { "url": "https://chromium.googlesource.com/external/github.com/google/anonymous-tokens.git", @@ -115,13 +120,13 @@ }, "src/third_party/dav1d/libdav1d": { "url": "https://chromium.googlesource.com/external/github.com/videolan/dav1d.git", - "rev": "389450f61ea0b2057fc9ea393d3065859c4ba7f2", - "hash": "sha256-FK3tOLq5NcKQuStY5o8Lv2CXpjYHJm7n+NnyLFMOCxo=" + "rev": "93f12c117a4e1c0cc2b129dcc52e84dbd9b84200", + "hash": "sha256-Q2CaWvDqOmfaPG6a+SUHG5rFHalPEf4Oq/ytT3xuSOk=" }, "src/third_party/dawn": { "url": "https://dawn.googlesource.com/dawn.git", - "rev": "740d2502dbbd719a76c5a8d3fb4dac1b5363f42e", - "hash": "sha256-R41YVv4uWCU6SsACXPRppeCDguTs+/NVJckvMGGTgJE=" + "rev": "73dbf565079c89a531e6e01c4e8fc048a8a9660b", + "hash": "sha256-6P3Mw60+xZVsFbrhG6UkTlz8xvvEOptV3Ar1sos0CsU=" }, "src/third_party/dawn/third_party/glfw": { "url": "https://chromium.googlesource.com/external/github.com/glfw/glfw", @@ -130,8 +135,8 @@ }, "src/third_party/dawn/third_party/dxc": { "url": "https://chromium.googlesource.com/external/github.com/microsoft/DirectXShaderCompiler", - "rev": "080aeb7199e66e4b0a2b6383fd26a9f8d2cccbf5", - "hash": "sha256-YHEBGqfftgK68wWAWVTxtbl1GECBT1qTNe7irYkM/8k=" + "rev": "ac36a797d3470e8ee906b98457a59270d01db30d", + "hash": "sha256-rhUNPA5b0H3PBsOpXbAeRLpS0tNQkiHbjRBWmJycSAY=" }, "src/third_party/dawn/third_party/dxheaders": { "url": "https://chromium.googlesource.com/external/github.com/microsoft/DirectX-Headers", @@ -155,38 +160,38 @@ }, "src/third_party/dawn/third_party/webgpu-cts": { "url": "https://chromium.googlesource.com/external/github.com/gpuweb/cts", - "rev": "815ff2bb4038144dea89c33021bc4429f22a130f", - "hash": "sha256-28uZotrv+/MBBo+pcBWY3Csqrdv5Y4DxGbGEwK9Cwdw=" + "rev": "8690defa74b6975c10e85c113f121d4b2a3f2564", + "hash": "sha256-ArbHGjkHd1sko7gDPFksYz7XHKNge+e6tVy6oKPuqzg=" }, "src/third_party/highway/src": { "url": "https://chromium.googlesource.com/external/github.com/google/highway.git", - "rev": "8295336dd70f1201d42c22ab5b0861de38cf8fbf", - "hash": "sha256-PXsXIqWB4NNiFhanRjMIFSWYuW/IRuQo8mMPUBEentY=" + "rev": "00fe003dac355b979f36157f9407c7c46448958e", + "hash": "sha256-IS7m1wBwpPBUNhx2GttY1fzvmLIeAp3o2gXfrFpRdvY=" }, "src/third_party/google_benchmark/src": { "url": "https://chromium.googlesource.com/external/github.com/google/benchmark.git", - "rev": "344117638c8ff7e239044fd0fa7085839fc03021", - "hash": "sha256-gztnxui9Fe/FTieMjdvfJjWHjkImtlsHn6fM1FruyME=" + "rev": "761305ec3b33abf30e08d50eb829e19a802581cc", + "hash": "sha256-cH8s1gP6kCcojAAfTt5iQCVqiAaSooNk4BdaILujM3w=" }, "src/third_party/boringssl/src": { "url": "https://boringssl.googlesource.com/boringssl.git", - "rev": "cd95210465496ac2337b313cf49f607762abe286", - "hash": "sha256-172yvjgbFWQyd0PBRl74PJzpY/mDGC85D7PdeogNodU=" + "rev": "571c76e919c0c48219ced35bef83e1fc83b00eed", + "hash": "sha256-ib9wbV6S64OFc4zx0wQsQ84+5RxbETK0PS9Wm1BFQ1U=" }, "src/third_party/breakpad/breakpad": { "url": "https://chromium.googlesource.com/breakpad/breakpad.git", - "rev": "6b0c5b7ee1988a14a4af94564e8ae8bba8a94374", - "hash": "sha256-kTkwRfaqw5ZCHEvu2YPZ+1vCfekHkY5pY3m9snDN64g=" + "rev": "47f7823bdf4b1f39e462b2a497a674860e922e38", + "hash": "sha256-cFXUi2oO/614jF0GV7oW0ss62dXWFHDNWNT8rWHAiQc=" }, "src/third_party/cast_core/public/src": { "url": "https://chromium.googlesource.com/cast_core/public", - "rev": "71f51fd6fa45fac73848f65421081edd723297cd", - "hash": "sha256-AalRQhJmornCqmvE2+36J/3LubaA0jr6P1PXy32lX4I=" + "rev": "fbc5e98031e1271a0a566fcd4d9092b2d3275d05", + "hash": "sha256-o5/Lbhh6HHSWCVCEyDwDCgs+PLm67si981w0HuIWY7c=" }, "src/third_party/catapult": { "url": "https://chromium.googlesource.com/catapult.git", - "rev": "44791916611acec1cd74c492c7453e46d9b0dbd2", - "hash": "sha256-SkF+RIIlU8Vl3AmN6kARkLuVz/X5vygNOtGN2K3Sr+M=" + "rev": "b91cf840ac3255ef03b23cc93621369627422a1a", + "hash": "sha256-65cZPyqZUdSnYPJYUMYeJgx3mUC6L/qb9P2bDqd2Zkk=" }, "src/third_party/ced/src": { "url": "https://chromium.googlesource.com/external/github.com/google/compact_enc_det.git", @@ -195,8 +200,8 @@ }, "src/third_party/chromium-variations": { "url": "https://chromium.googlesource.com/chromium-variations.git", - "rev": "7d681838b57a25ca6659b9cc0111f879147c416b", - "hash": "sha256-zio8SqKEqOYYjVWZnzfrPqngqym2lZu9M/hgSi3ey0Q=" + "rev": "c170abb48f7715c237f4c06eaed0fe6f8a4c6f8d", + "hash": "sha256-mg5mu2jcy0xyNJ650ywWUMC94keRsqhZQuPZclHmyLI=" }, "src/third_party/cld_3/src": { "url": "https://chromium.googlesource.com/external/github.com/google/cld_3.git", @@ -215,8 +220,8 @@ }, "src/third_party/cpuinfo/src": { "url": "https://chromium.googlesource.com/external/github.com/pytorch/cpuinfo.git", - "rev": "1e83a2fdd3102f65c6f1fb602c1b320486218a99", - "hash": "sha256-28cFACca+NYE8oKlP5aWXNCLeEjhWqJ6gRnFI+VxDvg=" + "rev": "8df44962d437a0477f07ba6b8843d0b6a48646a4", + "hash": "sha256-FlvmSjY8kt5XHymDLaZdPuZ4k5xcagJk8w/U6adTkWI=" }, "src/third_party/crc32c/src": { "url": "https://chromium.googlesource.com/external/github.com/google/crc32c.git", @@ -225,23 +230,23 @@ }, "src/third_party/cros_system_api": { "url": "https://chromium.googlesource.com/chromiumos/platform2/system_api.git", - "rev": "b08c5ad457bddea2664ba20fb25beb3d1799fed2", - "hash": "sha256-cwpcY8YTXk+VVIFphO5ihc5rvbG3ZY9iHeK81P5DHBs=" + "rev": "554629b9242e6ae832ef14e3384654426f7fcc06", + "hash": "sha256-fvGypRhgl2uX9YE2cwjL7d3pYBa3Imd5p0RLhMYRgrc=" }, "src/third_party/crossbench": { "url": "https://chromium.googlesource.com/crossbench.git", - "rev": "b4d7ae714c548c3e139b95a85582dc15ece1d2f7", - "hash": "sha256-1RDDbvce5WR32if3cFYxiU9HS04x3BYIgOFJPMVJSBo=" + "rev": "ae6f165652e0ea983d73f5d04b7470d08c869e4f", + "hash": "sha256-/K6eM9s+fd2wjCrK0g0CgFNy0zxEN9SxTvmE50hMtXw=" }, "src/third_party/depot_tools": { "url": "https://chromium.googlesource.com/chromium/tools/depot_tools.git", - "rev": "20b9bdcace7ed561d6a75728c85373503473cb6b", - "hash": "sha256-vlBENaVTtbwDJtSswuszcUlx+icZYJeP6ew6MO1cAv0=" + "rev": "41d43a2a2290450aeab946883542f8049b155c87", + "hash": "sha256-m/6b4VZZTUQOeED1mYvZOQCx8Re+Zd4O8SKDMjJ9Djo=" }, "src/third_party/devtools-frontend/src": { "url": "https://chromium.googlesource.com/devtools/devtools-frontend", - "rev": "5284f1c63b2b08c47b8915ce713a1aace991dfe9", - "hash": "sha256-1Nh9SVIAde4jxgwFucbtZpl6rMyPM4Plfi+dhwP0wI8=" + "rev": "f2f3682c9db8ca427f8c64f0402cc2c5152c6c24", + "hash": "sha256-mBWZdbgZfO01Pt2lZSHX/d5r+8A/+qCZA8MRtZdeTrs=" }, "src/third_party/dom_distiller_js/dist": { "url": "https://chromium.googlesource.com/chromium/dom-distiller/dist.git", @@ -250,8 +255,8 @@ }, "src/third_party/eigen3/src": { "url": "https://chromium.googlesource.com/external/gitlab.com/libeigen/eigen.git", - "rev": "7eea0a9213e801ad9479a6499fd0330ec1db8693", - "hash": "sha256-JkOjOnLrDOcYHi3hptT1BDRvsKpTtOsBHT8YLb1hlJM=" + "rev": "b396a6fbb2e173f52edb3360485dedf3389ef830", + "hash": "sha256-UroGjERR5TW9KbyLwR/NBpytXrW1tHfu6ZvQPngROq4=" }, "src/third_party/farmhash/src": { "url": "https://chromium.googlesource.com/external/github.com/google/farmhash.git", @@ -265,8 +270,8 @@ }, "src/third_party/ffmpeg": { "url": "https://chromium.googlesource.com/chromium/third_party/ffmpeg.git", - "rev": "686d6944501a6ee9c849581e3fe343273d4af3f6", - "hash": "sha256-j5mpWn4j+U4rRlXbq8okUUXrRKycZkiV+UntiS90ChM=" + "rev": "591ae4b02eaff9a03e2ec863da895128b0b49910", + "hash": "sha256-wwHxNuZe2hBmGBpVg/iQJBoL350jfPYPTPqDn3RiqZE=" }, "src/third_party/flac": { "url": "https://chromium.googlesource.com/chromium/deps/flac.git", @@ -300,8 +305,8 @@ }, "src/third_party/freetype/src": { "url": "https://chromium.googlesource.com/chromium/src/third_party/freetype2.git", - "rev": "f02bffad0fd57f3acfa835c3f2899c5b71ff8be0", - "hash": "sha256-Lc2hbmZnnXQa0vzlJCizNBQ5WCOI5sJglTTe5gWVYUA=" + "rev": "0ae7e607370cc66218ccfacf5de4db8a35424c2f", + "hash": "sha256-+nbRZi3vAMTURhhFVUu5+59fVIv0GH3YZog2JavyVLY=" }, "src/third_party/freetype-testing/src": { "url": "https://chromium.googlesource.com/external/github.com/freetype/freetype2-testing.git", @@ -350,8 +355,8 @@ }, "src/third_party/googletest/src": { "url": "https://chromium.googlesource.com/external/github.com/google/googletest.git", - "rev": "62df7bdbc10887e094661e07ec2595b7920376fd", - "hash": "sha256-Iv/7r79cKC1pFkxPPHK/IHv/HFx18XZ4YVr+C2CX8+M=" + "rev": "d144031940543e15423a25ae5a8a74141044862f", + "hash": "sha256-n7tiIFAj8AiSCa9Tw+1j+ro9cSt5vagZpkbBBUUtYQY=" }, "src/third_party/hunspell_dictionaries": { "url": "https://chromium.googlesource.com/chromium/deps/hunspell_dictionaries.git", @@ -375,8 +380,8 @@ }, "src/third_party/libFuzzer/src": { "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/compiler-rt/lib/fuzzer.git", - "rev": "487e79376394754705984c5de7c4ce7f82f2bd7c", - "hash": "sha256-xQXfRIcQmAVP0k2mT7Blv1wBxL6wDaWTbIPGcTiMZRo=" + "rev": "a7128317fe7935a43d6c9f39df54f21113951941", + "hash": "sha256-jPS+Xi/ia0sMspxSGN38zasmVS/HslxH/qOFsV9TguE=" }, "src/third_party/fuzztest/src": { "url": "https://chromium.googlesource.com/external/github.com/google/fuzztest.git", @@ -395,28 +400,23 @@ }, "src/third_party/libaom/source/libaom": { "url": "https://aomedia.googlesource.com/aom.git", - "rev": "840f8797871cc587f7113ea9d2483a1156d57c0e", - "hash": "sha256-2XHqNAmv2L3TEFXu4Q6rnASLmuE93QplSVKNqyhlKUk=" + "rev": "be60f06ab420d6a65c477213f04c8b0f2e12ba2e", + "hash": "sha256-9VhEVOG9cReDOGoX+x5G/jJ8Y5RDoQIiLMoZtt5c9pI=" }, "src/third_party/libavif/src": { "url": "https://chromium.googlesource.com/external/github.com/AOMediaCodec/libavif.git", - "rev": "2c36aed375fff68611641b57d919b191f33431d5", - "hash": "sha256-fApdfzEtQnmio6BVzkcr/VkwojrNs+cx/+Am80H9dXw=" + "rev": "1cdeff7ecf456492c47cf48fc0cef6591cdc95da", + "hash": "sha256-lUuVyh2srhWMNUp4lEivyDic3MSZf5s63iAb84We80M=" }, "src/third_party/crabbyavif/src": { "url": "https://chromium.googlesource.com/external/github.com/webmproject/CrabbyAvif.git", - "rev": "ffad64ff4e349f926ad5ffcc882e205a94156d77", - "hash": "sha256-M2ExAgLm/NZ2soQEv3Ap/qx/B3+nd3NdDqYOL0E/pc8=" - }, - "src/third_party/libavifinfo/src": { - "url": "https://aomedia.googlesource.com/libavifinfo.git", - "rev": "8d8b58a3f517ef8d1794baa28ca6ae7d19f65514", - "hash": "sha256-61OPjdMCIbHvWncmBzNw6sqlHcuc1kyqm9k1j4UTcZ0=" + "rev": "c3548280e0a516ed7cad7ff1591b5807cef64aa4", + "hash": "sha256-hO5epHYNYI6pGwVSUv1Hp3qb7qOv8uOs4u+IdhDxd8Q=" }, "src/third_party/nearby/src": { "url": "https://chromium.googlesource.com/external/github.com/google/nearby-connections.git", - "rev": "1b382075dd1bd545655af7ebef949b3090061b74", - "hash": "sha256-kpyJiFXtk8eK8EkgzUbG0GS+znEeqzlB62qy9tPpEC8=" + "rev": "8e87a6e51c93e7836ecdbcc0a520c7992f3ece13", + "hash": "sha256-DO3FW5Q233ctFKk4K5F8oZec9kfrVl6uxAwMn0niKz4=" }, "src/third_party/beto-core/src": { "url": "https://beto-core.googlesource.com/beto-core.git", @@ -440,8 +440,8 @@ }, "src/third_party/cros-components/src": { "url": "https://chromium.googlesource.com/external/google3/cros_components.git", - "rev": "902e8ca804ae6c05f505e510c16647c32ce4d1cb", - "hash": "sha256-j2m9zVajkAdPF1ehLX0Gxp4LyMunhFDDCzrCm2WzArc=" + "rev": "9129cf4b2a5ca775c280243257a0b4856a93c7fb", + "hash": "sha256-owXaTIj0pbhUeJkirxaRoCmgIN9DwNzY3h771kaN+Fc=" }, "src/third_party/libdrm/src": { "url": "https://chromium.googlesource.com/chromiumos/third_party/libdrm.git", @@ -490,8 +490,8 @@ }, "src/third_party/libvpx/source/libvpx": { "url": "https://chromium.googlesource.com/webm/libvpx.git", - "rev": "906334ac1de2b0afa666472dce5545b82c1251fb", - "hash": "sha256-7GInV/uHuK6bUa1dSBuxJn6adyjfoOqSqfmfTvQbAoc=" + "rev": "727319a77ffe68e9aacb08e09ae7151b3a8f70a3", + "hash": "sha256-QGm37X4uid8zv+vRu0pVTvoQd2WcKztrj3tJkDjx82o=" }, "src/third_party/libwebm/source": { "url": "https://chromium.googlesource.com/webm/libwebm.git", @@ -505,8 +505,8 @@ }, "src/third_party/libyuv": { "url": "https://chromium.googlesource.com/libyuv/libyuv.git", - "rev": "a8e59d207483f75b87dd5fc670e937672cdf5776", - "hash": "sha256-gTNmhYuYmt/JmWSAVbcE4PqG3kW/JaL7XEWXbiNVfMM=" + "rev": "6ac7c8f25170c85265fca69fd1fe5d31baf3344f", + "hash": "sha256-vPVq7RzqO7gBUgYuNX0Fwxqok9jtXXJZgbhVFchG5Ws=" }, "src/third_party/lss": { "url": "https://chromium.googlesource.com/linux-syscall-support.git", @@ -540,8 +540,8 @@ }, "src/third_party/openscreen/src": { "url": "https://chromium.googlesource.com/openscreen", - "rev": "4f27c4f1698522dfcea36dca948a13e2eaf4c26c", - "hash": "sha256-dosSqpFlvli60ZJ0vexVZOK/FmzOYq5BDrZKZW0lMfc=" + "rev": "cb6fd42532fc3a831d6863d5006217e32a67c417", + "hash": "sha256-IlGxfw6Mhc7FYvhU2+Ngt9qflqr4JMC2OcplvksGI+U=" }, "src/third_party/openscreen/src/buildtools": { "url": "https://chromium.googlesource.com/chromium/src/buildtools", @@ -555,13 +555,13 @@ }, "src/third_party/pdfium": { "url": "https://pdfium.googlesource.com/pdfium.git", - "rev": "7a8409531fbb58d7d15ae331e645977b113d7ced", - "hash": "sha256-KlqgaOxKJQHHjU1g1VCcJEBhv809DdEUedrxdk8N99I=" + "rev": "84a8011ec69d0e2de271c05be7d62979608040d9", + "hash": "sha256-d8qJECIdq01ct+sS7cHVKFulYJarwahKCEcVf762JNI=" }, "src/third_party/perfetto": { "url": "https://android.googlesource.com/platform/external/perfetto.git", - "rev": "24764a1d9c2fce1e9816ffae691f00353ade330d", - "hash": "sha256-FAaxTuIYExmL3PSWwcvLpnPD4qsGDGr4/CIyi0NSrnI=" + "rev": "ea011a2c2d3aecdc4f1674887e107a56d2905edd", + "hash": "sha256-3vervpsq/QLMrR7RcJMwwh+CdFvSEj8yAzj6s9d1XMo=" }, "src/third_party/protobuf-javascript/src": { "url": "https://chromium.googlesource.com/external/github.com/protocolbuffers/protobuf-javascript", @@ -580,8 +580,8 @@ }, "src/third_party/quic_trace/src": { "url": "https://chromium.googlesource.com/external/github.com/google/quic-trace.git", - "rev": "caa0a6eaba816ecb737f9a70782b7c80b8ac8dbc", - "hash": "sha256-Nf9ZDLcE1JunhbpEMHhrY2ROnbgrvVZoRkPwWq1DU0g=" + "rev": "413da873d93a03d3662f24b881ea459a79f9c589", + "hash": "sha256-N1uFoNd3mz/LH1z06581Ds7BUyc67SNXUPzqomYREr8=" }, "src/third_party/pywebsocket3/src": { "url": "https://chromium.googlesource.com/external/github.com/GoogleChromeLabs/pywebsocket3.git", @@ -600,8 +600,8 @@ }, "src/third_party/skia": { "url": "https://skia.googlesource.com/skia.git", - "rev": "f14f6b1ab7cf544c0190074488d17821281cfa4d", - "hash": "sha256-0p57otDuIShl6MngYs22XA1QYxptDVa3vCwJsH59H34=" + "rev": "c17fe9bc158c29de3cdd655ac73d14f52c17810a", + "hash": "sha256-mRfkEm+NzEX0DkJejk1THx4G7v0sIFmRrAnt3Zl5uco=" }, "src/third_party/smhasher/src": { "url": "https://chromium.googlesource.com/external/smhasher.git", @@ -620,8 +620,8 @@ }, "src/third_party/swiftshader": { "url": "https://swiftshader.googlesource.com/SwiftShader.git", - "rev": "7a9a492a38b7c701f7c96a15a76046aed8f8c0c3", - "hash": "sha256-6uBO4jwPSqhT4j+KTE0Za7B4prrE2kstsHNtHwTJX+Q=" + "rev": "d5c4284774115bb1e32c012a2be1b5fbeb1ab1f9", + "hash": "sha256-h2BHyaOM0oscfX5cu8s4N1yyOkg/yQbvwD1DxF+RAQc=" }, "src/third_party/text-fragments-polyfill/src": { "url": "https://chromium.googlesource.com/external/github.com/GoogleChromeLabs/text-fragments-polyfill.git", @@ -630,18 +630,18 @@ }, "src/third_party/tflite/src": { "url": "https://chromium.googlesource.com/external/github.com/tensorflow/tensorflow.git", - "rev": "689e8a82f8070a372981b7476fb673e243330d71", - "hash": "sha256-tImVDNyS5hCN6A1ODeVuB7XLCNr3EdxN8x961nPCM9g=" + "rev": "658227d3b535287dc6859788bde6076c4fe3fe7c", + "hash": "sha256-gOUt/NljRK5wMFwy2aLqZ5NHwk4y/GxbQ+AZ3MxM0M8=" }, "src/third_party/vulkan-deps": { "url": "https://chromium.googlesource.com/vulkan-deps", - "rev": "73fd75175922012f21557239b7743a152ea7f1fd", - "hash": "sha256-D8UIXXQX6dTxbuqFgd6AbmErr1r9839yiN6MrJlsqPw=" + "rev": "0b56dd5952b25fad65139b64096fcd187048ed38", + "hash": "sha256-LVWvbMLjkMyAUM+0UpQ4oRsfcRU5F/xY60wiwxth4Ko=" }, "src/third_party/glslang/src": { "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/glslang", - "rev": "2acc4ea0028bc703be2d4e9bc8a4032d015d6516", - "hash": "sha256-mwcvSRycM8bq3dDWk4yfkL8Tg5bfEap6lrr1Oxemzy4=" + "rev": "9c644fcb5b9a1a9c975c50a790fd14c5451292b0", + "hash": "sha256-twWSeJp9bNbLYFszCWv9BCztfbXUBKSWV55/U+hd2hw=" }, "src/third_party/spirv-cross/src": { "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/SPIRV-Cross", @@ -650,38 +650,38 @@ }, "src/third_party/spirv-headers/src": { "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/SPIRV-Headers", - "rev": "50bc4debdc3eec5045edbeb8ce164090e29b91f3", - "hash": "sha256-Zv5QZ8MmP45MH5e6EBDNPmP0vcjjNXJHKva5MNh5ovA=" + "rev": "996c728cf7dcfb29845cfa15222822318f047810", + "hash": "sha256-FrT/kVIMjcu2zv+7kDeNKM77NnOyMBb8pV0w8DBP42A=" }, "src/third_party/spirv-tools/src": { "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/SPIRV-Tools", - "rev": "42b315c15b1ff941b46bb3949c105e5386be8717", - "hash": "sha256-xb0TlPyXP2wu7jMrWZu+z8WC5mk0CbYgvkZEt3r+mww=" + "rev": "9117e042b93d4ff08d2406542708170f77aaa2a3", + "hash": "sha256-m/a1i26u8lzpKuQHyAy6ktWWjbLZEaio1awz8VovTGE=" }, "src/third_party/vulkan-headers/src": { "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-Headers", - "rev": "14345dab231912ee9601136e96ca67a6e1f632e7", - "hash": "sha256-ny/UVx4r+Fj39ZEepaWqDPplAJcrBQEQlkqsSofwLJ0=" + "rev": "cbcad3c0587dddc768d76641ea00f5c45ab5a278", + "hash": "sha256-exXzafLgrgxyRvaF+4pCF+OLtPT2gDmcvzazQ4EQ1eA=" }, "src/third_party/vulkan-loader/src": { "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-Loader", - "rev": "bd1c8ea9c6ac51e4c3a6ddb9d602bb204678eb5f", - "hash": "sha256-Ze/DGiD8Zj3mY+5Pi+tf6xMrX2YBqfl4Nc37b/JgmnI=" + "rev": "b0177a972b8d47e823a4500cf88df88a8c27add7", + "hash": "sha256-NDp2TLeMLAHb92R+PjaPDTx8ckIlpSsS3BNx3lerB68=" }, "src/third_party/vulkan-tools/src": { "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-Tools", - "rev": "c9a5acda16dc2759457dc856b5d7df00ac5bf4a2", - "hash": "sha256-0JzqUW6XbhPbLGs/smuNG6zQoWP8iaAO5VglGSyN94g=" + "rev": "15f2de809304aba619ee327f3273425418ca83de", + "hash": "sha256-PiWKL045DAOGm+Hl/UyO6vmD4fVfuf2fSvXK6gSYbwo=" }, "src/third_party/vulkan-utility-libraries/src": { "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-Utility-Libraries", - "rev": "8c907ea21fe0147f791d79051b18e21bc8c4ede0", - "hash": "sha256-2abhzNt/rKbAhGQZhUhQ2LoemtU1Yh1fx9rrijOtjy4=" + "rev": "87ab6b39a97d084a2ef27db85e3cbaf5d2622a09", + "hash": "sha256-luDw6g/EMSK67Et2wNta74PHGQU6Y7IRpDlSpgDYV6Q=" }, "src/third_party/vulkan-validation-layers/src": { "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-ValidationLayers", - "rev": "cbb4ab171fc7cd0b636a76ee542e238a8734f4be", - "hash": "sha256-nKpS0ddAsN2KhOg6J/SwB8ZlVXrJTVixD4DuUkyxb6c=" + "rev": "bc2c38412f739c298d6f5c076c064e6b5696959f", + "hash": "sha256-WWV+P++0Czeqg5p2UTqIP81pY8oz7cS7E7Z/sc0km6g=" }, "src/third_party/vulkan_memory_allocator": { "url": "https://chromium.googlesource.com/external/github.com/GPUOpen-LibrariesAndSDKs/VulkanMemoryAllocator.git", @@ -720,13 +720,13 @@ }, "src/third_party/webgpu-cts/src": { "url": "https://chromium.googlesource.com/external/github.com/gpuweb/cts.git", - "rev": "ae8b3ca40fbeee0bc67ef41a6c5b6dd5af839344", - "hash": "sha256-7u5Ay43GtcVTt3Cwg/5OaYQdG6SXXYtUun7DVN+XChE=" + "rev": "b9f32fd2943dd2b3d0033bf938c9d843f4b5c9a9", + "hash": "sha256-Dd5uWNtnBIc2jiMkh9KjI5O1tJtmMvdlMA2nf+VOkQQ=" }, "src/third_party/webrtc": { "url": "https://webrtc.googlesource.com/src.git", - "rev": "79aff54b0fa9238ce3518dd9eaf9610cd6f22e82", - "hash": "sha256-xkMnUduSG88EWiwq6PITN0KgAKjFd4QOis3dgxedK30=" + "rev": "afaf497805cbb502da89991c2dcd783201efdd08", + "hash": "sha256-S8kGTd3+lf5OTayCMOqqrjxH4tcbT0NLZBpKmTCysMs=" }, "src/third_party/wuffs/src": { "url": "https://skia.googlesource.com/external/github.com/google/wuffs-mirror-release-c.git", @@ -745,8 +745,8 @@ }, "src/third_party/xnnpack/src": { "url": "https://chromium.googlesource.com/external/github.com/google/XNNPACK.git", - "rev": "3986629de01e518a3f2359bf5629ef2b7ef72330", - "hash": "sha256-x8GQUj75mQXswI3b29tS9u25Zx3peYqDM8v1/wkC9cs=" + "rev": "d1d33679661a34f03a806af2b813f699db3004f9", + "hash": "sha256-aDPlmLxNY9M5+Qb8VtdfxphHXU/X6JwYhkUSXkLh/FE=" }, "src/tools/page_cycler/acid3": { "url": "https://chromium.googlesource.com/chromium/deps/acid3.git", @@ -755,13 +755,13 @@ }, "src/third_party/zstd/src": { "url": "https://chromium.googlesource.com/external/github.com/facebook/zstd.git", - "rev": "20707e3718ee14250fb8a44b3bf023ea36bd88df", - "hash": "sha256-/IUfh0De9m7ACrisqKlpxZsb+asoAWGXCaK6L+s24Q8=" + "rev": "7fb5347e88f10472226c9aa1962a148e55d8c480", + "hash": "sha256-4J/F2v2W3mMdhqQ4q35gYkGaqTKlcG6OxUt3vQ8pcLs=" }, "src/v8": { "url": "https://chromium.googlesource.com/v8/v8.git", - "rev": "9c09e7876ff830e1f9a731aa930040d1028ff5a1", - "hash": "sha256-OKa0W4s3VfaQ/MBHkrkZ8/LeRGqjGh9hTaqet7S4o58=" + "rev": "e51f1d7dbd113aa01ddfb30890c8a89b11fcd96c", + "hash": "sha256-KJirPTvmC6vRTvrl6Nl0SQSieX/OhgfIiTblMxgoAvU=" } } }, From 0194a85908b5558b5a04c1dacc2efa4b9618a87e Mon Sep 17 00:00:00 2001 From: talyz <kim.lindberger@gmail.com> Date: Wed, 15 Jan 2025 13:55:38 +0100 Subject: [PATCH 148/174] clickup: Enable Wayland compatibility Add the ability to enable Wayland compatibility through `NIXOS_OZONE_WL`. To make this possible, change the final packaging from happening in `appimageTools.wrapType2` to a regular derivation. Also, simplify the icon copying a bit. --- pkgs/by-name/cl/clickup/package.nix | 36 ++++++++++++++++++++++------- 1 file changed, 28 insertions(+), 8 deletions(-) diff --git a/pkgs/by-name/cl/clickup/package.nix b/pkgs/by-name/cl/clickup/package.nix index bd00bb23ea710..e0d2a9e8b4c31 100644 --- a/pkgs/by-name/cl/clickup/package.nix +++ b/pkgs/by-name/cl/clickup/package.nix @@ -1,7 +1,9 @@ { lib, + stdenvNoCC, appimageTools, fetchurl, + makeWrapper, }: let pname = "clickup"; @@ -13,24 +15,42 @@ let hash = "sha256-jAOYDX9j+ZTqWsSg0rEckKZnErgsIV6+CtUv3M3wNqM="; }; + appimage = appimageTools.wrapType2 { + inherit pname version src; + extraPkgs = pkgs: [ pkgs.xorg.libxkbfile ]; + }; + appimageContents = appimageTools.extractType2 { inherit pname version src; }; in -appimageTools.wrapType2 { - inherit pname version src; +stdenvNoCC.mkDerivation { + inherit pname version; + + src = appimage; + + nativeBuildInputs = [ makeWrapper ]; - extraPkgs = pkgs: [ pkgs.xorg.libxkbfile ]; + installPhase = '' + runHook preInstall + + mkdir -p $out/ + cp -r bin $out/bin + + mkdir -p $out/share/${pname} + cp -r ${appimageContents}/locales $out/share/${pname} + cp -r ${appimageContents}/resources $out/share/${pname} + cp -r --no-preserve=mode ${appimageContents}/usr/share/icons $out/share/ + find $out/share/icons -name desktop.png -execdir mv {} clickup.png \; - extraInstallCommands = '' install -m 444 -D ${appimageContents}/desktop.desktop $out/share/applications/clickup.desktop substituteInPlace $out/share/applications/clickup.desktop \ --replace-fail 'Exec=AppRun --no-sandbox %U' 'Exec=clickup' \ --replace-fail 'Icon=desktop' 'Icon=clickup' - for size in 16 32 64 128 256 512 1024; do - install -Dm444 ${appimageContents}/usr/share/icons/hicolor/''${size}x''${size}/apps/desktop.png \ - -t $out/share/icons/hicolor/''${size}x''${size}/apps/clickup.png - done + wrapProgram $out/bin/${pname} \ + --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}} --no-update" + + runHook postInstall ''; meta = { From b16db31253ded6d9774adb955d99a170e6e62627 Mon Sep 17 00:00:00 2001 From: FliegendeWurst <arne.keller@posteo.de> Date: Wed, 15 Jan 2025 15:37:40 +0100 Subject: [PATCH 149/174] totem: fix strictDeps build, mark cross as broken --- pkgs/by-name/to/totem/package.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/by-name/to/totem/package.nix b/pkgs/by-name/to/totem/package.nix index 6b1eb8c43ac86..07df3bffe60b8 100644 --- a/pkgs/by-name/to/totem/package.nix +++ b/pkgs/by-name/to/totem/package.nix @@ -49,6 +49,7 @@ stdenv.mkDerivation rec { itstool gobject-introspection wrapGAppsHook3 + gst_all_1.gstreamer # gst-inspect-1.0 ]; buildInputs = [ @@ -114,5 +115,7 @@ stdenv.mkDerivation rec { maintainers = teams.gnome.members; license = licenses.gpl2Plus; # with exception to allow use of non-GPL compatible plug-ins platforms = platforms.linux; + # gst-inspect-1.0 is not smart enough for cross compiling + broken = stdenv.buildPlatform != stdenv.hostPlatform; }; } From 8c8ded3107f97477da5df5a297e9c8807306e588 Mon Sep 17 00:00:00 2001 From: FliegendeWurst <arne.keller@posteo.de> Date: Wed, 15 Jan 2025 15:37:40 +0100 Subject: [PATCH 150/174] gnome-applets: fix cross build --- pkgs/by-name/gn/gnome-applets/package.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/by-name/gn/gnome-applets/package.nix b/pkgs/by-name/gn/gnome-applets/package.nix index 8cb706941ea3c..2ef3e827107d0 100644 --- a/pkgs/by-name/gn/gnome-applets/package.nix +++ b/pkgs/by-name/gn/gnome-applets/package.nix @@ -34,6 +34,7 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ gettext + glib # glib-compile-resources itstool pkg-config libxml2 From 1140c2d192ffa605bf93492622e43575e6e0781e Mon Sep 17 00:00:00 2001 From: Moraxyc <i@qaq.li> Date: Sun, 15 Dec 2024 21:10:06 +0800 Subject: [PATCH 151/174] mcdreforged: 2.13.2 -> 2.14.0 Diff: https://github.com/MCDReforged/MCDReforged/compare/refs/tags/v2.13.2...v2.14.0 Changelog: https://github.com/MCDReforged/MCDReforged/releases/tag/v2.14.0 --- pkgs/by-name/mc/mcdreforged/package.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/mc/mcdreforged/package.nix b/pkgs/by-name/mc/mcdreforged/package.nix index 947f4a90b0fa4..db9e9d6d98edf 100644 --- a/pkgs/by-name/mc/mcdreforged/package.nix +++ b/pkgs/by-name/mc/mcdreforged/package.nix @@ -8,7 +8,7 @@ python3.pkgs.buildPythonApplication rec { pname = "mcdreforged"; - version = "2.13.2"; + version = "2.14.0"; pyproject = true; src = fetchFromGitHub { @@ -31,6 +31,7 @@ python3.pkgs.buildPythonApplication rec { resolvelib ruamel-yaml typing-extensions + pathspec ]; nativeCheckInputs = [ python3.pkgs.pytestCheckHook ]; From 9971588613b5302e677068aeaa8cb5bc222b34ce Mon Sep 17 00:00:00 2001 From: Moraxyc <i@qaq.li> Date: Sun, 15 Dec 2024 21:27:47 +0800 Subject: [PATCH 152/174] mcdreforged: move to python-modules --- pkgs/by-name/mc/mcdreforged/package.nix | 52 +-------------- .../python-modules/mcdreforged/default.nix | 64 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 3 files changed, 67 insertions(+), 51 deletions(-) create mode 100644 pkgs/development/python-modules/mcdreforged/default.nix diff --git a/pkgs/by-name/mc/mcdreforged/package.nix b/pkgs/by-name/mc/mcdreforged/package.nix index db9e9d6d98edf..77c4811a8ec0d 100644 --- a/pkgs/by-name/mc/mcdreforged/package.nix +++ b/pkgs/by-name/mc/mcdreforged/package.nix @@ -1,51 +1 @@ -{ - lib, - fetchFromGitHub, - python3, - testers, - mcdreforged, -}: - -python3.pkgs.buildPythonApplication rec { - pname = "mcdreforged"; - version = "2.14.0"; - pyproject = true; - - src = fetchFromGitHub { - owner = "MCDReforged"; - repo = "MCDReforged"; - tag = "v${version}"; - hash = "sha256-4podJ3InBnNc+t4BpCQrg2QbJ9ZJr5fmroXyzo7JrZw="; - }; - - build-system = [ python3.pkgs.setuptools ]; - - dependencies = with python3.pkgs; [ - colorama - colorlog - packaging - parse - prompt-toolkit - psutil - requests - resolvelib - ruamel-yaml - typing-extensions - pathspec - ]; - - nativeCheckInputs = [ python3.pkgs.pytestCheckHook ]; - - passthru.tests = { - version = testers.testVersion { package = mcdreforged; }; - }; - - meta = { - description = "Rewritten version of MCDaemon, a python tool to control your Minecraft server"; - homepage = "https://mcdreforged.com"; - changelog = "https://github.com/MCDReforged/MCDReforged/releases/tag/v${version}"; - license = lib.licenses.lgpl3Only; - maintainers = with lib.maintainers; [ moraxyc ]; - mainProgram = "mcdreforged"; - }; -} +{ python3Packages }: with python3Packages; toPythonApplication mcdreforged diff --git a/pkgs/development/python-modules/mcdreforged/default.nix b/pkgs/development/python-modules/mcdreforged/default.nix new file mode 100644 index 0000000000000..c9a59aa95b563 --- /dev/null +++ b/pkgs/development/python-modules/mcdreforged/default.nix @@ -0,0 +1,64 @@ +{ + lib, + fetchFromGitHub, + buildPythonPackage, + setuptools, + colorama, + colorlog, + packaging, + parse, + prompt-toolkit, + psutil, + requests, + resolvelib, + ruamel-yaml, + typing-extensions, + pathspec, + pytestCheckHook, + testers, + mcdreforged, +}: + +buildPythonPackage rec { + pname = "mcdreforged"; + version = "2.14.0"; + pyproject = true; + + src = fetchFromGitHub { + owner = "MCDReforged"; + repo = "MCDReforged"; + tag = "v${version}"; + hash = "sha256-4podJ3InBnNc+t4BpCQrg2QbJ9ZJr5fmroXyzo7JrZw="; + }; + + build-system = [ setuptools ]; + + dependencies = [ + colorama + colorlog + packaging + parse + prompt-toolkit + psutil + requests + resolvelib + ruamel-yaml + typing-extensions + pathspec + ]; + + nativeCheckInputs = [ pytestCheckHook ]; + + passthru.tests = { + version = testers.testVersion { package = mcdreforged; }; + }; + + meta = { + description = "Rewritten version of MCDaemon, a python tool to control your Minecraft server"; + homepage = "https://mcdreforged.com"; + changelog = "https://github.com/MCDReforged/MCDReforged/releases/tag/v${version}"; + license = lib.licenses.lgpl3Only; + maintainers = with lib.maintainers; [ moraxyc ]; + mainProgram = "mcdreforged"; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 35ec6d5d50129..4139f14e6b22f 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -7994,6 +7994,8 @@ self: super: with self; { mccabe = callPackage ../development/python-modules/mccabe { }; + mcdreforged = callPackage ../development/python-modules/mcdreforged { }; + mcstatus = callPackage ../development/python-modules/mcstatus { }; mcuuid = callPackage ../development/python-modules/mcuuid { }; From 5820c2b636f065eb055ec1ab16acc7bdce59cb17 Mon Sep 17 00:00:00 2001 From: Moraxyc <i@qaq.li> Date: Sun, 15 Dec 2024 21:32:51 +0800 Subject: [PATCH 153/174] python312Packages.mcdreforged: use versionCheckHook --- .../python-modules/mcdreforged/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/mcdreforged/default.nix b/pkgs/development/python-modules/mcdreforged/default.nix index c9a59aa95b563..c86318481bcf5 100644 --- a/pkgs/development/python-modules/mcdreforged/default.nix +++ b/pkgs/development/python-modules/mcdreforged/default.nix @@ -15,8 +15,7 @@ typing-extensions, pathspec, pytestCheckHook, - testers, - mcdreforged, + versionCheckHook, }: buildPythonPackage rec { @@ -47,11 +46,12 @@ buildPythonPackage rec { pathspec ]; - nativeCheckInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ + pytestCheckHook + versionCheckHook + ]; - passthru.tests = { - version = testers.testVersion { package = mcdreforged; }; - }; + versionCheckProgramArg = [ "--version" ]; meta = { description = "Rewritten version of MCDaemon, a python tool to control your Minecraft server"; From 7aac4f4921d7416be1ed6ec0e8598ebbe202e404 Mon Sep 17 00:00:00 2001 From: Moraxyc <i@qaq.li> Date: Sun, 15 Dec 2024 21:33:35 +0800 Subject: [PATCH 154/174] python312Packages.mcdreforged: add updateScript --- pkgs/development/python-modules/mcdreforged/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/python-modules/mcdreforged/default.nix b/pkgs/development/python-modules/mcdreforged/default.nix index c86318481bcf5..6fe6d1dafcdd7 100644 --- a/pkgs/development/python-modules/mcdreforged/default.nix +++ b/pkgs/development/python-modules/mcdreforged/default.nix @@ -16,6 +16,7 @@ pathspec, pytestCheckHook, versionCheckHook, + nix-update-script, }: buildPythonPackage rec { @@ -53,6 +54,8 @@ buildPythonPackage rec { versionCheckProgramArg = [ "--version" ]; + passthru.updateScript = nix-update-script { }; + meta = { description = "Rewritten version of MCDaemon, a python tool to control your Minecraft server"; homepage = "https://mcdreforged.com"; From 803cf376b1e35cff4708b74a0b0f9cdb9b7069be Mon Sep 17 00:00:00 2001 From: Moraxyc <i@qaq.li> Date: Sun, 22 Dec 2024 02:44:32 +0800 Subject: [PATCH 155/174] python312Packages.mcdreforged: 2.14.0 -> 2.14.2 Diff: https://github.com/MCDReforged/MCDReforged/compare/refs/tags/v2.14.0...v2.14.2 Changelog: https://github.com/MCDReforged/MCDReforged/releases/tag/v2.14.2 --- pkgs/development/python-modules/mcdreforged/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/mcdreforged/default.nix b/pkgs/development/python-modules/mcdreforged/default.nix index 6fe6d1dafcdd7..47616ee254e8f 100644 --- a/pkgs/development/python-modules/mcdreforged/default.nix +++ b/pkgs/development/python-modules/mcdreforged/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { pname = "mcdreforged"; - version = "2.14.0"; + version = "2.14.2"; pyproject = true; src = fetchFromGitHub { From 8b88add8485c983865c2cc88988117dbe6554d85 Mon Sep 17 00:00:00 2001 From: Moraxyc <i@qaq.li> Date: Sat, 4 Jan 2025 15:32:30 +0800 Subject: [PATCH 156/174] python312Packages.mcdreforged: 2.14.2 -> 2.14.3 Diff: https://github.com/MCDReforged/MCDReforged/compare/refs/tags/v2.14.2...v2.14.3 Changelog: https://github.com/MCDReforged/MCDReforged/releases/tag/v2.14.3 --- pkgs/development/python-modules/mcdreforged/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mcdreforged/default.nix b/pkgs/development/python-modules/mcdreforged/default.nix index 47616ee254e8f..1bafab17641b4 100644 --- a/pkgs/development/python-modules/mcdreforged/default.nix +++ b/pkgs/development/python-modules/mcdreforged/default.nix @@ -21,14 +21,14 @@ buildPythonPackage rec { pname = "mcdreforged"; - version = "2.14.2"; + version = "2.14.3"; pyproject = true; src = fetchFromGitHub { owner = "MCDReforged"; repo = "MCDReforged"; tag = "v${version}"; - hash = "sha256-4podJ3InBnNc+t4BpCQrg2QbJ9ZJr5fmroXyzo7JrZw="; + hash = "sha256-sNpQIG41YxzXvEkckabYevAYrlCcdN9wS5tanKq8VPs="; }; build-system = [ setuptools ]; From ce39a776aa92d7d2556926bb3696e011efb80cf6 Mon Sep 17 00:00:00 2001 From: Moraxyc <i@qaq.li> Date: Thu, 16 Jan 2025 00:58:51 +0800 Subject: [PATCH 157/174] python312Packages.mcdreforged: 2.14.3 -> 2.14.4 Diff: https://github.com/MCDReforged/MCDReforged/compare/refs/tags/v2.14.3...v2.14.4 Changelog: https://github.com/MCDReforged/MCDReforged/releases/tag/v2.14.4 --- pkgs/development/python-modules/mcdreforged/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mcdreforged/default.nix b/pkgs/development/python-modules/mcdreforged/default.nix index 1bafab17641b4..5797bd47e7f7c 100644 --- a/pkgs/development/python-modules/mcdreforged/default.nix +++ b/pkgs/development/python-modules/mcdreforged/default.nix @@ -21,14 +21,14 @@ buildPythonPackage rec { pname = "mcdreforged"; - version = "2.14.3"; + version = "2.14.4"; pyproject = true; src = fetchFromGitHub { owner = "MCDReforged"; repo = "MCDReforged"; tag = "v${version}"; - hash = "sha256-sNpQIG41YxzXvEkckabYevAYrlCcdN9wS5tanKq8VPs="; + hash = "sha256-R9zM86ohABEaxj7NYj8FCPIYsMDJp0sKjOhWzit69B8="; }; build-system = [ setuptools ]; From 84c720f34d7bbc607ce80a44bce36e2d56b003c5 Mon Sep 17 00:00:00 2001 From: FliegendeWurst <arne.keller@posteo.de> Date: Wed, 15 Jan 2025 15:37:40 +0100 Subject: [PATCH 158/174] python312Packages.priority: cleanup --- pkgs/development/python-modules/priority/default.nix | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/priority/default.nix b/pkgs/development/python-modules/priority/default.nix index 5ba1bd0113127..9ab126ec911bc 100644 --- a/pkgs/development/python-modules/priority/default.nix +++ b/pkgs/development/python-modules/priority/default.nix @@ -5,19 +5,25 @@ fetchPypi, hypothesis, pytestCheckHook, + setuptools, }: buildPythonPackage rec { pname = "priority"; version = "2.0.0"; - format = "setuptools"; - disabled = pythonOlder "3.6.1"; + pyproject = true; + + disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; sha256 = "c965d54f1b8d0d0b19479db3924c7c36cf672dbf2aec92d43fbdaf4492ba18c0"; }; + build-system = [ + setuptools + ]; + pythonImportsCheck = [ "priority" ]; nativeCheckInputs = [ From d535e785bc920a8b9b6452e609244e6dbb13164b Mon Sep 17 00:00:00 2001 From: Austin Horstman <khaneliman12@gmail.com> Date: Wed, 15 Jan 2025 10:19:35 -0600 Subject: [PATCH 159/174] vimPlugins.snacks-nvim: 2025-01-06 -> 2025-01-15 Update for new picker --- pkgs/applications/editors/vim/plugins/generated.nix | 6 +++--- pkgs/applications/editors/vim/plugins/overrides.nix | 2 ++ 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix index 9c2898b48d532..f7fadbff867d2 100644 --- a/pkgs/applications/editors/vim/plugins/generated.nix +++ b/pkgs/applications/editors/vim/plugins/generated.nix @@ -11713,12 +11713,12 @@ final: prev: snacks-nvim = buildVimPlugin { pname = "snacks.nvim"; - version = "2025-01-06"; + version = "2025-01-15"; src = fetchFromGitHub { owner = "folke"; repo = "snacks.nvim"; - rev = "14e89401da348f5d14509fca164fb7bcec83e597"; - sha256 = "0z66fiy6mscwrwczgwngnhfcgi6mlr5kmv9k21nfwskrgmp8c71v"; + rev = "e5dd9281ee9402858fb7b7f1ac74ddcef40ebacc"; + sha256 = "147rbp4z58bvm6s2lk1yzis7rjrrppwgchxpiyf9klj2gh08mzwp"; }; meta.homepage = "https://github.com/folke/snacks.nvim/"; }; diff --git a/pkgs/applications/editors/vim/plugins/overrides.nix b/pkgs/applications/editors/vim/plugins/overrides.nix index 47053c2da49a9..f7255044c86ee 100644 --- a/pkgs/applications/editors/vim/plugins/overrides.nix +++ b/pkgs/applications/editors/vim/plugins/overrides.nix @@ -2853,6 +2853,8 @@ in "snacks.win" "snacks.words" "snacks.zen" + "snacks.picker.config.highlights" + "snacks.picker.actions" # Optional trouble integration "trouble.sources.profiler" ]; From e099e0b5d80e1f3fe139584f3f0d3e6610fc8aea Mon Sep 17 00:00:00 2001 From: FliegendeWurst <arne.keller@posteo.de> Date: Wed, 15 Jan 2025 15:37:40 +0100 Subject: [PATCH 160/174] python312Packages.liblarch: cleanup --- pkgs/development/python-modules/liblarch/default.nix | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/liblarch/default.nix b/pkgs/development/python-modules/liblarch/default.nix index 4dae337ca1f22..65e4c578dff9f 100644 --- a/pkgs/development/python-modules/liblarch/default.nix +++ b/pkgs/development/python-modules/liblarch/default.nix @@ -8,13 +8,15 @@ gtk3, pythonOlder, pytest, + setuptools, }: buildPythonPackage rec { - version = "3.2.0"; - format = "setuptools"; pname = "liblarch"; - disabled = pythonOlder "3.5.0"; + version = "3.2.0"; + pyproject = true; + + disabled = pythonOlder "3.5"; src = fetchFromGitHub { owner = "getting-things-gnome"; @@ -23,6 +25,10 @@ buildPythonPackage rec { hash = "sha256-A2qChe2z6rAhjRVX5VoHQitebf/nMATdVZQgtlquuYg="; }; + build-system = [ + setuptools + ]; + nativeCheckInputs = [ gobject-introspection # for setup hook gtk3 From 7ff0e8a8752d1ed127b97012ae3cf7766dc95e48 Mon Sep 17 00:00:00 2001 From: Franz Pletz <fpletz@fnordicwalking.de> Date: Wed, 15 Jan 2025 19:18:00 +0100 Subject: [PATCH 161/174] mediamtx: 1.11.0 -> 1.11.1 --- pkgs/by-name/me/mediamtx/package.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/me/mediamtx/package.nix b/pkgs/by-name/me/mediamtx/package.nix index a407c075741af..5a6fd3936a244 100644 --- a/pkgs/by-name/me/mediamtx/package.nix +++ b/pkgs/by-name/me/mediamtx/package.nix @@ -8,23 +8,23 @@ let hlsJs = fetchurl { - url = "https://cdn.jsdelivr.net/npm/hls.js@v1.5.18/dist/hls.min.js"; - hash = "sha256-X/LXFN4wvkKPx3sT4B25pLTPAV6bTWs+iGS2XT19Ptc="; + url = "https://cdn.jsdelivr.net/npm/hls.js@v1.5.19/dist/hls.min.js"; + hash = "sha256-KTlFB7LXpglQPzIzKajKy3DJRGDURwP4hcmRm7Oy/a8="; }; in buildGoModule rec { pname = "mediamtx"; # check for hls.js version updates in internal/servers/hls/hlsjsdownloader/VERSION - version = "1.11.0"; + version = "1.11.1"; src = fetchFromGitHub { owner = "bluenviron"; repo = pname; rev = "v${version}"; - hash = "sha256-WpMFP88MLpftfPn6DP2QM7oSRNwDAIC35/imrznLVA8="; + hash = "sha256-8/RTdcq8r5yMu586iDNyC/Cfi0PydX7QkU52noQR18Y="; }; - vendorHash = "sha256-yOeenOYV2MztEfhwxIkmbxn40XhYNZMMTm+kcR7TAtc="; + vendorHash = "sha256-Laos5sTQjtweC4GLuQuK2J/trObPlCmoHSUw4shVP4k="; postPatch = '' cp ${hlsJs} internal/servers/hls/hls.min.js From 66207d3681b0a5ddc71f4a6fcb7ed7f16aa3d86f Mon Sep 17 00:00:00 2001 From: Emery Hemingway <emery@slow.janky.email> Date: Thu, 16 Jan 2025 00:00:48 +0530 Subject: [PATCH 162/174] rsync: remove myself from maintainers Rsync should be abandoned. --- pkgs/applications/networking/sync/rsync/default.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/applications/networking/sync/rsync/default.nix b/pkgs/applications/networking/sync/rsync/default.nix index 0badc906dfe80..1cd9b2ec725f4 100644 --- a/pkgs/applications/networking/sync/rsync/default.nix +++ b/pkgs/applications/networking/sync/rsync/default.nix @@ -94,7 +94,6 @@ stdenv.mkDerivation rec { license = licenses.gpl3Plus; mainProgram = "rsync"; maintainers = with lib.maintainers; [ - ehmry kampfschlaefer ivan ]; From ae625955d5273594d2b52d029af40899f3b29581 Mon Sep 17 00:00:00 2001 From: Dalton Luce <daltonluce42@gmail.com> Date: Sun, 12 Jan 2025 17:26:40 -0500 Subject: [PATCH 163/174] astroterm: init at 1.0.4 --- pkgs/by-name/as/astroterm/package.nix | 56 +++++++++++++++++++++++++++ 1 file changed, 56 insertions(+) create mode 100644 pkgs/by-name/as/astroterm/package.nix diff --git a/pkgs/by-name/as/astroterm/package.nix b/pkgs/by-name/as/astroterm/package.nix new file mode 100644 index 0000000000000..9ed753ef05ebb --- /dev/null +++ b/pkgs/by-name/as/astroterm/package.nix @@ -0,0 +1,56 @@ +{ + stdenv, + lib, + fetchurl, + fetchFromGitHub, + xxd, + meson, + ninja, + ncurses, + argtable, + versionCheckHook, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "astroterm"; + version = "1.0.4"; + + src = fetchFromGitHub { + owner = "da-luce"; + repo = "astroterm"; + tag = "v${finalAttrs.version}"; + hash = "sha256-CYKW/RAQ3a5238cojbpGfTenMQApfaZOHnQMrZ6LWzA="; + }; + + bsc5File = fetchurl { + url = "https://web.archive.org/web/20231007085824/http://tdc-www.harvard.edu/catalogs/BSC5"; + hash = "sha256-5HHQLq9O7LYcEvh5octkMrqde2ipqMVlSh60KgyMw0A="; + }; + + nativeBuildInputs = [ + meson + ninja + xxd + versionCheckHook + ]; + buildInputs = [ + argtable + ncurses + ]; + + postPatch = '' + mkdir -p data + ln -s ${finalAttrs.bsc5File} data/bsc5 + ''; + + doCheck = true; + + meta = { + description = "Celestial viewer for the terminal, written in C"; + homepage = "https://github.com/da-luce/astroterm/"; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.da-luce ]; + mainProgram = "astroterm"; + platforms = lib.platforms.unix; + }; +}) From f2c733a28bdd51a91ca6067b19fd40112d9915f3 Mon Sep 17 00:00:00 2001 From: FliegendeWurst <arne.keller@posteo.de> Date: Wed, 15 Jan 2025 15:37:40 +0100 Subject: [PATCH 164/174] librest: fix strictDeps build --- pkgs/development/libraries/librest/default.nix | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/librest/default.nix b/pkgs/development/libraries/librest/default.nix index c932f59d0d127..4bbceccda5056 100644 --- a/pkgs/development/libraries/librest/default.nix +++ b/pkgs/development/libraries/librest/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { pkg-config gobject-introspection ] - ++ lib.optionals (stdenv.hostPlatform == stdenv.buildPlatform) [ + ++ lib.optionals (stdenv.buildPlatform.canExecute stdenv.hostPlatform) [ gtk-doc docbook-xsl-nons docbook_xml_dtd_412 @@ -45,12 +45,20 @@ stdenv.mkDerivation rec { libxml2 ]; + strictDeps = true; + configureFlags = [ - (lib.enableFeature (stdenv.hostPlatform == stdenv.buildPlatform) "gtk-doc") + (lib.enableFeature (stdenv.buildPlatform.canExecute stdenv.hostPlatform) "gtk-doc") # Remove when https://gitlab.gnome.org/GNOME/librest/merge_requests/2 is merged. "--with-ca-certificates=/etc/ssl/certs/ca-certificates.crt" ]; + postPatch = '' + # pkg-config doesn't look in $PATH if strictDeps is on + substituteInPlace ./configure \ + --replace-fail 'have_gtk_doc=no' "echo gtk-doc is present" + ''; + passthru = { updateScript = gnome.updateScript { packageName = pname; From 232bc55fb108c06b4e1fd1250af775a09e5de066 Mon Sep 17 00:00:00 2001 From: r-vdp <ramses@well-founded.dev> Date: Mon, 13 Jan 2025 10:25:39 +0100 Subject: [PATCH 165/174] alacritty: 0.14.0 -> 0.15.0 See https://github.com/alacritty/alacritty/releases/tag/v0.15.0 Update pkgs/by-name/al/alacritty/package.nix Co-authored-by: Sandro <sandro.jaeckel@gmail.com> --- pkgs/by-name/al/alacritty/package.nix | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/al/alacritty/package.nix b/pkgs/by-name/al/alacritty/package.nix index 67f349bf7ef3f..29e2cfd084c62 100644 --- a/pkgs/by-name/al/alacritty/package.nix +++ b/pkgs/by-name/al/alacritty/package.nix @@ -22,6 +22,7 @@ wayland, xdg-utils, + nix-update-script, }: let rpathLibs = @@ -43,16 +44,16 @@ let in rustPlatform.buildRustPackage rec { pname = "alacritty"; - version = "0.14.0"; + version = "0.15.0"; src = fetchFromGitHub { owner = "alacritty"; - repo = pname; + repo = "alacritty"; tag = "v${version}"; - hash = "sha256-ZhkuuxTx2y8vOfxfpDpJAyNyDdRWab0pqyDdbOCQ2XE="; + hash = "sha256-CAxf0ltvYXYTdjQmLQnRwRRJUBgABbHSB8DxfAbgBdo="; }; - cargoHash = "sha256-T+/G2z7H/egJ/IlP3KA31jydg1CmFdLW8bLYSf/yWck="; + cargoHash = "sha256-pVwPo9O3ortTtVzZn1p1grFGLBA2gVTOatdNFqNQ5zc="; nativeBuildInputs = [ cmake @@ -121,7 +122,10 @@ rustPlatform.buildRustPackage rec { dontPatchELF = true; - passthru.tests.test = nixosTests.terminal-emulators.alacritty; + passthru = { + tests.test = nixosTests.terminal-emulators.alacritty; + updateScript = nix-update-script { }; + }; meta = with lib; { description = "Cross-platform, GPU-accelerated terminal emulator"; From 062a2ef3422adbb2fa32c3ace8b3206d91bfc560 Mon Sep 17 00:00:00 2001 From: r-vdp <ramses@well-founded.dev> Date: Tue, 14 Jan 2025 16:10:08 +0100 Subject: [PATCH 166/174] alacritty: add myself as maintainer, drop Mic92 See https://github.com/NixOS/nixpkgs/pull/373582#discussion_r1914991708 --- pkgs/by-name/al/alacritty/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/al/alacritty/package.nix b/pkgs/by-name/al/alacritty/package.nix index 29e2cfd084c62..55fbae7aac2d9 100644 --- a/pkgs/by-name/al/alacritty/package.nix +++ b/pkgs/by-name/al/alacritty/package.nix @@ -134,7 +134,7 @@ rustPlatform.buildRustPackage rec { mainProgram = "alacritty"; maintainers = with maintainers; [ Br1ght0ne - mic92 + rvdp ]; platforms = platforms.unix; changelog = "https://github.com/alacritty/alacritty/blob/v${version}/CHANGELOG.md"; From e3ff48d93c2a5783caae14f3d7dfb5c10b35a31f Mon Sep 17 00:00:00 2001 From: Ben Lorenz <bnlrnz@gmail.com> Date: Wed, 15 Jan 2025 20:46:31 +0100 Subject: [PATCH 167/174] wlr-layout-ui: 1.6.14 -> 1.6.15 --- pkgs/by-name/wl/wlr-layout-ui/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/wl/wlr-layout-ui/package.nix b/pkgs/by-name/wl/wlr-layout-ui/package.nix index 56b122383ac21..5fc6fbe41f8c4 100644 --- a/pkgs/by-name/wl/wlr-layout-ui/package.nix +++ b/pkgs/by-name/wl/wlr-layout-ui/package.nix @@ -6,14 +6,14 @@ python3.pkgs.buildPythonApplication rec { pname = "wlr-layout-ui"; - version = "1.6.14"; + version = "1.6.15"; pyproject = true; src = fetchFromGitHub { owner = "fdev31"; repo = "wlr-layout-ui"; tag = version; - hash = "sha256-Qgg4fdxOVkADDOxmQgQFSF/wgrEQihoRNC9oXeQvaoI="; + hash = "sha256-9dGwqh4uq7Hc8OjD8mxAnwesoOSCXHjYIWBPylznxu4="; }; nativeBuildInputs = [ From 1c169270f7cc40b853b5e2d168483ffc502eae6e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" <ryantm-bot@ryantm.com> Date: Wed, 15 Jan 2025 20:07:03 +0000 Subject: [PATCH 168/174] kazumi: 1.5.0 -> 1.5.1 --- pkgs/by-name/ka/kazumi/package.nix | 4 ++-- pkgs/by-name/ka/kazumi/pubspec.lock.json | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/ka/kazumi/package.nix b/pkgs/by-name/ka/kazumi/package.nix index 8d9f76b797b8c..1cc0d4e664c4f 100644 --- a/pkgs/by-name/ka/kazumi/package.nix +++ b/pkgs/by-name/ka/kazumi/package.nix @@ -14,13 +14,13 @@ }: flutter327.buildFlutterApplication rec { pname = "kazumi"; - version = "1.5.0"; + version = "1.5.1"; src = fetchFromGitHub { owner = "Predidit"; repo = "Kazumi"; tag = version; - hash = "sha256-YYg8DpW/O517R9YZ9jpikNIy2MfLQdiLsdhO3uhCusc="; + hash = "sha256-JEVZptPD3PZqaIRmzYAaz6HHfNQqAQX6F/K/5bnLyl4="; }; pubspecLock = lib.importJSON ./pubspec.lock.json; diff --git a/pkgs/by-name/ka/kazumi/pubspec.lock.json b/pkgs/by-name/ka/kazumi/pubspec.lock.json index b5578972a100f..2bbf3398e8b71 100644 --- a/pkgs/by-name/ka/kazumi/pubspec.lock.json +++ b/pkgs/by-name/ka/kazumi/pubspec.lock.json @@ -230,11 +230,11 @@ "dependency": "direct main", "description": { "name": "card_settings_ui", - "sha256": "36bd1bb8e3d18612e2654e722da0f1ed9bc7a412339b906205107ece72b8e14b", + "sha256": "3c0677c31b68ac654e7efc85a4adfec4375445f8c67a1dbe88aa8cf115e52533", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.0.0" + "version": "1.1.1" }, "characters": { "dependency": "transitive", From 1cf5d65969e708428f7b7461d90fb82aa1507526 Mon Sep 17 00:00:00 2001 From: nartsisss <nartsiss+git@proton.me> Date: Wed, 15 Jan 2025 23:30:16 +0300 Subject: [PATCH 169/174] limbo: 0.0.11 -> 0.0.12 --- pkgs/by-name/li/limbo/package.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/li/limbo/package.nix b/pkgs/by-name/li/limbo/package.nix index 081a381844486..1a11ba77ee688 100644 --- a/pkgs/by-name/li/limbo/package.nix +++ b/pkgs/by-name/li/limbo/package.nix @@ -7,16 +7,16 @@ }: rustPlatform.buildRustPackage rec { pname = "limbo"; - version = "0.0.11"; + version = "0.0.12"; src = fetchFromGitHub { owner = "tursodatabase"; repo = "limbo"; tag = "v${version}"; - hash = "sha256-bX56aiL7Eqa3jLd1u9h6u583q0S9VZfJ+cVPB+8R1eU="; + hash = "sha256-Lmtvn7hWdrqumtTpiYK0sTsESeKo4Mfao32K0DfHmrc="; }; - cargoHash = "sha256-GspyWOxwAQvjNzN0yZvj3WpADR3VUO0MjSKiq9wbLOw="; + cargoHash = "sha256-hOKTN41yqMPh/Zo8jVRiOSL331py9QRzLhkTL2Jz0yI="; cargoBuildFlags = [ "-p" @@ -33,7 +33,7 @@ rustPlatform.buildRustPackage rec { meta = { description = "Interactive SQL shell for Limbo"; homepage = "https://github.com/tursodatabase/limbo"; - changelog = "https://github.com/tursodatabase/limbo/blob/${src.tag}/CHANGELOG.md"; + changelog = "https://github.com/tursodatabase/limbo/blob/v${version}/CHANGELOG.md"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ nartsiss ]; mainProgram = "limbo"; From fc43d7524544386993245844997fe34cf90ef922 Mon Sep 17 00:00:00 2001 From: Gavin John <gavinnjohn@gmail.com> Date: Wed, 15 Jan 2025 11:53:42 -0800 Subject: [PATCH 170/174] nixos/lib/eval-config: fix minor typo --- nixos/lib/eval-config.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/lib/eval-config.nix b/nixos/lib/eval-config.nix index 49b9e483ad2b2..e15ec7521d8ba 100644 --- a/nixos/lib/eval-config.nix +++ b/nixos/lib/eval-config.nix @@ -90,7 +90,7 @@ let You have set specialArgs.pkgs, which means that options like nixpkgs.config and nixpkgs.overlays will be ignored. If you wish to reuse an already created pkgs, which you know is configured correctly for this NixOS configuration, - please import the `nixosModules.pkgsReadOnly` module from the nixpkgs flake or + please import the `nixosModules.readOnlyPkgs` module from the nixpkgs flake or `(modulesPath + "/misc/nixpkgs/read-only.nix"), and set `{ nixpkgs.pkgs = <your pkgs>; }`. This properly disables the ignored options to prevent future surprises. '' From a383bb892cae86400a0156cbe1ee49b5eb800d4d Mon Sep 17 00:00:00 2001 From: Nikolay Korotkiy <sikmir@disroot.org> Date: Thu, 16 Jan 2025 01:11:54 +0400 Subject: [PATCH 171/174] notepad-next: modernize --- .../editors/notepad-next/default.nix | 34 ++++++++----------- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 15 insertions(+), 21 deletions(-) diff --git a/pkgs/applications/editors/notepad-next/default.nix b/pkgs/applications/editors/notepad-next/default.nix index 7c35a74dfb49a..09a761e24f149 100644 --- a/pkgs/applications/editors/notepad-next/default.nix +++ b/pkgs/applications/editors/notepad-next/default.nix @@ -1,55 +1,49 @@ { - mkDerivation, lib, fetchFromGitHub, - qmake, - qttools, - qtx11extras, + qt5, stdenv, }: -mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "notepad-next"; version = "0.10"; src = fetchFromGitHub { owner = "dail8859"; repo = "NotepadNext"; - rev = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-DpqFu7Nt7l1rmQoJ7aQnFEGPxo8NDrowHxmyLdKIX4A="; # External dependencies - https://github.com/dail8859/NotepadNext/issues/135 fetchSubmodules = true; }; nativeBuildInputs = [ - qmake - qttools + qt5.qmake + qt5.qttools + qt5.wrapQtAppsHook ]; - buildInputs = [ qtx11extras ]; + buildInputs = [ qt5.qtx11extras ]; qmakeFlags = [ "PREFIX=${placeholder "out"}" "src/NotepadNext.pro" ]; - postPatch = '' - substituteInPlace src/i18n.pri \ - --replace 'EXTRA_TRANSLATIONS = \' "" \ - --replace '$$[QT_INSTALL_TRANSLATIONS]/qt_zh_CN.qm' "" - ''; - postInstall = lib.optionalString stdenv.hostPlatform.isDarwin '' mv $out/bin $out/Applications rm -fr $out/share + mkdir -p $out/bin + ln -s $out/Applications/NotepadNext.app/Contents/MacOS/NotepadNext $out/bin/NotepadNext ''; - meta = with lib; { + meta = { homepage = "https://github.com/dail8859/NotepadNext"; description = "Cross-platform, reimplementation of Notepad++"; - license = licenses.gpl3Plus; - platforms = platforms.unix; - maintainers = [ maintainers.sebtm ]; + license = lib.licenses.gpl3Plus; + platforms = lib.platforms.unix; + maintainers = with lib.maintainers; [ sebtm ]; broken = stdenv.hostPlatform.isAarch64; mainProgram = "NotepadNext"; }; -} +}) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 01119dedd5df1..7fb716cb1302f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14670,7 +14670,7 @@ with pkgs; ncdu_1 = callPackage ../tools/misc/ncdu/1.nix { }; - notepad-next = libsForQt5.callPackage ../applications/editors/notepad-next { }; + notepad-next = callPackage ../applications/editors/notepad-next { }; notepadqq = libsForQt5.callPackage ../applications/editors/notepadqq { }; From e3b93c1fb2f0cb53c074ee56715bff40de94dfeb Mon Sep 17 00:00:00 2001 From: Nikolay Korotkiy <sikmir@disroot.org> Date: Thu, 16 Jan 2025 01:14:29 +0400 Subject: [PATCH 172/174] notepad-next: migrate to by-name --- .../default.nix => by-name/no/notepad-next/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 2 deletions(-) rename pkgs/{applications/editors/notepad-next/default.nix => by-name/no/notepad-next/package.nix} (100%) diff --git a/pkgs/applications/editors/notepad-next/default.nix b/pkgs/by-name/no/notepad-next/package.nix similarity index 100% rename from pkgs/applications/editors/notepad-next/default.nix rename to pkgs/by-name/no/notepad-next/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7fb716cb1302f..0da164a186818 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14670,8 +14670,6 @@ with pkgs; ncdu_1 = callPackage ../tools/misc/ncdu/1.nix { }; - notepad-next = callPackage ../applications/editors/notepad-next { }; - notepadqq = libsForQt5.callPackage ../applications/editors/notepadqq { }; notmuch = callPackage ../applications/networking/mailreaders/notmuch { From d2b502d03c039376429d3afd5e77926197897d89 Mon Sep 17 00:00:00 2001 From: PerchunPak <git@perchun.it> Date: Wed, 15 Jan 2025 23:25:18 +0100 Subject: [PATCH 173/174] astal.cava: unbreak Required dependency `libcava` was merged to master, so this is no longer broken. --- pkgs/development/libraries/astal/modules/cava.nix | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/astal/modules/cava.nix b/pkgs/development/libraries/astal/modules/cava.nix index f22ec48d033b6..e4b55f6ad8f0d 100644 --- a/pkgs/development/libraries/astal/modules/cava.nix +++ b/pkgs/development/libraries/astal/modules/cava.nix @@ -1,6 +1,13 @@ -{ buildAstalModule }: +{ + buildAstalModule, + libcava, + fftw, +}: buildAstalModule { name = "cava"; + buildInputs = [ + libcava + fftw + ]; meta.description = "Astal module for audio visualization using cava"; - meta.broken = true; # https://github.com/NixOS/nixpkgs/pull/368312 } From 561e1a72b8d001d6603d2d0583d5bdb2f1139745 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <mail@dotlambda.de> Date: Wed, 15 Jan 2025 15:42:30 -0800 Subject: [PATCH 174/174] python313Packages.svg2tikz: unbreak Version 3.3.0 provides compatibility with Inkscape 1.4. --- pkgs/development/python-modules/svg2tikz/default.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/development/python-modules/svg2tikz/default.nix b/pkgs/development/python-modules/svg2tikz/default.nix index 9a3eedf840f21..730100827611d 100644 --- a/pkgs/development/python-modules/svg2tikz/default.nix +++ b/pkgs/development/python-modules/svg2tikz/default.nix @@ -50,6 +50,5 @@ buildPythonPackage rec { dotlambda gal_bolle ]; - broken = true; }; }