From 501faf79fac647947bcbca6d9b0ae55c232c70d8 Mon Sep 17 00:00:00 2001 From: Willow Date: Fri, 15 Dec 2023 16:19:30 -0600 Subject: [PATCH 001/429] maintainers: add willow_ch --- maintainers/maintainer-list.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index d20aa7db61ad..fb9bcf8f0a3b 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -19719,6 +19719,15 @@ githubId = 20464732; name = "Willi Butz"; }; + willow_ch = { + email = "nix@w.wolo.dev"; + github = "spaghetus"; + githubId = 28763739; + name = "Willow Carlson-Huber"; + keys = [{ + fingerprint = "FE21E0981CDFD50ADD086423C21A693BA4693A60"; + }]; + }; willswats = { email = "williamstuwatson@gmail.com"; github = "willswats"; From afd044548fe0312d5f49df730115645256829ed8 Mon Sep 17 00:00:00 2001 From: Alexandros Liarokapis Date: Thu, 25 Jan 2024 00:10:11 +0200 Subject: [PATCH 002/429] Disable compiler runtime-test for cmake when cross-compiling to None platform. CMake implicitly runs a compiler test when it detects a new project. This normally compiles a minimal executable and runs it. When cross-compiling to a None platform this will fail for all CMake packages and the user is forced to override this manually through overlays. This commit changes Cmake's behavior when cross compiling so that it compiles a static library as a test instead. --- pkgs/build-support/lib/cmake.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/build-support/lib/cmake.nix b/pkgs/build-support/lib/cmake.nix index 57fa586d3455..84c44619e9e2 100644 --- a/pkgs/build-support/lib/cmake.nix +++ b/pkgs/build-support/lib/cmake.nix @@ -20,11 +20,13 @@ let "-DCMAKE_HOST_SYSTEM_VERSION=${stdenv.buildPlatform.uname.release}" ] ++ optionals (stdenv.buildPlatform.canExecute stdenv.hostPlatform) [ "-DCMAKE_CROSSCOMPILING_EMULATOR=env" + ] ++ optionals (stdenv.hostPlatform.isNone) [ + "-DCMAKE_TRY_COMPILE_TARGET_TYPE=STATIC_LIBRARY" ] ++ optionals stdenv.hostPlatform.isStatic [ "-DCMAKE_LINK_SEARCH_START_STATIC=ON" ]); - makeCMakeFlags = { cmakeFlags ? [], ... }: cmakeFlags ++ cmakeFlags'; + makeCMakeFlags = { cmakeFlags ? [ ], ... }: cmakeFlags ++ cmakeFlags'; in { From 4e5de4ef9598e9777aac542ee83bb4f34bc4d6fa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gutyina=20Gerg=C5=91?= Date: Wed, 25 Sep 2024 08:59:14 +0200 Subject: [PATCH 003/429] nixos/dwm-status: don't disable upower Previously if the user enables this module but doesn't use the battery feature, the user can't enable upower (at least without lib.mkForce). --- nixos/modules/services/misc/dwm-status.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/misc/dwm-status.nix b/nixos/modules/services/misc/dwm-status.nix index 927561270a79..0c37c3f5eb94 100644 --- a/nixos/modules/services/misc/dwm-status.nix +++ b/nixos/modules/services/misc/dwm-status.nix @@ -49,7 +49,7 @@ in config = lib.mkIf cfg.enable { - services.upower.enable = lib.elem "battery" cfg.order; + services.upower.enable = lib.mkIf (lib.elem "battery" cfg.order) true; systemd.user.services.dwm-status = { description = "Highly performant and configurable DWM status service"; From 77650561723637cce4e1ae3eeb784825828792ab Mon Sep 17 00:00:00 2001 From: L-Trump Date: Sat, 19 Oct 2024 00:31:12 +0800 Subject: [PATCH 004/429] playonlinux: add python dependency pyasyncore --- pkgs/applications/misc/playonlinux/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/misc/playonlinux/default.nix b/pkgs/applications/misc/playonlinux/default.nix index 92b29ee71736..747a6eb4fd2a 100644 --- a/pkgs/applications/misc/playonlinux/default.nix +++ b/pkgs/applications/misc/playonlinux/default.nix @@ -64,6 +64,7 @@ let wxpython setuptools natsort + pyasyncore ]); in stdenv.mkDerivation { From 6896c88c1b6ae2b68d30e32b03d2c5c63b2d8a90 Mon Sep 17 00:00:00 2001 From: Enric Morales Date: Mon, 21 Oct 2024 08:28:41 +0000 Subject: [PATCH 005/429] lib25519: add update script Co-Authored-By: imad.nyc lib25519: 20240321 -> 20241004 lib25519: add version test script --- pkgs/by-name/li/lib25519/package.nix | 24 +++++++++++++++++++++--- pkgs/by-name/li/lib25519/update.sh | 10 ++++++++++ 2 files changed, 31 insertions(+), 3 deletions(-) create mode 100755 pkgs/by-name/li/lib25519/update.sh diff --git a/pkgs/by-name/li/lib25519/package.nix b/pkgs/by-name/li/lib25519/package.nix index 68d35a796a03..515ef90967fa 100644 --- a/pkgs/by-name/li/lib25519/package.nix +++ b/pkgs/by-name/li/lib25519/package.nix @@ -3,16 +3,22 @@ lib, python3, fetchzip, + testers, + valgrind, librandombytes, libcpucycles, + lib25519, }: +let + version = "20241004"; +in stdenv.mkDerivation (finalAttrs: { pname = "lib25519"; - version = "20240321"; + inherit version; src = fetchzip { url = "https://lib25519.cr.yp.to/lib25519-${finalAttrs.version}.tar.gz"; - hash = "sha256-R10Q803vCjIZCS4Z/uErsx547RaXfAELGQm9NuNhw+I="; + hash = "sha256-gKLMk+yZ/nDlwohZiCFurSZwHExX3Ge2W1O0JoGQf8M="; }; patches = [ ./environment-variable-tools.patch ]; @@ -31,7 +37,10 @@ stdenv.mkDerivation (finalAttrs: { runHook postConfigure ''; - nativeBuildInputs = [ python3 ]; + nativeBuildInputs = [ + python3 + valgrind + ]; buildInputs = [ librandombytes libcpucycles @@ -52,6 +61,15 @@ stdenv.mkDerivation (finalAttrs: { runHook postInstallCheck ''; + passthru = { + updateScript = ./update.sh; + tests.version = testers.testVersion { + package = lib25519; + command = "lib25519-test | head -n 2 | grep version"; + version = "lib25519 version ${version}"; + }; + }; + meta = { homepage = "https://randombytes.cr.yp.to/"; description = "A simple API for applications generating fresh randomness"; diff --git a/pkgs/by-name/li/lib25519/update.sh b/pkgs/by-name/li/lib25519/update.sh new file mode 100755 index 000000000000..7d366810c762 --- /dev/null +++ b/pkgs/by-name/li/lib25519/update.sh @@ -0,0 +1,10 @@ +#!/usr/bin/env nix-shell +#!nix-shell -i bash -p curl cacert nix common-updater-scripts --pure +#shellcheck shell=bash + +set -eu -o pipefail + +# upstream doesn't use git, but has this file specifically for versioning +version="$(curl https://lib25519.cr.yp.to/lib25519-latest-version.txt)" + +update-source-version lib25519 "$version" From e380a8f3e0dc87b546a8bff1c41113220435ec7e Mon Sep 17 00:00:00 2001 From: Mikael Fangel <34864484+MikaelFangel@users.noreply.github.com> Date: Sat, 11 May 2024 23:17:51 +0200 Subject: [PATCH 006/429] nwjs: change license to MIT --- pkgs/development/tools/nwjs/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/tools/nwjs/default.nix b/pkgs/development/tools/nwjs/default.nix index 408584de712e..91cc9b7634d4 100644 --- a/pkgs/development/tools/nwjs/default.nix +++ b/pkgs/development/tools/nwjs/default.nix @@ -139,13 +139,13 @@ stdenv.mkDerivation { runHook postInstall ''; - meta = with lib; { + meta = { description = "App runtime based on Chromium and node.js"; homepage = "https://nwjs.io/"; platforms = [ "i686-linux" "x86_64-linux" ]; - sourceProvenance = with sourceTypes; [ binaryNativeCode ]; - maintainers = [ maintainers.mikaelfangel ]; + sourceProvenance = [ lib.sourceTypes.binaryNativeCode ]; + maintainers = [ lib.maintainers.mikaelfangel ]; mainProgram = "nw"; - license = licenses.bsd3; + license = lib.licenses.mit; }; } From 06d1364d1d2931d50b2143243859a34a92cd18d2 Mon Sep 17 00:00:00 2001 From: Mikael Fangel <34864484+MikaelFangel@users.noreply.github.com> Date: Sat, 11 May 2024 23:23:03 +0200 Subject: [PATCH 007/429] nwjs: simplify the bits variable assignment Update pkgs/development/tools/nwjs/default.nix Co-authored-by: Arne Keller <2012gdwu+github@posteo.de> --- pkgs/development/tools/nwjs/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/tools/nwjs/default.nix b/pkgs/development/tools/nwjs/default.nix index 91cc9b7634d4..5dfb16ded79e 100644 --- a/pkgs/development/tools/nwjs/default.nix +++ b/pkgs/development/tools/nwjs/default.nix @@ -37,7 +37,7 @@ }: let - bits = if stdenv.hostPlatform.system == "x86_64-linux" then "x64" else "ia32"; + bits = if stdenv.hostPlatform.is64bit then "x64" else "ia32"; nwEnv = buildEnv { name = "nwjs-env"; From a141face92ff0b03c8d9613178399089b7483aed Mon Sep 17 00:00:00 2001 From: Robert James Hernandez Date: Mon, 11 Nov 2024 21:58:42 +0000 Subject: [PATCH 008/429] helmsman: nixfmt-rfc-style --- pkgs/by-name/he/helmsman/package.nix | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/he/helmsman/package.nix b/pkgs/by-name/he/helmsman/package.nix index ad4fc5edaee0..d477fec2940b 100644 --- a/pkgs/by-name/he/helmsman/package.nix +++ b/pkgs/by-name/he/helmsman/package.nix @@ -1,4 +1,9 @@ -{ lib, buildGoModule, fetchFromGitHub, ... }: +{ + lib, + buildGoModule, + fetchFromGitHub, + ... +}: buildGoModule rec { pname = "helmsman"; From 19c58a0fa8e13fa72c6ccba1a8d446c2a7de68ba Mon Sep 17 00:00:00 2001 From: Robert James Hernandez Date: Mon, 11 Nov 2024 22:02:09 +0000 Subject: [PATCH 009/429] helmsman: only build helsman subPackage helmsman drv would otherwise try to build the following subPackages: https://github.com/Praqma/helmsman/tree/dadf5fa910fb25e48b617cb71f7f380d53970ea1/internal --- pkgs/by-name/he/helmsman/package.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/by-name/he/helmsman/package.nix b/pkgs/by-name/he/helmsman/package.nix index d477fec2940b..d78753c79ccd 100644 --- a/pkgs/by-name/he/helmsman/package.nix +++ b/pkgs/by-name/he/helmsman/package.nix @@ -16,6 +16,8 @@ buildGoModule rec { sha256 = "sha256-u/Fj3A81hH7i1yTg+kcqCPrwEkj0cyhZvNzRYURDoZU="; }; + subPackages = [ "cmd/helmsman" ]; + vendorHash = "sha256-3eIMMKMvRzOSMvufETR9H1PnPDeEc+su8UuvbQJZ7kI="; doCheck = false; From 5cc4399755f29a7ecb31810d77d02f4db2baa257 Mon Sep 17 00:00:00 2001 From: Robert James Hernandez Date: Mon, 11 Nov 2024 22:05:59 +0000 Subject: [PATCH 010/429] helmsman: add sarcasticadmin as maintainer --- pkgs/by-name/he/helmsman/package.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/he/helmsman/package.nix b/pkgs/by-name/he/helmsman/package.nix index d78753c79ccd..f3f5136ab4de 100644 --- a/pkgs/by-name/he/helmsman/package.nix +++ b/pkgs/by-name/he/helmsman/package.nix @@ -27,6 +27,9 @@ buildGoModule rec { mainProgram = "helmsman"; homepage = "https://github.com/Praqma/helmsman"; license = licenses.mit; - maintainers = with maintainers; [ lynty ]; + maintainers = with maintainers; [ + lynty + sarcasticadmin + ]; }; } From 55a2b3eb0c016c3a450dec784a9d1a70051d6df8 Mon Sep 17 00:00:00 2001 From: Pim Snel Date: Fri, 16 Aug 2024 16:39:15 +0200 Subject: [PATCH 011/429] sc-im: fix aligning selection of cells cause crash Fixes #335130 For complete description of problem with video see https://github.com/andmarti1424/sc-im/issues/884 --- pkgs/by-name/sc/sc-im/package.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/by-name/sc/sc-im/package.nix b/pkgs/by-name/sc/sc-im/package.nix index c8d90823863f..978b858c6458 100644 --- a/pkgs/by-name/sc/sc-im/package.nix +++ b/pkgs/by-name/sc/sc-im/package.nix @@ -46,6 +46,9 @@ stdenv.mkDerivation rec { makeFlags = [ "prefix=${placeholder "out"}" ]; + # https://github.com/andmarti1424/sc-im/issues/884 + hardeningDisable = [ "fortify" ]; + env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang "-Wno-error=implicit-function-declaration"; postInstall = '' From cbead292e4aafd2ff4a384cfead3fb824d3d0657 Mon Sep 17 00:00:00 2001 From: diniamo Date: Mon, 2 Sep 2024 17:04:28 +0200 Subject: [PATCH 012/429] ani-cli: only add the player to the PATH as a fallback, format --- pkgs/by-name/an/ani-cli/package.nix | 62 ++++++++++++++++------------- 1 file changed, 34 insertions(+), 28 deletions(-) diff --git a/pkgs/by-name/an/ani-cli/package.nix b/pkgs/by-name/an/ani-cli/package.nix index b5d9fb11f5e0..21a4f6352c0e 100644 --- a/pkgs/by-name/an/ani-cli/package.nix +++ b/pkgs/by-name/an/ani-cli/package.nix @@ -1,23 +1,29 @@ -{ fetchFromGitHub -, makeWrapper -, stdenvNoCC -, lib -, gnugrep -, gnused -, curl -, catt -, syncplay -, ffmpeg -, fzf -, aria2 -, withMpv ? true, mpv -, withVlc ? false, vlc -, withIina ? false, iina -, chromecastSupport ? false -, syncSupport ? false +{ + fetchFromGitHub, + makeWrapper, + stdenvNoCC, + lib, + gnugrep, + gnused, + curl, + catt, + syncplay, + ffmpeg, + fzf, + aria2, + mpv, + vlc, + iina, + withMpv ? true, + withVlc ? false, + withIina ? false, + chromecastSupport ? false, + syncSupport ? false, }: -assert withMpv || withVlc || withIina; +let + players = lib.optional withMpv mpv ++ lib.optional withVlc vlc ++ lib.optional withIina iina; +in stdenvNoCC.mkDerivation rec { pname = "ani-cli"; @@ -31,15 +37,14 @@ stdenvNoCC.mkDerivation rec { }; nativeBuildInputs = [ makeWrapper ]; - runtimeDependencies = - let player = [] - ++ lib.optional withMpv mpv - ++ lib.optional withVlc vlc - ++ lib.optional withIina iina; - in [ gnugrep gnused curl fzf ffmpeg aria2 ] - ++ player - ++ lib.optional chromecastSupport catt - ++ lib.optional syncSupport syncplay; + runtimeDependencies = [ + gnugrep + gnused + curl + fzf + ffmpeg + aria2 + ] ++ lib.optional chromecastSupport catt ++ lib.optional syncSupport syncplay; installPhase = '' runHook preInstall @@ -47,7 +52,8 @@ stdenvNoCC.mkDerivation rec { install -Dm755 ani-cli $out/bin/ani-cli wrapProgram $out/bin/ani-cli \ - --prefix PATH : ${lib.makeBinPath runtimeDependencies} + --prefix PATH : ${lib.makeBinPath runtimeDependencies} \ + ${lib.optionalString (builtins.length players > 0) "--suffix PATH : ${lib.makeBinPath players}"} runHook postInstall ''; From c3d2d3e3148d9fb50554799c379ece36238f7ba3 Mon Sep 17 00:00:00 2001 From: diniamo Date: Sat, 14 Sep 2024 21:13:17 +0200 Subject: [PATCH 013/429] ani-cli: add diniamo as a maintainer --- pkgs/by-name/an/ani-cli/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/an/ani-cli/package.nix b/pkgs/by-name/an/ani-cli/package.nix index 21a4f6352c0e..158cef30a400 100644 --- a/pkgs/by-name/an/ani-cli/package.nix +++ b/pkgs/by-name/an/ani-cli/package.nix @@ -62,7 +62,7 @@ stdenvNoCC.mkDerivation rec { homepage = "https://github.com/pystardust/ani-cli"; description = "Cli tool to browse and play anime"; license = licenses.gpl3Plus; - maintainers = with maintainers; [ skykanin ]; + maintainers = with maintainers; [ skykanin diniamo ]; platforms = platforms.unix; mainProgram = "ani-cli"; }; From 80ab465c94ee609d5629bb97a4043465f0d5661f Mon Sep 17 00:00:00 2001 From: diniamo Date: Sat, 14 Sep 2024 21:26:07 +0200 Subject: [PATCH 014/429] ani-cli: avoid `with lib;` --- pkgs/by-name/an/ani-cli/package.nix | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/an/ani-cli/package.nix b/pkgs/by-name/an/ani-cli/package.nix index 158cef30a400..a3d5fa98b2b5 100644 --- a/pkgs/by-name/an/ani-cli/package.nix +++ b/pkgs/by-name/an/ani-cli/package.nix @@ -58,12 +58,15 @@ stdenvNoCC.mkDerivation rec { runHook postInstall ''; - meta = with lib; { + meta = { homepage = "https://github.com/pystardust/ani-cli"; description = "Cli tool to browse and play anime"; - license = licenses.gpl3Plus; - maintainers = with maintainers; [ skykanin diniamo ]; - platforms = platforms.unix; + license = lib.licenses.gpl3Plus; + maintainers = with lib.maintainers; [ + skykanin + diniamo + ]; + platforms = lib.platforms.unix; mainProgram = "ani-cli"; }; } From 0ac27f49bfd68f9fdcbb46d271b691bc7458543d Mon Sep 17 00:00:00 2001 From: diniamo Date: Sat, 14 Sep 2024 21:26:22 +0200 Subject: [PATCH 015/429] ani-cli: avoid `rec` --- pkgs/by-name/an/ani-cli/package.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/an/ani-cli/package.nix b/pkgs/by-name/an/ani-cli/package.nix index a3d5fa98b2b5..da34a48d55e0 100644 --- a/pkgs/by-name/an/ani-cli/package.nix +++ b/pkgs/by-name/an/ani-cli/package.nix @@ -25,19 +25,19 @@ let players = lib.optional withMpv mpv ++ lib.optional withVlc vlc ++ lib.optional withIina iina; in -stdenvNoCC.mkDerivation rec { +stdenvNoCC.mkDerivation (finalAttrs: { pname = "ani-cli"; version = "4.9"; src = fetchFromGitHub { owner = "pystardust"; repo = "ani-cli"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-7zuepWTtrFp9RW3zTSjPzyJ9e+09PdKgwcnV+DqPEUY="; }; nativeBuildInputs = [ makeWrapper ]; - runtimeDependencies = [ + runtimeInputs = [ gnugrep gnused curl @@ -52,7 +52,7 @@ stdenvNoCC.mkDerivation rec { install -Dm755 ani-cli $out/bin/ani-cli wrapProgram $out/bin/ani-cli \ - --prefix PATH : ${lib.makeBinPath runtimeDependencies} \ + --prefix PATH : ${lib.makeBinPath finalAttrs.runtimeInputs} \ ${lib.optionalString (builtins.length players > 0) "--suffix PATH : ${lib.makeBinPath players}"} runHook postInstall @@ -69,4 +69,4 @@ stdenvNoCC.mkDerivation rec { platforms = lib.platforms.unix; mainProgram = "ani-cli"; }; -} +}) From dea5930f0ed8c29d3758d5ade9898b4e99d80b74 Mon Sep 17 00:00:00 2001 From: Nobody_alias_N <165517462+Nobody-alias-N@users.noreply.github.com> Date: Thu, 28 Nov 2024 19:47:40 +0200 Subject: [PATCH 016/429] wine64Packages.{unstable,staging}: 9.20 -> 9.22 --- pkgs/applications/emulators/wine/sources.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/emulators/wine/sources.nix b/pkgs/applications/emulators/wine/sources.nix index 54da7fd960d3..4c5a0501c769 100644 --- a/pkgs/applications/emulators/wine/sources.nix +++ b/pkgs/applications/emulators/wine/sources.nix @@ -69,9 +69,9 @@ in rec { unstable = fetchurl rec { # NOTE: Don't forget to change the hash for staging as well. - version = "9.20"; + version = "9.22"; url = "https://dl.winehq.org/wine/source/9.x/wine-${version}.tar.xz"; - hash = "sha256-lfK0WxRYElvn2fzMlMpfjM4KXkrhHQ0ZPPt93bNeeoY="; + hash = "sha256-4VDSl0KqVPdo7z6XbthhqqT59IVC5Am+qQLQ9Js1loM="; inherit (stable) patches; ## see http://wiki.winehq.org/Gecko @@ -117,7 +117,7 @@ in rec { staging = fetchFromGitLab rec { # https://gitlab.winehq.org/wine/wine-staging inherit (unstable) version; - hash = "sha256-ewozuCtYPaV9d4XD9sdRGMfJcBIE13TC5vNEWdbcGCs="; + hash = "sha256-8bWr8HTl6y9t6TBQr5843FoxxwFJ0z7H/3Zx0gHZO+k="; domain = "gitlab.winehq.org"; owner = "wine"; repo = "wine-staging"; From 0941dc795a2f8f70e8682c9f74362bf9649b1669 Mon Sep 17 00:00:00 2001 From: jurraca Date: Fri, 29 Nov 2024 12:16:22 +0000 Subject: [PATCH 017/429] nostr-rs-relay: 0.8.13-unstable -> 0.9.0 --- pkgs/by-name/no/nostr-rs-relay/package.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/no/nostr-rs-relay/package.nix b/pkgs/by-name/no/nostr-rs-relay/package.nix index c63f4d2a057f..a1ddcc3b2725 100644 --- a/pkgs/by-name/no/nostr-rs-relay/package.nix +++ b/pkgs/by-name/no/nostr-rs-relay/package.nix @@ -11,15 +11,15 @@ rustPlatform.buildRustPackage rec { pname = "nostr-rs-relay"; - version = "0.8.13-unstable-2024-08-14"; + version = "0.9.0"; src = fetchFromGitHub { owner = "scsibug"; repo = "nostr-rs-relay"; - rev = "5a2189062560709b641bb13bedaca2cd478b4403"; - hash = "sha256-ZUndTcLGdAODgSsIqajlNdaEYbYWame0vFRBVmRFzKw="; + rev = version; + hash = "sha256-MS5jgUh9aLAFr4Nnf3Wid+ki0PTfsyob3r16/EXYZ7E="; }; - cargoHash = "sha256-+agmlg6tAnEJ5o586fUY7V4fdNScDPKCbaZqt7R3gqg="; + cargoHash = "sha256-nKW3mnD/PgDU+WBBwO0SYfNmLYl5T2k4qwPo79DbJpk="; buildInputs = [ openssl.dev ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ From 482ff494b881aac44f64c0ca045e2fe973050de3 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Fri, 29 Nov 2024 15:20:43 +0100 Subject: [PATCH 018/429] windows.mcfgthreads: 1.6.1 -> 1.9.2 --- pkgs/os-specific/windows/mcfgthreads/default.nix | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/pkgs/os-specific/windows/mcfgthreads/default.nix b/pkgs/os-specific/windows/mcfgthreads/default.nix index 2d5771068dc9..11ec8db38797 100644 --- a/pkgs/os-specific/windows/mcfgthreads/default.nix +++ b/pkgs/os-specific/windows/mcfgthreads/default.nix @@ -2,26 +2,34 @@ lib, stdenv, fetchFromGitHub, - autoreconfHook, + meson, + ninja, }: stdenv.mkDerivation rec { pname = "mcfgthread"; - version = "1.6.1"; + version = "1.9.2"; src = fetchFromGitHub { owner = "lhmouse"; repo = "mcfgthread"; rev = "v${lib.versions.majorMinor version}-ga.${lib.versions.patch version}"; - hash = "sha256-FrmeaQhwLrNewS0HDlbWgCvVQ5U1l0jrw0YVuQdt9Ck="; + hash = "sha256-bB7ghhSqAqkyU1PLuVVJfkTYTtEU9f0CR1k+k+u3EgY="; }; + postPatch = '' + sed -z "s/Rules for tests.*//;s/'cpp'/'c'/g" -i meson.build + ''; + outputs = [ "out" "dev" ]; - nativeBuildInputs = [ autoreconfHook ]; + nativeBuildInputs = [ + meson + ninja + ]; meta = { description = "Threading support library for Windows 7 and above"; From f2b47bffd00ba103eea3bcc62b3926892d14805d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gutyina=20Gerg=C5=91?= Date: Fri, 15 Nov 2024 20:32:32 +0100 Subject: [PATCH 019/429] ciscoPacketTracer8: nixfmt --- .../by-name/ci/ciscoPacketTracer8/package.nix | 35 +++++++++++-------- 1 file changed, 20 insertions(+), 15 deletions(-) diff --git a/pkgs/by-name/ci/ciscoPacketTracer8/package.nix b/pkgs/by-name/ci/ciscoPacketTracer8/package.nix index 8c29081bf79e..01ae0ae1f7f1 100644 --- a/pkgs/by-name/ci/ciscoPacketTracer8/package.nix +++ b/pkgs/by-name/ci/ciscoPacketTracer8/package.nix @@ -1,17 +1,18 @@ -{ stdenvNoCC -, lib -, alsa-lib -, autoPatchelfHook -, copyDesktopItems -, dbus -, dpkg -, expat -, fontconfig -, glib -, makeDesktopItem -, makeWrapper -, qt5 -, requireFile +{ + stdenvNoCC, + lib, + alsa-lib, + autoPatchelfHook, + copyDesktopItems, + dbus, + dpkg, + expat, + fontconfig, + glib, + makeDesktopItem, + makeWrapper, + qt5, + requireFile, }: let @@ -91,7 +92,11 @@ stdenvNoCC.mkDerivation (args: { desktopName = "Cisco Packet Tracer 8"; icon = "ciscoPacketTracer8"; exec = "packettracer8 %f"; - mimeTypes = [ "application/x-pkt" "application/x-pka" "application/x-pkz" ]; + mimeTypes = [ + "application/x-pkt" + "application/x-pka" + "application/x-pkz" + ]; }) ]; From b5047459f9ccb75c513e2b06014711333f501dd0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gutyina=20Gerg=C5=91?= Date: Fri, 29 Nov 2024 19:44:21 +0100 Subject: [PATCH 020/429] ciscoPacketTracer8: remove `with lib;`, order `meta` attrs --- pkgs/by-name/ci/ciscoPacketTracer8/package.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/ci/ciscoPacketTracer8/package.nix b/pkgs/by-name/ci/ciscoPacketTracer8/package.nix index 01ae0ae1f7f1..f6b81b6e69f6 100644 --- a/pkgs/by-name/ci/ciscoPacketTracer8/package.nix +++ b/pkgs/by-name/ci/ciscoPacketTracer8/package.nix @@ -106,13 +106,13 @@ stdenvNoCC.mkDerivation (args: { inherit hashes; }; - meta = with lib; { + meta = { description = "Network simulation tool from Cisco"; homepage = "https://www.netacad.com/courses/packet-tracer"; - sourceProvenance = with sourceTypes; [ binaryNativeCode ]; - license = licenses.unfree; - maintainers = with maintainers; [ ]; - platforms = [ "x86_64-linux" ]; + license = lib.licenses.unfree; mainProgram = "packettracer8"; + maintainers = with lib.maintainers; [ ]; + platforms = [ "x86_64-linux" ]; + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; }; }) From aeb72d953458ca682d8dacf93545bcad4343d0ec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gutyina=20Gerg=C5=91?= Date: Fri, 29 Nov 2024 19:45:49 +0100 Subject: [PATCH 021/429] ciscoPacketTracer8: add maintainer gepbird --- pkgs/by-name/ci/ciscoPacketTracer8/package.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/ci/ciscoPacketTracer8/package.nix b/pkgs/by-name/ci/ciscoPacketTracer8/package.nix index f6b81b6e69f6..fef17198f253 100644 --- a/pkgs/by-name/ci/ciscoPacketTracer8/package.nix +++ b/pkgs/by-name/ci/ciscoPacketTracer8/package.nix @@ -111,7 +111,9 @@ stdenvNoCC.mkDerivation (args: { homepage = "https://www.netacad.com/courses/packet-tracer"; license = lib.licenses.unfree; mainProgram = "packettracer8"; - maintainers = with lib.maintainers; [ ]; + maintainers = with lib.maintainers; [ + gepbird + ]; platforms = [ "x86_64-linux" ]; sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; }; From 46041f4f37a762e533a70bb897c27f13c24edd59 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gutyina=20Gerg=C5=91?= Date: Fri, 15 Nov 2024 23:03:02 +0100 Subject: [PATCH 022/429] ciscoPacketTracer8: add version parameter --- pkgs/by-name/ci/ciscoPacketTracer8/package.nix | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/ci/ciscoPacketTracer8/package.nix b/pkgs/by-name/ci/ciscoPacketTracer8/package.nix index fef17198f253..1c3f5f016a18 100644 --- a/pkgs/by-name/ci/ciscoPacketTracer8/package.nix +++ b/pkgs/by-name/ci/ciscoPacketTracer8/package.nix @@ -13,6 +13,7 @@ makeWrapper, qt5, requireFile, + version ? "8.2.2", }: let @@ -28,14 +29,14 @@ let }; in -stdenvNoCC.mkDerivation (args: { +stdenvNoCC.mkDerivation { pname = "ciscoPacketTracer8"; - version = "8.2.2"; + inherit version; src = requireFile { - name = names.${args.version}; - hash = hashes.${args.version}; + name = names.${version}; + hash = hashes.${version}; url = "https://www.netacad.com"; }; @@ -117,4 +118,4 @@ stdenvNoCC.mkDerivation (args: { platforms = [ "x86_64-linux" ]; sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; }; -}) +} From f8e91e908e33ceb61418cc75e9bee24af93d4948 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gutyina=20Gerg=C5=91?= Date: Fri, 15 Nov 2024 23:07:54 +0100 Subject: [PATCH 023/429] ciscoPacketTracer8: revert to fhsEnv --- .../by-name/ci/ciscoPacketTracer8/package.nix | 155 +++++++++++------- 1 file changed, 99 insertions(+), 56 deletions(-) diff --git a/pkgs/by-name/ci/ciscoPacketTracer8/package.nix b/pkgs/by-name/ci/ciscoPacketTracer8/package.nix index 1c3f5f016a18..f21558d9de36 100644 --- a/pkgs/by-name/ci/ciscoPacketTracer8/package.nix +++ b/pkgs/by-name/ci/ciscoPacketTracer8/package.nix @@ -1,18 +1,29 @@ { - stdenvNoCC, lib, - alsa-lib, + stdenvNoCC, + requireFile, autoPatchelfHook, - copyDesktopItems, + makeWrapper, + alsa-lib, dbus, - dpkg, expat, fontconfig, glib, + libdrm, + libglvnd, + libpulseaudio, + libudev0-shim, + libxkbcommon, + libxml2, + libxslt, + nspr, + wayland, + nss, + xorg, + dpkg, + buildFHSEnv, + copyDesktopItems, makeDesktopItem, - makeWrapper, - qt5, - requireFile, version ? "8.2.2", }: @@ -27,62 +38,100 @@ let "8.2.1" = "CiscoPacketTracer_821_Ubuntu_64bit.deb"; "8.2.2" = "CiscoPacketTracer822_amd64_signed.deb"; }; + + unwrapped = stdenvNoCC.mkDerivation { + name = "ciscoPacketTracer8-unwrapped"; + inherit version; + + src = requireFile { + name = names.${version}; + hash = hashes.${version}; + url = "https://www.netacad.com"; + }; + + buildInputs = + [ + autoPatchelfHook + makeWrapper + alsa-lib + dbus + expat + fontconfig + glib + libdrm + libglvnd + libpulseaudio + libudev0-shim + libxkbcommon + libxml2 + libxslt + nspr + nss + wayland + ] + ++ (with xorg; [ + libICE + libSM + libX11 + libXScrnSaver + libXcomposite + libXcursor + libXdamage + libXext + libXfixes + libXi + libXrandr + libXrender + libXtst + libxcb + xcbutilimage + xcbutilkeysyms + xcbutilrenderutil + xcbutilwm + ]); + + unpackPhase = '' + runHook preUnpack + + ${lib.getExe' dpkg "dpkg-deb"} -x $src $out + chmod 755 "$out" + + runHook postUnpack + ''; + + installPhase = '' + runHook preInstall + + makeWrapper "$out/opt/pt/bin/PacketTracer" "$out/bin/packettracer8" \ + --prefix LD_LIBRARY_PATH : "$out/opt/pt/bin" + + runHook postInstall + ''; + }; + + fhs-env = buildFHSEnv { + name = "ciscoPacketTracer8-fhs-env"; + runScript = lib.getExe' unwrapped "packettracer8"; + targetPkgs = pkgs: [ libudev0-shim ]; + }; in stdenvNoCC.mkDerivation { pname = "ciscoPacketTracer8"; - inherit version; - src = requireFile { - name = names.${version}; - hash = hashes.${version}; - url = "https://www.netacad.com"; - }; - - unpackPhase = '' - runHook preUnpack - - dpkg-deb -x $src $out - chmod 755 "$out" - - runHook postUnpack - ''; + dontUnpack = true; nativeBuildInputs = [ - autoPatchelfHook copyDesktopItems - dpkg - makeWrapper - qt5.wrapQtAppsHook - ]; - - buildInputs = [ - alsa-lib - dbus - expat - fontconfig - glib - qt5.qtbase - qt5.qtmultimedia - qt5.qtnetworkauth - qt5.qtscript - qt5.qtspeech - qt5.qtwebengine - qt5.qtwebsockets ]; installPhase = '' runHook preInstall - makeWrapper "$out/opt/pt/bin/PacketTracer" "$out/bin/packettracer8" \ - "''${qtWrapperArgs[@]}" \ - --set QT_QPA_PLATFORMTHEME "" \ - --prefix LD_LIBRARY_PATH : "$out/opt/pt/bin" - - install -D $out/opt/pt/art/app.png $out/share/icons/hicolor/128x128/apps/ciscoPacketTracer8.png - - rm $out/opt/pt/bin/libQt5* -f + mkdir -p $out/bin + ln -s ${fhs-env}/bin/${fhs-env.name} $out/bin/packettracer8 + ln -s ${fhs-env}/usr $out/usr runHook postInstall ''; @@ -91,7 +140,7 @@ stdenvNoCC.mkDerivation { (makeDesktopItem { name = "cisco-pt8.desktop"; desktopName = "Cisco Packet Tracer 8"; - icon = "ciscoPacketTracer8"; + icon = "${unwrapped}/opt/pt/art/app.png"; exec = "packettracer8 %f"; mimeTypes = [ "application/x-pkt" @@ -101,12 +150,6 @@ stdenvNoCC.mkDerivation { }) ]; - dontWrapQtApps = true; - - passthru = { - inherit hashes; - }; - meta = { description = "Network simulation tool from Cisco"; homepage = "https://www.netacad.com/courses/packet-tracer"; From a67194f905f0b41d072e0485a2574feb44df5ba9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gutyina=20Gerg=C5=91?= Date: Fri, 22 Nov 2024 22:06:49 +0100 Subject: [PATCH 024/429] ciscoPacketTracer8: allow overriding src --- pkgs/by-name/ci/ciscoPacketTracer8/package.nix | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/ci/ciscoPacketTracer8/package.nix b/pkgs/by-name/ci/ciscoPacketTracer8/package.nix index f21558d9de36..4f0801c984b5 100644 --- a/pkgs/by-name/ci/ciscoPacketTracer8/package.nix +++ b/pkgs/by-name/ci/ciscoPacketTracer8/package.nix @@ -25,6 +25,7 @@ copyDesktopItems, makeDesktopItem, version ? "8.2.2", + packetTracerSource ? null, }: let @@ -43,11 +44,15 @@ let name = "ciscoPacketTracer8-unwrapped"; inherit version; - src = requireFile { - name = names.${version}; - hash = hashes.${version}; - url = "https://www.netacad.com"; - }; + src = + if (packetTracerSource != null) then + packetTracerSource + else + requireFile { + name = names.${version}; + hash = hashes.${version}; + url = "https://www.netacad.com"; + }; buildInputs = [ From 2995a17c25fe44cf04f0857b2eeee98950e317a5 Mon Sep 17 00:00:00 2001 From: griffi-gh Date: Sun, 1 Dec 2024 14:14:03 +0100 Subject: [PATCH 025/429] xsnow: 3.4.4 -> 3.7.9 --- pkgs/by-name/xs/xsnow/package.nix | 42 +++++++++++++++++++++++++------ 1 file changed, 35 insertions(+), 7 deletions(-) diff --git a/pkgs/by-name/xs/xsnow/package.nix b/pkgs/by-name/xs/xsnow/package.nix index ba9791cc6f1a..a94ad14e8364 100644 --- a/pkgs/by-name/xs/xsnow/package.nix +++ b/pkgs/by-name/xs/xsnow/package.nix @@ -1,16 +1,39 @@ -{ lib, stdenv, fetchurl, pkg-config, libxml2, gtk3-x11, libXt, libXpm }: - +{ + lib, + stdenv, + fetchurl, + pkg-config, + libxml2, + wrapGAppsHook3, + gtk3-x11, + xorg, + libxkbcommon, + gsl, +}: stdenv.mkDerivation rec { pname = "xsnow"; - version = "3.4.4"; + version = "3.7.9"; src = fetchurl { url = "https://ratrabbit.nl/downloads/xsnow/xsnow-${version}.tar.gz"; - sha256 = "sha256-fPMy5AxKspFkcWphf/IjMc/ZQtayljThKxbcMtvOjRc="; + sha256 = "sha256-DEzQblUfm2kd0I21sUwO3EVUm/WHnOk7T6iMgo3+EAY="; }; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ gtk3-x11 libxml2 libXt libXpm ]; + nativeBuildInputs = [ + pkg-config + wrapGAppsHook3 + ]; + buildInputs = [ + gtk3-x11 + libxkbcommon + libxml2 + gsl + ] ++ (with xorg; [ + libX11 + libXpm + libXt + libXtst + ]); makeFlags = [ "gamesdir=$(out)/bin" ]; @@ -20,8 +43,13 @@ stdenv.mkDerivation rec { description = "X-windows application that will let it snow on the root, in between and on windows"; mainProgram = "xsnow"; homepage = "https://ratrabbit.nl/ratrabbit/xsnow/"; + changelog = "https://ratrabbit.nl/ratrabbit/xsnow/changelog/index.html"; + downloadPage = "https://ratrabbit.nl/ratrabbit/xsnow/downloads/index.html"; license = licenses.gpl3Plus; - maintainers = with maintainers; [ robberer ]; + maintainers = with maintainers; [ + robberer + griffi-gh + ]; platforms = platforms.unix; }; } From c0fd43c6d156cb006c64db51cba989f0fcc03902 Mon Sep 17 00:00:00 2001 From: griffi-gh Date: Sun, 1 Dec 2024 18:10:23 +0100 Subject: [PATCH 026/429] ttysvr: 0.3.3 -> 0.3.4 --- pkgs/by-name/tt/ttysvr/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/tt/ttysvr/package.nix b/pkgs/by-name/tt/ttysvr/package.nix index a4537246c025..47a21d97cf98 100644 --- a/pkgs/by-name/tt/ttysvr/package.nix +++ b/pkgs/by-name/tt/ttysvr/package.nix @@ -15,15 +15,15 @@ }: rustPlatform.buildRustPackage rec { pname = "ttysvr"; - version = "0.3.3"; + version = "0.3.4"; src = fetchFromGitHub { owner = "cxreiff"; repo = "ttysvr"; rev = "refs/tags/v${version}"; - hash = "sha256-qUwnx+hwd3PRzz1TlQzPAppj6aTZZpTG2e5cBaA3zZI="; + hash = "sha256-W8IglZVvhFqn0TH1ZBGWERizCxCQ+C4SckYFLCzB3yc="; }; - cargoHash = "sha256-kIE8+FUS3i8Ulkj35lO1iRmFx5x+r89THVuzNzAv6tE="; + cargoHash = "sha256-gHrsdlmA8QxahrWIy6+5knLydVcSbEfS7+02fF1sSsA="; nativeBuildInputs = [ pkg-config From 84d991d304360cc2e70a72b2a50eae1a898738ac Mon Sep 17 00:00:00 2001 From: Jonas Heinrich Date: Wed, 4 Dec 2024 07:27:21 +0100 Subject: [PATCH 027/429] python3Packages.prosemirror: 0.5.0 -> 0.5.1 --- pkgs/development/python-modules/prosemirror/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/prosemirror/default.nix b/pkgs/development/python-modules/prosemirror/default.nix index 2457d8b60cf2..e556b8249b87 100644 --- a/pkgs/development/python-modules/prosemirror/default.nix +++ b/pkgs/development/python-modules/prosemirror/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "prosemirror"; - version = "0.5.0"; + version = "0.5.1"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-AwhPJHPDuuQW7NlUs7KL0SLTAH9F+E8RzRbsRnHraiI="; + hash = "sha256-COjCU//frJf2MNgaAz5aQizbjRsF3ypYFXS6aDjqrIU="; }; build-system = [ setuptools-scm ]; From 3c999ebf694f3b5d7571b60efd2445a6f7cd900a Mon Sep 17 00:00:00 2001 From: Jonas Heinrich Date: Wed, 4 Dec 2024 07:27:29 +0100 Subject: [PATCH 028/429] python3Packages.prosemirror: add changelog --- pkgs/development/python-modules/prosemirror/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/python-modules/prosemirror/default.nix b/pkgs/development/python-modules/prosemirror/default.nix index e556b8249b87..c18ea1521b9b 100644 --- a/pkgs/development/python-modules/prosemirror/default.nix +++ b/pkgs/development/python-modules/prosemirror/default.nix @@ -34,6 +34,7 @@ buildPythonPackage rec { meta = { description = "Python implementation of core ProseMirror modules for collaborative editing"; homepage = "https://pypi.org/project/prosemirror"; + changelog = "https://github.com/fellowapp/prosemirror-py/releases/tag/v${version}"; license = lib.licenses.bsd3; maintainers = with lib.maintainers; [ onny ]; }; From 7d23946c14235d2ae91ceadcc32e1e258f0fc965 Mon Sep 17 00:00:00 2001 From: Jonas Heinrich Date: Wed, 4 Dec 2024 07:27:49 +0100 Subject: [PATCH 029/429] python3Packages.prosemirror: nixfmt --- pkgs/development/python-modules/prosemirror/default.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/prosemirror/default.nix b/pkgs/development/python-modules/prosemirror/default.nix index c18ea1521b9b..511ff68767c6 100644 --- a/pkgs/development/python-modules/prosemirror/default.nix +++ b/pkgs/development/python-modules/prosemirror/default.nix @@ -27,9 +27,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "prosemirror" ]; - nativeCheckInputs = [ - pytestCheckHook - ]; + nativeCheckInputs = [ pytestCheckHook ]; meta = { description = "Python implementation of core ProseMirror modules for collaborative editing"; From 7de8722dc3d9bde0fed3fb066967b66d58f398cb Mon Sep 17 00:00:00 2001 From: SpringerJack Date: Wed, 4 Dec 2024 22:51:17 +0100 Subject: [PATCH 030/429] ipe: optional support for qvoronoi Ipe can optionally compiled with ipelets computing Voronoi diagrams. This depends on qhull and is therefore needs to be enabled explicitly. --- pkgs/applications/graphics/ipe/default.nix | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/graphics/ipe/default.nix b/pkgs/applications/graphics/ipe/default.nix index aa12c5861f2e..ff49948bdb14 100644 --- a/pkgs/applications/graphics/ipe/default.nix +++ b/pkgs/applications/graphics/ipe/default.nix @@ -15,9 +15,11 @@ , qtbase , qtsvg , texliveSmall +, qhull , wrapQtAppsHook , zlib , withTeXLive ? true +, withQVoronoi ? false , buildPackages }: @@ -48,6 +50,8 @@ stdenv.mkDerivation rec { zlib ] ++ (lib.optionals withTeXLive [ texliveSmall + ]) ++ (lib.optionals withQVoronoi [ + qhull ]); makeFlags = [ @@ -56,7 +60,10 @@ stdenv.mkDerivation rec { "LUA_PACKAGE=lua" "MOC=${buildPackages.qt6Packages.qtbase}/libexec/moc" "IPE_NO_SPELLCHECK=1" # qtSpell is not yet packaged - ]; + ] ++ (lib.optionals withQVoronoi [ + "IPEQVORONOI=1" + "QHULL_CFLAGS=-I${qhull}/include/libqhull_r" + ]); qtWrapperArgs = lib.optionals withTeXLive [ "--prefix PATH : ${lib.makeBinPath [ texliveSmall ]}" ]; From 20847c0e357524a3252865ab34acd3b0e0737252 Mon Sep 17 00:00:00 2001 From: paumr Date: Sun, 8 Dec 2024 16:56:51 +0100 Subject: [PATCH 031/429] Revert "jellyfin-media-player: 1.10.1 -> 1.11.1" This reverts commit cd180e8ae912db00b09a915937a03b650c22f8b9. --- .../video/jellyfin-media-player/default.nix | 16 ++++++++--- .../jellyfin-media-player/fix-web-path.patch | 28 +++++++++++++++++++ 2 files changed, 40 insertions(+), 4 deletions(-) create mode 100644 pkgs/applications/video/jellyfin-media-player/fix-web-path.patch diff --git a/pkgs/applications/video/jellyfin-media-player/default.nix b/pkgs/applications/video/jellyfin-media-player/default.nix index 6c25495b0341..f141ff0f3654 100644 --- a/pkgs/applications/video/jellyfin-media-player/default.nix +++ b/pkgs/applications/video/jellyfin-media-player/default.nix @@ -21,21 +21,24 @@ , qtwebchannel , qtwebengine , qtx11extras -, withDbus ? stdenv.hostPlatform.isLinux +, jellyfin-web +, withDbus ? stdenv.isLinux }: mkDerivation rec { pname = "jellyfin-media-player"; - version = "1.11.1"; + version = "1.10.1"; src = fetchFromGitHub { owner = "jellyfin"; repo = "jellyfin-media-player"; rev = "v${version}"; - sha256 = "sha256-Jsn4kWQzUaQI9MpbsLJr6JSJk9ZSnMEcrebQ2DYegSU="; + sha256 = "sha256-l1jNrEUrDCc4R1CZ0b0Omjka6wTryjWqnEJbfCSJ0ZE="; }; patches = [ + # fix the location of the jellyfin-web path + ./fix-web-path.patch # disable update notifications since the end user can't simply download the release artifacts to update ./disable-update-notifications.patch ]; @@ -74,7 +77,12 @@ mkDerivation rec { "-DLINUX_X11POWER=ON" ]; - postInstall = lib.optionalString stdenv.hostPlatform.isDarwin '' + preConfigure = '' + # link the jellyfin-web files to be copied by cmake (see fix-web-path.patch) + ln -s ${jellyfin-web}/share/jellyfin-web . + ''; + + postInstall = lib.optionalString stdenv.isDarwin '' mkdir -p $out/bin $out/Applications mv "$out/Jellyfin Media Player.app" $out/Applications ln -s "$out/Applications/Jellyfin Media Player.app/Contents/MacOS/Jellyfin Media Player" $out/bin/jellyfinmediaplayer diff --git a/pkgs/applications/video/jellyfin-media-player/fix-web-path.patch b/pkgs/applications/video/jellyfin-media-player/fix-web-path.patch new file mode 100644 index 000000000000..250a5c069545 --- /dev/null +++ b/pkgs/applications/video/jellyfin-media-player/fix-web-path.patch @@ -0,0 +1,28 @@ +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index 5abca9b..d09176b 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -107,10 +107,8 @@ endif() + set(RESOURCE_ROOT .) + if(APPLE) + set(RESOURCE_ROOT Resources) +- if(EXISTS ${CMAKE_CURRENT_BINARY_DIR}/../dist/) +- add_resources(TARGET ${MAIN_TARGET} SOURCES ${CMAKE_CURRENT_BINARY_DIR}/../dist/ DEST ${RESOURCE_ROOT}/web-client/desktop) +- endif() +- add_resources(TARGET ${MAIN_TARGET} SOURCES ${CMAKE_SOURCE_DIR}/native/ DEST ${RESOURCE_ROOT}/web-client/extension) ++ install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/../../jellyfin-web/ DESTINATION ${RESOURCE_ROOT}/web-client/desktop) ++ install(DIRECTORY ${CMAKE_SOURCE_DIR}/native/ DESTINATION ${RESOURCE_ROOT}/web-client/extension) + endif() + + if(NOT APPLE) +@@ -123,9 +121,7 @@ if(NOT APPLE) + install(FILES ${loc}/qtwebengine_devtools_resources.pak DESTINATION resources) + endif() + endforeach() +- if(EXISTS ${CMAKE_CURRENT_BINARY_DIR}/../dist/) +- install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/../dist/ DESTINATION ${INSTALL_RESOURCE_DIR}/web-client/desktop) +- endif() ++ install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/../../jellyfin-web/ DESTINATION ${INSTALL_RESOURCE_DIR}/web-client/desktop) + install(DIRECTORY ${CMAKE_SOURCE_DIR}/native/ DESTINATION ${INSTALL_RESOURCE_DIR}/web-client/extension) + endif() + From eb6ea54db50b5f381779c6edb806e251b1768aa6 Mon Sep 17 00:00:00 2001 From: Tomodachi94 Date: Tue, 10 Dec 2024 06:09:53 +0000 Subject: [PATCH 032/429] zsh-you-should-use: modernize --- pkgs/by-name/zs/zsh-you-should-use/package.nix | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/by-name/zs/zsh-you-should-use/package.nix b/pkgs/by-name/zs/zsh-you-should-use/package.nix index 0746754ecfef..b76c2ba06fb4 100644 --- a/pkgs/by-name/zs/zsh-you-should-use/package.nix +++ b/pkgs/by-name/zs/zsh-you-should-use/package.nix @@ -1,14 +1,14 @@ -{ lib, stdenv, fetchFromGitHub }: +{ lib, stdenvNoCC, fetchFromGitHub }: -stdenv.mkDerivation rec { +stdenvNoCC.mkDerivation (finalAttrs: { pname = "zsh-you-should-use"; version = "1.9.0"; src = fetchFromGitHub { owner = "MichaelAquilina"; - repo = pname; - rev = version; - sha256 = "sha256-+3iAmWXSsc4OhFZqAMTwOL7AAHBp5ZtGGtvqCnEOYc0="; + repo = "zsh-you-should-use"; + tag = finalAttrs.version; + hash = "sha256-+3iAmWXSsc4OhFZqAMTwOL7AAHBp5ZtGGtvqCnEOYc0="; }; strictDeps = true; @@ -18,10 +18,10 @@ stdenv.mkDerivation rec { install -D you-should-use.plugin.zsh $out/share/zsh/plugins/you-should-use/you-should-use.plugin.zsh ''; - meta = with lib; { + meta = { homepage = "https://github.com/MichaelAquilina/zsh-you-should-use"; - license = licenses.gpl3; + license = lib.licenses.gpl3; description = "ZSH plugin that reminds you to use existing aliases for commands you just typed"; maintainers = [ ]; }; -} +}) From 842c83c040f3620854bc094e7b186965149f19cd Mon Sep 17 00:00:00 2001 From: Tomodachi94 Date: Tue, 10 Dec 2024 06:11:04 +0000 Subject: [PATCH 033/429] zsh-you-should-use: adopt --- pkgs/by-name/zs/zsh-you-should-use/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/zs/zsh-you-should-use/package.nix b/pkgs/by-name/zs/zsh-you-should-use/package.nix index b76c2ba06fb4..e39bd39e5275 100644 --- a/pkgs/by-name/zs/zsh-you-should-use/package.nix +++ b/pkgs/by-name/zs/zsh-you-should-use/package.nix @@ -22,6 +22,6 @@ stdenvNoCC.mkDerivation (finalAttrs: { homepage = "https://github.com/MichaelAquilina/zsh-you-should-use"; license = lib.licenses.gpl3; description = "ZSH plugin that reminds you to use existing aliases for commands you just typed"; - maintainers = [ ]; + maintainers = with lib.maintainers; [ tomodachi94 ]; }; }) From da186a6585ca1d24abf1bf94daf8deb15686fb11 Mon Sep 17 00:00:00 2001 From: Tomodachi94 Date: Tue, 10 Dec 2024 06:18:45 +0000 Subject: [PATCH 034/429] zsh-you-should-use: add update script --- pkgs/by-name/zs/zsh-you-should-use/package.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/zs/zsh-you-should-use/package.nix b/pkgs/by-name/zs/zsh-you-should-use/package.nix index e39bd39e5275..00694cd5713b 100644 --- a/pkgs/by-name/zs/zsh-you-should-use/package.nix +++ b/pkgs/by-name/zs/zsh-you-should-use/package.nix @@ -1,4 +1,4 @@ -{ lib, stdenvNoCC, fetchFromGitHub }: +{ lib, stdenvNoCC, fetchFromGitHub, gitUpdater }: stdenvNoCC.mkDerivation (finalAttrs: { pname = "zsh-you-should-use"; @@ -18,6 +18,8 @@ stdenvNoCC.mkDerivation (finalAttrs: { install -D you-should-use.plugin.zsh $out/share/zsh/plugins/you-should-use/you-should-use.plugin.zsh ''; + passthru.updateScript = gitUpdater { }; + meta = { homepage = "https://github.com/MichaelAquilina/zsh-you-should-use"; license = lib.licenses.gpl3; From 98738252fb9cbf19354bab16793c43b56a791cb8 Mon Sep 17 00:00:00 2001 From: Tomodachi94 Date: Tue, 10 Dec 2024 06:55:44 +0000 Subject: [PATCH 035/429] zsh-you-should-use: hardcode tput dependency --- pkgs/by-name/zs/zsh-you-should-use/package.nix | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/zs/zsh-you-should-use/package.nix b/pkgs/by-name/zs/zsh-you-should-use/package.nix index 00694cd5713b..03c184edaca3 100644 --- a/pkgs/by-name/zs/zsh-you-should-use/package.nix +++ b/pkgs/by-name/zs/zsh-you-should-use/package.nix @@ -1,4 +1,4 @@ -{ lib, stdenvNoCC, fetchFromGitHub, gitUpdater }: +{ lib, stdenvNoCC, ncurses, fetchFromGitHub, gitUpdater }: stdenvNoCC.mkDerivation (finalAttrs: { pname = "zsh-you-should-use"; @@ -14,6 +14,11 @@ stdenvNoCC.mkDerivation (finalAttrs: { strictDeps = true; dontBuild = true; + postPatch = '' + substituteInPlace you-should-use.plugin.zsh \ + --replace-fail "tput" "${lib.getExe' ncurses "tput"}" + ''; + installPhase = '' install -D you-should-use.plugin.zsh $out/share/zsh/plugins/you-should-use/you-should-use.plugin.zsh ''; From 22b6ee8848bca70e6ceb81dd2c81e5db81c58aeb Mon Sep 17 00:00:00 2001 From: paumr Date: Mon, 9 Dec 2024 16:12:03 +0100 Subject: [PATCH 036/429] jellyfin-media-player: 1.10.1 -> 1.11.1 --- .../video/jellyfin-media-player/default.nix | 6 ++-- .../jellyfin-media-player/fix-web-path.patch | 28 +++++++++++++------ 2 files changed, 22 insertions(+), 12 deletions(-) diff --git a/pkgs/applications/video/jellyfin-media-player/default.nix b/pkgs/applications/video/jellyfin-media-player/default.nix index f141ff0f3654..e9ec8aa67275 100644 --- a/pkgs/applications/video/jellyfin-media-player/default.nix +++ b/pkgs/applications/video/jellyfin-media-player/default.nix @@ -22,18 +22,18 @@ , qtwebengine , qtx11extras , jellyfin-web -, withDbus ? stdenv.isLinux +, withDbus ? stdenv.hostPlatform.isLinux }: mkDerivation rec { pname = "jellyfin-media-player"; - version = "1.10.1"; + version = "1.11.1"; src = fetchFromGitHub { owner = "jellyfin"; repo = "jellyfin-media-player"; rev = "v${version}"; - sha256 = "sha256-l1jNrEUrDCc4R1CZ0b0Omjka6wTryjWqnEJbfCSJ0ZE="; + sha256 = "sha256-Jsn4kWQzUaQI9MpbsLJr6JSJk9ZSnMEcrebQ2DYegSU="; }; patches = [ diff --git a/pkgs/applications/video/jellyfin-media-player/fix-web-path.patch b/pkgs/applications/video/jellyfin-media-player/fix-web-path.patch index 250a5c069545..3f182fd407ef 100644 --- a/pkgs/applications/video/jellyfin-media-player/fix-web-path.patch +++ b/pkgs/applications/video/jellyfin-media-player/fix-web-path.patch @@ -1,28 +1,38 @@ diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index 5abca9b..d09176b 100644 +index 9df49da..be1c479 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt -@@ -107,10 +107,8 @@ endif() +@@ -106,7 +106,8 @@ endif() set(RESOURCE_ROOT .) if(APPLE) set(RESOURCE_ROOT Resources) -- if(EXISTS ${CMAKE_CURRENT_BINARY_DIR}/../dist/) -- add_resources(TARGET ${MAIN_TARGET} SOURCES ${CMAKE_CURRENT_BINARY_DIR}/../dist/ DEST ${RESOURCE_ROOT}/web-client/desktop) -- endif() - add_resources(TARGET ${MAIN_TARGET} SOURCES ${CMAKE_SOURCE_DIR}/native/ DEST ${RESOURCE_ROOT}/web-client/extension) + install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/../../jellyfin-web/ DESTINATION ${RESOURCE_ROOT}/web-client/desktop) + install(DIRECTORY ${CMAKE_SOURCE_DIR}/native/ DESTINATION ${RESOURCE_ROOT}/web-client/extension) endif() if(NOT APPLE) -@@ -123,9 +121,7 @@ if(NOT APPLE) +@@ -119,6 +120,7 @@ if(NOT APPLE) install(FILES ${loc}/qtwebengine_devtools_resources.pak DESTINATION resources) endif() endforeach() -- if(EXISTS ${CMAKE_CURRENT_BINARY_DIR}/../dist/) -- install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/../dist/ DESTINATION ${INSTALL_RESOURCE_DIR}/web-client/desktop) -- endif() + install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/../../jellyfin-web/ DESTINATION ${INSTALL_RESOURCE_DIR}/web-client/desktop) install(DIRECTORY ${CMAKE_SOURCE_DIR}/native/ DESTINATION ${INSTALL_RESOURCE_DIR}/web-client/extension) endif() +diff --git a/src/settings/SettingsComponent.cpp b/src/settings/SettingsComponent.cpp +index c398523..7023948 100644 +--- a/src/settings/SettingsComponent.cpp ++++ b/src/settings/SettingsComponent.cpp +@@ -748,7 +748,7 @@ QString SettingsComponent::getWebClientUrl(bool desktop) + + if (url == "bundled") + { +- auto path = Paths::webExtensionPath() + "find-webclient.html"; ++ auto path = Paths::webClientPath("desktop"); + + url = "file:///" + path; + } +-- +2.36.0 + From afa059a15ba28b5524399861d114909c35490cfc Mon Sep 17 00:00:00 2001 From: paumr Date: Mon, 9 Dec 2024 16:47:09 +0100 Subject: [PATCH 037/429] jellyfin-media-player: added paumr as maintainer --- pkgs/applications/video/jellyfin-media-player/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/video/jellyfin-media-player/default.nix b/pkgs/applications/video/jellyfin-media-player/default.nix index e9ec8aa67275..174cb55de29d 100644 --- a/pkgs/applications/video/jellyfin-media-player/default.nix +++ b/pkgs/applications/video/jellyfin-media-player/default.nix @@ -93,7 +93,7 @@ mkDerivation rec { description = "Jellyfin Desktop Client based on Plex Media Player"; license = with licenses; [ gpl2Only mit ]; platforms = [ "aarch64-linux" "x86_64-linux" "aarch64-darwin" "x86_64-darwin" ]; - maintainers = with maintainers; [ jojosch kranzes ]; + maintainers = with maintainers; [ jojosch kranzes paumr ]; mainProgram = "jellyfinmediaplayer"; }; } From 640ef7805e2a18bac4dce853860659a8120518c3 Mon Sep 17 00:00:00 2001 From: Willow Date: Fri, 15 Dec 2023 16:19:42 -0600 Subject: [PATCH 038/429] caper: init at 0.9 caper: apply recommended changes Co-authored-by: Yohann Boniface caper: apply recommended changes caper: apply nixfmt caper: apply nixfmt rfc style --- maintainers/maintainer-list.nix | 4 +- pkgs/by-name/ca/caper/package.nix | 64 +++++++++++++++++++++++++++++++ 2 files changed, 65 insertions(+), 3 deletions(-) create mode 100644 pkgs/by-name/ca/caper/package.nix diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index fb9bcf8f0a3b..a3db4fff93a5 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -19724,9 +19724,7 @@ github = "spaghetus"; githubId = 28763739; name = "Willow Carlson-Huber"; - keys = [{ - fingerprint = "FE21E0981CDFD50ADD086423C21A693BA4693A60"; - }]; + keys = [ { fingerprint = "FE21E0981CDFD50ADD086423C21A693BA4693A60"; } ]; }; willswats = { email = "williamstuwatson@gmail.com"; diff --git a/pkgs/by-name/ca/caper/package.nix b/pkgs/by-name/ca/caper/package.nix new file mode 100644 index 000000000000..f7dc73b829de --- /dev/null +++ b/pkgs/by-name/ca/caper/package.nix @@ -0,0 +1,64 @@ +{ + stdenv, + lib, + ocaml, + ocamlPackages, + gnum4, + fetchFromGitLab, +}: +stdenv.mkDerivation rec { + pname = "caper"; + version = "0.9"; + + src = fetchFromGitLab { + owner = "niksu"; + repo = "caper"; + rev = "v${version}"; + hash = "sha256-TSryjz0NrGdkc+6vmfBqsuVpV3N9FvteTFsVqpUcm0w="; + }; + + nativeBuildInputs = [ + ocaml + ocamlPackages.ocamlbuild + ocamlPackages.findlib + ocamlPackages.menhir + gnum4 + ]; + + buildInputs = [ + ocamlPackages.angstrom + ]; + + strictDeps = true; + + buildPhase = '' + runHook preBuild + CAPER_WITH_ENGLISH=yes bash build.sh caper.native + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + mkdir -p $out/bin + cp caper.native $out/bin/caper + runHook postInstall + ''; + + meta = { + description = "Tool for understanding and processing pcap (packet capture) expressions"; + longDescription = '' + Caper is a tool for understanding and processing "pcap expressions" (also known as *tcpdump filters*) which are used for network packet analysis. + Caper can be used for: + * Expanding out pcap expressions "in full" to understand their implicit features. + * Reasoning about whether two expressions accept the same set of packets, or how their accepted packets differ. + * Converting pcap expressions into BPF programs. + * Converting between pcap expressions and English. + + More info can be found in the Caper paper (https://www.nik.network/caper/pcap_semantics.pdf). + ''; + homepage = "https://gitlab.com/niksu/caper"; + license = lib.licenses.gpl3Plus; + maintainers = with lib.maintainers; [ willow_ch ]; + mainProgram = "caper"; + }; +} From 39ab44a5666c67b06e9f42802cda6bc80dc77f51 Mon Sep 17 00:00:00 2001 From: Erik Arvstedt Date: Thu, 12 Dec 2024 13:14:33 +0100 Subject: [PATCH 039/429] extra-container: 0.12 -> 0.13 --- pkgs/by-name/ex/extra-container/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ex/extra-container/package.nix b/pkgs/by-name/ex/extra-container/package.nix index 84a5367b449a..f4298130399f 100644 --- a/pkgs/by-name/ex/extra-container/package.nix +++ b/pkgs/by-name/ex/extra-container/package.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "extra-container"; - version = "0.12"; + version = "0.13"; src = fetchFromGitHub { owner = "erikarvstedt"; repo = pname; rev = version; - hash = "sha256-/5wPv962ZHvZoZMOr4nMz7qcvbzlExRYS2nrnay/PU8="; + hash = "sha256-vgh3TqfkFdnPxREBedw4MQehIDc3N8YyxBOB45n+AvU="; }; buildCommand = '' From 70cf61d858ba1824e276914bfae0be8df8127d11 Mon Sep 17 00:00:00 2001 From: linsui <36977733+linsui@users.noreply.github.com> Date: Thu, 12 Dec 2024 21:41:33 +0800 Subject: [PATCH 040/429] waydroid: fix 1.4.3 --- pkgs/by-name/wa/waydroid/package.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pkgs/by-name/wa/waydroid/package.nix b/pkgs/by-name/wa/waydroid/package.nix index d1703941a4e5..435412e25ec8 100644 --- a/pkgs/by-name/wa/waydroid/package.nix +++ b/pkgs/by-name/wa/waydroid/package.nix @@ -31,6 +31,14 @@ python3Packages.buildPythonApplication rec { hash = "sha256-LejyuGYgW46++95XROuWc13Q+w0l+AzGAl9ekfmAIEk="; }; + patches = [ + (fetchpatch { + url = "https://github.com/waydroid/waydroid/commit/af296c90a788dde0b33813b12607cfab2fa65b98.patch"; + hash = "sha256-1vkEKk00dbBLbbBxZIhcoOYUP976SJlaWyzYSWBy0nU="; + revert = true; + }) + ]; + nativeBuildInputs = [ gobject-introspection wrapGAppsHook3 From f7a62ae15a735fe09446e6b23d0d73dbf212e341 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 12 Dec 2024 20:02:52 +0000 Subject: [PATCH 041/429] mongoc: 1.29.0 -> 1.29.1 --- pkgs/development/libraries/mongoc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/mongoc/default.nix b/pkgs/development/libraries/mongoc/default.nix index 650dd9255189..50caf125fcd7 100644 --- a/pkgs/development/libraries/mongoc/default.nix +++ b/pkgs/development/libraries/mongoc/default.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation rec { pname = "mongoc"; - version = "1.29.0"; + version = "1.29.1"; src = fetchFromGitHub { owner = "mongodb"; repo = "mongo-c-driver"; rev = "refs/tags/${version}"; - hash = "sha256-367qk0u81jnNA/9ruCo9wUWnCPrNjLhp9x62iEpCmE4="; + hash = "sha256-81UgJ5GboznaK9omhr3ZMOeOQbIru33Ic42tQAazSzw="; }; nativeBuildInputs = [ From 2f453455b74c34a6d9391f733faf1576c79ec37d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 13 Dec 2024 08:11:12 +0000 Subject: [PATCH 042/429] fluidd: 1.31.0 -> 1.31.2 --- pkgs/by-name/fl/fluidd/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/fl/fluidd/package.nix b/pkgs/by-name/fl/fluidd/package.nix index 407e0007b13a..05894dc685f7 100644 --- a/pkgs/by-name/fl/fluidd/package.nix +++ b/pkgs/by-name/fl/fluidd/package.nix @@ -2,12 +2,12 @@ stdenvNoCC.mkDerivation rec { pname = "fluidd"; - version = "1.31.0"; + version = "1.31.2"; src = fetchurl { name = "fluidd-v${version}.zip"; url = "https://github.com/fluidd-core/fluidd/releases/download/v${version}/fluidd.zip"; - sha256 = "sha256-ym3ZVY4GzCjGSy11l3eWV9F/P75e2SJqZA+gse0QJlI="; + sha256 = "sha256-It/etwQGBok805FVTneOR+LU7QkHUHWXpUWtKLq6xe0="; }; nativeBuildInputs = [ unzip ]; From bf2f6de39ded3be2c9e929f1081503dc936730a6 Mon Sep 17 00:00:00 2001 From: Moritz Sanft <58110325+msanft@users.noreply.github.com> Date: Fri, 13 Dec 2024 12:13:34 +0100 Subject: [PATCH 043/429] nixos/etc-activation: only assert for 6.6 kernel in switchable systems The assertion is based on the availability of `move-mount-beneath`, which is only used in re-activation logic for switchable systems. Systems that have `system.switch.enable == false` should be allowed to user older kernels. --- nixos/modules/system/etc/etc-activation.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/nixos/modules/system/etc/etc-activation.nix b/nixos/modules/system/etc/etc-activation.nix index aed58af780b7..47c65590e0c4 100644 --- a/nixos/modules/system/etc/etc-activation.nix +++ b/nixos/modules/system/etc/etc-activation.nix @@ -32,8 +32,10 @@ message = "`!system.etc.overlay.mutable` requires `systemd.sysusers.enable` or `services.userborn.enable`"; } { - assertion = lib.versionAtLeast config.boot.kernelPackages.kernel.version "6.6"; - message = "`system.etc.overlay.enable requires a newer kernel, at least version 6.6"; + assertion = + (config.system.switch.enable) + -> (lib.versionAtLeast config.boot.kernelPackages.kernel.version "6.6"); + message = "switchable systems with `system.etc.overlay.enable` require a newer kernel, at least version 6.6"; } ]; From a1fde467e2f84bc6181f75eda866f51c6350507e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 13 Dec 2024 13:01:41 +0000 Subject: [PATCH 044/429] gcsfuse: 2.5.1 -> 2.6.0 --- pkgs/by-name/gc/gcsfuse/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/gc/gcsfuse/package.nix b/pkgs/by-name/gc/gcsfuse/package.nix index 63f67ff34271..16de9a16ac92 100644 --- a/pkgs/by-name/gc/gcsfuse/package.nix +++ b/pkgs/by-name/gc/gcsfuse/package.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "gcsfuse"; - version = "2.5.1"; + version = "2.6.0"; src = fetchFromGitHub { owner = "googlecloudplatform"; repo = "gcsfuse"; rev = "v${version}"; - hash = "sha256-4UzRg6fNKBrTSoimJ9jURW9oPRhUOAUDMG3JaM7f100="; + hash = "sha256-+dzArLWP6mZ0m/pS64AYPckpf4SDu0Rt84x00Q4QC7I="; }; - vendorHash = "sha256-QrpILFzgUQwmrvjCdtrlgq1zSW7f82qMHsifI39WaB0="; + vendorHash = "sha256-FIPIEIa14oOIgHonXXYwQS9XkuCJjABgq6I8B7V1jQI="; subPackages = [ "." From 47bdb26b653ed309251fb85a78c61174dc5f8dab Mon Sep 17 00:00:00 2001 From: Ngoc Nguyen Date: Sun, 15 Dec 2024 02:04:42 +0900 Subject: [PATCH 045/429] maintainers: add baongoc124 --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 1477878902a4..53b65c753d23 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -2478,6 +2478,12 @@ githubId = 66330398; name = "Victor Hang"; }; + baongoc124 = { + email = "baongoc124@gmail.com"; + github = "baongoc124"; + githubId = 766221; + name = "Ngoc Nguyen"; + }; barab-i = { email = "barab_i@outlook.com"; github = "barab-i"; From 7ba86f50b53a98f4795309f5e9189d7b726d902f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 15 Dec 2024 12:16:04 +0100 Subject: [PATCH 046/429] sunvox: 2.1.2 -> 2.1.2b Co-authored-by: OPNA2608 --- pkgs/by-name/su/sunvox/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/su/sunvox/package.nix b/pkgs/by-name/su/sunvox/package.nix index fe39aec2f995..6b274e489b49 100644 --- a/pkgs/by-name/su/sunvox/package.nix +++ b/pkgs/by-name/su/sunvox/package.nix @@ -27,15 +27,15 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "sunvox"; - version = "2.1.2"; + version = "2.1.2b"; src = fetchzip { urls = [ "https://www.warmplace.ru/soft/sunvox/sunvox-${finalAttrs.version}.zip" # Upstream removes downloads of older versions, please save bumped versions to archive.org - "https://web.archive.org/web/20241121002213/https://www.warmplace.ru/soft/sunvox/sunvox-${finalAttrs.version}.zip" + "https://web.archive.org/web/20241215075639/https://www.warmplace.ru/soft/sunvox/sunvox-${finalAttrs.version}.zip" ]; - hash = "sha256-7DZyoOz3jDYsuGqbs0PRs6jdWCxBhSDUKk8KVJQm/3o="; + hash = "sha256-RmGqko1OLkQb0Oeydpfy4wxzp6iz2MpS7R22d4qjEaE="; }; nativeBuildInputs = From fdbfc8232d795a2aa1e8bce5695c41b504561ec1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E0=B9=82=E0=B8=97=E0=B8=AA=E0=B8=95=E0=B8=B1=E0=B8=A5?= Date: Sun, 15 Dec 2024 18:36:06 +0700 Subject: [PATCH 047/429] biboumi: add optional libraries (including PostgreSQL) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Some of these libraries are entirely optional (but recommended) according to the documentation. PostgreSQL support wasn’t even added to Nixpkgs despite technically the NixOS module allowing it. Note that Botan2, I was not able to get the GCrypt fallback to work --- pkgs/by-name/bi/biboumi/package.nix | 37 +++++++++++++++++++---------- 1 file changed, 24 insertions(+), 13 deletions(-) diff --git a/pkgs/by-name/bi/biboumi/package.nix b/pkgs/by-name/bi/biboumi/package.nix index 2228ae64ac1e..cdcd493aa2f5 100644 --- a/pkgs/by-name/bi/biboumi/package.nix +++ b/pkgs/by-name/bi/biboumi/package.nix @@ -6,16 +6,25 @@ cmake, libuuid, expat, - sqlite, - libidn, libiconv, botan2, systemd, pkg-config, - udns, python3Packages, + withIDN ? true, + libidn, + withPostgreSQL ? false, + postgresql, + withSQLite ? true, + sqlite, + withUDNS ? true, + udns, }: +assert lib.assertMsg ( + withPostgreSQL || withSQLite +) "At least one Biboumi database provider required"; + let louiz_catch = fetchgit { url = "https://lab.louiz.org/louiz/Catch.git"; @@ -39,16 +48,18 @@ stdenv.mkDerivation rec { pkg-config python3Packages.sphinx ]; - buildInputs = [ - libuuid - expat - sqlite - libiconv - libidn - botan2 - systemd - udns - ]; + buildInputs = + [ + libuuid + expat + libiconv + systemd + botan2 + ] + ++ lib.optional withIDN libidn + ++ lib.optional withPostgreSQL postgresql + ++ lib.optional withSQLite sqlite + ++ lib.optional withUDNS udns; buildFlags = [ "all" From 7eeb17d3eeeb135a6654f2d850ffb0a01ea90787 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 16 Dec 2024 15:12:34 +0000 Subject: [PATCH 048/429] sympa: 6.2.72 -> 6.2.74 --- pkgs/by-name/sy/sympa/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/sy/sympa/package.nix b/pkgs/by-name/sy/sympa/package.nix index bbab3ac4f5d6..83018f0c72e0 100644 --- a/pkgs/by-name/sy/sympa/package.nix +++ b/pkgs/by-name/sy/sympa/package.nix @@ -70,13 +70,13 @@ let in stdenv.mkDerivation rec { pname = "sympa"; - version = "6.2.72"; + version = "6.2.74"; src = fetchFromGitHub { owner = "sympa-community"; repo = pname; rev = version; - sha256 = "sha256-8G6MxpqVa3E5J/68E7tljcXF4w7OmNkI0nJwsgxJE28="; + sha256 = "sha256-Z5V4LqogIobs8pT+ED6iZGjnC+J+GQBHq2opu1yv/7k="; }; configureFlags = [ From 7c81e1d58761b599cf2e39fc59cff5c855d7b08e Mon Sep 17 00:00:00 2001 From: Jeremy Kolb Date: Mon, 16 Dec 2024 11:00:04 -0500 Subject: [PATCH 049/429] open-vm-tools: substituteInPlace use --replace-fail --- pkgs/by-name/op/open-vm-tools/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/op/open-vm-tools/package.nix b/pkgs/by-name/op/open-vm-tools/package.nix index ac340b7a87c5..8a039edbfba6 100644 --- a/pkgs/by-name/op/open-vm-tools/package.nix +++ b/pkgs/by-name/op/open-vm-tools/package.nix @@ -119,8 +119,8 @@ stdenv.mkDerivation (finalAttrs: { sed -i 's,/bin/fusermount3,${fuse3}/bin/fusermount3,' vmhgfs-fuse/config.c substituteInPlace services/plugins/vix/foundryToolsDaemon.c \ - --replace "/usr/bin/vmhgfs-fuse" "${placeholder "out"}/bin/vmhgfs-fuse" \ - --replace "/bin/mount" "${util-linux}/bin/mount" + --replace-fail "/usr/bin/vmhgfs-fuse" "${placeholder "out"}/bin/vmhgfs-fuse" \ + --replace-fail "/bin/mount" "${util-linux}/bin/mount" ''; configureFlags = [ @@ -145,7 +145,7 @@ stdenv.mkDerivation (finalAttrs: { which ] }" - substituteInPlace "$out/lib/udev/rules.d/99-vmware-scsi-udev.rules" --replace "/bin/sh" "${bash}/bin/sh" + substituteInPlace "$out/lib/udev/rules.d/99-vmware-scsi-udev.rules" --replace-fail "/bin/sh" "${bash}/bin/sh" ''; meta = with lib; { From 463adcffd4d4047e1dc21e9cab2cbbf9a2fd183c Mon Sep 17 00:00:00 2001 From: Artur Manuel Date: Mon, 16 Dec 2024 16:57:52 +0000 Subject: [PATCH 050/429] nicotine-plus: 3.3.6 -> 3.3.7 --- pkgs/by-name/ni/nicotine-plus/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ni/nicotine-plus/package.nix b/pkgs/by-name/ni/nicotine-plus/package.nix index df2e532fb44d..bbb0ee5ff3d8 100644 --- a/pkgs/by-name/ni/nicotine-plus/package.nix +++ b/pkgs/by-name/ni/nicotine-plus/package.nix @@ -12,13 +12,13 @@ }: python3Packages.buildPythonApplication rec { pname = "nicotine-plus"; - version = "3.3.6"; + version = "3.3.7"; pyproject = true; src = fetchFromGitHub { owner = "nicotine-plus"; repo = "nicotine-plus"; rev = "refs/tags/${version}"; - hash = "sha256-je3hyxbF9wKW2gvHoDp712EJxBxooS2z0pQM57WDdOk="; + hash = "sha256-Rj+dDkBXNV4l4A9LxjBApzBQ4c1edP5XjoPfpifkDoM="; }; nativeBuildInputs = [ From fb04895bee114cc25541e5b25b8aa4fd00953d6a Mon Sep 17 00:00:00 2001 From: Jeremy Kolb Date: Mon, 16 Dec 2024 14:24:31 -0500 Subject: [PATCH 051/429] open-vm-tools: remove with lib --- pkgs/by-name/op/open-vm-tools/package.nix | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/op/open-vm-tools/package.nix b/pkgs/by-name/op/open-vm-tools/package.nix index 8a039edbfba6..8ce2bd828869 100644 --- a/pkgs/by-name/op/open-vm-tools/package.nix +++ b/pkgs/by-name/op/open-vm-tools/package.nix @@ -39,6 +39,15 @@ xmlsec, withX ? true, }: +let + inherit (lib) + licenses + maintainers + makeBinPath + optional + optionals + ; +in stdenv.mkDerivation (finalAttrs: { pname = "open-vm-tools"; @@ -83,7 +92,7 @@ stdenv.mkDerivation (finalAttrs: { xercesc xmlsec ] - ++ lib.optionals withX [ + ++ optionals withX [ gdk-pixbuf-xlib gtk3 gtkmm3 @@ -127,7 +136,7 @@ stdenv.mkDerivation (finalAttrs: { "--without-kernel-modules" "--with-udev-rules-dir=${placeholder "out"}/lib/udev/rules.d" "--with-fuse=fuse3" - ] ++ lib.optional (!withX) "--without-x"; + ] ++ optional (!withX) "--without-x"; enableParallelBuilding = true; @@ -138,7 +147,7 @@ stdenv.mkDerivation (finalAttrs: { postInstall = '' wrapProgram "$out/etc/vmware-tools/scripts/vmware/network" \ --prefix PATH ':' "${ - lib.makeBinPath [ + makeBinPath [ iproute2 dbus systemd @@ -148,7 +157,7 @@ stdenv.mkDerivation (finalAttrs: { substituteInPlace "$out/lib/udev/rules.d/99-vmware-scsi-udev.rules" --replace-fail "/bin/sh" "${bash}/bin/sh" ''; - meta = with lib; { + meta = { homepage = "https://github.com/vmware/open-vm-tools"; changelog = "https://github.com/vmware/open-vm-tools/releases/tag/stable-${finalAttrs.version}"; description = "Set of tools for VMWare guests to improve host-guest interaction"; From fa24aa68b98c7d577ab2467b3090786b19c03c9d Mon Sep 17 00:00:00 2001 From: Jeremy Kolb Date: Mon, 16 Dec 2024 14:41:31 -0500 Subject: [PATCH 052/429] open-vm-tools: add missing license --- pkgs/by-name/op/open-vm-tools/package.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/op/open-vm-tools/package.nix b/pkgs/by-name/op/open-vm-tools/package.nix index 8ce2bd828869..aa5290520a8c 100644 --- a/pkgs/by-name/op/open-vm-tools/package.nix +++ b/pkgs/by-name/op/open-vm-tools/package.nix @@ -165,7 +165,10 @@ stdenv.mkDerivation (finalAttrs: { A set of services and modules that enable several features in VMware products for better management of, and seamless user interactions with, guests. ''; - license = licenses.gpl2; + license = with licenses; [ + gpl2 + lgpl21Only + ]; platforms = [ "x86_64-linux" "i686-linux" From ddde8c0f6887dd443945b250fe3a4e252ccf25fa Mon Sep 17 00:00:00 2001 From: qubitnano <146656568+qubitnano@users.noreply.github.com> Date: Sat, 23 Nov 2024 12:29:39 -0500 Subject: [PATCH 053/429] sm64ex: unstable-2022-12-19 -> 0-unstable-2024-07-04 --- pkgs/games/sm64ex/sm64ex.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/games/sm64ex/sm64ex.nix b/pkgs/games/sm64ex/sm64ex.nix index 89c2ca5821dd..8f86d46d71ea 100644 --- a/pkgs/games/sm64ex/sm64ex.nix +++ b/pkgs/games/sm64ex/sm64ex.nix @@ -2,13 +2,13 @@ callPackage ./generic.nix { pname = "sm64ex"; - version = "unstable-2022-12-19"; + version = "0-unstable-2024-07-04"; src = fetchFromGitHub { owner = "sm64pc"; repo = "sm64ex"; - rev = "afc7e8da695bdf1aea5400a0d5c8b188d16a2088"; - sha256 = "sha256-TbA9yGPtP2uGsxN3eFaQwFeNjAjZ5hSk8Qmx1pRQxf8="; + rev = "20bb444562aa1dba79cf6adcb5da632ba580eec3"; + sha256 = "sha256-nw+F0upTetLqib5r5QxmcOauSJccpTydV3soXz9CHLQ="; }; extraMeta = { From 739cd63aa626dd9bce65fc76bc1974e317346621 Mon Sep 17 00:00:00 2001 From: qubitnano <146656568+qubitnano@users.noreply.github.com> Date: Sat, 23 Nov 2024 12:34:54 -0500 Subject: [PATCH 054/429] sm64ex: enable 60fps patch by default --- pkgs/games/sm64ex/default.nix | 8 ++++++-- pkgs/games/sm64ex/generic.nix | 3 +++ pkgs/games/sm64ex/sm64ex.nix | 18 ++++++++++++++++-- 3 files changed, 25 insertions(+), 4 deletions(-) diff --git a/pkgs/games/sm64ex/default.nix b/pkgs/games/sm64ex/default.nix index 8068f522482f..def730c90f77 100644 --- a/pkgs/games/sm64ex/default.nix +++ b/pkgs/games/sm64ex/default.nix @@ -1,7 +1,11 @@ -{ callPackage, branch }: +{ + callPackage, + branch, + _60fps ? true, +}: { - sm64ex = callPackage ./sm64ex.nix { }; + sm64ex = callPackage ./sm64ex.nix { inherit _60fps; }; sm64ex-coop = callPackage ./coop.nix { }; } diff --git a/pkgs/games/sm64ex/generic.nix b/pkgs/games/sm64ex/generic.nix index b7f38686fe20..c7f07cbabfea 100644 --- a/pkgs/games/sm64ex/generic.nix +++ b/pkgs/games/sm64ex/generic.nix @@ -4,6 +4,7 @@ src, extraNativeBuildInputs ? [ ], extraBuildInputs ? [ ], + extraPatches ? [ ], extraMeta ? { }, compileFlags ? [ ], postInstall ? "", @@ -51,6 +52,8 @@ stdenv.mkDerivation rec { ] ++ compileFlags; + patches = extraPatches; + preBuild = '' patchShebangs extract_assets.py ln -s ${baseRom} ./baserom.${region}.z64 diff --git a/pkgs/games/sm64ex/sm64ex.nix b/pkgs/games/sm64ex/sm64ex.nix index 8f86d46d71ea..c653b149724f 100644 --- a/pkgs/games/sm64ex/sm64ex.nix +++ b/pkgs/games/sm64ex/sm64ex.nix @@ -1,6 +1,12 @@ -{ callPackage, fetchFromGitHub }: +{ + callPackage, + fetchFromGitHub, + fetchpatch, + lib, + _60fps, +}: -callPackage ./generic.nix { +callPackage ./generic.nix rec { pname = "sm64ex"; version = "0-unstable-2024-07-04"; @@ -11,6 +17,14 @@ callPackage ./generic.nix { sha256 = "sha256-nw+F0upTetLqib5r5QxmcOauSJccpTydV3soXz9CHLQ="; }; + extraPatches = lib.optionals _60fps [ + (fetchpatch { + name = "60fps_ex.patch"; + url = "file://${src}/enhancements/60fps_ex.patch"; + hash = "sha256-2V7WcZ8zG8Ef0bHmXVz2iaR48XRRDjTvynC4RPxMkcA="; + }) + ]; + extraMeta = { homepage = "https://github.com/sm64pc/sm64ex"; description = "Super Mario 64 port based off of decompilation"; From 41d526828f23ca7769e32d66d435bf6bd7a1b58f Mon Sep 17 00:00:00 2001 From: qubitnano <146656568+qubitnano@users.noreply.github.com> Date: Sat, 23 Nov 2024 12:42:14 -0500 Subject: [PATCH 055/429] sm64ex-coop: drop --- .../manual/release-notes/rl-2505.section.md | 2 + pkgs/games/sm64ex/coop.nix | 38 ------------------- pkgs/games/sm64ex/default.nix | 2 - pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 4 -- 5 files changed, 3 insertions(+), 44 deletions(-) delete mode 100644 pkgs/games/sm64ex/coop.nix diff --git a/nixos/doc/manual/release-notes/rl-2505.section.md b/nixos/doc/manual/release-notes/rl-2505.section.md index 595b6af0e339..0827016a372d 100644 --- a/nixos/doc/manual/release-notes/rl-2505.section.md +++ b/nixos/doc/manual/release-notes/rl-2505.section.md @@ -90,6 +90,8 @@ - `fluxus` has been removed, as it depends on `racket_7_9` and had no updates in 9 years. +- `sm64ex-coop` has been removed as it was archived upstream. Consider migrating to `sm64coopdx`. + - `renovate` was updated to v39. See the [upstream release notes](https://docs.renovatebot.com/release-notes-for-major-versions/#version-39) for breaking changes. Like upstream's docker images, renovate now runs on NodeJS 22. diff --git a/pkgs/games/sm64ex/coop.nix b/pkgs/games/sm64ex/coop.nix deleted file mode 100644 index f1a01664f7dc..000000000000 --- a/pkgs/games/sm64ex/coop.nix +++ /dev/null @@ -1,38 +0,0 @@ -{ - callPackage, - fetchFromGitHub, - autoPatchelfHook, - zlib, - stdenvNoCC, -}: - -callPackage ./generic.nix { - pname = "sm64ex-coop"; - version = "unstable-2023-02-22"; - - src = fetchFromGitHub { - owner = "djoslin0"; - repo = "sm64ex-coop"; - rev = "8746a503086793c87860daadfaeaaf0a31b2d6cf"; - sha256 = "sha256-iwJsq0FN9npxveIoMiB7zL5j1V72IExtEpzGj6lwLXQ="; - }; - - extraNativeBuildInputs = [ autoPatchelfHook ]; - - extraBuildInputs = [ zlib ]; - - postInstall = - let - sharedLib = stdenvNoCC.hostPlatform.extensions.sharedLibrary; - in - '' - mkdir -p $out/lib - cp $src/lib/bass/libbass{,_fx}${sharedLib} $out/lib - cp $src/lib/discordsdk/libdiscord_game_sdk${sharedLib} $out/lib - ''; - - extraMeta = { - homepage = "https://github.com/djoslin0/sm64ex-coop"; - description = "Super Mario 64 online co-op mod, forked from sm64ex"; - }; -} diff --git a/pkgs/games/sm64ex/default.nix b/pkgs/games/sm64ex/default.nix index def730c90f77..4ba3f74c50b8 100644 --- a/pkgs/games/sm64ex/default.nix +++ b/pkgs/games/sm64ex/default.nix @@ -6,7 +6,5 @@ { sm64ex = callPackage ./sm64ex.nix { inherit _60fps; }; - - sm64ex-coop = callPackage ./coop.nix { }; } .${branch} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 0090e579371e..22b280022522 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1173,6 +1173,7 @@ mapAliases { SkypeExport = skypeexport; # Added 2024-06-12 slack-dark = throw "'slack-dark' has been renamed to/replaced by 'slack'"; # Converted to throw 2024-10-17 slurm-llnl = slurm; # renamed July 2017 + sm64ex-coop = throw "'sm64ex-coop' was removed as it was archived upstream. Consider migrating to 'sm64coopdx'"; # added 2024-11-23 snapTools = throw "snapTools was removed because makeSnap produced broken snaps and it was the only function in snapTools. See https://github.com/NixOS/nixpkgs/issues/100618 for more details."; # 2024-03-04; soldat-unstable = opensoldat; # Added 2022-07-02 soundOfSorting = sound-of-sorting; # Added 2023-07-07 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a75f2b915919..002bd843d7bc 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16544,10 +16544,6 @@ with pkgs; branch = "sm64ex"; }; - sm64ex-coop = callPackage ../games/sm64ex { - branch = "sm64ex-coop"; - }; - amoeba = callPackage ../games/amoeba { }; amoeba-data = callPackage ../games/amoeba/data.nix { }; From 8248382fdd6a43d36f4ae75a0c8d0521cc9f818c Mon Sep 17 00:00:00 2001 From: qubitnano <146656568+qubitnano@users.noreply.github.com> Date: Sat, 23 Nov 2024 12:52:53 -0500 Subject: [PATCH 056/429] sm64ex: migrate to pkgs/by-name --- pkgs/by-name/sm/sm64ex/package.nix | 86 +++++++++++++++++++++++++++++ pkgs/games/sm64ex/default.nix | 10 ---- pkgs/games/sm64ex/generic.nix | 87 ------------------------------ pkgs/games/sm64ex/sm64ex.nix | 32 ----------- pkgs/top-level/all-packages.nix | 4 -- 5 files changed, 86 insertions(+), 133 deletions(-) create mode 100644 pkgs/by-name/sm/sm64ex/package.nix delete mode 100644 pkgs/games/sm64ex/default.nix delete mode 100644 pkgs/games/sm64ex/generic.nix delete mode 100644 pkgs/games/sm64ex/sm64ex.nix diff --git a/pkgs/by-name/sm/sm64ex/package.nix b/pkgs/by-name/sm/sm64ex/package.nix new file mode 100644 index 000000000000..7a2ea046d59a --- /dev/null +++ b/pkgs/by-name/sm/sm64ex/package.nix @@ -0,0 +1,86 @@ +{ + lib, + stdenv, + fetchFromGitHub, + fetchpatch, + python3, + pkg-config, + audiofile, + SDL2, + hexdump, + sm64baserom, + region ? "us", + _60fps ? true, +}: +let + baseRom = (sm64baserom.override { inherit region; }).romPath; +in +stdenv.mkDerivation (finalAttrs: { + + pname = "sm64ex"; + version = "0-unstable-2024-07-04"; + + src = fetchFromGitHub { + owner = "sm64pc"; + repo = "sm64ex"; + rev = "20bb444562aa1dba79cf6adcb5da632ba580eec3"; + hash = "sha256-nw+F0upTetLqib5r5QxmcOauSJccpTydV3soXz9CHLQ="; + }; + + patches = lib.optionals _60fps [ + (fetchpatch { + name = "60fps_ex.patch"; + url = "file://${finalAttrs.src}/enhancements/60fps_ex.patch"; + hash = "sha256-2V7WcZ8zG8Ef0bHmXVz2iaR48XRRDjTvynC4RPxMkcA="; + }) + ]; + + nativeBuildInputs = [ + python3 + pkg-config + hexdump + ]; + + buildInputs = [ + audiofile + SDL2 + ]; + + enableParallelBuilding = true; + + makeFlags = + [ + "VERSION=${region}" + ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + "OSX_BUILD=1" + ]; + + preBuild = '' + patchShebangs extract_assets.py + ln -s ${baseRom} ./baserom.${region}.z64 + ''; + + installPhase = '' + runHook preInstall + + mkdir -p $out/bin + cp build/${region}_pc/sm64.${region}.f3dex2e $out/bin/sm64ex + + runHook postInstall + ''; + + meta = { + homepage = "https://github.com/sm64pc/sm64ex"; + description = "Super Mario 64 port based off of decompilation"; + longDescription = '' + Note that you must supply a baserom yourself to extract assets from. + If you are not using an US baserom, you must overwrite the "region" attribute with either "eu" or "jp". + If you would like to use patches sm64ex distributes as makeflags, add them to the "compileFlags" attribute. + ''; + mainProgram = "sm64ex"; + license = lib.licenses.unfree; + maintainers = with lib.maintainers; [ qubitnano ]; + platforms = lib.platforms.unix; + }; +}) diff --git a/pkgs/games/sm64ex/default.nix b/pkgs/games/sm64ex/default.nix deleted file mode 100644 index 4ba3f74c50b8..000000000000 --- a/pkgs/games/sm64ex/default.nix +++ /dev/null @@ -1,10 +0,0 @@ -{ - callPackage, - branch, - _60fps ? true, -}: - -{ - sm64ex = callPackage ./sm64ex.nix { inherit _60fps; }; -} -.${branch} diff --git a/pkgs/games/sm64ex/generic.nix b/pkgs/games/sm64ex/generic.nix deleted file mode 100644 index c7f07cbabfea..000000000000 --- a/pkgs/games/sm64ex/generic.nix +++ /dev/null @@ -1,87 +0,0 @@ -{ - pname, - version, - src, - extraNativeBuildInputs ? [ ], - extraBuildInputs ? [ ], - extraPatches ? [ ], - extraMeta ? { }, - compileFlags ? [ ], - postInstall ? "", - region ? "us", - - lib, - stdenv, - python3, - pkg-config, - audiofile, - SDL2, - hexdump, - sm64baserom, -}: -let - baseRom = (sm64baserom.override { inherit region; }).romPath; -in -stdenv.mkDerivation rec { - inherit - pname - version - src - postInstall - ; - - nativeBuildInputs = [ - python3 - pkg-config - hexdump - ] ++ extraNativeBuildInputs; - - buildInputs = [ - audiofile - SDL2 - ] ++ extraBuildInputs; - - enableParallelBuilding = true; - - makeFlags = - [ - "VERSION=${region}" - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - "OSX_BUILD=1" - ] - ++ compileFlags; - - patches = extraPatches; - - preBuild = '' - patchShebangs extract_assets.py - ln -s ${baseRom} ./baserom.${region}.z64 - ''; - - installPhase = '' - runHook preInstall - - mkdir -p $out/bin - cp build/${region}_pc/sm64.${region}.f3dex2e $out/bin/sm64ex - - runHook postInstall - ''; - - meta = - with lib; - { - longDescription = '' - ${extraMeta.description or "Super Mario 64 port based off of decompilation"} - - Note that you must supply a baserom yourself to extract assets from. - If you are not using an US baserom, you must overwrite the "region" attribute with either "eu" or "jp". - If you would like to use patches sm64ex distributes as makeflags, add them to the "compileFlags" attribute. - ''; - mainProgram = "sm64ex"; - license = licenses.unfree; - maintainers = [ ]; - platforms = platforms.unix; - } - // extraMeta; -} diff --git a/pkgs/games/sm64ex/sm64ex.nix b/pkgs/games/sm64ex/sm64ex.nix deleted file mode 100644 index c653b149724f..000000000000 --- a/pkgs/games/sm64ex/sm64ex.nix +++ /dev/null @@ -1,32 +0,0 @@ -{ - callPackage, - fetchFromGitHub, - fetchpatch, - lib, - _60fps, -}: - -callPackage ./generic.nix rec { - pname = "sm64ex"; - version = "0-unstable-2024-07-04"; - - src = fetchFromGitHub { - owner = "sm64pc"; - repo = "sm64ex"; - rev = "20bb444562aa1dba79cf6adcb5da632ba580eec3"; - sha256 = "sha256-nw+F0upTetLqib5r5QxmcOauSJccpTydV3soXz9CHLQ="; - }; - - extraPatches = lib.optionals _60fps [ - (fetchpatch { - name = "60fps_ex.patch"; - url = "file://${src}/enhancements/60fps_ex.patch"; - hash = "sha256-2V7WcZ8zG8Ef0bHmXVz2iaR48XRRDjTvynC4RPxMkcA="; - }) - ]; - - extraMeta = { - homepage = "https://github.com/sm64pc/sm64ex"; - description = "Super Mario 64 port based off of decompilation"; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 002bd843d7bc..0b92cd108dc4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16540,10 +16540,6 @@ with pkgs; qgo = libsForQt5.callPackage ../games/qgo { }; - sm64ex = callPackage ../games/sm64ex { - branch = "sm64ex"; - }; - amoeba = callPackage ../games/amoeba { }; amoeba-data = callPackage ../games/amoeba/data.nix { }; From fda14c3dc025a18557d04feda75071dcae484795 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 17 Dec 2024 10:17:59 +0000 Subject: [PATCH 057/429] pstoedit: 4.01 -> 4.02 --- pkgs/by-name/ps/pstoedit/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ps/pstoedit/package.nix b/pkgs/by-name/ps/pstoedit/package.nix index b72b2650e9b6..af1916667b2d 100644 --- a/pkgs/by-name/ps/pstoedit/package.nix +++ b/pkgs/by-name/ps/pstoedit/package.nix @@ -17,11 +17,11 @@ stdenv.mkDerivation rec { pname = "pstoedit"; - version = "4.01"; + version = "4.02"; src = fetchurl { url = "mirror://sourceforge/pstoedit/pstoedit-${version}.tar.gz"; - hash = "sha256-RZdlq3NssQ+VVKesAsXqfzVcbC6fz9IXYRx9UQKxB2s="; + hash = "sha256-VYi0MtLGsq2YKLRJFepYE/+aOjMSpB+g3kw43ayd9y8="; }; outputs = [ From a01cab513a00540e688e97f887853f7af382222f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 17 Dec 2024 11:23:06 +0000 Subject: [PATCH 058/429] liblo: 0.31 -> 0.32 --- pkgs/by-name/li/liblo/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/li/liblo/package.nix b/pkgs/by-name/li/liblo/package.nix index 71483dc24d42..a983ace49fac 100644 --- a/pkgs/by-name/li/liblo/package.nix +++ b/pkgs/by-name/li/liblo/package.nix @@ -6,11 +6,11 @@ stdenv.mkDerivation rec { pname = "liblo"; - version = "0.31"; + version = "0.32"; src = fetchurl { url = "mirror://sourceforge/liblo/liblo/${version}/${pname}-${version}.tar.gz"; - sha256 = "0l67rkdhfa8cffa0nynql3lh2xlbn1454h6qxhjddp1029p48krb"; + sha256 = "sha256-XfBfKgOV/FrJD2tTi4yCuyGUFAb9GnCnZcczakfXAgg="; }; doCheck = false; # fails 1 out of 3 tests From 6900d0cf3eae266b3dc1dc2e88f09de3f3eb3f4a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E0=B9=82=E0=B8=97=E0=B8=AA=E0=B8=95=E0=B8=B1=E0=B8=A5?= Date: Mon, 16 Dec 2024 15:48:22 +0700 Subject: [PATCH 059/429] nixos/biboumi: expose package for overriding --- nixos/modules/services/networking/biboumi.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/nixos/modules/services/networking/biboumi.nix b/nixos/modules/services/networking/biboumi.nix index c9259cf82ccb..75591e3109bc 100644 --- a/nixos/modules/services/networking/biboumi.nix +++ b/nixos/modules/services/networking/biboumi.nix @@ -22,6 +22,8 @@ in services.biboumi = { enable = lib.mkEnableOption "the Biboumi XMPP gateway to IRC"; + package = lib.mkPackageOption pkgs "biboumi" { }; + settings = lib.mkOption { description = '' See [biboumi 8.5](https://lab.louiz.org/louiz/biboumi/blob/8.5/doc/biboumi.1.rst) @@ -118,7 +120,7 @@ in }; options.policy_directory = lib.mkOption { type = lib.types.path; - default = "${pkgs.biboumi}/etc/biboumi"; + default = "${cfg.package}/etc/biboumi"; defaultText = lib.literalExpression ''"''${pkgs.biboumi}/etc/biboumi"''; description = '' A directory that should contain the policy files, @@ -208,7 +210,7 @@ in '' ) ]; - ExecStart = "${pkgs.biboumi}/bin/biboumi /run/biboumi/biboumi.cfg"; + ExecStart = "${lib.getExe cfg.package} /run/biboumi/biboumi.cfg"; ExecReload = "${pkgs.coreutils}/bin/kill -USR1 $MAINPID"; # Firewalls needing opening for output connections can still do that # selectively for biboumi with: From a7e3b6a1ae356b05ea80dea730f9b0887f2b2083 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E0=B9=82=E0=B8=97=E0=B8=AA=E0=B8=95=E0=B8=B1=E0=B8=A5?= Date: Mon, 16 Dec 2024 15:50:27 +0700 Subject: [PATCH 060/429] nixos/biboumi: update docs version --- nixos/modules/services/networking/biboumi.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/nixos/modules/services/networking/biboumi.nix b/nixos/modules/services/networking/biboumi.nix index 75591e3109bc..cb083bdd8b9f 100644 --- a/nixos/modules/services/networking/biboumi.nix +++ b/nixos/modules/services/networking/biboumi.nix @@ -26,7 +26,8 @@ in settings = lib.mkOption { description = '' - See [biboumi 8.5](https://lab.louiz.org/louiz/biboumi/blob/8.5/doc/biboumi.1.rst) + See [biboumi 9.0](https://doc.biboumi.louiz.org/9.0/admin.html#configuration) + for documentation. ''; default = { }; From 3284305eb31c89291fee4a1e17e97df7cbe820a3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E0=B9=82=E0=B8=97=E0=B8=AA=E0=B8=95=E0=B8=B1=E0=B8=A5?= Date: Mon, 16 Dec 2024 15:52:14 +0700 Subject: [PATCH 061/429] allow the ability to skip the database --- nixos/modules/services/networking/biboumi.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/nixos/modules/services/networking/biboumi.nix b/nixos/modules/services/networking/biboumi.nix index cb083bdd8b9f..ec28cadd8da2 100644 --- a/nixos/modules/services/networking/biboumi.nix +++ b/nixos/modules/services/networking/biboumi.nix @@ -64,10 +64,13 @@ in ''; }; options.db_name = lib.mkOption { - type = with lib.types; either path str; + type = with lib.types; nullOr (either path str); default = "${stateDir}/biboumi.sqlite"; description = '' The name of the database to use. + + Set it to null and use [credentialsFile](#opt-services.biboumi.credentialsFile) + if you do not want this connection string to go into the Nix store. ''; example = "postgresql://user:secret@localhost"; }; From 2b3bcc2bbae375a60b21220a1d6e9b6a444ca47a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 17 Dec 2024 13:49:45 +0000 Subject: [PATCH 062/429] netmaker: 0.26.0 -> 0.30.0 --- pkgs/applications/networking/netmaker/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/netmaker/default.nix b/pkgs/applications/networking/netmaker/default.nix index 2cd846733640..4df72311568d 100644 --- a/pkgs/applications/networking/netmaker/default.nix +++ b/pkgs/applications/networking/netmaker/default.nix @@ -13,16 +13,16 @@ buildGoModule rec { pname = "netmaker"; - version = "0.26.0"; + version = "0.30.0"; src = fetchFromGitHub { owner = "gravitl"; repo = pname; rev = "v${version}"; - hash = "sha256-f6R7Dc5M3MUjsCXvQAqamU9FFuqYEZoxYKwKhk4ilPc="; + hash = "sha256-Z2omesoEB6lJFy8ph6CFTb6XWsdgsvEG+i49dXmaC0Y="; }; - vendorHash = "sha256-g9JyIuqYJZK47xQYM0+d1hcHcNBGLH3lW60hI6UkD84="; + vendorHash = "sha256-PYkjJ17hS0E0ncsUdrGWRn+3dEwZxS1nD0UjSDQflQ8="; inherit subPackages; From 16152c7848aaad2b316c377737d6abf098d14c77 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 17 Dec 2024 13:51:57 +0000 Subject: [PATCH 063/429] netmaker-full: 0.26.0 -> 0.30.0 --- pkgs/applications/networking/netmaker/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/netmaker/default.nix b/pkgs/applications/networking/netmaker/default.nix index 2cd846733640..4df72311568d 100644 --- a/pkgs/applications/networking/netmaker/default.nix +++ b/pkgs/applications/networking/netmaker/default.nix @@ -13,16 +13,16 @@ buildGoModule rec { pname = "netmaker"; - version = "0.26.0"; + version = "0.30.0"; src = fetchFromGitHub { owner = "gravitl"; repo = pname; rev = "v${version}"; - hash = "sha256-f6R7Dc5M3MUjsCXvQAqamU9FFuqYEZoxYKwKhk4ilPc="; + hash = "sha256-Z2omesoEB6lJFy8ph6CFTb6XWsdgsvEG+i49dXmaC0Y="; }; - vendorHash = "sha256-g9JyIuqYJZK47xQYM0+d1hcHcNBGLH3lW60hI6UkD84="; + vendorHash = "sha256-PYkjJ17hS0E0ncsUdrGWRn+3dEwZxS1nD0UjSDQflQ8="; inherit subPackages; From 15b41de20802563ec650a2010e5a36a8671de08c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Tue, 17 Dec 2024 09:38:21 -0800 Subject: [PATCH 064/429] libdeltachat: 1.151.6 -> 1.152.0 Diff: https://github.com/deltachat/deltachat-core-rust/compare/v1.151.6...v1.152.0 Changelog: https://github.com/deltachat/deltachat-core-rust/blob/v1.152.0/CHANGELOG.md --- pkgs/by-name/li/libdeltachat/package.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/li/libdeltachat/package.nix b/pkgs/by-name/li/libdeltachat/package.nix index 296ca86cd9e3..b3f37d404a1b 100644 --- a/pkgs/by-name/li/libdeltachat/package.nix +++ b/pkgs/by-name/li/libdeltachat/package.nix @@ -20,13 +20,13 @@ stdenv.mkDerivation rec { pname = "libdeltachat"; - version = "1.151.6"; + version = "1.152.0"; src = fetchFromGitHub { owner = "deltachat"; repo = "deltachat-core-rust"; - rev = "v${version}"; - hash = "sha256-alt4RkZeKz5yqbie3ksu9fKXKapYR0hCaY7vOMicrk8="; + tag = "v${version}"; + hash = "sha256-ncgJGeQXOI/Sc5ZfjEGBOY0qiLQrg4/N6QIStWUuJ7s="; }; patches = [ @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { cargoDeps = rustPlatform.fetchCargoVendor { pname = "deltachat-core-rust"; inherit version src; - hash = "sha256-++LG3MhmNVfHfMEuaSZrJYsf3NVbPWFD8KoDsiu9/Eg="; + hash = "sha256-kV42OSvYXzY5lim2MUxDADOIGiCUop7QKV6nl6IsPzs="; }; nativeBuildInputs = [ @@ -82,7 +82,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Delta Chat Rust Core library"; homepage = "https://github.com/deltachat/deltachat-core-rust/"; - changelog = "https://github.com/deltachat/deltachat-core-rust/blob/${src.rev}/CHANGELOG.md"; + changelog = "https://github.com/deltachat/deltachat-core-rust/blob/${src.tag}/CHANGELOG.md"; license = licenses.mpl20; maintainers = with maintainers; [ dotlambda ]; platforms = platforms.unix; From 7898b22eb6f8aeb48b73a261e91ebfc751f64ece Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Tue, 17 Dec 2024 09:40:21 -0800 Subject: [PATCH 065/429] deltachat-desktop: 1.48.0 -> 1.50.0 Diff: https://github.com/deltachat/deltachat-desktop/compare/v1.48.0...v1.50.0 Changelog: https://github.com/deltachat/deltachat-desktop/blob/v1.50.0/CHANGELOG.md --- pkgs/by-name/de/deltachat-desktop/package.nix | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/pkgs/by-name/de/deltachat-desktop/package.nix b/pkgs/by-name/de/deltachat-desktop/package.nix index 3ccaf9d89c0c..0bb503fc0af7 100644 --- a/pkgs/by-name/de/deltachat-desktop/package.nix +++ b/pkgs/by-name/de/deltachat-desktop/package.nix @@ -19,17 +19,17 @@ let deltachat-rpc-server' = deltachat-rpc-server.overrideAttrs rec { - version = "1.148.7"; + version = "1.152.0"; src = fetchFromGitHub { owner = "deltachat"; repo = "deltachat-core-rust"; - rev = "v${version}"; - hash = "sha256-mTNWSR4ea972tIOvg6RClEc44mKXoHDEWoLZXio8O4k="; + tag = "v${version}"; + hash = "sha256-ncgJGeQXOI/Sc5ZfjEGBOY0qiLQrg4/N6QIStWUuJ7s="; }; cargoDeps = rustPlatform.fetchCargoVendor { pname = "deltachat-core-rust"; inherit version src; - hash = "sha256-eDj8DIvvWWj+tfHuzR35WXlKY5klGxW+MixdN++vugk="; + hash = "sha256-kV42OSvYXzY5lim2MUxDADOIGiCUop7QKV6nl6IsPzs="; }; }; electron = electron_32; @@ -37,18 +37,18 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "deltachat-desktop"; - version = "1.48.0"; + version = "1.50.0"; src = fetchFromGitHub { owner = "deltachat"; repo = "deltachat-desktop"; - rev = "v${finalAttrs.version}"; - hash = "sha256-BgB12pHySJIMtBCph5UkBjioMhEYQq9i7htkrWQNlps="; + tag = "v${finalAttrs.version}"; + hash = "sha256-0yVO9uIq70Oogt254+iHJv7p8mUeRpxVlJOcISJrKgo="; }; pnpmDeps = pnpm.fetchDeps { inherit (finalAttrs) pname version src; - hash = "sha256-YBfHVZB6TScIKbWQrN1KJYSUZytR81UwKZ87GaxGlZ8="; + hash = "sha256-07jvAKY5GBrZ6EKY9yHwWESezjQXSjjRzImaG+yUlGc="; }; nativeBuildInputs = [ @@ -68,7 +68,7 @@ stdenv.mkDerivation (finalAttrs: { env = { ELECTRON_SKIP_BINARY_DOWNLOAD = "1"; - VERSION_INFO_GIT_REF = finalAttrs.src.rev; + VERSION_INFO_GIT_REF = finalAttrs.src.tag; }; buildPhase = '' @@ -142,7 +142,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "Email-based instant messaging for Desktop"; homepage = "https://github.com/deltachat/deltachat-desktop"; - changelog = "https://github.com/deltachat/deltachat-desktop/blob/${finalAttrs.src.rev}/CHANGELOG.md"; + changelog = "https://github.com/deltachat/deltachat-desktop/blob/${finalAttrs.src.tag}/CHANGELOG.md"; license = lib.licenses.gpl3Plus; mainProgram = "deltachat"; maintainers = with lib.maintainers; [ dotlambda ]; From ab27e24a78b47fafa4ea8f5db3d4d76526bab2eb Mon Sep 17 00:00:00 2001 From: Melody Renata Date: Tue, 17 Dec 2024 16:34:13 -0500 Subject: [PATCH 066/429] lug-helper: fix missing dependencies * Added missing dependencies for winetricks * Added libnotify for notifications --- pkgs/by-name/lu/lug-helper/package.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/by-name/lu/lug-helper/package.nix b/pkgs/by-name/lu/lug-helper/package.nix index 20726e8f7f9e..5514d18dd1e9 100644 --- a/pkgs/by-name/lu/lug-helper/package.nix +++ b/pkgs/by-name/lu/lug-helper/package.nix @@ -7,6 +7,9 @@ coreutils, findutils, zenity, + unzip, + cabextract, + libnotify, fetchFromGitHub, nix-update-script, }: @@ -55,6 +58,9 @@ stdenvNoCC.mkDerivation (finalAttrs: { coreutils findutils zenity + cabextract + unzip + libnotify ] } From 40805f17b405c02d83135bf3de15e8336990c45c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 18 Dec 2024 01:55:14 +0000 Subject: [PATCH 067/429] pdns: 4.9.2 -> 4.9.3 --- pkgs/by-name/pd/pdns/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/pd/pdns/package.nix b/pkgs/by-name/pd/pdns/package.nix index 87b4f65eb51b..d9bf21b24e46 100644 --- a/pkgs/by-name/pd/pdns/package.nix +++ b/pkgs/by-name/pd/pdns/package.nix @@ -24,11 +24,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "pdns"; - version = "4.9.2"; + version = "4.9.3"; src = fetchurl { url = "https://downloads.powerdns.com/releases/pdns-${finalAttrs.version}.tar.bz2"; - hash = "sha256-9XBkBCcEH0xcVHDRbv+VGnA4w1PdxGGydQKQzpmy48I="; + hash = "sha256-suZwRqe5WCXDXdyRGe1uLoU1N6V20MTukIC7XwrT6NU="; }; # redact configure flags from version output to reduce closure size patches = [ ./version.patch ]; From a8e93c7ed85ecea310832af1e4a11072bfbc7a8b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 18 Dec 2024 07:27:30 +0000 Subject: [PATCH 068/429] spicedb: 1.38.1 -> 1.39.1 --- pkgs/servers/spicedb/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/spicedb/default.nix b/pkgs/servers/spicedb/default.nix index ccd3259c5ec5..2eed999ae2e5 100644 --- a/pkgs/servers/spicedb/default.nix +++ b/pkgs/servers/spicedb/default.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "spicedb"; - version = "1.38.1"; + version = "1.39.1"; src = fetchFromGitHub { owner = "authzed"; repo = "spicedb"; rev = "v${version}"; - hash = "sha256-axPf0HV+slTJ3aDuy8x/YZ/UKkTuRcKSMhkMPRrbm4M="; + hash = "sha256-+fU0JpaTAzEyI5+fzbOBarWUfdSz8XMSxN23LSIzcnA="; }; - vendorHash = "sha256-8Y8Mg6zLR9FOrf/TfGBOOo7ud5/1pXTm7d/Kdtwx0Gc="; + vendorHash = "sha256-sbbuTZsdhsIrLRpy1w41jxJaZkCFJTBYRb+7KvFxo3U="; ldflags = [ "-X 'github.com/jzelinskie/cobrautil/v2.Version=${src.rev}'" From 526e858b7221dad86780ee2b06b95b06cd3dd12f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 18 Dec 2024 11:45:28 +0000 Subject: [PATCH 069/429] gridtracker: 1.24.0104 -> 1.24.0922 --- pkgs/by-name/gr/gridtracker/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/gr/gridtracker/package.nix b/pkgs/by-name/gr/gridtracker/package.nix index dff08d4d8767..16788295631c 100644 --- a/pkgs/by-name/gr/gridtracker/package.nix +++ b/pkgs/by-name/gr/gridtracker/package.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "gridtracker"; - version = "1.24.0104"; + version = "1.24.0922"; src = fetchFromGitLab { owner = "gridtracker.org"; repo = "gridtracker"; rev = "v${version}"; - hash = "sha256-p3PdYOk0yvG3QkM17grzZmf9upK1n0zo4aOrlhGTvTU="; + hash = "sha256-6WgP13JVOzYnYtCDH3qCQXT70X9j4yqlUb18FFf1aSY="; }; nativeBuildInputs = [ wrapGAppsHook3 ]; From e8cf4d17e628aab86a6f898850b3885182c845f9 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 18 Dec 2024 12:45:24 +0000 Subject: [PATCH 070/429] lhapdf: 6.5.4 -> 6.5.5 --- pkgs/development/libraries/physics/lhapdf/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/physics/lhapdf/default.nix b/pkgs/development/libraries/physics/lhapdf/default.nix index bb2bc4e8a72e..fe9161ca1381 100644 --- a/pkgs/development/libraries/physics/lhapdf/default.nix +++ b/pkgs/development/libraries/physics/lhapdf/default.nix @@ -8,11 +8,11 @@ stdenv.mkDerivation rec { pname = "lhapdf"; - version = "6.5.4"; + version = "6.5.5"; src = fetchurl { url = "https://www.hepforge.org/archive/lhapdf/LHAPDF-${version}.tar.gz"; - sha256 = "sha256-JEOksyzDsFl8gki9biVwOs6ckaeiU8X2CxtUKO+chp4="; + sha256 = "sha256-ZB1eoJQreeREfhXlozSR/zxwMtcdYYEZk14UrSf146U="; }; # The Apple SDK only exports locale_t from xlocale.h whereas glibc From 712bb5b97575c83d084aaaaa251ff64c0629921f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 18 Dec 2024 13:02:55 +0000 Subject: [PATCH 071/429] scite: 5.5.3 -> 5.5.4 --- pkgs/by-name/sc/scite/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/sc/scite/package.nix b/pkgs/by-name/sc/scite/package.nix index e8b2c0ba9b50..9ffccd8602b2 100644 --- a/pkgs/by-name/sc/scite/package.nix +++ b/pkgs/by-name/sc/scite/package.nix @@ -8,11 +8,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "scite"; - version = "5.5.3"; + version = "5.5.4"; src = fetchurl { url = "https://www.scintilla.org/scite${lib.replaceStrings [ "." ] [ "" ] finalAttrs.version}.tgz"; - hash = "sha256-MtXy8a4MzdJP8Rf6otc+Zu+KfYSJnmmXfBS8RVBBbOY="; + hash = "sha256-Q50DPEUrswv3lS4wOQmRpqvQIqAx6OdLJXF/nkaukKg="; }; nativeBuildInputs = [ From ac77cf7e6aae9215b902213d4da442efef4d89b8 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 18 Dec 2024 13:23:17 +0000 Subject: [PATCH 072/429] kclvm_cli: 0.10.8 -> 0.11.0 --- pkgs/by-name/kc/kclvm_cli/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/kc/kclvm_cli/package.nix b/pkgs/by-name/kc/kclvm_cli/package.nix index ca37fc6e71fb..239f0d829103 100644 --- a/pkgs/by-name/kc/kclvm_cli/package.nix +++ b/pkgs/by-name/kc/kclvm_cli/package.nix @@ -9,17 +9,17 @@ }: rustPlatform.buildRustPackage rec { pname = "kclvm_cli"; - version = "0.10.8"; + version = "0.11.0"; src = fetchFromGitHub { owner = "kcl-lang"; repo = "kcl"; rev = "v${version}"; - hash = "sha256-ls/Qe/nw3UIfZTjt7r7tzUwxlb5y4jBK2FQlOsMCttM="; + hash = "sha256-wRmLXR1r/FtZVfc6jifEj0jS0U0HIgJzBtuuzLQchjo="; }; sourceRoot = "${src.name}/cli"; - cargoHash = "sha256-elIo986ag7x+q17HwkcoqFnD9+1+Jq66XIHYZNaBB/w="; + cargoHash = "sha256-nZktEEp0BYusNJL7w9WhX6JK1LCmyi7dI659I9IR+Wo="; cargoPatches = [ ./cargo_lock.patch ]; buildInputs = From 63c1ea97a19f189387cc0056ef24b4c4e76a8002 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 18 Dec 2024 13:34:47 +0000 Subject: [PATCH 073/429] ndpi: 4.10 -> 4.12 --- pkgs/by-name/nd/ndpi/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/nd/ndpi/package.nix b/pkgs/by-name/nd/ndpi/package.nix index 6bc064fafbfe..4d66df8dbffd 100644 --- a/pkgs/by-name/nd/ndpi/package.nix +++ b/pkgs/by-name/nd/ndpi/package.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "ndpi"; - version = "4.10"; + version = "4.12"; src = fetchFromGitHub { owner = "ntop"; repo = "nDPI"; rev = "refs/tags/${finalAttrs.version}"; - hash = "sha256-iXqvDMJsOXcg9YkqKFgInLLfH6j/HEp4bEaIl6dpVtc="; + hash = "sha256-jdyKvM/Tb9pRWQPxpB/UQOOKamWrTS24Ofc3M5M1Zso="; }; nativeBuildInputs = [ From d9434769daf66288f834042bcffbe6148d6c6dcc Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 18 Dec 2024 14:11:22 +0000 Subject: [PATCH 074/429] pt2-clone: 1.71 -> 1.72 --- pkgs/by-name/pt/pt2-clone/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/pt/pt2-clone/package.nix b/pkgs/by-name/pt/pt2-clone/package.nix index e87977736bd6..99042320dd60 100644 --- a/pkgs/by-name/pt/pt2-clone/package.nix +++ b/pkgs/by-name/pt/pt2-clone/package.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "pt2-clone"; - version = "1.71"; + version = "1.72"; src = fetchFromGitHub { owner = "8bitbubsy"; repo = "pt2-clone"; rev = "v${finalAttrs.version}"; - sha256 = "sha256-wyiY4qiWnisWKjBmkZSbmndJMMtogAQ+MWu4VLHROY0="; + sha256 = "sha256-Laq2C2bjLqeyT8eRH0DVjGmGg8R3TBfFL3XzwXTzKzo="; }; nativeBuildInputs = [ cmake ]; From d9abdb3bb0e9cbce418bc1a70691d60901501050 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 18 Dec 2024 15:12:49 +0000 Subject: [PATCH 075/429] sentry-native: 0.7.16 -> 0.7.17 --- pkgs/by-name/se/sentry-native/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/se/sentry-native/package.nix b/pkgs/by-name/se/sentry-native/package.nix index f6c41a8bead5..6ea12337b4e3 100644 --- a/pkgs/by-name/se/sentry-native/package.nix +++ b/pkgs/by-name/se/sentry-native/package.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "sentry-native"; - version = "0.7.16"; + version = "0.7.17"; src = fetchFromGitHub { owner = "getsentry"; repo = "sentry-native"; rev = version; - hash = "sha256-CLJdr/hHP/yW6Pv3MR2qno6lU7Q0W+usrBfdKF5K1g0="; + hash = "sha256-bOtSFSBED5xXoONQVX+myBkoKyTCTuP6BZSX/XXwlZo="; }; nativeBuildInputs = [ From 361a9f0f94b592f9a764a92aa58c72c3db28599c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 18 Dec 2024 18:29:00 +0000 Subject: [PATCH 076/429] cli11: 2.3.2 -> 2.4.2 --- pkgs/by-name/cl/cli11/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/cl/cli11/package.nix b/pkgs/by-name/cl/cli11/package.nix index 596178f81dc2..c47724390a69 100644 --- a/pkgs/by-name/cl/cli11/package.nix +++ b/pkgs/by-name/cl/cli11/package.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "cli11"; - version = "2.3.2"; + version = "2.4.2"; src = fetchFromGitHub { owner = "CLIUtils"; repo = "CLI11"; rev = "v${finalAttrs.version}"; - hash = "sha256-x3/kBlf5LdzkTO4NYOKanZBfcU4oK+fJw9L7cf88LsY="; + hash = "sha256-BLjGKN/UQIPVFlZaJ2VxTLFfY6otpJZ6HqfLtt5+r88="; }; buildInputs = [ catch2 ]; From f3ffbef1da7bcdebdbd9e4170618de451336ce5f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 19 Dec 2024 00:36:19 +0000 Subject: [PATCH 077/429] asdf-vm: 0.14.1 -> 0.15.0 --- pkgs/by-name/as/asdf-vm/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/as/asdf-vm/package.nix b/pkgs/by-name/as/asdf-vm/package.nix index 2c2bc6fba121..1acbce85e93a 100644 --- a/pkgs/by-name/as/asdf-vm/package.nix +++ b/pkgs/by-name/as/asdf-vm/package.nix @@ -48,13 +48,13 @@ let in stdenv.mkDerivation rec { pname = "asdf-vm"; - version = "0.14.1"; + version = "0.15.0"; src = fetchFromGitHub { owner = "asdf-vm"; repo = "asdf"; rev = "v${version}"; - sha256 = "sha256-1dacsAoZVwoQv8+V4FrjRLa7awLIZchlhkuET0wTO7w="; + sha256 = "sha256-quDgoYi+3hZUEAzXWTHuL5UK1T+4o7+G67w0UzZOjJA="; }; nativeBuildInputs = [ From 4680d11d112fbce66bab5ab893b0177c5e005c48 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 19 Dec 2024 00:39:06 +0000 Subject: [PATCH 078/429] clightning: 24.11 -> 24.11.1 --- pkgs/by-name/cl/clightning/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/cl/clightning/package.nix b/pkgs/by-name/cl/clightning/package.nix index 38ee7892c2b9..2484b659a4a8 100644 --- a/pkgs/by-name/cl/clightning/package.nix +++ b/pkgs/by-name/cl/clightning/package.nix @@ -28,11 +28,11 @@ let in stdenv.mkDerivation rec { pname = "clightning"; - version = "24.11"; + version = "24.11.1"; src = fetchurl { url = "https://github.com/ElementsProject/lightning/releases/download/v${version}/clightning-v${version}.zip"; - hash = "sha256-MWTzUn5kCBMr6u5k3qD7bVZjd7d+C+Z6I1noDcvXup4="; + hash = "sha256-FdrD+FA0t90oJnXjUA8oalU7DDjUv70fAteNxbhscgk="; }; # when building on darwin we need cctools to provide the correct libtool From 03feaccae82ae21f91beaa41222958979b4fd90c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 19 Dec 2024 01:02:12 +0000 Subject: [PATCH 079/429] soapui: 5.7.2 -> 5.8.0 --- pkgs/applications/networking/soapui/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/soapui/default.nix b/pkgs/applications/networking/soapui/default.nix index bde8a72416ff..4912f0932c96 100644 --- a/pkgs/applications/networking/soapui/default.nix +++ b/pkgs/applications/networking/soapui/default.nix @@ -9,11 +9,11 @@ }: stdenv.mkDerivation rec { pname = "soapui"; - version = "5.7.2"; + version = "5.8.0"; src = fetchurl { url = "https://dl.eviware.com/soapuios/${version}/SoapUI-${version}-linux-bin.tar.gz"; - sha256 = "sha256-pT0ZANVC7Sv7zxMDPY86aclIUGZeazOZadiVVsmEjtw="; + sha256 = "sha256-Xg1aeB/KQ5zMlJADFCnnpzA6iQMTlMgO7YKuWW8Y6oI="; }; nativeBuildInputs = [ makeWrapper ]; From 31666700b5545aa98a23dbc70bd3e43bc3576e4d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 19 Dec 2024 01:05:05 +0000 Subject: [PATCH 080/429] flowblade: 2.16.3 -> 2.18 --- pkgs/by-name/fl/flowblade/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/fl/flowblade/package.nix b/pkgs/by-name/fl/flowblade/package.nix index 7d8d72458072..441da2aec4ce 100644 --- a/pkgs/by-name/fl/flowblade/package.nix +++ b/pkgs/by-name/fl/flowblade/package.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation rec { pname = "flowblade"; - version = "2.16.3"; + version = "2.18"; src = fetchFromGitHub { owner = "jliljebl"; repo = pname; rev = "v${version}"; - sha256 = "sha256-WXB071lndw4/APTgwxNVjmYBvzMXZdLn1OaWqBXjW2Q="; + sha256 = "sha256-zdQY85sm4bv0WBcCK+xo3j0zIjjMQ5j7w7zljqD9WU8="; }; buildInputs = [ From 941c3b20ba257c3092afd04c5b9dfd40e7f257e5 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 19 Dec 2024 01:32:22 +0000 Subject: [PATCH 081/429] imgproxy: 3.26.1 -> 3.27.0 --- pkgs/by-name/im/imgproxy/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/im/imgproxy/package.nix b/pkgs/by-name/im/imgproxy/package.nix index d6c2af61ff98..b81f51f1986c 100644 --- a/pkgs/by-name/im/imgproxy/package.nix +++ b/pkgs/by-name/im/imgproxy/package.nix @@ -11,16 +11,16 @@ buildGoModule rec { pname = "imgproxy"; - version = "3.26.1"; + version = "3.27.0"; src = fetchFromGitHub { owner = pname; repo = pname; - hash = "sha256-r8yczisCN2jfWFc0L+EIgJLw5MPK4r5+lJsW6FM2hUY="; + hash = "sha256-swqbT/DXI2LsW006wBesqYLbAEscn2p/36gT3VE7pqg="; rev = "v${version}"; }; - vendorHash = "sha256-LGQ+JJ3OqDisT+CsnseVO54wyRTOkGpG9/zzpJw9P1I="; + vendorHash = "sha256-VBJo9Ai130u9tChU2f2tdSynuad7TACTSiYyULTK5Bw="; nativeBuildInputs = [ pkg-config From 3aa17d16b9b307357c320c1b7f53b4a2fc1ac8f2 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 19 Dec 2024 04:47:38 +0000 Subject: [PATCH 082/429] telepresence2: 2.20.3 -> 2.21.1 --- pkgs/by-name/te/telepresence2/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/te/telepresence2/package.nix b/pkgs/by-name/te/telepresence2/package.nix index 8cd9de5f56ae..196b04983ca2 100644 --- a/pkgs/by-name/te/telepresence2/package.nix +++ b/pkgs/by-name/te/telepresence2/package.nix @@ -31,13 +31,13 @@ let in buildGoModule rec { pname = "telepresence2"; - version = "2.20.3"; + version = "2.21.1"; src = fetchFromGitHub { owner = "telepresenceio"; repo = "telepresence"; rev = "v${version}"; - hash = "sha256-Oi3clmECnUyz+VX1HrZRu/EUTmkQay9c/ejdcdNjoGo="; + hash = "sha256-YXGhgxpNVk1u8pFJmN194OP8wFVaMfFRiK0yitxFBPo="; }; propagatedBuildInputs = [ @@ -51,7 +51,7 @@ buildGoModule rec { export CGO_ENABLED=0 ''; - vendorHash = "sha256-1Of/IBwXqyKzOSXsJE3vavurvo7ZghfBDlLn4QCR40o="; + vendorHash = "sha256-7ZMFKApMjxDBGuk5q+Px7ovIPO8SteNuZ1d1IdPtme0="; ldflags = [ "-s" From 5cc5a0037431b8441923f89c7b1bc033d34495e7 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 19 Dec 2024 10:30:41 +0000 Subject: [PATCH 083/429] databricks-cli: 0.236.0 -> 0.237.0 --- pkgs/by-name/da/databricks-cli/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/da/databricks-cli/package.nix b/pkgs/by-name/da/databricks-cli/package.nix index 876cb6b58b9e..fa6ca494349e 100644 --- a/pkgs/by-name/da/databricks-cli/package.nix +++ b/pkgs/by-name/da/databricks-cli/package.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "databricks-cli"; - version = "0.236.0"; + version = "0.237.0"; src = fetchFromGitHub { owner = "databricks"; repo = "cli"; rev = "v${version}"; - hash = "sha256-ldxRPZQgbr9FHqekjYdr+puLLq4AtXZ75sVeCmrPq9k="; + hash = "sha256-dGhEOghGs0Fif1/6Yfyy+aMzY+/ougl7GiPh3AikE1c="; }; - vendorHash = "sha256-S2j4cnTH9uB97v6SRnphWXBr9yWTTcoWn0OF4iiDt2g="; + vendorHash = "sha256-GYgbZ8JdQXEOYCAxrloHccA0eS02hs9NTMRfD+hakks="; excludedPackages = [ "bundle/internal" ]; From 0bcf3d7e2f98d5d08ad7af44cd49bff2d5f519f8 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 18 Dec 2024 20:21:06 +0000 Subject: [PATCH 084/429] argc: 1.21.1 -> 1.22.0 --- pkgs/by-name/ar/argc/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ar/argc/package.nix b/pkgs/by-name/ar/argc/package.nix index cbb39455c1c1..7b9f0cc589a1 100644 --- a/pkgs/by-name/ar/argc/package.nix +++ b/pkgs/by-name/ar/argc/package.nix @@ -14,16 +14,16 @@ let in rustPlatform.buildRustPackage rec { pname = "argc"; - version = "1.21.1"; + version = "1.22.0"; src = fetchFromGitHub { owner = "sigoden"; repo = "argc"; rev = "v${version}"; - hash = "sha256-76QWVERWnA9tZoymEdQUlaHedLmo68rIlab1UFsVWtc="; + hash = "sha256-sviGDwxbCBsNY5viV7Qim6B/COd1Uz0Wj/6n/Ge+A50="; }; - cargoHash = "sha256-MzwIdsrSgKdHZ4AyLv4ofApxJN1DgXywyVAYLMPabwY="; + cargoHash = "sha256-xGL2degbWauMi+BPGQgYvza6SiIRQxE4KZ0jMOMec7M="; nativeBuildInputs = [ installShellFiles ] ++ lib.optional (!canExecuteHost) buildPackages.argc; From 5ade7d90224094fd0bc1457ffc6cdfd703c40f57 Mon Sep 17 00:00:00 2001 From: Pavel Sobolev Date: Thu, 19 Dec 2024 21:46:50 +0300 Subject: [PATCH 085/429] pvs-studio: disable automatic updates --- pkgs/by-name/pv/pvs-studio/package.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/by-name/pv/pvs-studio/package.nix b/pkgs/by-name/pv/pvs-studio/package.nix index 0d5144056f87..d6157bab9918 100644 --- a/pkgs/by-name/pv/pvs-studio/package.nix +++ b/pkgs/by-name/pv/pvs-studio/package.nix @@ -11,6 +11,7 @@ pvs-studio, }: +# nixpkgs-update: no auto update stdenv.mkDerivation rec { pname = "pvs-studio"; version = "7.33.85330.89"; From dc95f0356bbd8250f9ce4936f6952b26a6ba76da Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 19 Dec 2024 20:17:04 +0000 Subject: [PATCH 086/429] cloudflared: 2024.11.1 -> 2024.12.2 --- pkgs/applications/networking/cloudflared/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cloudflared/default.nix b/pkgs/applications/networking/cloudflared/default.nix index 2158073882b0..1826209e2ced 100644 --- a/pkgs/applications/networking/cloudflared/default.nix +++ b/pkgs/applications/networking/cloudflared/default.nix @@ -8,13 +8,13 @@ buildGoModule rec { pname = "cloudflared"; - version = "2024.11.1"; + version = "2024.12.2"; src = fetchFromGitHub { owner = "cloudflare"; repo = "cloudflared"; rev = "refs/tags/${version}"; - hash = "sha256-4gSR7CHeSzBR4y46QHPohszrz9uO37TxRxhEbYC18zc="; + hash = "sha256-gk18N8iJve4lznkUb93Qzdgl93fTCOZCAXqm1BjsDak="; }; vendorHash = null; From 5d4e2e5d2c864a2db001651b6b379a8151ec9b1b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 19 Dec 2024 21:03:05 +0000 Subject: [PATCH 087/429] jbang: 0.121.0 -> 0.122.0 --- pkgs/by-name/jb/jbang/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/jb/jbang/package.nix b/pkgs/by-name/jb/jbang/package.nix index 4754da247179..d96d1669e926 100644 --- a/pkgs/by-name/jb/jbang/package.nix +++ b/pkgs/by-name/jb/jbang/package.nix @@ -9,12 +9,12 @@ }: stdenv.mkDerivation rec { - version = "0.121.0"; + version = "0.122.0"; pname = "jbang"; src = fetchzip { url = "https://github.com/jbangdev/jbang/releases/download/v${version}/${pname}-${version}.tar"; - sha256 = "sha256-Zx0+ybvxh4M1B+KB8DQCO5AF/1T7LbQgMSB3JeQK9Bc="; + sha256 = "sha256-uBzIk4Ivy/XLFlsUpGejV45T8MIseE2l8AVprWJi3hI="; }; nativeBuildInputs = [ makeWrapper ]; From 5736cebc5c14b9596a6be0cdd586ae4b8a32f036 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 19 Dec 2024 22:57:18 +0000 Subject: [PATCH 088/429] prowlarr: 1.26.1.4844 -> 1.28.2.4885 --- pkgs/servers/prowlarr/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/servers/prowlarr/default.nix b/pkgs/servers/prowlarr/default.nix index 71deeefa1851..b248f7749160 100644 --- a/pkgs/servers/prowlarr/default.nix +++ b/pkgs/servers/prowlarr/default.nix @@ -21,15 +21,15 @@ let }.${stdenv.hostPlatform.system} or unsupported; hash = { - aarch64-darwin = "sha256-Ht8M0gHO6a+JVUGEZXdU2LFiNCx2jrGmErXT6kVTje0="; - aarch64-linux = "sha256-d3/6NxctWbMBSR7CPF2N46g1TJc63KnKKqZcu2p0A80="; - x86_64-darwin = "sha256-diShDytcYY+9/gNDAQM+xZ/79o40Qs+62dtxpW0EfaQ="; - x86_64-linux = "sha256-bb3UzRr0Df4QejSsFzL7x9PnyULL3ML8CL6EGmsqelM="; + aarch64-darwin = "sha256-cGHmreI6M9CI2CsL2iC9O0dOcyvdlYQDpJ8NRG1Yt2U="; + aarch64-linux = "sha256-vXFQL6Sifjin3NoEhvjH9pTbcBy7aqwA9LI6T7sJQyI="; + x86_64-darwin = "sha256-+OB+OBj9W2c9b655gUMcDg12iWePKC4gDa5pubsNImA="; + x86_64-linux = "sha256-h1mwt8iAv9z9Qg+zUgEkB698lsoTtcOocAJz5kKmKQI="; }.${stdenv.hostPlatform.system} or unsupported; in stdenv.mkDerivation rec { inherit pname; - version = "1.26.1.4844"; + version = "1.28.2.4885"; src = fetchurl { url = "https://github.com/Prowlarr/Prowlarr/releases/download/v${version}/Prowlarr.master.${version}.${os}-core-${arch}.tar.gz"; From edde55453f3aa5d98eef33fc9f07f8ce960abfb8 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 19 Dec 2024 23:37:42 +0000 Subject: [PATCH 089/429] rednotebook: 2.36 -> 2.37 --- pkgs/applications/editors/rednotebook/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/rednotebook/default.nix b/pkgs/applications/editors/rednotebook/default.nix index 7600b3376d17..27d353c8f6c8 100644 --- a/pkgs/applications/editors/rednotebook/default.nix +++ b/pkgs/applications/editors/rednotebook/default.nix @@ -16,14 +16,14 @@ buildPythonApplication rec { pname = "rednotebook"; - version = "2.36"; + version = "2.37"; pyproject = true; src = fetchFromGitHub { owner = "jendrikseipp"; repo = "rednotebook"; tag = "v${version}"; - sha256 = "sha256-ISwYQPI7qM0+cEdWnHLdrJA/07BUjDP4gzF/GzqNcsE="; + sha256 = "sha256-ytaj29xZflq20+6Iqmynsr34Q9DP5uOvSBkg+vIWXgU="; }; # We have not packaged tests. From 099cca9d2dc55797ca0380d52df46dbe592fc05c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 20 Dec 2024 00:38:20 +0000 Subject: [PATCH 090/429] remmina: 1.4.36 -> 1.4.37 --- pkgs/applications/networking/remote/remmina/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/remote/remmina/default.nix b/pkgs/applications/networking/remote/remmina/default.nix index 69f773163d0a..ba512da0c6aa 100644 --- a/pkgs/applications/networking/remote/remmina/default.nix +++ b/pkgs/applications/networking/remote/remmina/default.nix @@ -52,13 +52,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "remmina"; - version = "1.4.36"; + version = "1.4.37"; src = fetchFromGitLab { owner = "Remmina"; repo = "Remmina"; rev = "v${finalAttrs.version}"; - hash = "sha256-u+ysAFi7I7nXIiAw7VCmHbqgtRoZgkPnRfy/Mnl1b2g="; + hash = "sha256-ZxQqRtJl4U33qSHbuYHN72r+VKx1ckfFH2iZQHl6qVE="; }; nativeBuildInputs = [ From a79e449d58fe1edf854dbe731aceccdc98e83814 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 20 Dec 2024 00:40:24 +0000 Subject: [PATCH 091/429] eslint_d: 14.2.2 -> 14.3.0 --- pkgs/by-name/es/eslint_d/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/es/eslint_d/package.nix b/pkgs/by-name/es/eslint_d/package.nix index d36a4eed20a1..58d8f25d491a 100644 --- a/pkgs/by-name/es/eslint_d/package.nix +++ b/pkgs/by-name/es/eslint_d/package.nix @@ -8,16 +8,16 @@ buildNpmPackage rec { pname = "eslint_d"; - version = "14.2.2"; + version = "14.3.0"; src = fetchFromGitHub { owner = "mantoni"; repo = "eslint_d.js"; rev = "v${version}"; - hash = "sha256-7VsbGudZlfrjU+x3a9OWxu9qDCiDUq8xez85qNj08xY="; + hash = "sha256-Mu3dSgRIC2L9IImKixJfaUsltlajY0cYdXOSikNQuPo="; }; - npmDepsHash = "sha256-u8kmHQ7UfCR446d+HbkGlK76Aki+KrOtBO6/a/VXoTg="; + npmDepsHash = "sha256-nZ9q+Xmd8JLs+xYEO1TVbDEmQl2UwR9D9OWqVChNHhw="; dontNpmBuild = true; From 4acd290bdcd1ca7a20c431d89d83b85778f68e50 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 20 Dec 2024 00:55:43 +0000 Subject: [PATCH 092/429] kicad-small: 8.0.6 -> 8.0.7 --- .../science/electronics/kicad/versions.nix | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/pkgs/applications/science/electronics/kicad/versions.nix b/pkgs/applications/science/electronics/kicad/versions.nix index 6c6f11813cd2..a0a35a789d3f 100644 --- a/pkgs/applications/science/electronics/kicad/versions.nix +++ b/pkgs/applications/science/electronics/kicad/versions.nix @@ -3,23 +3,23 @@ { "kicad" = { kicadVersion = { - version = "8.0.6"; + version = "8.0.7"; src = { - rev = "16c59e4e71dab2a0ed2f9e61f990b69657b4bfe2"; - sha256 = "1vc9igk8id2c34shilg7lh361psvwiqxpsn2yq7cwnwgaq7v1swq"; + rev = "bfcc0ac495d7a5fcfc5546c07bf16049d346b795"; + sha256 = "0k3xn2pkn4lw9jqx1l5r1h91x2azkq4b9zzhrq15cr4jw8af1y8w"; }; }; libVersion = { - version = "8.0.6"; + version = "8.0.7"; libSources = { - symbols.rev = "5fab56fc44319fed1d159cd7fa48e4468b0a5dad"; - symbols.sha256 = "1ahzx14bmjgpvifsl2xm8c76zagkj2spc9cpb8ms4jlda92lp078"; - templates.rev = "2343281a4df1ffbd4e0c6fcb9856f81adbbc201e"; + symbols.rev = "42f411da32d930a1255a9e842859d6ff8f034b17"; + symbols.sha256 = "0fp56xs7jb1pmqjammq0wkr5cq1fz1a3y3jriavxs09mrb56nghl"; + templates.rev = "8402f4c99a45cfbb2ba5185a975f60fb6718d631"; templates.sha256 = "03idwrk3vj9h2az8j8lqpbdbnfxdbkzh4db68kq3644yj3cnlcza"; - footprints.rev = "2e76906e448f352228a8f6bc06f77ae959a57975"; - footprints.sha256 = "1fv0liwbl2blwd2xy9whwinkczi98ah83rwi4v6bvm9d9318vbig"; - packages3d.rev = "005244f418b0d014e2907ca42df5ab85a1e29466"; - packages3d.sha256 = "1i6ypl7lw7hnifl943z3lwv4sy00mfwgqi001bj9qh547kf9rxd4"; + footprints.rev = "e40b11ba8b166956f1a654fa02613f65683ae20d"; + footprints.sha256 = "1ssrmx2bh6v4psg89q0l69d40jj10adz0506p2mq5yc1sgy0bag2"; + packages3d.rev = "27171b4df32b3e76e7b47098eae8e5ec61b136e5"; + packages3d.sha256 = "159dm48zm5n6301ck2w48alwgy5a2yl075hb94gy67bir4sc0ijb"; }; }; }; From e9b1c813e3a78437d8c9f133e9ce11f300aa7d39 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 20 Dec 2024 04:30:16 +0000 Subject: [PATCH 093/429] lilypond-unstable: 2.25.21 -> 2.25.22 --- pkgs/misc/lilypond/unstable.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/misc/lilypond/unstable.nix b/pkgs/misc/lilypond/unstable.nix index 4935bd8e4b78..6a9b8fcb4bd2 100644 --- a/pkgs/misc/lilypond/unstable.nix +++ b/pkgs/misc/lilypond/unstable.nix @@ -5,10 +5,10 @@ }: lilypond.overrideAttrs (oldAttrs: rec { - version = "2.25.21"; + version = "2.25.22"; src = fetchurl { url = "https://lilypond.org/download/sources/v${lib.versions.majorMinor version}/lilypond-${version}.tar.gz"; - hash = "sha256-mckXCpZLig0ePkeGpiqYQQREFxgioiK/+mpA3GBNwGc="; + hash = "sha256-+p0D//hU/AKVJ6DuPhoK9EOqZxZpTVRugabxidmHYLU="; }; passthru.updateScript = { From 0d83cbce808e840b1ef15a33e89892135d24ee79 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 20 Dec 2024 07:37:44 +0000 Subject: [PATCH 094/429] tanka: 0.30.2 -> 0.31.0 --- pkgs/by-name/ta/tanka/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ta/tanka/package.nix b/pkgs/by-name/ta/tanka/package.nix index 8d7d67c165d7..66db433fcfd8 100644 --- a/pkgs/by-name/ta/tanka/package.nix +++ b/pkgs/by-name/ta/tanka/package.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "tanka"; - version = "0.30.2"; + version = "0.31.0"; src = fetchFromGitHub { owner = "grafana"; repo = pname; rev = "v${version}"; - sha256 = "sha256-46qnhjQDYmoqeFrRTo5ofr0oErS7U2SKWMb78N1z2+w="; + sha256 = "sha256-h7oIL9MWah5kEBj0N6Ro53P0T9fF0B8qdfv1031vLN8="; }; - vendorHash = "sha256-w0xgtTsoUWyu5MQC+A6YrZsyBSeuGOCdYTN5VApvYwI="; + vendorHash = "sha256-/8tPq/piCrguFoRigzGoAUSBJ2C1AY0ghyHosPE5n68="; doCheck = false; # Required for versions >= 0.28 as they introduce a gowork.sum file. This is only used for tests so we can safely disable GOWORK From 226587381bac07f7d518b5f6c313fdce7ed7794b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Chocholat=C3=BD?= Date: Fri, 20 Dec 2024 10:39:09 +0100 Subject: [PATCH 095/429] jjui: Add update script using nix-update --- pkgs/by-name/jj/jjui/package.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/by-name/jj/jjui/package.nix b/pkgs/by-name/jj/jjui/package.nix index 9ad1b3cd6bcd..31930afb6f63 100644 --- a/pkgs/by-name/jj/jjui/package.nix +++ b/pkgs/by-name/jj/jjui/package.nix @@ -2,6 +2,7 @@ lib, buildGoModule, fetchFromGitHub, + nix-update-script, }: buildGoModule { pname = "jjui"; @@ -20,6 +21,8 @@ buildGoModule { mv $out/bin/cmd $out/bin/jjui ''; + passthru.updateScript = nix-update-script { }; + meta = { description = "A TUI for Jujutsu VCS"; homepage = "https://github.com/idursun/jjui"; From c951613d3cb3d61b14c890238017d0685ff359f9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Chocholat=C3=BD?= Date: Fri, 20 Dec 2024 10:42:04 +0100 Subject: [PATCH 096/429] jjui: 0-unstable-2024-12-10 -> 0.1 --- pkgs/by-name/jj/jjui/package.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/jj/jjui/package.nix b/pkgs/by-name/jj/jjui/package.nix index 31930afb6f63..625fad1d092c 100644 --- a/pkgs/by-name/jj/jjui/package.nix +++ b/pkgs/by-name/jj/jjui/package.nix @@ -4,18 +4,18 @@ fetchFromGitHub, nix-update-script, }: -buildGoModule { +buildGoModule rec { pname = "jjui"; - version = "0-unstable-2024-12-10"; + version = "0.1"; src = fetchFromGitHub { owner = "idursun"; repo = "jjui"; - rev = "525c8042a51710cdaefa91176af68a22ad0045bd"; - hash = "sha256-WSlcJFLOe5UVvWubSPP391+AxepEa5M6GpmZnjYMjww="; + rev = "v${version}"; + hash = "sha256-MdSzY2JWL34qB13mX4FWG/4wzl30FmATYQ09N1v5Isc="; }; - vendorHash = "sha256-kg5b3tzwyAhn00GwdUDf4OdYZvCJZHgkgpzHFWy5SxI="; + vendorHash = "sha256-pzbOFXSlEebc4fCyNyQSdeVqar+HfEjsSyJo+mHkQeg="; postFixup = '' mv $out/bin/cmd $out/bin/jjui From ae97e9612f8faf83bb727da66e87ca2a1f8c7e6b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gutyina=20Gerg=C5=91?= Date: Fri, 20 Dec 2024 13:30:38 +0100 Subject: [PATCH 097/429] famistudio: move to finalAttrs --- pkgs/by-name/fa/famistudio/package.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/by-name/fa/famistudio/package.nix b/pkgs/by-name/fa/famistudio/package.nix index 0dc7fc256436..9961002befab 100644 --- a/pkgs/by-name/fa/famistudio/package.nix +++ b/pkgs/by-name/fa/famistudio/package.nix @@ -24,14 +24,14 @@ let else throw "Don't know how to build FamiStudio for ${stdenv.hostPlatform.system}"; in -buildDotnetModule rec { +buildDotnetModule (finalAttrs: { pname = "famistudio"; version = "4.2.1"; src = fetchFromGitHub { owner = "BleuBleu"; repo = "FamiStudio"; - rev = "refs/tags/${version}"; + rev = "refs/tags/${finalAttrs.version}"; hash = "sha256-WYy/6cWQg3Ayok/eAdnvlWAvdcuhy/sdlWOVvaYcPkc="; }; @@ -43,8 +43,8 @@ buildDotnetModule rec { callPackage ./build-native-wrapper.nix ( args // { - inherit version src; - sourceRoot = "${src.name}/ThirdParty/${args.depname}"; + inherit (finalAttrs) version src; + sourceRoot = "${finalAttrs.src.name}/ThirdParty/${args.depname}"; } ); nativeWrapperToReplaceFormat = @@ -117,10 +117,10 @@ buildDotnetModule rec { rm FamiStudio/*.{dll,dylib,so*} # Replace copying of vendored prebuilt native libraries with copying of our native libraries - substituteInPlace ${projectFile} ${libraryReplaceArgs} + substituteInPlace ${finalAttrs.projectFile} ${libraryReplaceArgs} # Un-hardcode target platform if set - sed -i -e '/PlatformTarget/d' ${projectFile} + sed -i -e '/PlatformTarget/d' ${finalAttrs.projectFile} # Don't require a special name to be preserved, our OpenAL isn't 32-bit substituteInPlace FamiStudio/Source/AudioStreams/OpenALStream.cs \ @@ -168,4 +168,4 @@ buildDotnetModule rec { platforms = lib.platforms.unix; mainProgram = "FamiStudio"; }; -} +}) From 40086fb0ea36cb4917cf3fbf0449bd8896ad6aa3 Mon Sep 17 00:00:00 2001 From: FlafyDev Date: Fri, 20 Dec 2024 18:22:47 +0200 Subject: [PATCH 098/429] nixos/networkd: add RequestAddress to network sectionDHCPv4 --- nixos/modules/system/boot/networkd.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/modules/system/boot/networkd.nix b/nixos/modules/system/boot/networkd.nix index 130d6098b1e2..859f43b2d50a 100644 --- a/nixos/modules/system/boot/networkd.nix +++ b/nixos/modules/system/boot/networkd.nix @@ -869,6 +869,7 @@ let "DUIDType" "DUIDRawData" "IAID" + "RequestAddress" "RequestBroadcast" "RouteMetric" "RouteTable" From 21e85783e0732486f9052b18b4124d511680804e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 20 Dec 2024 16:41:03 +0000 Subject: [PATCH 099/429] louvre: 2.9.0-1 -> 2.13.0-1 --- pkgs/by-name/lo/louvre/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/lo/louvre/package.nix b/pkgs/by-name/lo/louvre/package.nix index d859934514df..ec04ad564341 100644 --- a/pkgs/by-name/lo/louvre/package.nix +++ b/pkgs/by-name/lo/louvre/package.nix @@ -24,13 +24,13 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "louvre"; - version = "2.9.0-1"; + version = "2.13.0-1"; src = fetchFromGitHub { owner = "CuarzoSoftware"; repo = "Louvre"; rev = "v${finalAttrs.version}"; - hash = "sha256-0M1Hl5kF8r4iFflkGBb9CWqwzauSZPVKSRNWZKFZC4U="; + hash = "sha256-ZUGan5lcE44Lt6xEvVO9Nd1ONBEvvwj8QuLDnAaenpU="; }; sourceRoot = "${finalAttrs.src.name}/src"; From 0a5de06f6ff57c4937fed7dff2b8ca4fe65305aa Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 20 Dec 2024 17:29:09 +0000 Subject: [PATCH 100/429] gfold: 4.5.1 -> 4.6.0 --- pkgs/applications/version-management/gfold/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/version-management/gfold/default.nix b/pkgs/applications/version-management/gfold/default.nix index 9406ecbf95e7..7f764283d032 100644 --- a/pkgs/applications/version-management/gfold/default.nix +++ b/pkgs/applications/version-management/gfold/default.nix @@ -8,7 +8,7 @@ let pname = "gfold"; - version = "4.5.1"; + version = "4.6.0"; in rustPlatform.buildRustPackage { inherit pname version; @@ -17,10 +17,10 @@ rustPlatform.buildRustPackage { owner = "nickgerace"; repo = pname; rev = version; - hash = "sha256-lIEYz5ngARzpJ4I1iN2bGd4eha1BiSmREJG6Cy2Lqrs="; + hash = "sha256-z5E+YS2zO4zgsW7mZbVN0z4HOurqoXwXn8hQc++9tks="; }; - cargoHash = "sha256-9/Ro5aYKJCJ+5wvv6PmfWMrhYfc3a3d0DAhGDwMrvq4="; + cargoHash = "sha256-mSqqtHZDm1ySu48DdI2sF7i7A8rDkFS/4/9uB30JOI8="; passthru.tests.version = testers.testVersion { package = gfold; From 0360d59d0f4596509bfe3ea9abefcceae0dcf926 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 20 Dec 2024 17:52:50 +0000 Subject: [PATCH 101/429] healthchecks: 3.8 -> 3.9 --- pkgs/by-name/he/healthchecks/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/he/healthchecks/package.nix b/pkgs/by-name/he/healthchecks/package.nix index 043431c53a3b..c0c42962278f 100644 --- a/pkgs/by-name/he/healthchecks/package.nix +++ b/pkgs/by-name/he/healthchecks/package.nix @@ -15,14 +15,14 @@ let in py.pkgs.buildPythonApplication rec { pname = "healthchecks"; - version = "3.8"; + version = "3.9"; format = "other"; src = fetchFromGitHub { owner = "healthchecks"; repo = pname; tag = "v${version}"; - sha256 = "sha256-RVmIaobts6GT1I4pc5/kZblbo6CwwQ33m3xBruSXZss="; + sha256 = "sha256-78Ku7yYhgIZ+uIMPKkExIXUOKmfiRMjEiBm2SugyD+s="; }; propagatedBuildInputs = with py.pkgs; [ From 976ec244339e39e63b3297ae7941f55de281a948 Mon Sep 17 00:00:00 2001 From: Niklas Korz Date: Fri, 20 Dec 2024 19:40:35 +0100 Subject: [PATCH 102/429] matomo: 5.2.0 -> 5.2.1 --- pkgs/servers/web-apps/matomo/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/servers/web-apps/matomo/default.nix b/pkgs/servers/web-apps/matomo/default.nix index 3eb4c2a8113a..eab263044cec 100644 --- a/pkgs/servers/web-apps/matomo/default.nix +++ b/pkgs/servers/web-apps/matomo/default.nix @@ -10,15 +10,15 @@ let versions = { matomo = { - version = "5.2.0"; - hash = "sha256-0hMbcvntoOWFJ00DytkFfcP7/giqtrhmxawVNzMP2KA="; + version = "5.2.1"; + hash = "sha256-5glMwwIG0Uo8bu904u40FUa+yaUlrQe1nUCkv9/ATks="; }; matomo-beta = { - version = "5.2.0"; + version = "5.2.1"; # `beta` examples: "b1", "rc1", null # when updating: use null if stable version is >= latest beta or release candidate beta = null; - hash = "sha256-0hMbcvntoOWFJ00DytkFfcP7/giqtrhmxawVNzMP2KA="; + hash = "sha256-5glMwwIG0Uo8bu904u40FUa+yaUlrQe1nUCkv9/ATks="; }; }; common = From 15eafd036bae7c7fa19f322bd55a014f8c06e586 Mon Sep 17 00:00:00 2001 From: sehqlr Date: Fri, 20 Dec 2024 14:48:38 -0600 Subject: [PATCH 103/429] Fixed the Monica email configuration bug --- maintainers/maintainer-list.nix | 7 +++++++ nixos/modules/services/web-apps/monica.nix | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 38aa90b275d6..a28e93cfe8c8 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -20347,6 +20347,13 @@ githubId = 71049646; keys = [ { fingerprint = "8BDF DFB5 6842 2393 82A0 441B 9238 BC70 9E05 516A"; } ]; }; + sehqlr = { + name = "Sam Hatfield"; + email = "hey@samhatfield.me"; + matrix = "@sehqlr:matrix.org"; + github = "sehqlr"; + githubId = 2746852; + }; sei40kr = { name = "Seong Yong-ju"; email = "sei40kr@gmail.com"; diff --git a/nixos/modules/services/web-apps/monica.nix b/nixos/modules/services/web-apps/monica.nix index 6774e2c9bb46..16151f3be9dc 100644 --- a/nixos/modules/services/web-apps/monica.nix +++ b/nixos/modules/services/web-apps/monica.nix @@ -296,7 +296,7 @@ in { DB_USERNAME = db.user; MAIL_DRIVER = mail.driver; MAIL_FROM_NAME = mail.fromName; - MAIL_FROM = mail.from; + MAIL_FROM_ADDRESS = mail.from; MAIL_HOST = mail.host; MAIL_PORT = mail.port; MAIL_USERNAME = mail.user; From 62659a8ca7bba5d151365ff641b74439181725c0 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 20 Dec 2024 23:02:11 +0000 Subject: [PATCH 104/429] jdt-language-server: 1.42.0 -> 1.43.0 --- pkgs/by-name/jd/jdt-language-server/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/jd/jdt-language-server/package.nix b/pkgs/by-name/jd/jdt-language-server/package.nix index 0f6609651100..fc6c759f1696 100644 --- a/pkgs/by-name/jd/jdt-language-server/package.nix +++ b/pkgs/by-name/jd/jdt-language-server/package.nix @@ -6,15 +6,15 @@ }: let - timestamp = "202411281516"; + timestamp = "202412191447"; in stdenv.mkDerivation (finalAttrs: { pname = "jdt-language-server"; - version = "1.42.0"; + version = "1.43.0"; src = fetchurl { url = "https://download.eclipse.org/jdtls/milestones/${finalAttrs.version}/jdt-language-server-${finalAttrs.version}-${timestamp}.tar.gz"; - hash = "sha256-ddJtwD+IbAiZWKZo3Iuu3hpVmm6DvxLJYHCk7hmdxY4="; + hash = "sha256-46M/+Iiq8dmY7AtuDx7LjurFPu+I3eIiBMPNM3nl+5g="; }; sourceRoot = "."; From e9e1d145f6e6da36d743619704aa8e1eed14704b Mon Sep 17 00:00:00 2001 From: Jared Baur Date: Fri, 20 Dec 2024 15:47:57 -0800 Subject: [PATCH 105/429] nixos/fontdir: fix X11-fonts cross compilation --- nixos/modules/config/fonts/fontdir.nix | 42 ++++++++++++++++++-------- 1 file changed, 29 insertions(+), 13 deletions(-) diff --git a/nixos/modules/config/fonts/fontdir.nix b/nixos/modules/config/fonts/fontdir.nix index 1d47970d131d..c0ca9d1b537a 100644 --- a/nixos/modules/config/fonts/fontdir.nix +++ b/nixos/modules/config/fonts/fontdir.nix @@ -8,19 +8,35 @@ let cfg = config.fonts.fontDir; - x11Fonts = pkgs.runCommand "X11-fonts" { preferLocalBuild = true; } '' - mkdir -p "$out/share/X11/fonts" - font_regexp='.*\.\(ttf\|ttc\|otb\|otf\|pcf\|pfa\|pfb\|bdf\)\(\.gz\)?' - find ${toString config.fonts.packages} -regex "$font_regexp" \ - -exec ln -sf -t "$out/share/X11/fonts" '{}' \; - cd "$out/share/X11/fonts" - ${lib.optionalString cfg.decompressFonts '' - ${pkgs.gzip}/bin/gunzip -f *.gz - ''} - ${pkgs.xorg.mkfontscale}/bin/mkfontscale - ${pkgs.xorg.mkfontdir}/bin/mkfontdir - cat $(find ${pkgs.xorg.fontalias}/ -name fonts.alias) >fonts.alias - ''; + x11Fonts = pkgs.callPackage ( + { + runCommand, + gzip, + xorg, + }: + runCommand "X11-fonts" + { + preferLocalBuild = true; + nativeBuildInputs = [ + gzip + xorg.mkfontscale + xorg.mkfontdir + ]; + } + '' + mkdir -p "$out/share/X11/fonts" + font_regexp='.*\.\(ttf\|ttc\|otb\|otf\|pcf\|pfa\|pfb\|bdf\)\(\.gz\)?' + find ${toString config.fonts.packages} -regex "$font_regexp" \ + -exec ln -sf -t "$out/share/X11/fonts" '{}' \; + cd "$out/share/X11/fonts" + ${lib.optionalString cfg.decompressFonts '' + gunzip -f *.gz + ''} + mkfontscale + mkfontdir + cat $(find ${pkgs.xorg.fontalias}/ -name fonts.alias) >fonts.alias + '' + ) { }; in From e344f839716f022bb48c68789c6bff327307e5ae Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 21 Dec 2024 01:05:19 +0000 Subject: [PATCH 106/429] tinygo: 0.34.0 -> 0.35.0 --- pkgs/development/compilers/tinygo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/tinygo/default.nix b/pkgs/development/compilers/tinygo/default.nix index 1829c3be1b4a..ea4a10ae09c8 100644 --- a/pkgs/development/compilers/tinygo/default.nix +++ b/pkgs/development/compilers/tinygo/default.nix @@ -34,13 +34,13 @@ in buildGoModule rec { pname = "tinygo"; - version = "0.34.0"; + version = "0.35.0"; src = fetchFromGitHub { owner = "tinygo-org"; repo = "tinygo"; rev = "v${version}"; - hash = "sha256-jntixwHGg9buWQuu9I47DHUxK1xJbDRHxRMEwKoOhHo="; + hash = "sha256-oy6797o3lMMRJ+bPHY59Bv7mX25aEwBn4OslAohfY2g="; fetchSubmodules = true; # The public hydra server on `hydra.nixos.org` is configured with # `max_output_size` of 3GB. The purpose of this `postFetch` step From 7e80b7355b8698e522383dff6710c7d51aab12c4 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 21 Dec 2024 01:11:30 +0000 Subject: [PATCH 107/429] noseyparker: 0.21.0 -> 0.22.0 --- pkgs/by-name/no/noseyparker/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/no/noseyparker/package.nix b/pkgs/by-name/no/noseyparker/package.nix index be2c5971598f..adb032933e26 100644 --- a/pkgs/by-name/no/noseyparker/package.nix +++ b/pkgs/by-name/no/noseyparker/package.nix @@ -12,16 +12,16 @@ rustPlatform.buildRustPackage rec { pname = "noseyparker"; - version = "0.21.0"; + version = "0.22.0"; src = fetchFromGitHub { owner = "praetorian-inc"; repo = "noseyparker"; rev = "v${version}"; - hash = "sha256-mRGlJto2b/oPLsvktQuBUsIO0kao9i4GjbmgztdAwiQ="; + hash = "sha256-HRuqeKV0Y8kf/KBSHIK25Xrpr7tJODQQa4BoqxiulzU="; }; - cargoHash = "sha256-NibALhXquX/izimso8BBSWDCwDIykvbr7yN610nnOS4="; + cargoHash = "sha256-/EeKoR4IHNwQj8Ohs46U2BYJWkutJ1XWhW6xsR+k7Yg="; nativeCheckInputs = [ git From 02e0722c208a36b81796f8e3e27c1e6f2ddd45f8 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 21 Dec 2024 02:03:15 +0000 Subject: [PATCH 108/429] ostree-full: 2024.8 -> 2024.10 --- pkgs/by-name/os/ostree/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/os/ostree/package.nix b/pkgs/by-name/os/ostree/package.nix index 3bed8333cb25..bab231271d53 100644 --- a/pkgs/by-name/os/ostree/package.nix +++ b/pkgs/by-name/os/ostree/package.nix @@ -45,13 +45,13 @@ let ]); in stdenv.mkDerivation rec { pname = "ostree"; - version = "2024.8"; + version = "2024.10"; outputs = [ "out" "dev" "man" "installedTests" ]; src = fetchurl { url = "https://github.com/ostreedev/ostree/releases/download/v${version}/libostree-${version}.tar.xz"; - sha256 = "sha256-4hNuEWZp8RT/c0nxLimfY8C+znM0UWSUFKjc2FuGPD8="; + sha256 = "sha256-VOM4fe4f8WAxoGeayitg2pCrf0omwhGCIzPH8jAAq+4="; }; From 73888229b960e47d3d44b25df4ec713b974ea034 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 21 Dec 2024 11:26:48 +0000 Subject: [PATCH 109/429] kak-tree-sitter-unwrapped: 1.1.2 -> 1.1.3 --- pkgs/by-name/ka/kak-tree-sitter-unwrapped/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ka/kak-tree-sitter-unwrapped/package.nix b/pkgs/by-name/ka/kak-tree-sitter-unwrapped/package.nix index 49c04df4dd03..b15e544e2224 100644 --- a/pkgs/by-name/ka/kak-tree-sitter-unwrapped/package.nix +++ b/pkgs/by-name/ka/kak-tree-sitter-unwrapped/package.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage rec { pname = "kak-tree-sitter-unwrapped"; - version = "1.1.2"; + version = "1.1.3"; src = fetchFromSourcehut { owner = "~hadronized"; repo = "kak-tree-sitter"; rev = "kak-tree-sitter-v${version}"; - hash = "sha256-wBWfSyR8LGtug/mCD0bJ4lbdN3trIA/03AnCxZoEOSA="; + hash = "sha256-vQZ+zQgwIw5ZBdIuMDD37rIdhe+WpNBmq0TciXBNiSU="; }; - cargoHash = "sha256-v0DNcWPoHdquOlyPoPLoFulz66yCPR1W1Z3uuTjli5k="; + cargoHash = "sha256-bDxQEbUyeNUqYRaWV2kBL60ZFGtA4s+kwmgz6y88MAw="; passthru = { updateScript = nix-update-script { }; From 41fe8d27061c9d0ac3db30dcfe59ec6ac762bb28 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 21 Dec 2024 13:08:19 +0000 Subject: [PATCH 110/429] peergos: 0.21.0 -> 0.22.0 --- pkgs/by-name/pe/peergos/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/pe/peergos/package.nix b/pkgs/by-name/pe/peergos/package.nix index 7331fbd63651..bff626692ea9 100644 --- a/pkgs/by-name/pe/peergos/package.nix +++ b/pkgs/by-name/pe/peergos/package.nix @@ -9,10 +9,10 @@ stdenv.mkDerivation rec { pname = "peergos"; - version = "0.21.0"; + version = "0.22.0"; src = fetchurl { url = "https://github.com/Peergos/web-ui/releases/download/v${version}/Peergos.jar"; - hash = "sha256-jhZ/75MM6DSXgux+rniINQrvlvPldnAaCe3E/2IHziM="; + hash = "sha256-JjJBHL2wdAt+V9wAujvBIdAw/OAe89sHsYsv+cXEjTY="; }; dontUnpack = true; From 1987668c4b06162d5fb751bf1fbd2751db90eef7 Mon Sep 17 00:00:00 2001 From: David Calavera Date: Sat, 21 Dec 2024 18:14:56 +0000 Subject: [PATCH 111/429] cargo-lambda: 1.5.0 -> 1.6.1 --- pkgs/development/tools/rust/cargo-lambda/default.nix | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/pkgs/development/tools/rust/cargo-lambda/default.nix b/pkgs/development/tools/rust/cargo-lambda/default.nix index c66e39c01baa..a3f1d083d9bc 100644 --- a/pkgs/development/tools/rust/cargo-lambda/default.nix +++ b/pkgs/development/tools/rust/cargo-lambda/default.nix @@ -16,16 +16,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-lambda"; - version = "1.5.0"; + version = "1.6.1"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - hash = "sha256-58kVtwBZEAlv9eVesqmWMZ+KxAwEiGMm8mCf9X5tPMI="; + hash = "sha256-O4yJ+6Uk4dHjCDp28JbUtL/B+v9JJEGkinZ4MsIpjUk="; }; - cargoHash = "sha256-DoMIVpYtEHvYSW2THpZFdhoFI0zjC70hYnwnzGwkJ4Q="; + cargoHash = "sha256-vK37S5hLuHYimTljo0i6iRq2kt/r0kZ6Uqw2wQMhSGc="; nativeCheckInputs = [ cacert ]; @@ -42,11 +42,6 @@ rustPlatform.buildRustPackage rec { Security ]; - checkFlags = [ - # Tests disabled because they access the network. - "--skip=test_download_example" - ]; - # Remove files that don't make builds reproducible: # - Remove build.rs file that adds the build date to the version. # - Remove cargo_lambda.rs that contains tests that reach the network. From 334a9bd0b269b616fbc33a6f7c02470ebc4b8efd Mon Sep 17 00:00:00 2001 From: pwnwriter Date: Thu, 19 Dec 2024 11:13:47 -0500 Subject: [PATCH 112/429] rwalk: init at 0.8.7 --- pkgs/by-name/rw/rwalk/Cargo.lock | 3263 +++++++++++++++++++++++++++++ pkgs/by-name/rw/rwalk/package.nix | 54 + 2 files changed, 3317 insertions(+) create mode 100644 pkgs/by-name/rw/rwalk/Cargo.lock create mode 100644 pkgs/by-name/rw/rwalk/package.nix diff --git a/pkgs/by-name/rw/rwalk/Cargo.lock b/pkgs/by-name/rw/rwalk/Cargo.lock new file mode 100644 index 000000000000..5dd721af76dd --- /dev/null +++ b/pkgs/by-name/rw/rwalk/Cargo.lock @@ -0,0 +1,3263 @@ +# This file is automatically @generated by Cargo. +# It is not intended for manual editing. +version = 3 + +[[package]] +name = "addr2line" +version = "0.21.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8a30b2e23b9e17a9f90641c7ab1549cd9b44f296d3ccbf309d2863cfe398a0cb" +dependencies = [ + "gimli", +] + +[[package]] +name = "adler" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" + +[[package]] +name = "ahash" +version = "0.8.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e89da841a80418a9b391ebaea17f5c112ffaaa96f621d2c285b5174da76b9011" +dependencies = [ + "cfg-if", + "const-random", + "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 = "ansi-str" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1cf4578926a981ab0ca955dc023541d19de37112bc24c1a197bd806d3d86ad1d" +dependencies = [ + "ansitok", +] + +[[package]] +name = "ansi_term" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d52a9bb7ec0cf484c551830a7ce27bd20d67eac647e1befb56b0be4ee39a55d2" +dependencies = [ + "winapi", +] + +[[package]] +name = "ansitok" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "220044e6a1bb31ddee4e3db724d29767f352de47445a6cd75e1a173142136c83" +dependencies = [ + "nom 7.1.3", + "vte 0.10.1", +] + +[[package]] +name = "anstream" +version = "0.6.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8acc5369981196006228e28809f761875c0327210a891e941f4c683b3a99529b" +dependencies = [ + "anstyle", + "anstyle-parse", + "anstyle-query", + "anstyle-wincon", + "colorchoice", + "is_terminal_polyfill", + "utf8parse", +] + +[[package]] +name = "anstyle" +version = "1.0.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "55cc3b69f167a1ef2e161439aa98aed94e6028e5f9a59be9a6ffb47aef1651f9" + +[[package]] +name = "anstyle-parse" +version = "0.2.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3b2d16507662817a6a20a9ea92df6652ee4f94f914589377d69f3b21bc5798a9" +dependencies = [ + "utf8parse", +] + +[[package]] +name = "anstyle-query" +version = "1.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "79947af37f4177cfead1110013d678905c37501914fba0efea834c3fe9a8d60c" +dependencies = [ + "windows-sys 0.59.0", +] + +[[package]] +name = "anstyle-wincon" +version = "3.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2109dbce0e72be3ec00bed26e6a7479ca384ad226efdd66db8fa2e3a38c83125" +dependencies = [ + "anstyle", + "windows-sys 0.59.0", +] + +[[package]] +name = "arrayvec" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "23b62fc65de8e4e7f52534fb52b0f3ed04746ae267519eef2a83941e8085068b" + +[[package]] +name = "async-trait" +version = "0.1.83" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "721cae7de5c34fbb2acd27e21e6d2cf7b886dce0c27388d46c4e6c47ea4318dd" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.90", +] + +[[package]] +name = "atty" +version = "0.2.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8" +dependencies = [ + "hermit-abi 0.1.19", + "libc", + "winapi", +] + +[[package]] +name = "autocfg" +version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26" + +[[package]] +name = "backtrace" +version = "0.3.71" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "26b05800d2e817c8b3b4b54abd461726265fa9789ae34330622f2db9ee696f9d" +dependencies = [ + "addr2line", + "cc", + "cfg-if", + "libc", + "miniz_oxide", + "object", + "rustc-demangle", +] + +[[package]] +name = "base64" +version = "0.22.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6" + +[[package]] +name = "better-panic" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6fa9e1d11a268684cbd90ed36370d7577afb6c62d912ddff5c15fc34343e5036" +dependencies = [ + "backtrace", + "console", +] + +[[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 = "bytecount" +version = "0.6.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5ce89b21cab1437276d2650d57e971f9d548a2d9037cc231abdc0562b97498ce" + +[[package]] +name = "byteorder" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" + +[[package]] +name = "bytes" +version = "1.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "325918d6fe32f23b19878fe4b34794ae41fc19ddbe53b10571a4874d44ffd39b" + +[[package]] +name = "cc" +version = "1.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c31a0499c1dc64f458ad13872de75c0eb7e3fdb0e67964610c914b034fc5956e" +dependencies = [ + "shlex", +] + +[[package]] +name = "cfg-if" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" + +[[package]] +name = "clap" +version = "4.5.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3135e7ec2ef7b10c6ed8950f0f792ed96ee093fa088608f1c76e569722700c84" +dependencies = [ + "clap_builder", + "clap_derive", +] + +[[package]] +name = "clap-markdown" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8ebc67e6266e14f8b31541c2f204724fa2ac7ad5c17d6f5908fbb92a60f42cff" +dependencies = [ + "clap", +] + +[[package]] +name = "clap_builder" +version = "4.5.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "30582fc632330df2bd26877bde0c1f4470d57c582bbc070376afcd04d8cb4838" +dependencies = [ + "anstream", + "anstyle", + "clap_lex", + "strsim", + "terminal_size", +] + +[[package]] +name = "clap_complete" +version = "4.5.40" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ac2e663e3e3bed2d32d065a8404024dad306e699a04263ec59919529f803aee9" +dependencies = [ + "clap", +] + +[[package]] +name = "clap_complete_nushell" +version = "4.5.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "315902e790cc6e5ddd20cbd313c1d0d49db77f191e149f96397230fb82a17677" +dependencies = [ + "clap", + "clap_complete", +] + +[[package]] +name = "clap_derive" +version = "4.5.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4ac6a0c7b1a9e9a5186361f67dfa1b88213572f427fb9ab038efb2bd8c582dab" +dependencies = [ + "heck 0.5.0", + "proc-macro2", + "quote", + "syn 2.0.90", +] + +[[package]] +name = "clap_lex" +version = "0.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f46ad14479a25103f283c0f10005961cf086d8dc42205bb44c46ac563475dca6" + +[[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 = "color-eyre" +version = "0.6.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "55146f5e46f237f7423d74111267d4597b59b0dad0ffaf7303bce9945d843ad5" +dependencies = [ + "backtrace", + "color-spantrace", + "eyre", + "indenter", + "once_cell", + "owo-colors", + "tracing-error", +] + +[[package]] +name = "color-spantrace" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cd6be1b2a7e382e2b98b43b2adcca6bb0e465af0bdd38123873ae61eb17a72c2" +dependencies = [ + "once_cell", + "owo-colors", + "tracing-core", + "tracing-error", +] + +[[package]] +name = "colorchoice" +version = "1.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5b63caa9aa9397e2d9480a9b13673856c78d8ac123288526c37d7839f2a86990" + +[[package]] +name = "colored" +version = "2.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "117725a109d387c937a1533ce01b450cbde6b88abceea8473c4d7a85853cda3c" +dependencies = [ + "lazy_static 1.5.0", + "windows-sys 0.59.0", +] + +[[package]] +name = "config" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1b1b9d958c2b1368a663f05538fc1b5975adce1e19f435acceae987aceeeb369" +dependencies = [ + "lazy_static 1.5.0", + "nom 5.1.3", + "rust-ini", + "serde 1.0.216", + "serde-hjson", + "serde_json", + "toml 0.5.11", + "yaml-rust", +] + +[[package]] +name = "console" +version = "0.15.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ea3c6ecd8059b57859df5c69830340ed3c41d30e3da0c1cbed90a96ac853041b" +dependencies = [ + "encode_unicode", + "libc", + "once_cell", + "unicode-width 0.2.0", + "windows-sys 0.59.0", +] + +[[package]] +name = "const-random" +version = "0.1.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "87e00182fe74b066627d63b85fd550ac2998d4b0bd86bfed477a0ae4c7c71359" +dependencies = [ + "const-random-macro", +] + +[[package]] +name = "const-random-macro" +version = "0.1.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f9d839f2a20b0aee515dc581a6172f2321f96cab76c1a38a4c584a194955390e" +dependencies = [ + "getrandom", + "once_cell", + "tiny-keccak", +] + +[[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 = "crunchy" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7" + +[[package]] +name = "cssparser" +version = "0.31.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5b3df4f93e5fbbe73ec01ec8d3f68bba73107993a5b1e7519273c32db9b0d5be" +dependencies = [ + "cssparser-macros", + "dtoa-short", + "itoa", + "phf 0.11.2", + "smallvec", +] + +[[package]] +name = "cssparser-macros" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "13b588ba4ac1a99f7f2964d24b3d896ddc6bf847ee3855dbd4366f058cfcd331" +dependencies = [ + "quote", + "syn 2.0.90", +] + +[[package]] +name = "csv" +version = "1.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "acdc4883a9c96732e4733212c01447ebd805833b7275a73ca3ee080fd77afdaf" +dependencies = [ + "csv-core", + "itoa", + "ryu", + "serde 1.0.216", +] + +[[package]] +name = "csv-core" +version = "0.1.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5efa2b3d7902f4b634a20cae3c9c4e6209dc4779feb6863329607560143efa70" +dependencies = [ + "memchr", +] + +[[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 2.0.90", +] + +[[package]] +name = "directories" +version = "4.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f51c5d4ddabd36886dd3e1438cb358cdcb0d7c499cb99cb4ac2e38e18b5cb210" +dependencies = [ + "dirs-sys 0.3.7", +] + +[[package]] +name = "dirs" +version = "5.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "44c45a9d03d6676652bcb5e724c7e988de1acad23a711b5217ab9cbecbec2225" +dependencies = [ + "dirs-sys 0.4.1", +] + +[[package]] +name = "dirs-sys" +version = "0.3.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1b1d1d91c932ef41c0f2663aa8b0ca0342d444d842c06914aa0a7e352d0bada6" +dependencies = [ + "libc", + "redox_users", + "winapi", +] + +[[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 = "displaydoc" +version = "0.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.90", +] + +[[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 = "ego-tree" +version = "0.6.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "12a0bb14ac04a9fcf170d0bbbef949b44cc492f4452bd20c095636956f653642" + +[[package]] +name = "either" +version = "1.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "60b1af1c220855b6ceac025d3f6ecdd2b7c4894bfe9cd9bda4fbb4bc7c0d4cf0" + +[[package]] +name = "encode_unicode" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "34aa73646ffb006b8f5147f3dc182bd4bcb190227ce861fc4a4844bf8e3cb2c0" + +[[package]] +name = "endian-type" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c34f04666d835ff5d62e058c3995147c06f42fe86ff053337632bca83e42702d" + +[[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 = "equivalent" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" + +[[package]] +name = "errno" +version = "0.3.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "33d852cb9b869c2a9b3df2f71a3074817f01e1844f839a144f5fcef059a4eb5d" +dependencies = [ + "libc", + "windows-sys 0.59.0", +] + +[[package]] +name = "error-code" +version = "3.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a5d9305ccc6942a704f4335694ecd3de2ea531b114ac2d51f5f843750787a92f" + +[[package]] +name = "eyre" +version = "0.6.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7cd915d99f24784cdc19fd37ef22b97e3ff0ae756c7e492e9fbfe897d61e2aec" +dependencies = [ + "indenter", + "once_cell", +] + +[[package]] +name = "fastrand" +version = "2.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "37909eebbb50d72f9059c3b6d82c0463f2ff062c9e95845c43a6c9c0355411be" + +[[package]] +name = "fd-lock" +version = "4.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7e5768da2206272c81ef0b5e951a41862938a6070da63bcea197899942d3b947" +dependencies = [ + "cfg-if", + "rustix", + "windows-sys 0.52.0", +] + +[[package]] +name = "fixedbitset" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80" + +[[package]] +name = "fnv" +version = "1.0.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" + +[[package]] +name = "foreign-types" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1" +dependencies = [ + "foreign-types-shared", +] + +[[package]] +name = "foreign-types-shared" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" + +[[package]] +name = "form_urlencoded" +version = "1.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e13624c2627564efccf4934284bdd98cbaa14e79b0b5a141218e507b3a823456" +dependencies = [ + "percent-encoding", +] + +[[package]] +name = "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.3.31" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "65bc07b1a8bc7c85c5f2e110c476c7389b4554ba72af57d8445ea63a576b0876" +dependencies = [ + "futures-channel", + "futures-core", + "futures-executor", + "futures-io", + "futures-sink", + "futures-task", + "futures-util", +] + +[[package]] +name = "futures-channel" +version = "0.3.31" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2dff15bf788c671c1934e366d07e30c1814a8ef514e1af724a602e8a2fbe1b10" +dependencies = [ + "futures-core", + "futures-sink", +] + +[[package]] +name = "futures-core" +version = "0.3.31" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "05f29059c0c2090612e8d742178b0580d2dc940c837851ad723096f87af6663e" + +[[package]] +name = "futures-executor" +version = "0.3.31" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e28d1d997f585e54aebc3f97d39e72338912123a67330d723fdbb564d646c9f" +dependencies = [ + "futures-core", + "futures-task", + "futures-util", +] + +[[package]] +name = "futures-io" +version = "0.3.31" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9e5c1b78ca4aae1ac06c48a526a655760685149f0d465d21f37abfe57ce075c6" + +[[package]] +name = "futures-macro" +version = "0.3.31" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "162ee34ebcb7c64a8abebc059ce0fee27c2262618d7b60ed8faf72fef13c3650" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.90", +] + +[[package]] +name = "futures-sink" +version = "0.3.31" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e575fab7d1e0dcb8d0c7bcf9a63ee213816ab51902e6d244a95819acacf1d4f7" + +[[package]] +name = "futures-task" +version = "0.3.31" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f90f7dce0722e95104fcb095585910c0977252f286e354b5e3bd38902cd99988" + +[[package]] +name = "futures-util" +version = "0.3.31" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9fa08315bb612088cc391249efdc3bc77536f16c91f6cf495e6fbe85b20a4a81" +dependencies = [ + "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 = "getopts" +version = "0.2.21" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "14dbbfd5c71d70241ecf9e6f13737f7b5ce823821063188d7e46c41d371eebd5" +dependencies = [ + "unicode-width 0.1.14", +] + +[[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 = "gimli" +version = "0.28.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4271d37baee1b8c7e4b708028c57d816cf9d2434acb33a549475f78c181f6253" + +[[package]] +name = "hashbrown" +version = "0.15.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bf151400ff0baff5465007dd2f3e717f3fe502074ca563069ce3a6629d07b289" + +[[package]] +name = "heck" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" + +[[package]] +name = "heck" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea" + +[[package]] +name = "hermit-abi" +version = "0.1.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33" +dependencies = [ + "libc", +] + +[[package]] +name = "hermit-abi" +version = "0.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024" + +[[package]] +name = "hermit-abi" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fbf6a919d6cf397374f7dfeeea91d974c7c0a7221d0d0f4f20d859d329e53fcc" + +[[package]] +name = "home" +version = "0.5.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "589533453244b0995c858700322199b2becb13b627df2851f64a2775d024abcf" +dependencies = [ + "windows-sys 0.59.0", +] + +[[package]] +name = "html5ever" +version = "0.27.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c13771afe0e6e846f1e67d038d4cb29998a6779f93c809212e4e9c32efd244d4" +dependencies = [ + "log", + "mac", + "markup5ever", + "proc-macro2", + "quote", + "syn 2.0.90", +] + +[[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" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f16ca2af56261c99fba8bac40a10251ce8188205a4c448fbb745a2e4daa76fea" +dependencies = [ + "bytes", + "fnv", + "itoa", +] + +[[package]] +name = "http-body" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1efedce1fb8e6913f23e0c92de8e62cd5b772a67e7b3946df930a62566c93184" +dependencies = [ + "bytes", + "http 1.2.0", +] + +[[package]] +name = "http-body-util" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "793429d76616a256bcb62c2a2ec2bed781c8307e797e2598c50010f2bee2544f" +dependencies = [ + "bytes", + "futures-util", + "http 1.2.0", + "http-body", + "pin-project-lite", +] + +[[package]] +name = "http-rest-file" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "92d2f9d7798b724494ce3c33694afb86fb67bc33bcd03877c6f38953a180c05f" +dependencies = [ + "http 0.2.12", + "regex", + "serde 1.0.216", + "serde_json", + "thiserror", + "url", +] + +[[package]] +name = "httparse" +version = "1.9.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7d71d3574edd2771538b901e6549113b4006ece66150fb69c0fb6d9a2adae946" + +[[package]] +name = "human-panic" +version = "2.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "80b84a66a325082740043a6c28bbea400c129eac0d3a27673a1de971e44bf1f7" +dependencies = [ + "anstream", + "anstyle", + "backtrace", + "os_info", + "serde 1.0.216", + "serde_derive", + "toml 0.8.19", + "uuid", +] + +[[package]] +name = "humantime" +version = "2.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" + +[[package]] +name = "hyper" +version = "1.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "256fb8d4bd6413123cc9d91832d78325c48ff41677595be797d90f42969beae0" +dependencies = [ + "bytes", + "futures-channel", + "futures-util", + "http 1.2.0", + "http-body", + "httparse", + "itoa", + "pin-project-lite", + "smallvec", + "tokio", + "want", +] + +[[package]] +name = "hyper-tls" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "70206fc6890eaca9fde8a0bf71caa2ddfc9fe045ac9e5c70df101a7dbde866e0" +dependencies = [ + "bytes", + "http-body-util", + "hyper", + "hyper-util", + "native-tls", + "tokio", + "tokio-native-tls", + "tower-service", +] + +[[package]] +name = "hyper-util" +version = "0.1.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "df2dcfbe0677734ab2f3ffa7fa7bfd4706bfdc1ef393f2ee30184aed67e631b4" +dependencies = [ + "bytes", + "futures-channel", + "futures-util", + "http 1.2.0", + "http-body", + "hyper", + "pin-project-lite", + "socket2", + "tokio", + "tower-service", + "tracing", +] + +[[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_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_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", + "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", + "stable_deref_trait", + "tinystr", + "writeable", + "yoke", + "zerofrom", + "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 2.0.90", +] + +[[package]] +name = "idna" +version = "1.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "686f825264d630750a544639377bae737628043f20d38bbc029e8f29ea968a7e" +dependencies = [ + "idna_adapter", + "smallvec", + "utf8_iter", +] + +[[package]] +name = "idna_adapter" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "daca1df1c957320b2cf139ac61e7bd64fed304c5040df000a745aa1de3b4ef71" +dependencies = [ + "icu_normalizer", + "icu_properties", +] + +[[package]] +name = "indenter" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ce23b50ad8242c51a442f3ff322d56b02f08852c77e4c0b4d3fd684abc89c683" + +[[package]] +name = "indexmap" +version = "2.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "62f822373a4fe84d4bb149bf54e584a7f4abec90e072ed49cda0edea5b95471f" +dependencies = [ + "equivalent", + "hashbrown", +] + +[[package]] +name = "indicatif" +version = "0.17.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cbf675b85ed934d3c67b5c5469701eec7db22689d0a2139d856e0925fa28b281" +dependencies = [ + "console", + "number_prefix", + "portable-atomic", + "unicode-segmentation", + "unicode-width 0.2.0", + "web-time", +] + +[[package]] +name = "instant" +version = "0.1.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e0242819d153cba4b4b05a5a8f2a7e9bbf97b6055b2a002b395c96b5ff3c0222" +dependencies = [ + "cfg-if", +] + +[[package]] +name = "ipnet" +version = "2.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ddc24109865250148c2e0f3d25d4f0f479571723792d3802153c60922a4fb708" + +[[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 = "is_terminal_polyfill" +version = "1.70.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7943c866cc5cd64cbc25b2e01621d07fa8eb2a1a23160ee81ce38704e97b8ecf" + +[[package]] +name = "itertools" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ba291022dbbd398a455acf126c1e341954079855bc60dfdda641363bd6922569" +dependencies = [ + "either", +] + +[[package]] +name = "itoa" +version = "1.0.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d75a2a4b1b190afb6f5425f10f6a8f959d2ea0b9c2b1d79553551850539e4674" + +[[package]] +name = "js-sys" +version = "0.3.76" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6717b6b5b077764fb5966237269cb3c64edddde4b14ce42647430a78ced9e7b7" +dependencies = [ + "once_cell", + "wasm-bindgen", +] + +[[package]] +name = "lazy_static" +version = "0.2.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "76f033c7ad61445c5b347c7382dd1237847eb1bce590fe50365dcb33d546be73" + +[[package]] +name = "lazy_static" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe" + +[[package]] +name = "lexical-core" +version = "0.7.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6607c62aa161d23d17a9072cc5da0be67cdfc89d3afb1e8d9c842bebc2525ffe" +dependencies = [ + "arrayvec", + "bitflags 1.3.2", + "cfg-if", + "ryu", + "static_assertions", +] + +[[package]] +name = "libc" +version = "0.2.169" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b5aba8db14291edd000dfcc4d620c7ebfb122c613afb886ca8803fa4e128a20a" + +[[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 = "linked-hash-map" +version = "0.5.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0717cef1bc8b636c6e1c1bbdefc09e6322da8a9321966e8928ef80d20f7f770f" + +[[package]] +name = "linux-raw-sys" +version = "0.4.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89" + +[[package]] +name = "litemap" +version = "0.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4ee93343901ab17bd981295f2cf0026d4ad018c7c31ba84549a4ddbb47a45104" + +[[package]] +name = "lock_api" +version = "0.4.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "07af8b9cdd281b7915f413fa73f29ebd5d55d0d3f0155584dade1ff18cea1b17" +dependencies = [ + "autocfg", + "scopeguard", + "serde 1.0.216", +] + +[[package]] +name = "log" +version = "0.4.22" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24" + +[[package]] +name = "mac" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c41e0c4fef86961ac6d6f8a82609f55f31b05e4fce149ac5710e439df7619ba4" + +[[package]] +name = "markup5ever" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "16ce3abbeba692c8b8441d036ef91aea6df8da2c6b6e21c7e14d3c18e526be45" +dependencies = [ + "log", + "phf 0.11.2", + "phf_codegen 0.11.2", + "string_cache", + "string_cache_codegen", + "tendril", +] + +[[package]] +name = "md5" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "490cc448043f947bae3cbee9c203358d62dbee0db12107a74be5c30ccfd09771" + +[[package]] +name = "memchr" +version = "2.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3" + +[[package]] +name = "merge" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "10bbef93abb1da61525bbc45eeaff6473a41907d19f8f9aa5168d214e10693e9" +dependencies = [ + "merge_derive", + "num-traits 0.2.19", +] + +[[package]] +name = "merge_derive" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "209d075476da2e63b4b29e72a2ef627b840589588e71400a25e3565c4f849d07" +dependencies = [ + "proc-macro-error", + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "mime" +version = "0.3.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a" + +[[package]] +name = "minimal-lexical" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" + +[[package]] +name = "miniz_oxide" +version = "0.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b8a240ddb74feaf34a79a7add65a741f3167852fba007066dcac1ca548d89c08" +dependencies = [ + "adler", +] + +[[package]] +name = "mio" +version = "1.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2886843bf800fba2e3377cff24abf6379b4c4d5c6681eaf9ea5b0d15090450bd" +dependencies = [ + "libc", + "wasi", + "windows-sys 0.52.0", +] + +[[package]] +name = "native-tls" +version = "0.2.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a8614eb2c83d59d1c8cc974dd3f920198647674a0a035e1af1fa58707e317466" +dependencies = [ + "libc", + "log", + "openssl", + "openssl-probe", + "openssl-sys", + "schannel", + "security-framework", + "security-framework-sys", + "tempfile", +] + +[[package]] +name = "new_debug_unreachable" +version = "1.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "650eef8c711430f1a879fdd01d4745a7deea475becfb90269c06775983bbf086" + +[[package]] +name = "nibble_vec" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "77a5d83df9f36fe23f0c3648c6bbb8b0298bb5f1939c8f2704431371f4b84d43" +dependencies = [ + "smallvec", +] + +[[package]] +name = "nix" +version = "0.27.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2eb04e9c688eff1c89d72b407f168cf79bb9e867a9d3323ed6c01519eb9cc053" +dependencies = [ + "bitflags 2.6.0", + "cfg-if", + "libc", +] + +[[package]] +name = "no-std-compat" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b93853da6d84c2e3c7d730d6473e8817692dd89be387eb01b94d7f108ecb5b8c" +dependencies = [ + "spin", +] + +[[package]] +name = "nom" +version = "5.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "08959a387a676302eebf4ddbcbc611da04285579f76f88ee0506c63b1a61dd4b" +dependencies = [ + "lexical-core", + "memchr", + "version_check", +] + +[[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 = "num-traits" +version = "0.1.43" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "92e5113e9fd4cc14ded8e499429f396a20f98c772a47cc8622a736e1ec843c31" +dependencies = [ + "num-traits 0.2.19", +] + +[[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 0.3.9", + "libc", +] + +[[package]] +name = "number_prefix" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "830b246a0e5f20af87141b25c173cd1b609bd7779a4617d6ec582abaf90870f3" + +[[package]] +name = "object" +version = "0.32.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a6a622008b6e321afc04970976f62ee297fdbaa6f95318ca343e3eebb9648441" +dependencies = [ + "memchr", +] + +[[package]] +name = "once_cell" +version = "1.20.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1261fe7e33c73b354eab43b1273a57c8f967d0391e80353e51f764ac02cf6775" +dependencies = [ + "portable-atomic", +] + +[[package]] +name = "openssl" +version = "0.10.68" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6174bc48f102d208783c2c84bf931bb75927a617866870de8a4ea85597f871f5" +dependencies = [ + "bitflags 2.6.0", + "cfg-if", + "foreign-types", + "libc", + "once_cell", + "openssl-macros", + "openssl-sys", +] + +[[package]] +name = "openssl-macros" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.90", +] + +[[package]] +name = "openssl-probe" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" + +[[package]] +name = "openssl-src" +version = "300.4.1+3.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "faa4eac4138c62414b5622d1b31c5c304f34b406b013c079c2bbc652fdd6678c" +dependencies = [ + "cc", +] + +[[package]] +name = "openssl-sys" +version = "0.9.104" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "45abf306cbf99debc8195b66b7346498d7b10c210de50418b5ccd7ceba08c741" +dependencies = [ + "cc", + "libc", + "openssl-src", + "pkg-config", + "vcpkg", +] + +[[package]] +name = "option-ext" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "04744f49eae99ab78e0d5c0b603ab218f515ea8cfe5a456d7629ad883a3b6e7d" + +[[package]] +name = "ordered-float" +version = "2.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "68f19d67e5a2795c94e73e0bb1cc1a7edeb2e28efd39e2e1c9b7a40c1108b11c" +dependencies = [ + "num-traits 0.2.19", +] + +[[package]] +name = "os_info" +version = "3.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e5ca711d8b83edbb00b44d504503cd247c9c0bd8b0fa2694f2a1a3d8165379ce" +dependencies = [ + "log", + "serde 1.0.216", + "windows-sys 0.52.0", +] + +[[package]] +name = "owo-colors" +version = "3.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c1b04fb49957986fdce4d6ee7a65027d55d4b6d2265e5848bbb507b58ccfdb6f" + +[[package]] +name = "papergrid" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9ad43c07024ef767f9160710b3a6773976194758c7919b17e63b863db0bdf7fb" +dependencies = [ + "ansi-str", + "ansitok", + "bytecount", + "fnv", + "unicode-width 0.1.14", +] + +[[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", + "smallvec", + "windows-targets 0.52.6", +] + +[[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.6.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b4c5cc86750666a3ed20bdaf5ca2a0344f9c67674cae0515bec2da16fbaa47db" +dependencies = [ + "fixedbitset", + "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.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4fb1c3a8bc4dd4e5cfce29b44ffc14bedd2ee294559a294e2a4d4c9e9a6a13cd" +dependencies = [ + "phf_generator 0.10.0", + "phf_shared 0.10.0", +] + +[[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 2.0.90", +] + +[[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-lite" +version = "0.2.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "915a1e146535de9163f3987b8944ed8cf49a18bb0056bcebcdcece385cece4ff" + +[[package]] +name = "pin-utils" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" + +[[package]] +name = "pkg-config" +version = "0.3.31" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "953ec861398dccce10c670dfeaf3ec4911ca479e9c02154b3a215178c5f566f2" + +[[package]] +name = "portable-atomic" +version = "1.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "280dc24453071f1b63954171985a0b0d30058d287960968b9b2aca264c8d4ee6" + +[[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 = "proc-macro-error" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c" +dependencies = [ + "proc-macro-error-attr", + "proc-macro2", + "quote", + "syn 1.0.109", + "version_check", +] + +[[package]] +name = "proc-macro-error-attr" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869" +dependencies = [ + "proc-macro2", + "quote", + "version_check", +] + +[[package]] +name = "proc-macro2" +version = "1.0.92" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "37d3544b3f2748c54e147655edb5025752e2303145b5aefb3c3ea2c78b973bb0" +dependencies = [ + "unicode-ident", +] + +[[package]] +name = "ptree" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a0de80796b316aec75344095a6d2ef68ec9b8f573b9e7adc821149ba3598e270" +dependencies = [ + "ansi_term", + "atty", + "config", + "directories", + "petgraph", + "serde 1.0.216", + "serde-value", + "tint", +] + +[[package]] +name = "quote" +version = "1.0.37" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af" +dependencies = [ + "proc-macro2", +] + +[[package]] +name = "radix_trie" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c069c179fcdc6a2fe24d8d18305cf085fdbd4f922c041943e203685d6a1c58fd" +dependencies = [ + "endian-type", + "nibble_vec", +] + +[[package]] +name = "rand" +version = "0.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_syscall" +version = "0.5.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "03a862b389f93e68874fbf580b9de08dd02facb9a788ebadaf4a3fd33cf58834" +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", + "thiserror", +] + +[[package]] +name = "regex" +version = "1.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b544ef1b4eac5dc2db33ea63606ae9ffcfac26c1416a2806ae0bf5f56b201191" +dependencies = [ + "aho-corasick", + "memchr", + "regex-automata", + "regex-syntax", +] + +[[package]] +name = "regex-automata" +version = "0.4.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "809e8dc61f6de73b46c85f4c96486310fe304c434cfa43669d7b40f711150908" +dependencies = [ + "aho-corasick", + "memchr", + "regex-syntax", +] + +[[package]] +name = "regex-syntax" +version = "0.8.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2b15c43186be67a4fd63bee50d0303afffcef381492ebe2c5d87f324e1b8815c" + +[[package]] +name = "reqwest" +version = "0.12.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a77c62af46e79de0a562e1a9849205ffcb7fc1238876e9bd743357570e04046f" +dependencies = [ + "base64", + "bytes", + "futures-core", + "futures-util", + "http 1.2.0", + "http-body", + "http-body-util", + "hyper", + "hyper-tls", + "hyper-util", + "ipnet", + "js-sys", + "log", + "mime", + "native-tls", + "once_cell", + "percent-encoding", + "pin-project-lite", + "rustls-pemfile", + "serde 1.0.216", + "serde_json", + "serde_urlencoded", + "sync_wrapper", + "tokio", + "tokio-native-tls", + "tower-service", + "url", + "wasm-bindgen", + "wasm-bindgen-futures", + "web-sys", + "windows-registry", +] + +[[package]] +name = "rhai" +version = "1.20.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d0277a46f29fe3b3eb10821ca2c65a4751b686b6c84422aae31695ba167b0fbc" +dependencies = [ + "ahash", + "bitflags 2.6.0", + "instant", + "no-std-compat", + "num-traits 0.2.19", + "once_cell", + "rhai_codegen", + "serde 1.0.216", + "smallvec", + "smartstring", + "thin-vec", +] + +[[package]] +name = "rhai_codegen" +version = "2.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a5a11a05ee1ce44058fa3d5961d05194fdbe3ad6b40f904af764d81b86450e6b" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.90", +] + +[[package]] +name = "rust-ini" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3e52c148ef37f8c375d49d5a73aa70713125b7f19095948a923f80afdeb22ec2" + +[[package]] +name = "rustc-demangle" +version = "0.1.24" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "719b953e2095829ee67db738b3bfa9fa368c94900df327b3f07fe6e794d2fe1f" + +[[package]] +name = "rustix" +version = "0.38.42" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f93dc38ecbab2eb790ff964bb77fa94faf256fd3e73285fd7ba0903b76bedb85" +dependencies = [ + "bitflags 2.6.0", + "errno", + "libc", + "linux-raw-sys", + "windows-sys 0.59.0", +] + +[[package]] +name = "rustls-pemfile" +version = "2.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dce314e5fee3f39953d46bb63bb8a46d40c2f8fb7cc5a3b6cab2bde9721d6e50" +dependencies = [ + "rustls-pki-types", +] + +[[package]] +name = "rustls-pki-types" +version = "1.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d2bf47e6ff922db3825eb750c4e2ff784c6ff8fb9e13046ef6a1d1c5401b0b37" + +[[package]] +name = "rustyline" +version = "13.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "02a2d683a4ac90aeef5b1013933f6d977bd37d51ff3f4dad829d4931a7e6be86" +dependencies = [ + "bitflags 2.6.0", + "cfg-if", + "clipboard-win", + "fd-lock", + "home", + "libc", + "log", + "memchr", + "nix", + "radix_trie", + "unicode-segmentation", + "unicode-width 0.1.14", + "utf8parse", + "winapi", +] + +[[package]] +name = "rwalk" +version = "0.8.7" +dependencies = [ + "async-trait", + "better-panic", + "clap", + "clap-markdown", + "clap_complete", + "clap_complete_nushell", + "color-eyre", + "colored", + "csv", + "dirs", + "env_logger", + "futures", + "http-rest-file", + "human-panic", + "indicatif", + "itertools", + "lazy_static 1.5.0", + "log", + "md5", + "merge", + "num_cpus", + "parking_lot", + "ptree", + "regex", + "reqwest", + "rhai", + "rustyline", + "scraper", + "serde 1.0.216", + "serde_json", + "strip-ansi-escapes", + "strsim", + "tabled", + "tokio", + "toml 0.8.19", + "url", +] + +[[package]] +name = "ryu" +version = "1.0.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f" + +[[package]] +name = "schannel" +version = "0.1.27" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1f29ebaa345f945cec9fbbc532eb307f0fdad8161f281b6369539c8d84876b3d" +dependencies = [ + "windows-sys 0.59.0", +] + +[[package]] +name = "scopeguard" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" + +[[package]] +name = "scraper" +version = "0.19.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "761fb705fdf625482d2ed91d3f0559dcfeab2798fe2771c69560a774865d0802" +dependencies = [ + "ahash", + "cssparser", + "ego-tree", + "getopts", + "html5ever", + "once_cell", + "selectors", + "tendril", +] + +[[package]] +name = "security-framework" +version = "2.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "897b2245f0b511c87893af39b033e5ca9cce68824c4d7e7630b5a1d339658d02" +dependencies = [ + "bitflags 2.6.0", + "core-foundation", + "core-foundation-sys", + "libc", + "security-framework-sys", +] + +[[package]] +name = "security-framework-sys" +version = "2.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1863fd3768cd83c56a7f60faa4dc0d403f1b6df0a38c3c25f44b7894e45370d5" +dependencies = [ + "core-foundation-sys", + "libc", +] + +[[package]] +name = "selectors" +version = "0.25.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4eb30575f3638fc8f6815f448d50cb1a2e255b0897985c8c59f4d37b72a07b06" +dependencies = [ + "bitflags 2.6.0", + "cssparser", + "derive_more", + "fxhash", + "log", + "new_debug_unreachable", + "phf 0.10.1", + "phf_codegen 0.10.0", + "precomputed-hash", + "servo_arc", + "smallvec", +] + +[[package]] +name = "serde" +version = "0.8.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9dad3f759919b92c3068c696c15c3d17238234498bbdcc80f2c469606f948ac8" + +[[package]] +name = "serde" +version = "1.0.216" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b9781016e935a97e8beecf0c933758c97a5520d32930e460142b4cd80c6338e" +dependencies = [ + "serde_derive", +] + +[[package]] +name = "serde-hjson" +version = "0.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6a3a4e0ea8a88553209f6cc6cfe8724ecad22e1acf372793c27d995290fe74f8" +dependencies = [ + "lazy_static 1.5.0", + "num-traits 0.1.43", + "regex", + "serde 0.8.23", +] + +[[package]] +name = "serde-value" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f3a1a3341211875ef120e117ea7fd5228530ae7e7036a779fdc9117be6b3282c" +dependencies = [ + "ordered-float", + "serde 1.0.216", +] + +[[package]] +name = "serde_derive" +version = "1.0.216" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "46f859dbbf73865c6627ed570e78961cd3ac92407a2d117204c49232485da55e" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.90", +] + +[[package]] +name = "serde_json" +version = "1.0.133" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c7fceb2473b9166b2294ef05efcb65a3db80803f0b03ef86a5fc88a2b85ee377" +dependencies = [ + "itoa", + "memchr", + "ryu", + "serde 1.0.216", +] + +[[package]] +name = "serde_spanned" +version = "0.6.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "87607cb1398ed59d48732e575a4c28a7a8ebf2454b964fe3f224f2afc07909e1" +dependencies = [ + "serde 1.0.216", +] + +[[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 1.0.216", +] + +[[package]] +name = "servo_arc" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d036d71a959e00c77a63538b90a6c2390969f9772b096ea837205c6bd0491a44" +dependencies = [ + "stable_deref_trait", +] + +[[package]] +name = "sharded-slab" +version = "0.1.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f40ca3c46823713e0d4209592e8d6e826aa57e928f09752619fc696c499637f6" +dependencies = [ + "lazy_static 1.5.0", +] + +[[package]] +name = "shlex" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64" + +[[package]] +name = "signal-hook-registry" +version = "1.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a9e9e0b4211b72e7b8b6e85c807d36c212bdb33ea8587f7569562a84df5465b1" +dependencies = [ + "libc", +] + +[[package]] +name = "siphasher" +version = "0.3.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "38b58827f4464d87d377d175e90bf58eb00fd8716ff0a62f80356b5e61555d0d" + +[[package]] +name = "slab" +version = "0.4.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f92a496fb766b417c996b9c5e57daf2f7ad3b0bebe1ccfca4856390e3d3bb67" +dependencies = [ + "autocfg", +] + +[[package]] +name = "smallvec" +version = "1.13.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67" +dependencies = [ + "serde 1.0.216", +] + +[[package]] +name = "smartstring" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3fb72c633efbaa2dd666986505016c32c3044395ceaf881518399d2f4127ee29" +dependencies = [ + "autocfg", + "serde 1.0.216", + "static_assertions", + "version_check", +] + +[[package]] +name = "socket2" +version = "0.5.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c970269d99b64e60ec3bd6ad27270092a5394c4e309314b18ae3fe575695fbe8" +dependencies = [ + "libc", + "windows-sys 0.52.0", +] + +[[package]] +name = "spin" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d" + +[[package]] +name = "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 = "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 1.0.216", +] + +[[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 = "strip-ansi-escapes" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "55ff8ef943b384c414f54aefa961dd2bd853add74ec75e7ac74cf91dba62bcfa" +dependencies = [ + "vte 0.11.1", +] + +[[package]] +name = "strsim" +version = "0.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f" + +[[package]] +name = "syn" +version = "1.0.109" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", +] + +[[package]] +name = "syn" +version = "2.0.90" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "919d3b74a5dd0ccd15aeb8f93e7006bd9e14c295087c9896a110f490752bcf31" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", +] + +[[package]] +name = "sync_wrapper" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0bf256ce5efdfa370213c1dabab5935a12e49f2c58d15e9eac2870d3b4f27263" +dependencies = [ + "futures-core", +] + +[[package]] +name = "synstructure" +version = "0.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c8af7666ab7b6390ab78131fb5b0fce11d6b7a6951602017c35fa82800708971" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.90", +] + +[[package]] +name = "tabled" +version = "0.15.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4c998b0c8b921495196a48aabaf1901ff28be0760136e31604f7967b0792050e" +dependencies = [ + "ansi-str", + "ansitok", + "papergrid", + "tabled_derive", + "unicode-width 0.1.14", +] + +[[package]] +name = "tabled_derive" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4c138f99377e5d653a371cdad263615634cfc8467685dfe8e73e2b8e98f44b17" +dependencies = [ + "heck 0.4.1", + "proc-macro-error", + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "tempfile" +version = "3.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "28cce251fcbc87fac86a866eeb0d6c2d536fc16d06f184bb61aeae11aa4cee0c" +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 = [ + "futf", + "mac", + "utf-8", +] + +[[package]] +name = "termcolor" +version = "1.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "06794f8f6c5c898b3275aebefa6b8a1cb24cd2c6c79397ab15774837a0bc5755" +dependencies = [ + "winapi-util", +] + +[[package]] +name = "terminal_size" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5352447f921fda68cf61b4101566c0bdb5104eff6804d0678e5227580ab6a4e9" +dependencies = [ + "rustix", + "windows-sys 0.59.0", +] + +[[package]] +name = "thin-vec" +version = "0.2.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a38c90d48152c236a3ab59271da4f4ae63d678c5d7ad6b7714d7cb9760be5e4b" +dependencies = [ + "serde 1.0.216", +] + +[[package]] +name = "thiserror" +version = "1.0.69" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b6aaf5339b578ea85b50e080feb250a3e8ae8cfcdff9a461c9ec2904bc923f52" +dependencies = [ + "thiserror-impl", +] + +[[package]] +name = "thiserror-impl" +version = "1.0.69" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4fee6c4efc90059e10f81e6d42c60a18f76588c3d74cb83a0b242a2b6c7504c1" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.90", +] + +[[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 = "tint" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7af24570664a3074673dbbf69a65bdae0ae0b72f2949b1adfbacb736ee4d6896" +dependencies = [ + "lazy_static 0.2.11", +] + +[[package]] +name = "tiny-keccak" +version = "2.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2c9d3793400a45f954c52e73d068316d76b6f4e36977e3fcebb13a2721e80237" +dependencies = [ + "crunchy", +] + +[[package]] +name = "tinystr" +version = "0.7.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9117f5d4db391c1cf6927e7bea3db74b9a1c1add8f7eda9ffd5364f40f57b82f" +dependencies = [ + "displaydoc", + "zerovec", +] + +[[package]] +name = "tokio" +version = "1.42.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5cec9b21b0450273377fc97bd4c33a8acffc8c996c987a7c5b319a0083707551" +dependencies = [ + "backtrace", + "bytes", + "libc", + "mio", + "pin-project-lite", + "signal-hook-registry", + "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 2.0.90", +] + +[[package]] +name = "tokio-native-tls" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bbae76ab933c85776efabc971569dd6119c580d8f5d448769dec1764bf796ef2" +dependencies = [ + "native-tls", + "tokio", +] + +[[package]] +name = "toml" +version = "0.5.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f4f7f0dd8d50a853a531c426359045b1998f04219d88799810762cd4ad314234" +dependencies = [ + "serde 1.0.216", +] + +[[package]] +name = "toml" +version = "0.8.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a1ed1f98e3fdc28d6d910e6737ae6ab1a93bf1985935a1193e68f93eeb68d24e" +dependencies = [ + "serde 1.0.216", + "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 1.0.216", +] + +[[package]] +name = "toml_edit" +version = "0.22.22" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4ae48d6208a266e853d946088ed816055e556cc6028c5e8e2b84d9fa5dd7c7f5" +dependencies = [ + "indexmap", + "serde 1.0.216", + "serde_spanned", + "toml_datetime", + "winnow", +] + +[[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.41" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "784e0ac535deb450455cbfa28a6f0df145ea1bb7ae51b821cf5e7927fdcfbdd0" +dependencies = [ + "pin-project-lite", + "tracing-core", +] + +[[package]] +name = "tracing-core" +version = "0.1.33" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e672c95779cf947c5311f83787af4fa8fffd12fb27e4993211a84bdfd9610f9c" +dependencies = [ + "once_cell", + "valuable", +] + +[[package]] +name = "tracing-error" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8b1581020d7a273442f5b45074a6a57d5757ad0a47dac0e9f0bd57b81936f3db" +dependencies = [ + "tracing", + "tracing-subscriber", +] + +[[package]] +name = "tracing-subscriber" +version = "0.3.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e8189decb5ac0fa7bc8b96b7cb9b2701d60d48805aca84a238004d665fcc4008" +dependencies = [ + "sharded-slab", + "thread_local", + "tracing-core", +] + +[[package]] +name = "try-lock" +version = "0.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b" + +[[package]] +name = "unicode-ident" +version = "1.0.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "adb9e6ca4f869e1180728b7950e35922a7fc6397f7b641499e8f3ef06e50dc83" + +[[package]] +name = "unicode-segmentation" +version = "1.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f6ccf251212114b54433ec949fd6a7841275f9ada20dddd2f29e9ceea4501493" + +[[package]] +name = "unicode-width" +version = "0.1.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7dd6e30e90baa6f72411720665d41d89b9a3d039dc45b8faea1ddd07f617f6af" + +[[package]] +name = "unicode-width" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1fc81956842c57dac11422a97c3b8195a1ff727f06e85c84ed2e8aa277c9a0fd" + +[[package]] +name = "url" +version = "2.5.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "32f8b686cadd1473f4bd0117a5d28d36b1ade384ea9b5069a1c40aefed7fda60" +dependencies = [ + "form_urlencoded", + "idna", + "percent-encoding", +] + +[[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 = "utf8parse" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821" + +[[package]] +name = "uuid" +version = "1.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f8c5f0a0af699448548ad1a2fbf920fb4bee257eae39953ba95cb84891a0446a" +dependencies = [ + "getrandom", +] + +[[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 = "version_check" +version = "0.9.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a" + +[[package]] +name = "vte" +version = "0.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6cbce692ab4ca2f1f3047fcf732430249c0e971bfdd2b234cf2c47ad93af5983" +dependencies = [ + "arrayvec", + "utf8parse", + "vte_generate_state_changes", +] + +[[package]] +name = "vte" +version = "0.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f5022b5fbf9407086c180e9557be968742d839e68346af7792b8592489732197" +dependencies = [ + "utf8parse", + "vte_generate_state_changes", +] + +[[package]] +name = "vte_generate_state_changes" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2e369bee1b05d510a7b4ed645f5faa90619e05437111783ea5848f28d97d3c2e" +dependencies = [ + "proc-macro2", + "quote", +] + +[[package]] +name = "want" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bfa7760aed19e106de2c7c0b581b509f2f25d3dacaf737cb82ac61bc6d760b0e" +dependencies = [ + "try-lock", +] + +[[package]] +name = "wasi" +version = "0.11.0+wasi-snapshot-preview1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" + +[[package]] +name = "wasm-bindgen" +version = "0.2.99" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a474f6281d1d70c17ae7aa6a613c87fce69a127e2624002df63dcb39d6cf6396" +dependencies = [ + "cfg-if", + "once_cell", + "wasm-bindgen-macro", +] + +[[package]] +name = "wasm-bindgen-backend" +version = "0.2.99" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5f89bb38646b4f81674e8f5c3fb81b562be1fd936d84320f3264486418519c79" +dependencies = [ + "bumpalo", + "log", + "proc-macro2", + "quote", + "syn 2.0.90", + "wasm-bindgen-shared", +] + +[[package]] +name = "wasm-bindgen-futures" +version = "0.4.49" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "38176d9b44ea84e9184eff0bc34cc167ed044f816accfe5922e54d84cf48eca2" +dependencies = [ + "cfg-if", + "js-sys", + "once_cell", + "wasm-bindgen", + "web-sys", +] + +[[package]] +name = "wasm-bindgen-macro" +version = "0.2.99" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2cc6181fd9a7492eef6fef1f33961e3695e4579b9872a6f7c83aee556666d4fe" +dependencies = [ + "quote", + "wasm-bindgen-macro-support", +] + +[[package]] +name = "wasm-bindgen-macro-support" +version = "0.2.99" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "30d7a95b763d3c45903ed6c81f156801839e5ee968bb07e534c44df0fcd330c2" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.90", + "wasm-bindgen-backend", + "wasm-bindgen-shared", +] + +[[package]] +name = "wasm-bindgen-shared" +version = "0.2.99" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "943aab3fdaaa029a6e0271b35ea10b72b943135afe9bffca82384098ad0e06a6" + +[[package]] +name = "web-sys" +version = "0.3.76" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "04dd7223427d52553d3702c004d3b2fe07c148165faa56313cb00211e31c12bc" +dependencies = [ + "js-sys", + "wasm-bindgen", +] + +[[package]] +name = "web-time" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5a6580f308b1fad9207618087a65c04e7a10bc77e02c8e84e9b00dd4b12fa0bb" +dependencies = [ + "js-sys", + "wasm-bindgen", +] + +[[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-registry" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e400001bb720a623c1c69032f8e3e4cf09984deec740f007dd2b03ec864804b0" +dependencies = [ + "windows-result", + "windows-strings", + "windows-targets 0.52.6", +] + +[[package]] +name = "windows-result" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1d1043d8214f791817bab27572aaa8af63732e11bf84aa21a45a78d6c317ae0e" +dependencies = [ + "windows-targets 0.52.6", +] + +[[package]] +name = "windows-strings" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4cd9b125c486025df0eabcb585e62173c6c9eddcec5d117d3b6e8c30e2ee4d10" +dependencies = [ + "windows-result", + "windows-targets 0.52.6", +] + +[[package]] +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 = "winnow" +version = "0.6.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "36c1fec1a2bb5866f07c25f68c26e565c4c200aebb96d7e55710c19d3e8ac49b" +dependencies = [ + "memchr", +] + +[[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" + +[[package]] +name = "yaml-rust" +version = "0.4.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "56c1936c4cc7a1c9ab21a1ebb602eb942ba868cbd44a99cb7cdc5892335e1c85" +dependencies = [ + "linked-hash-map", +] + +[[package]] +name = "yoke" +version = "0.7.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "120e6aef9aa629e3d4f52dc8cc43a015c7724194c97dfaf45180d2daf2b77f40" +dependencies = [ + "serde 1.0.216", + "stable_deref_trait", + "yoke-derive", + "zerofrom", +] + +[[package]] +name = "yoke-derive" +version = "0.7.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2380878cad4ac9aac1e2435f3eb4020e8374b5f13c296cb75b4620ff8e229154" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.90", + "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 2.0.90", +] + +[[package]] +name = "zerofrom" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cff3ee08c995dee1859d998dea82f7374f2826091dd9cd47def953cae446cd2e" +dependencies = [ + "zerofrom-derive", +] + +[[package]] +name = "zerofrom-derive" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "595eed982f7d355beb85837f651fa22e90b3c044842dc7f2c2842c086f295808" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.90", + "synstructure", +] + +[[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 2.0.90", +] diff --git a/pkgs/by-name/rw/rwalk/package.nix b/pkgs/by-name/rw/rwalk/package.nix new file mode 100644 index 000000000000..72ea23c1fadc --- /dev/null +++ b/pkgs/by-name/rw/rwalk/package.nix @@ -0,0 +1,54 @@ +{ + lib, + rustPlatform, + fetchFromGitHub, + pkg-config, + openssl, + stdenv, + darwin, +}: + +rustPlatform.buildRustPackage rec { + pname = "rwalk"; + version = "0.8.7"; + + src = fetchFromGitHub { + owner = "cestef"; + repo = "rwalk"; + tag = "v${version}"; + hash = "sha256-rEecl8KdPqPreCRq8CZCBfpedInYD7+gfCwCst+VS90="; + }; + + cargoLock = { + lockFile = ./Cargo.lock; + }; + + postPatch = '' + ln -s ${./Cargo.lock} Cargo.lock + ''; + + nativeBuildInputs = [ + pkg-config + ]; + + buildInputs = + [ + openssl + ] + ++ lib.optionals stdenv.isDarwin [ + darwin.apple_sdk.frameworks.Security + ]; + + env = { + OPENSSL_NO_VENDOR = true; + }; + + meta = { + description = "A blazingly fast web directory scanner written in Rust"; + homepage = "https://github.com/cestef/rwalk"; + changelog = "https://github.com/cestef/rwalk/blob/${src.tag}/CHANGELOG.md"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ pwnwriter ]; + mainProgram = "rwalk"; + }; +} From ab94430a32417f36104660412d2e7742847b1303 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 21 Dec 2024 19:10:58 +0000 Subject: [PATCH 113/429] kickstart: 0.4.0 -> 0.5.0 --- pkgs/by-name/ki/kickstart/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ki/kickstart/package.nix b/pkgs/by-name/ki/kickstart/package.nix index 3f22c0373771..c02ed94dfab6 100644 --- a/pkgs/by-name/ki/kickstart/package.nix +++ b/pkgs/by-name/ki/kickstart/package.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage rec { pname = "kickstart"; - version = "0.4.0"; + version = "0.5.0"; src = fetchFromGitHub { owner = "Keats"; repo = "kickstart"; rev = "v${version}"; - hash = "sha256-GIBSHPIUq+skTx5k+94/K1FJ30BCboWPA6GadgXwp+I="; + hash = "sha256-4POxv6fIrp+wKb9V+6Y2YPx3FXp3hpnkq+62H9TwGII="; }; - cargoHash = "sha256-cOcldEte7zxyxzvj7v7uCczs5AQ+v4mMfqmTK9hrv1o="; + cargoHash = "sha256-wMy3c4iqHOWmbJNCdy4/2XVgyF6lcAxSs3pAaD53JAg="; checkFlags = [ # remote access From 1ad7b8d1293fa3fe9ed89bcb6c19374622bfc293 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 21 Dec 2024 19:18:53 +0000 Subject: [PATCH 114/429] zxtune: 5080 -> 5081 --- pkgs/by-name/zx/zxtune/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/zx/zxtune/package.nix b/pkgs/by-name/zx/zxtune/package.nix index d938a5dc1b4e..764bedfa9679 100644 --- a/pkgs/by-name/zx/zxtune/package.nix +++ b/pkgs/by-name/zx/zxtune/package.nix @@ -43,7 +43,7 @@ let ++ lib.optional withQt (if (supportWayland) then qt5.qtwayland else qt5.qtbase); in stdenv.mkDerivation rec { pname = "zxtune"; - version = "5080"; + version = "5081"; outputs = [ "out" ]; @@ -51,7 +51,7 @@ in stdenv.mkDerivation rec { owner = "zxtune"; repo = "zxtune"; rev = "r${version}"; - hash = "sha256-It+CTDuh6Bxbac4KqFc7MmOXpkEhqSyiPs81Z3T1wyc="; + hash = "sha256-gim73TF+zBnyxq2qu4uJnr0bCBfWlyYT/75UaZnij8c="; }; passthru.updateScript = nix-update-script { From 226fc8388b008f660cc94351a3c2c5236689ace4 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 21 Dec 2024 19:22:28 +0000 Subject: [PATCH 115/429] yourkit-java: 2024.9-b160 -> 2024.9-b161 --- pkgs/by-name/yo/yourkit-java/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/yo/yourkit-java/package.nix b/pkgs/by-name/yo/yourkit-java/package.nix index 693bc142679f..6d3e410b65c5 100644 --- a/pkgs/by-name/yo/yourkit-java/package.nix +++ b/pkgs/by-name/yo/yourkit-java/package.nix @@ -9,7 +9,7 @@ let vPath = v: lib.elemAt (lib.splitString "-" v) 0; - version = "2024.9-b160"; + version = "2024.9-b161"; arches = { aarch64-linux = "arm64"; @@ -20,8 +20,8 @@ let arches.${stdenvNoCC.targetPlatform.system} or (throw "Unsupported system"); hashes = { - arm64 = "sha256-/3LoKuB3LwjqnlPBDjRsXmal8KiNPtImBn/5vM5GQRI="; - x64 = "sha256-TBzKaEC+JjI9WQb3CmsHbt5u5614bloTfdiamXromSk="; + arm64 = "sha256-fUXZau0tK6CDfrVHZeHFpnoZQyNRVyuBYwY8ChjLqjc="; + x64 = "sha256-3AJ0PFEbDaY+x7XgcV+YWyl7wVyefjHYd9DB57I5FKc="; }; desktopItem = makeDesktopItem { From 4d4e9f6ae91194849aecb191e1954b25fd54ce78 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 21 Dec 2024 20:28:54 +0000 Subject: [PATCH 116/429] zrok: 0.4.44 -> 0.4.45 --- pkgs/tools/networking/zrok/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/networking/zrok/default.nix b/pkgs/tools/networking/zrok/default.nix index 4d26579be450..93ead3af039c 100644 --- a/pkgs/tools/networking/zrok/default.nix +++ b/pkgs/tools/networking/zrok/default.nix @@ -18,15 +18,15 @@ let hash = { - x86_64-linux = "sha256-oga8WQYxFeJlXhkJRpgb08QSV1vA7rfbVzwxxdl8xUw="; - aarch64-linux = "sha256-Xa7CGpv35fZDZjYmR3y3NUriOt1/I85556P32eP9UjQ="; - armv7l-linux = "sha256-k3FGn5pZX5Iqzh0J/nclQC4+n6CMrr+JPt2/rabnWvo="; + x86_64-linux = "sha256-eF+PazWfQjWvrQrrf1D/8wEJgzQZGzpWEEYsJTN07pM="; + aarch64-linux = "sha256-y8Vqh4I8BW2KfK6TVbRAT1Hx0G0oAJrkCDihgO8VH18="; + armv7l-linux = "sha256-RSwBFM6glrVbl7KttGT7kl/sB8ctyVhu+MZUXSmFyYY="; } .${system} or throwSystem; in stdenv.mkDerivation (finalAttrs: { pname = "zrok"; - version = "0.4.44"; + version = "0.4.45"; src = fetchzip { url = "https://github.com/openziti/zrok/releases/download/v${finalAttrs.version}/zrok_${finalAttrs.version}_${plat}.tar.gz"; From 73feb7813e3754b07aa0fe0ca6100783de97db8e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 21 Dec 2024 20:44:50 +0000 Subject: [PATCH 117/429] graphite-cli: 1.4.8 -> 1.4.11 --- pkgs/by-name/gr/graphite-cli/package-lock.json | 4 ++-- pkgs/by-name/gr/graphite-cli/package.nix | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/gr/graphite-cli/package-lock.json b/pkgs/by-name/gr/graphite-cli/package-lock.json index 446a91efc0ff..f7f98e5226d8 100644 --- a/pkgs/by-name/gr/graphite-cli/package-lock.json +++ b/pkgs/by-name/gr/graphite-cli/package-lock.json @@ -1,12 +1,12 @@ { "name": "@withgraphite/graphite-cli", - "version": "1.4.8", + "version": "1.4.11", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "@withgraphite/graphite-cli", - "version": "1.4.8", + "version": "1.4.11", "hasInstallScript": true, "license": "None", "dependencies": { diff --git a/pkgs/by-name/gr/graphite-cli/package.nix b/pkgs/by-name/gr/graphite-cli/package.nix index 8066ec5321ed..34d94ab3c8d0 100644 --- a/pkgs/by-name/gr/graphite-cli/package.nix +++ b/pkgs/by-name/gr/graphite-cli/package.nix @@ -8,14 +8,14 @@ buildNpmPackage rec { pname = "graphite-cli"; - version = "1.4.8"; + version = "1.4.11"; src = fetchurl { url = "https://registry.npmjs.org/@withgraphite/graphite-cli/-/graphite-cli-${version}.tgz"; - hash = "sha256-PzoMDBoWAXVbK3itcpybpjZ+lWd8tS7UOFtWWMwTh5U="; + hash = "sha256-gky/nv7GS6hR3Zjm+J1Ob0SSbw4PneOm54WK7Ls9i9g="; }; - npmDepsHash = "sha256-mybKtbguxxHkPUm9oSYPjxGZxf6tEy4OKqyI5dNQFnE="; + npmDepsHash = "sha256-WvLASGTsNbM/IC+qyOAruiYKnHSx0bGc03Bh1wtnPn8="; postPatch = '' ln -s ${./package-lock.json} package-lock.json From cb0f1fafa83dd30199cbeb6e58a7de4904b8dce2 Mon Sep 17 00:00:00 2001 From: Qusic Date: Sat, 21 Dec 2024 15:14:17 -0800 Subject: [PATCH 118/429] wrangler: add updateScript --- pkgs/by-name/wr/wrangler/package.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/by-name/wr/wrangler/package.nix b/pkgs/by-name/wr/wrangler/package.nix index 84427e0be7d5..6654ee0f063d 100644 --- a/pkgs/by-name/wr/wrangler/package.nix +++ b/pkgs/by-name/wr/wrangler/package.nix @@ -10,6 +10,7 @@ llvmPackages, musl, xorg, + gitUpdater, }: stdenv.mkDerivation (finalAttrs: { pname = "wrangler"; @@ -27,6 +28,8 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-8EItfBV2n2rnXPCTYjDZlr/tdlEn8YOdIzOsj35w5gQ="; }; + passthru.updateScript = gitUpdater { rev-prefix = "wrangler@"; }; + buildInputs = [ llvmPackages.libcxx From 8d2e6511ca280087619e8692fc2eb5ce9b353d2a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 22 Dec 2024 06:49:17 +0000 Subject: [PATCH 119/429] overturemaps: 0.11.0 -> 0.12.0 --- pkgs/by-name/ov/overturemaps/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ov/overturemaps/package.nix b/pkgs/by-name/ov/overturemaps/package.nix index 387c4f46d1c8..788d75e593c8 100644 --- a/pkgs/by-name/ov/overturemaps/package.nix +++ b/pkgs/by-name/ov/overturemaps/package.nix @@ -6,12 +6,12 @@ python3Packages.buildPythonPackage rec { pname = "overturemaps"; - version = "0.11.0"; + version = "0.12.0"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-voLt1wsWYlbC9vrepFgdHaP3yThvhr8ZwEkffTdJeVU="; + hash = "sha256-Nr8ZB5A8ePJI69IL4Mzjmz22FLzsTGdfP+eTSAqCcoc="; }; build-system = with python3Packages; [ poetry-core ]; From 7f12e53e88ed2c31f59fbde03722dcc6fb9c0d96 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 22 Dec 2024 08:33:33 +0000 Subject: [PATCH 120/429] protonmail-desktop: 1.6.0 -> 1.6.1 --- pkgs/by-name/pr/protonmail-desktop/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/pr/protonmail-desktop/package.nix b/pkgs/by-name/pr/protonmail-desktop/package.nix index 062533379069..99fa4700b2bf 100644 --- a/pkgs/by-name/pr/protonmail-desktop/package.nix +++ b/pkgs/by-name/pr/protonmail-desktop/package.nix @@ -9,7 +9,7 @@ }: let mainProgram = "proton-mail"; - version = "1.6.0"; + version = "1.6.1"; in stdenv.mkDerivation { @@ -18,7 +18,7 @@ stdenv.mkDerivation { src = fetchurl { url = "https://proton.me/download/mail/linux/${version}/ProtonMail-desktop-beta.deb"; - sha256 = "sha256-17JHxczPA2Z17PCgXWPG7gyoIQNcMS+rfv6vuYXdAZM="; + sha256 = "sha256-ajN7f3SmqUfgJGksPVRuc1qR2FjEQaY+y/rpn7Hs71I="; }; dontConfigure = true; From f0030485c0675f29330df96914e37f6c4f65849a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 22 Dec 2024 12:00:55 +0000 Subject: [PATCH 121/429] emacsPackages.voicemacs: 0-unstable-2024-10-11 -> 0-unstable-2024-12-11 --- .../elisp-packages/manual-packages/voicemacs/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/voicemacs/package.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/voicemacs/package.nix index b6e76f1996d1..d6c86c0a7b84 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/voicemacs/package.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/voicemacs/package.nix @@ -20,13 +20,13 @@ melpaBuild { pname = "voicemacs"; - version = "0-unstable-2024-10-11"; + version = "0-unstable-2024-12-11"; src = fetchFromGitHub { owner = "jcaw"; repo = "voicemacs"; - rev = "d8dade06a48994ff04f48e1177eed4e9243cbcb1"; - hash = "sha256-kCuwjMl3pPWQNoXEl+oK6YoOLpk8kazLb69RwiGltAA="; + rev = "fb6133f59d3062a0cb2396353d9a1edd2af4750a"; + hash = "sha256-7JF6c5T+Dl3/S3zMHwvf7lsnsPWoZStE1FiVobJHgyI="; }; patches = [ From 16f7997902bade385fc3928c9b377552c7940e1b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 22 Dec 2024 13:00:10 +0000 Subject: [PATCH 122/429] papermc: 1.21.4-12 -> 1.21.4-15 --- pkgs/games/papermc/versions.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/games/papermc/versions.json b/pkgs/games/papermc/versions.json index 8fc65d9017f4..060f5d3a18b9 100644 --- a/pkgs/games/papermc/versions.json +++ b/pkgs/games/papermc/versions.json @@ -68,7 +68,7 @@ "version": "1.21.3-81" }, "1.21.4": { - "hash": "sha256-SCm+hrMdYGT8YKJAPwPBKWyUzNdrh7LM8Lp4FUP8q5w=", - "version": "1.21.4-12" + "hash": "sha256-FDVaeckg1PoHfiwuwxBRLD2uZkwtAMshEJeSQY9NM8E=", + "version": "1.21.4-15" } } From 729a6c72f9e74a162f063b95626eee3ba5229d6d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 22 Dec 2024 13:23:26 +0000 Subject: [PATCH 123/429] libdwarf-lite: 0.11.0 -> 0.11.1 --- pkgs/by-name/li/libdwarf-lite/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/li/libdwarf-lite/package.nix b/pkgs/by-name/li/libdwarf-lite/package.nix index e8bf9bfee696..3d5df9741cac 100644 --- a/pkgs/by-name/li/libdwarf-lite/package.nix +++ b/pkgs/by-name/li/libdwarf-lite/package.nix @@ -6,13 +6,13 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "libdwarf-lite"; - version = "0.11.0"; + version = "0.11.1"; src = fetchFromGitHub { owner = "jeremy-rifkin"; repo = "libdwarf-lite"; rev = "v${finalAttrs.version}"; - hash = "sha256-S2KDfWqqdQfK5+eQny2X5k0A5u9npkQ8OFRLBmTulao="; + hash = "sha256-qHikjAG5xuuHquqqKGuiDHXVZSlg/MbNp9JNSAKM/Hs="; }; outputs = [ From 4a0e3ff8447026a78fb0c67a20f4557351c7173e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 22 Dec 2024 16:37:07 +0000 Subject: [PATCH 124/429] zsh-prezto: 0-unstable-2024-06-03 -> 0-unstable-2024-12-12 --- pkgs/by-name/zs/zsh-prezto/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/zs/zsh-prezto/package.nix b/pkgs/by-name/zs/zsh-prezto/package.nix index 7fce5d1f10cf..34a8f6edd259 100644 --- a/pkgs/by-name/zs/zsh-prezto/package.nix +++ b/pkgs/by-name/zs/zsh-prezto/package.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "zsh-prezto"; - version = "0-unstable-2024-06-03"; + version = "0-unstable-2024-12-12"; src = fetchFromGitHub { owner = "sorin-ionescu"; repo = "prezto"; - rev = "9195b66161b196238cbd52a8a4abd027bdaf5f73"; - sha256 = "wN/86uFBahUWl9RnKvdf88zVxou7B8Kh7/s3JfMye0g="; + rev = "9626ce2beb8e20afb8f63020d974ff8a213bc773"; + sha256 = "TkmzNyPKv/K9sW0CCiR8hnXXM0d6En49HcdPsa011Xw="; fetchSubmodules = true; }; From 38ce7109ae94c4d32b6a010a9cc743a9682f667d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 22 Dec 2024 18:06:15 +0000 Subject: [PATCH 125/429] jicofo: 1.0-1104 -> 1.0-1117 --- pkgs/servers/jicofo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/jicofo/default.nix b/pkgs/servers/jicofo/default.nix index fd8fc8bfcfe8..da3829bae8f8 100644 --- a/pkgs/servers/jicofo/default.nix +++ b/pkgs/servers/jicofo/default.nix @@ -9,10 +9,10 @@ let pname = "jicofo"; - version = "1.0-1104"; + version = "1.0-1117"; src = fetchurl { url = "https://download.jitsi.org/stable/${pname}_${version}-1_all.deb"; - sha256 = "T4pv3rJLdpTMd8notPxsEq0rbfswxI/1uqrKzV+n5ts="; + sha256 = "PUIPLCdL68+cf3eue7+p0aptYavq046RtSaFM9XPgQQ="; }; in stdenv.mkDerivation { From 8f16c8fc389ffd59a2a90e0784da135fbfc7632f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 22 Dec 2024 18:16:36 +0000 Subject: [PATCH 126/429] jackett: 0.22.1064 -> 0.22.1109 --- pkgs/servers/jackett/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/jackett/default.nix b/pkgs/servers/jackett/default.nix index 5b3a3b4beabf..087b224cd64a 100644 --- a/pkgs/servers/jackett/default.nix +++ b/pkgs/servers/jackett/default.nix @@ -11,13 +11,13 @@ buildDotnetModule rec { pname = "jackett"; - version = "0.22.1064"; + version = "0.22.1109"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - hash = "sha512-+4A3hQllNoBul1V8lK1nNx+ZN9apMPOOnEeyegKIRDRXV/voDzxpEf2+RS7XhquPyPkQkDNkPN+iMrD5+eyA5Q=="; + hash = "sha512-iuhArQtzOTxHLKP9VruCZp134BIc+haOAnLUtP4phcsjrFerD7SN1OwwG581iEEzNh8jiFSEbCgQzOlltM/GyQ=="; }; projectFile = "src/Jackett.Server/Jackett.Server.csproj"; From 03589ed5bf9f8db99fd9d705c9aeabdab24af6f0 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 22 Dec 2024 19:00:16 +0000 Subject: [PATCH 127/429] etesync-dav: 0.33.4 -> 0.33.6 --- pkgs/by-name/et/etesync-dav/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/et/etesync-dav/package.nix b/pkgs/by-name/et/etesync-dav/package.nix index f0c0e1c6a3fc..6f024cdca10c 100644 --- a/pkgs/by-name/et/etesync-dav/package.nix +++ b/pkgs/by-name/et/etesync-dav/package.nix @@ -8,13 +8,13 @@ }: python3Packages.buildPythonApplication rec { pname = "etesync-dav"; - version = "0.33.4"; + version = "0.33.6"; src = fetchFromGitHub { owner = "etesync"; repo = "etesync-dav"; tag = "v${version}"; - hash = "sha256-g+rK762tSWPDaBsaTwpTzfK/lqVs+Z/Qrpq2HCpipQE="; + hash = "sha256-CkdO/63IgUOf8AC2fUDKPyax0CHWVs8AkoTaperWxFk="; }; dependencies = with python3Packages; [ From ca31e178104800e1364f1df79932e187c5f1ff0a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 23 Dec 2024 00:44:02 +0000 Subject: [PATCH 128/429] lgogdownloader: 3.15 -> 3.16 --- pkgs/by-name/lg/lgogdownloader/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/lg/lgogdownloader/package.nix b/pkgs/by-name/lg/lgogdownloader/package.nix index bdd32121a5c0..f3b3360d0221 100644 --- a/pkgs/by-name/lg/lgogdownloader/package.nix +++ b/pkgs/by-name/lg/lgogdownloader/package.nix @@ -21,13 +21,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "lgogdownloader"; - version = "3.15"; + version = "3.16"; src = fetchFromGitHub { owner = "Sude-"; repo = "lgogdownloader"; rev = "refs/tags/v${finalAttrs.version}"; - hash = "sha256-h2N5pRwwZZ3jAvRrT4Ebk4N5WO9tQjDrp8KRqriwUi4="; + hash = "sha256-coPUPercfpB8LilBn5Uww9rEM+X9QAgzDECtQ1Ui/hg="; }; nativeBuildInputs = [ From 340e51e1e7cd8407053fc4c22ffe3e3df9b478a1 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 23 Dec 2024 02:19:45 +0000 Subject: [PATCH 129/429] prometheus-nextcloud-exporter: 0.7.0 -> 0.8.0 --- pkgs/servers/monitoring/prometheus/nextcloud-exporter.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/monitoring/prometheus/nextcloud-exporter.nix b/pkgs/servers/monitoring/prometheus/nextcloud-exporter.nix index f07f4e099f48..de6e31c91eae 100644 --- a/pkgs/servers/monitoring/prometheus/nextcloud-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/nextcloud-exporter.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "prometheus-nextcloud-exporter"; - version = "0.7.0"; + version = "0.8.0"; src = fetchFromGitHub { owner = "xperimental"; repo = "nextcloud-exporter"; rev = "v${version}"; - sha256 = "sha256-tbzXxrAzMZyyePeI+Age31+XJFJcp+1RqoCAGCKaLmQ="; + sha256 = "sha256-lK5a63ZokFlm5S3k1a0MGBm+vAAqQV/5ERjJ0zZ4Yno="; }; - vendorHash = "sha256-9ABGc5uSOIjhKcnTH5WOuwg0kXhFsxOlAkatcOQy3dg="; + vendorHash = "sha256-9+Vv2GodEocDppWvTj4W3/tBqSJJZ9LkyTl5evm/45Y="; passthru.tests = { inherit (nixosTests.prometheus-exporters) nextcloud; }; From 2c0b84284157dd15073500dd73316b7299502030 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 23 Dec 2024 02:31:17 +0000 Subject: [PATCH 130/429] package-project-cmake: 1.12.0 -> 1.13.0 --- pkgs/by-name/pa/package-project-cmake/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/pa/package-project-cmake/package.nix b/pkgs/by-name/pa/package-project-cmake/package.nix index 10e40923e418..fa97e0e7f48d 100644 --- a/pkgs/by-name/pa/package-project-cmake/package.nix +++ b/pkgs/by-name/pa/package-project-cmake/package.nix @@ -6,13 +6,13 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "package-project-cmake"; - version = "1.12.0"; + version = "1.13.0"; src = fetchFromGitHub { owner = "TheLartians"; repo = "PackageProject.cmake"; rev = "v${finalAttrs.version}"; - hash = "sha256-TMf9nA0V1qTXpzEJ0A6b3mIVN0MIogn5WlZeVY+Q2bg="; + hash = "sha256-RbqywBm+C1Bo1KeFL2MdsE2PMKWbc3x2iWswKGXtO9o="; }; dontConfigure = true; From 5e0eaf68ab71432fb5e567f2cba1a6e7e2261c53 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 23 Dec 2024 02:36:53 +0000 Subject: [PATCH 131/429] pgmodeler: 1.1.5 -> 1.1.6 --- pkgs/applications/misc/pgmodeler/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/pgmodeler/default.nix b/pkgs/applications/misc/pgmodeler/default.nix index b1dcadb75b34..c134f00b2f88 100644 --- a/pkgs/applications/misc/pgmodeler/default.nix +++ b/pkgs/applications/misc/pgmodeler/default.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation rec { pname = "pgmodeler"; - version = "1.1.5"; + version = "1.1.6"; src = fetchFromGitHub { owner = "pgmodeler"; repo = "pgmodeler"; rev = "v${version}"; - sha256 = "sha256-VbAGdMeuIQLzcHwYoPbkC0UjzxXgW4BGlYfz32oHmms="; + sha256 = "sha256-ZoWCXCRaFQMf/RbcgXZQiF4+TDogdMOtccxOTk1c7Jw="; }; nativeBuildInputs = [ From 9468b63e4c0129a1a95b061a996a6994b6469a22 Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Sun, 22 Dec 2024 22:22:34 -0500 Subject: [PATCH 132/429] adms: enable on darwin --- pkgs/by-name/ad/adms/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/ad/adms/package.nix b/pkgs/by-name/ad/adms/package.nix index 9546378e01b2..2602b900e244 100644 --- a/pkgs/by-name/ad/adms/package.nix +++ b/pkgs/by-name/ad/adms/package.nix @@ -40,6 +40,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/Qucs/adms"; license = lib.licenses.gpl3; maintainers = with lib.maintainers; [ disassembler ]; - platforms = with lib.platforms; linux; + platforms = with lib.platforms; unix; }; } From 0bd44ede0a2235afaacefbd63fe56670e1654fe8 Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Sun, 22 Dec 2024 22:23:40 -0500 Subject: [PATCH 133/429] qucs-s: enable on darwin --- .../science/electronics/qucs-s/default.nix | 25 +++++++++++++++++-- 1 file changed, 23 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/electronics/qucs-s/default.nix b/pkgs/applications/science/electronics/qucs-s/default.nix index 3fd4273fd49a..1f89610c568b 100644 --- a/pkgs/applications/science/electronics/qucs-s/default.nix +++ b/pkgs/applications/science/electronics/qucs-s/default.nix @@ -29,8 +29,29 @@ stdenv.mkDerivation rec { hash = "sha256-ll5P8cqJBzoieExElggn5tRbDcmH7L3yvcbtAQ0BBww="; }; + postPatch = '' + # Workaround a CMake bug (we don't generally do distributable bundles in nixpkgs anyway): + # warning: cannot resolve item '/usr/lib/libSystem.B.dylib' + # + # possible problems: + # need more directories? + # need to use InstallRequiredSystemLibraries? + # run in install tree instead of build tree? + for filename in \ + qucs/CMakeLists.txt \ + qucs-transcalc/CMakeLists.txt \ + qucs-attenuator/CMakeLists.txt \ + qucs-s-spar-viewer/CMakeLists.txt \ + ; do + substituteInPlace "$filename" \ + --replace-fail 'fixup_bundle(' 'message(\"nixpkgs will not fixup_bundle: \" ' + done + ''; + nativeBuildInputs = [ flex bison wrapQtAppsHook cmake ]; - buildInputs = [ qtbase qttools qtcharts qtsvg qtwayland libX11 gperf adms ] ++ kernels; + buildInputs = [ qtbase qttools qtcharts qtsvg gperf adms ] + ++ lib.optionals stdenv.isLinux [ qtwayland libX11 ] + ++ kernels; cmakeFlags = [ "-DWITH_QT6=ON" @@ -56,6 +77,6 @@ stdenv.mkDerivation rec { license = licenses.gpl2Plus; mainProgram = "qucs-s"; maintainers = with maintainers; [ mazurel kashw2 thomaslepoix ]; - platforms = with platforms; linux; + platforms = with platforms; unix; }; } From 256577c3605c4e7e46af3c8f62b333b0038298ce Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Sun, 22 Dec 2024 22:42:02 -0500 Subject: [PATCH 134/429] qucsator-rf: enable on darwin --- pkgs/by-name/qu/qucsator-rf/package.nix | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/qu/qucsator-rf/package.nix b/pkgs/by-name/qu/qucsator-rf/package.nix index 3667d84b280f..f3ef6f64d18a 100644 --- a/pkgs/by-name/qu/qucsator-rf/package.nix +++ b/pkgs/by-name/qu/qucsator-rf/package.nix @@ -22,6 +22,12 @@ stdenv.mkDerivation rec { hash = "sha256-IvB4CTvK6x4wwUXMoXIqBku1Hh9em6ITTpwFllYsTEg="; }; + # Upstream forces NO_DEFAULT_PATH on APPLE + postPatch = '' + substituteInPlace CMakeLists.txt \ + --replace-fail '"/usr/local/opt/bison/bin/"' '"${bison}/bin"' + ''; + nativeBuildInputs = [ cmake flex @@ -43,6 +49,6 @@ stdenv.mkDerivation rec { license = lib.licenses.gpl2Plus; mainProgram = "qucsator_rf"; maintainers = with lib.maintainers; [ thomaslepoix ]; - platforms = lib.platforms.linux; + platforms = lib.platforms.unix; }; } From 41d38a5aa5629562a424717665f3349c5fc1f27a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 23 Dec 2024 19:26:51 +0000 Subject: [PATCH 135/429] alsa-utils: 1.2.12 -> 1.2.13 --- pkgs/by-name/al/alsa-utils/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/al/alsa-utils/package.nix b/pkgs/by-name/al/alsa-utils/package.nix index afbbb45e92d5..f85f379380de 100644 --- a/pkgs/by-name/al/alsa-utils/package.nix +++ b/pkgs/by-name/al/alsa-utils/package.nix @@ -30,11 +30,11 @@ let in stdenv.mkDerivation rec { pname = "alsa-utils"; - version = "1.2.12"; + version = "1.2.13"; src = fetchurl { url = "mirror://alsa/utils/alsa-utils-${version}.tar.bz2"; - hash = "sha256-mLxmd9DAB0AGZ5BRgiMkoKsIea6lWKj2i1EXgNMM2SQ="; + hash = "sha256-FwKmsc35uj6ZbsvB3c+RceaAj1lh1QPQ8n6A7hYvHao="; }; nativeBuildInputs = [ From 1aa29a6462e19b1b24b902de306cb5b82d3deacf Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 23 Dec 2024 21:29:58 +0000 Subject: [PATCH 136/429] shadps4: 0.4.0-unstable-2024-12-08 -> 0.4.0-unstable-2024-12-23 --- pkgs/by-name/sh/shadps4/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/sh/shadps4/package.nix b/pkgs/by-name/sh/shadps4/package.nix index b5f8cc04bcea..de4c17532b39 100644 --- a/pkgs/by-name/sh/shadps4/package.nix +++ b/pkgs/by-name/sh/shadps4/package.nix @@ -37,13 +37,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "shadps4"; - version = "0.4.0-unstable-2024-12-08"; + version = "0.4.0-unstable-2024-12-23"; src = fetchFromGitHub { owner = "shadps4-emu"; repo = "shadPS4"; - rev = "4fb2247196d4626bab8f2c28710b0c34cad053fe"; - hash = "sha256-bRURBUhIVQLrBxJFaJirw3n1n7xviRoAZGLZ+rV/UeM="; + rev = "c2e9c877dd82e9bf79c8ede7bc8cffb591a31c76"; + hash = "sha256-6LmNLH5Fy+9AYDXLh/YFThs3EUgA6gnmUEvBltkUQig="; fetchSubmodules = true; }; From f8dca9319b78cb6973734b659e1febac1e7e6f47 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 24 Dec 2024 04:13:22 +0000 Subject: [PATCH 137/429] lcm: 1.5.0 -> 1.5.1 --- pkgs/by-name/lc/lcm/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/lc/lcm/package.nix b/pkgs/by-name/lc/lcm/package.nix index 767d453a4776..dd2c4df711f6 100644 --- a/pkgs/by-name/lc/lcm/package.nix +++ b/pkgs/by-name/lc/lcm/package.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "lcm"; - version = "1.5.0"; + version = "1.5.1"; src = fetchFromGitHub { owner = "lcm-proj"; repo = "lcm"; rev = "v${version}"; - hash = "sha256-IFHoJl5OtnUb+w3gLG5f578yAektjgrY9Uj2eUVoIrc="; + hash = "sha256-043AJzalfx+qcCoxQgPU4T/DcUH0pXOE4v1aJaW3aXs="; }; outputs = [ From 4780e19ce0c2e4980ec50c78d0f531dd25f4384a Mon Sep 17 00:00:00 2001 From: Ben Pye Date: Mon, 23 Dec 2024 20:56:01 -0800 Subject: [PATCH 138/429] intel-gpu-tools: 1.29 -> 1.30 --- pkgs/by-name/in/intel-gpu-tools/package.nix | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/pkgs/by-name/in/intel-gpu-tools/package.nix b/pkgs/by-name/in/intel-gpu-tools/package.nix index 5bcc2385682d..76a5680c7e7f 100644 --- a/pkgs/by-name/in/intel-gpu-tools/package.nix +++ b/pkgs/by-name/in/intel-gpu-tools/package.nix @@ -44,24 +44,16 @@ stdenv.mkDerivation rec { pname = "intel-gpu-tools"; - version = "1.29"; + version = "1.30"; src = fetchFromGitLab { domain = "gitlab.freedesktop.org"; owner = "drm"; repo = "igt-gpu-tools"; rev = "refs/tags/v${version}"; - hash = "sha256-t6DeFmIgTomMNwE53n5JicnvuCd/QfpNYWCdwPwc30E="; + hash = "sha256-lZNDDWfySz7etxzN/28bo9qDE8SxK2vPAAOR3hxSoWY="; }; - patches = [ - (fetchpatch { - name = "basename.patch"; - url = "https://gitlab.freedesktop.org/drm/igt-gpu-tools/-/commit/604dec781ef283885f65968358bd9ae88c5193c3.patch"; - hash = "sha256-zU6U9uuTDvuADVYmT9sMYA85Xgtvqgy378LvWFDVEJw="; - }) - ]; - nativeBuildInputs = [ bison docbook_xsl From ed0277da033d319596b4a3431532741b0def4c02 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 24 Dec 2024 05:08:53 +0000 Subject: [PATCH 139/429] bosh-cli: 7.8.2 -> 7.8.5 --- pkgs/by-name/bo/bosh-cli/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/bo/bosh-cli/package.nix b/pkgs/by-name/bo/bosh-cli/package.nix index 15e88ef060f1..5e6d47469772 100644 --- a/pkgs/by-name/bo/bosh-cli/package.nix +++ b/pkgs/by-name/bo/bosh-cli/package.nix @@ -9,13 +9,13 @@ buildGoModule rec { pname = "bosh-cli"; - version = "7.8.2"; + version = "7.8.5"; src = fetchFromGitHub { owner = "cloudfoundry"; repo = pname; rev = "v${version}"; - sha256 = "sha256-ABoqJr2HDhox1ylTvAf5sQkYYzEWAnmXWavw0jXrRgo="; + sha256 = "sha256-8uxl8h7EAhLo4BMLPbtQdxK5kNe9fv1PbViBELJZXKY="; }; vendorHash = null; From f9be289a7645ff3b73666197de0e82454813a384 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 24 Dec 2024 05:24:40 +0000 Subject: [PATCH 140/429] glooctl: 1.18.0 -> 1.18.2 --- pkgs/by-name/gl/glooctl/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/gl/glooctl/package.nix b/pkgs/by-name/gl/glooctl/package.nix index d0e3897c6d53..13b92c0a3334 100644 --- a/pkgs/by-name/gl/glooctl/package.nix +++ b/pkgs/by-name/gl/glooctl/package.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "glooctl"; - version = "1.18.0"; + version = "1.18.2"; src = fetchFromGitHub { owner = "solo-io"; repo = "gloo"; rev = "v${version}"; - hash = "sha256-lzO5jRHGjk6G7Rt4jPlCrw9ecO7KXvfQEFJZ4/6LtkM="; + hash = "sha256-EpZaO7I8wQ8PnZKc8hBiK/mY+v+A8osuvrmGH/qGr64="; }; - vendorHash = "sha256-i2FBlywKuFXjc+kwZw8A0Anea26eMbw3v7gBH5dh0WE="; + vendorHash = "sha256-N6S/g89mNsDlJIWOl9F4xo8L/k/k8971rEV9pSShf3U="; subPackages = [ "projects/gloo/cli/cmd" ]; From d8476da2c795dc495581c9b9978272957c68bbf7 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 24 Dec 2024 05:36:54 +0000 Subject: [PATCH 141/429] goose: 3.23.1 -> 3.24.0 --- pkgs/by-name/go/goose/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/go/goose/package.nix b/pkgs/by-name/go/goose/package.nix index ec81cf0579b3..506f891bef76 100644 --- a/pkgs/by-name/go/goose/package.nix +++ b/pkgs/by-name/go/goose/package.nix @@ -7,17 +7,17 @@ buildGoModule rec { pname = "goose"; - version = "3.23.1"; + version = "3.24.0"; src = fetchFromGitHub { owner = "pressly"; repo = pname; rev = "v${version}"; - hash = "sha256-/Zz6upxfEB/F5XPc+T0veiT7n1qfWdK3VirXARSPrWU="; + hash = "sha256-VAdRlmEY4fAMQtKLfleleW/thnPJJcfSBw+efCNNSmc="; }; proxyVendor = true; - vendorHash = "sha256-PgGMft5JzDyRsH4RLGZOzolJWkNGJOqcYY04/CWIn/Q="; + vendorHash = "sha256-wTzQoDgo54FY4Mt4rfZc075p/FGu3WhS+TSc3Bps75M="; # skipping: end-to-end tests require a docker daemon postPatch = '' From 0f03ddbdf04d2848f833dea0fd2a1f26f36b312f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 24 Dec 2024 08:37:04 +0000 Subject: [PATCH 142/429] istioctl: 1.24.1 -> 1.24.2 --- pkgs/by-name/is/istioctl/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/is/istioctl/package.nix b/pkgs/by-name/is/istioctl/package.nix index 9d58c2d439e1..183d130cd051 100644 --- a/pkgs/by-name/is/istioctl/package.nix +++ b/pkgs/by-name/is/istioctl/package.nix @@ -7,15 +7,15 @@ buildGoModule rec { pname = "istioctl"; - version = "1.24.1"; + version = "1.24.2"; src = fetchFromGitHub { owner = "istio"; repo = "istio"; rev = version; - hash = "sha256-HQKQ96VslM4ZYcNbTQnvJRD2slZCMXwTqsiyc90gmR0="; + hash = "sha256-JJ/zLW6ri53qSTmbGZS2FhY2AJ1h3L/hk0rnj0swml4="; }; - vendorHash = "sha256-tyw5mwkI5BFT9PFHaPA6DMNXJMS1x7y+yCc+kPKRfto="; + vendorHash = "sha256-0sUxqOW3PeMXZvlTmMBvs6vnc3pSLzSISfUSo9YdToQ="; nativeBuildInputs = [ installShellFiles ]; From 27c0af47745bb5fd30e6df7a4b17a700a7b99ec7 Mon Sep 17 00:00:00 2001 From: Christoph Heiss Date: Tue, 24 Dec 2024 22:42:31 +0100 Subject: [PATCH 143/429] proxmox-backup-client: 3.2.2 -> 3.3.2 Needs some refreshed patches and an additional crate to fetch/patch extra. Patches are taken from the (unofficial) AUR package as applicable. Signed-off-by: Christoph Heiss --- ...ependencies-not-available-on-crates..patch | 209 +++ ...-docs-Add-target-path-fixup-variable.patch | 33 - ...-docs-Add-target-path-fixup-variable.patch | 25 + ...argo-use-local-patched-h2-dependency.patch | 26 + .../pr/proxmox-backup-client/Cargo.lock | 1379 ++++++++++------- .../pr/proxmox-backup-client/package.nix | 60 +- 6 files changed, 1147 insertions(+), 585 deletions(-) create mode 100644 pkgs/by-name/pr/proxmox-backup-client/0001-cargo-re-route-dependencies-not-available-on-crates..patch delete mode 100644 pkgs/by-name/pr/proxmox-backup-client/0001-docs-Add-target-path-fixup-variable.patch create mode 100644 pkgs/by-name/pr/proxmox-backup-client/0002-docs-Add-target-path-fixup-variable.patch create mode 100644 pkgs/by-name/pr/proxmox-backup-client/0003-cargo-use-local-patched-h2-dependency.patch diff --git a/pkgs/by-name/pr/proxmox-backup-client/0001-cargo-re-route-dependencies-not-available-on-crates..patch b/pkgs/by-name/pr/proxmox-backup-client/0001-cargo-re-route-dependencies-not-available-on-crates..patch new file mode 100644 index 000000000000..c1ba7aa5290f --- /dev/null +++ b/pkgs/by-name/pr/proxmox-backup-client/0001-cargo-re-route-dependencies-not-available-on-crates..patch @@ -0,0 +1,209 @@ +From 15345a1ca0a52f2e977361002fe984609704ec90 Mon Sep 17 00:00:00 2001 +From: Christoph Heiss +Date: Tue, 24 Dec 2024 17:40:48 +0100 +Subject: [PATCH 1/3] cargo: re-route dependencies not available on crates.io + to git repos + +Signed-off-by: Christoph Heiss +--- + Cargo.toml | 147 ++++++++++------------------------------------------- + 1 file changed, 26 insertions(+), 121 deletions(-) + +diff --git a/Cargo.toml b/Cargo.toml +index 9354fb17..d2014429 100644 +--- a/Cargo.toml ++++ b/Cargo.toml +@@ -42,8 +42,6 @@ members = [ + + "proxmox-backup-banner", + "proxmox-backup-client", +- "proxmox-file-restore", +- "proxmox-restore-daemon", + + "pxar-bin", + ] +@@ -112,7 +110,6 @@ pbs-tools = { path = "pbs-tools" } + # regular crates + anyhow = "1.0" + async-trait = "0.1.56" +-apt-pkg-native = "0.3.2" + base64 = "0.13" + bitflags = "2.4" + bytes = "1.0" +@@ -126,7 +123,6 @@ flate2 = "1.0" + foreign-types = "0.3" + futures = "0.3" + h2 = { version = "0.4", features = [ "stream" ] } +-handlebars = "3.0" + hex = "0.4.3" + http = "0.2" + hyper = { version = "0.14", features = [ "full" ] } +@@ -162,139 +158,48 @@ xdg = "2.2" + zstd = { version = "0.12", features = [ "bindgen" ] } + zstd-safe = "6.0" + +-[dependencies] +-anyhow.workspace = true +-async-trait.workspace = true +-base64.workspace = true +-bytes.workspace = true +-cidr.workspace = true +-const_format.workspace = true +-crc32fast.workspace = true +-crossbeam-channel.workspace = true +-endian_trait.workspace = true +-futures.workspace = true +-h2.workspace = true +-hex.workspace = true +-http.workspace = true +-hyper.workspace = true +-libc.workspace = true +-log.workspace = true +-nix.workspace = true +-nom.workspace = true +-num-traits.workspace = true +-once_cell.workspace = true +-openssl.workspace = true +-percent-encoding.workspace = true +-regex.workspace = true +-rustyline.workspace = true +-serde.workspace = true +-serde_json.workspace = true +-syslog.workspace = true +-termcolor.workspace = true +-thiserror.workspace = true +-tokio = { workspace = true, features = [ "fs", "io-util", "io-std", "macros", "net", "parking_lot", "process", "rt", "rt-multi-thread", "signal", "time" ] } +-tokio-openssl.workspace = true +-tokio-stream.workspace = true +-tokio-util = { workspace = true, features = [ "codec" ] } +-tracing.workspace = true +-udev.workspace = true +-url.workspace = true +-walkdir.workspace = true +-zstd.workspace = true +- +-#valgrind_request = { git = "https://github.com/edef1c/libvalgrind_request", version = "1.1.0", optional = true } +- +-# proxmox workspace +-proxmox-apt.workspace = true +-proxmox-apt-api-types.workspace = true +-proxmox-async.workspace = true +-proxmox-auth-api = { workspace = true, features = [ "api", "pam-authenticator" ] } +-proxmox-compression.workspace = true +-proxmox-config-digest.workspace = true +-proxmox-daemon.workspace = true +-proxmox-http = { workspace = true, features = [ "client-trait", "proxmox-async", "rate-limited-stream" ] } # pbs-client doesn't use these +-proxmox-human-byte.workspace = true +-proxmox-io.workspace = true +-proxmox-lang.workspace = true +-proxmox-log.workspace = true +-proxmox-ldap.workspace = true +-proxmox-metrics.workspace = true +-proxmox-notify = { workspace = true, features = [ "pbs-context" ] } +-proxmox-openid.workspace = true +-proxmox-rest-server = { workspace = true, features = [ "rate-limited-stream" ] } +-proxmox-router = { workspace = true, features = [ "cli", "server"] } +-proxmox-schema = { workspace = true, features = [ "api-macro" ] } +-proxmox-section-config.workspace = true +-proxmox-serde = { workspace = true, features = [ "serde_json" ] } +-proxmox-shared-cache.workspace = true +-proxmox-shared-memory.workspace = true +-proxmox-sortable-macro.workspace = true +-proxmox-subscription.workspace = true +-proxmox-sys = { workspace = true, features = [ "timer" ] } +-proxmox-systemd.workspace = true +-proxmox-tfa.workspace = true +-proxmox-time.workspace = true +-proxmox-uuid.workspace = true +-proxmox-worker-task.workspace = true +- +-# in their respective repo +-proxmox-acme.workspace = true +-pxar.workspace = true +- +-# proxmox-backup workspace/internal crates +-pbs-api-types.workspace = true +-pbs-buildcfg.workspace = true +-pbs-client.workspace = true +-pbs-config.workspace = true +-pbs-datastore.workspace = true +-pbs-key-config.workspace = true +-pbs-tape.workspace = true +-pbs-tools.workspace = true +-proxmox-rrd.workspace = true +-proxmox-rrd-api-types.workspace = true +- + # Local path overrides + # NOTE: You must run `cargo update` after changing this for it to take effect! + [patch.crates-io] + + #proxmox-apt = { path = "../proxmox/proxmox-apt" } +-#proxmox-apt-api-types = { path = "../proxmox/proxmox-apt-api-types" } +-#proxmox-async = { path = "../proxmox/proxmox-async" } +-#proxmox-auth-api = { path = "../proxmox/proxmox-auth-api" } +-#proxmox-borrow = { path = "../proxmox/proxmox-borrow" } +-#proxmox-compression = { path = "../proxmox/proxmox-compression" } +-#proxmox-config-digest = { path = "../proxmox/proxmox-config-digest" } ++proxmox-apt-api-types = { path = "../proxmox/proxmox-apt-api-types" } ++proxmox-async = { path = "../proxmox/proxmox-async" } ++proxmox-auth-api = { path = "../proxmox/proxmox-auth-api" } ++proxmox-borrow = { path = "../proxmox/proxmox-borrow" } ++proxmox-compression = { path = "../proxmox/proxmox-compression" } ++proxmox-config-digest = { path = "../proxmox/proxmox-config-digest" } + #proxmox-daemon = { path = "../proxmox/proxmox-daemon" } +-#proxmox-fuse = { path = "../proxmox-fuse" } +-#proxmox-http = { path = "../proxmox/proxmox-http" } +-#proxmox-human-byte = { path = "../proxmox/proxmox-human-byte" } +-#proxmox-io = { path = "../proxmox/proxmox-io" } +-#proxmox-lang = { path = "../proxmox/proxmox-lang" } +-#proxmox-log = { path = "../proxmox/proxmox-log" } ++proxmox-fuse = { path = "../proxmox-fuse" } ++proxmox-http = { path = "../proxmox/proxmox-http" } ++proxmox-human-byte = { path = "../proxmox/proxmox-human-byte" } ++proxmox-io = { path = "../proxmox/proxmox-io" } ++proxmox-lang = { path = "../proxmox/proxmox-lang" } ++proxmox-log = { path = "../proxmox/proxmox-log" } + #proxmox-ldap = { path = "../proxmox/proxmox-ldap" } + #proxmox-metrics = { path = "../proxmox/proxmox-metrics" } +-#proxmox-notify = { path = "../proxmox/proxmox-notify" } ++proxmox-notify = { path = "../proxmox/proxmox-notify" } + #proxmox-openid = { path = "../proxmox/proxmox-openid" } + #proxmox-rest-server = { path = "../proxmox/proxmox-rest-server" } +-#proxmox-router = { path = "../proxmox/proxmox-router" } ++proxmox-router = { path = "../proxmox/proxmox-router" } + #proxmox-rrd = { path = "../proxmox/proxmox-rrd" } + #proxmox-rrd-api-types = { path = "../proxmox/proxmox-rrd-api-types" } +-#proxmox-schema = { path = "../proxmox/proxmox-schema" } +-#proxmox-section-config = { path = "../proxmox/proxmox-section-config" } +-#proxmox-serde = { path = "../proxmox/proxmox-serde" } +-#proxmox-shared-memory = { path = "../proxmox/proxmox-shared-memory" } +-#proxmox-sortable-macro = { path = "../proxmox/proxmox-sortable-macro" } ++proxmox-schema = { path = "../proxmox/proxmox-schema" } ++proxmox-section-config = { path = "../proxmox/proxmox-section-config" } ++proxmox-serde = { path = "../proxmox/proxmox-serde" } ++proxmox-shared-memory = { path = "../proxmox/proxmox-shared-memory" } ++proxmox-sortable-macro = { path = "../proxmox/proxmox-sortable-macro" } + #proxmox-subscription = { path = "../proxmox/proxmox-subscription" } +-#proxmox-sys = { path = "../proxmox/proxmox-sys" } +-#proxmox-systemd = { path = "../proxmox/proxmox-systemd" } ++proxmox-sys = { path = "../proxmox/proxmox-sys" } ++proxmox-systemd = { path = "../proxmox/proxmox-systemd" } + #proxmox-tfa = { path = "../proxmox/proxmox-tfa" } +-#proxmox-time = { path = "../proxmox/proxmox-time" } +-#proxmox-uuid = { path = "../proxmox/proxmox-uuid" } +-#proxmox-worker-task = { path = "../proxmox/proxmox-worker-task" } ++proxmox-time = { path = "../proxmox/proxmox-time" } ++proxmox-uuid = { path = "../proxmox/proxmox-uuid" } ++proxmox-worker-task = { path = "../proxmox/proxmox-worker-task" } + + #proxmox-acme = { path = "../proxmox/proxmox-acme" } +-#pathpatterns = {path = "../pathpatterns" } +-#pxar = { path = "../pxar" } ++pathpatterns = {path = "../pathpatterns" } ++pxar = { path = "../pxar" } + + [features] + default = [] +-- +2.47.0 + diff --git a/pkgs/by-name/pr/proxmox-backup-client/0001-docs-Add-target-path-fixup-variable.patch b/pkgs/by-name/pr/proxmox-backup-client/0001-docs-Add-target-path-fixup-variable.patch deleted file mode 100644 index 1999461ade5a..000000000000 --- a/pkgs/by-name/pr/proxmox-backup-client/0001-docs-Add-target-path-fixup-variable.patch +++ /dev/null @@ -1,33 +0,0 @@ -From f8c26751c51c1618278689d8b3ce94496c579064 Mon Sep 17 00:00:00 2001 -From: Christoph Heiss -Date: Fri, 10 Feb 2023 23:54:41 +0100 -Subject: [PATCH] docs: Add target path fixup variable - -Signed-off-by: Christoph Heiss ---- - docs/Makefile | 5 +++-- - 1 file changed, 3 insertions(+), 2 deletions(-) - -diff --git a/docs/Makefile b/docs/Makefile -index 94130228..f4766a64 100644 ---- a/docs/Makefile -+++ b/docs/Makefile -@@ -67,12 +67,13 @@ API_VIEWER_FILES := \ - SPHINXOPTS = - SPHINXBUILD = sphinx-build - BUILDDIR = output -+RUSTC_TARGET ?= - - ifeq ($(BUILD_MODE), release) --COMPILEDIR := ../target/release -+COMPILEDIR := ../target/$(RUSTC_TARGET)/release - SPHINXOPTS += -t release - else --COMPILEDIR := ../target/debug -+COMPILEDIR := ../target/$(RUSTC_TARGET)/debug - SPHINXOPTS += -t devbuild - endif - --- -2.40.0 - diff --git a/pkgs/by-name/pr/proxmox-backup-client/0002-docs-Add-target-path-fixup-variable.patch b/pkgs/by-name/pr/proxmox-backup-client/0002-docs-Add-target-path-fixup-variable.patch new file mode 100644 index 000000000000..a052c9b7fba0 --- /dev/null +++ b/pkgs/by-name/pr/proxmox-backup-client/0002-docs-Add-target-path-fixup-variable.patch @@ -0,0 +1,25 @@ +From fbfbc075c7451cda415fc5678cf5bce8bb11dc78 Mon Sep 17 00:00:00 2001 +From: Christoph Heiss +Date: Tue, 24 Dec 2024 17:22:35 +0100 +Subject: [PATCH 2/3] docs: Add target path fixup variable + +Signed-off-by: Christoph Heiss +--- + docs/Makefile | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/docs/Makefile b/docs/Makefile +index 66da6037..a9939131 100644 +--- a/docs/Makefile ++++ b/docs/Makefile +@@ -92,6 +92,7 @@ API_VIEWER_FILES := \ + SPHINXOPTS = -E + SPHINXBUILD = sphinx-build + BUILDDIR = output ++DEB_HOST_RUST_TYPE ?= $(RUSTC_TARGET) + + ifeq ($(BUILD_MODE), release) + COMPILEDIR := ../target/$(DEB_HOST_RUST_TYPE)/release +-- +2.47.0 + diff --git a/pkgs/by-name/pr/proxmox-backup-client/0003-cargo-use-local-patched-h2-dependency.patch b/pkgs/by-name/pr/proxmox-backup-client/0003-cargo-use-local-patched-h2-dependency.patch new file mode 100644 index 000000000000..4a92350d3ebd --- /dev/null +++ b/pkgs/by-name/pr/proxmox-backup-client/0003-cargo-use-local-patched-h2-dependency.patch @@ -0,0 +1,26 @@ +From 3fc7e2ab65ad6a8af360fafa84b97f551fa1b619 Mon Sep 17 00:00:00 2001 +From: Christoph Heiss +Date: Tue, 24 Dec 2024 17:35:40 +0100 +Subject: [PATCH 3/3] cargo: use local patched h2 dependency + +Signed-off-by: Christoph Heiss +--- + Cargo.toml | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/Cargo.toml b/Cargo.toml +index d2014429..54f951c8 100644 +--- a/Cargo.toml ++++ b/Cargo.toml +@@ -201,6 +201,8 @@ proxmox-worker-task = { path = "../proxmox/proxmox-worker-task" } + pathpatterns = {path = "../pathpatterns" } + pxar = { path = "../pxar" } + ++h2 = { path = "./h2" } ++ + [features] + default = [] + #valgrind = ["valgrind_request"] +-- +2.47.0 + diff --git a/pkgs/by-name/pr/proxmox-backup-client/Cargo.lock b/pkgs/by-name/pr/proxmox-backup-client/Cargo.lock index 2412f6a78da6..f7420ac3d37e 100644 --- a/pkgs/by-name/pr/proxmox-backup-client/Cargo.lock +++ b/pkgs/by-name/pr/proxmox-backup-client/Cargo.lock @@ -4,18 +4,18 @@ version = 3 [[package]] name = "addr2line" -version = "0.21.0" +version = "0.24.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a30b2e23b9e17a9f90641c7ab1549cd9b44f296d3ccbf309d2863cfe398a0cb" +checksum = "dfbe277e56a376000877090da837660b4427aad530e3028d44e0bffe4f89a1c1" dependencies = [ "gimli", ] [[package]] -name = "adler" -version = "1.0.2" +name = "adler2" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" +checksum = "512761e0bb2578dd7380c6baaa0f4ce03e84f95e960231d1dec8bf4d7d6e2627" [[package]] name = "ahash" @@ -40,35 +40,41 @@ dependencies = [ [[package]] name = "allocator-api2" -version = "0.2.18" +version = "0.2.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c6cb57a04249c6480766f7f7cef5467412af1490f8d1e243141daddada3264f" +checksum = "683d7910e743518b0e34f1186f92494becacb047c7b6bf616c96772180fef923" [[package]] name = "anyhow" -version = "1.0.82" +version = "1.0.95" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f538837af36e6f6a9be0faa67f9a314f8119e4e4b5867c6ab40ed60360142519" +checksum = "34ac096ce696dc2fcabef30516bb13c0a68a11d30131d3df6f04711467681b04" + +[[package]] +name = "atomic-waker" +version = "1.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0" [[package]] name = "autocfg" -version = "1.2.0" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1fdabc7756949593fe60f30ec81974b613357de856987752631dea1e3394c80" +checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26" [[package]] name = "backtrace" -version = "0.3.71" +version = "0.3.74" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26b05800d2e817c8b3b4b54abd461726265fa9789ae34330622f2db9ee696f9d" +checksum = "8d82cb332cdfaed17ae235a638438ac4d4839913cc2af585c3c6746e8f8bee1a" dependencies = [ "addr2line", - "cc", "cfg-if", "libc", "miniz_oxide", "object", "rustc-demangle", + "windows-targets 0.52.6", ] [[package]] @@ -85,22 +91,22 @@ checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6" [[package]] name = "bindgen" -version = "0.69.4" +version = "0.69.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a00dc851838a2120612785d195287475a3ac45514741da670b735818822129a0" +checksum = "271383c67ccabffb7381723dea0672a673f292304fcb45c01cc648c7a8d58088" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "cexpr", "clang-sys", "itertools", "lazy_static", "lazycell", - "proc-macro2 1.0.81", - "quote 1.0.36", + "proc-macro2 1.0.92", + "quote 1.0.37", "regex", "rustc-hash", "shlex", - "syn 2.0.60", + "syn 2.0.91", "which", ] @@ -112,9 +118,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "bitflags" -version = "2.5.0" +version = "2.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1" +checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de" [[package]] name = "block-buffer" @@ -133,19 +139,19 @@ checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c" [[package]] name = "bytes" -version = "1.6.0" +version = "1.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "514de17de45fdb8dc022b1a7975556c53c86f9f0aa5f534b98977b171857c2c9" +checksum = "325918d6fe32f23b19878fe4b34794ae41fc19ddbe53b10571a4874d44ffd39b" [[package]] name = "cc" -version = "1.0.96" +version = "1.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "065a29261d53ba54260972629f9ca6bffa69bac13cd1fed61420f7fa68b9f8bd" +checksum = "c31a0499c1dc64f458ad13872de75c0eb7e3fdb0e67964610c914b034fc5956e" dependencies = [ "jobserver", "libc", - "once_cell", + "shlex", ] [[package]] @@ -169,15 +175,15 @@ version = "0.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8eebd66744a15ded14960ab4ccdbfb51ad3b81f51f3f04a80adac98c985396c9" dependencies = [ - "hashbrown", + "hashbrown 0.14.5", "stacker", ] [[package]] name = "clang-sys" -version = "1.7.0" +version = "1.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67523a3b4be3ce1989d607a828d036249522dd9c1c8de7f4dd2dae43a37369d1" +checksum = "0b023947811758c97c59bf9d1c188fd619ad4718dcaa767947df1cadb14f39f4" dependencies = [ "glob", "libc", @@ -197,22 +203,22 @@ dependencies = [ [[package]] name = "const_format" -version = "0.2.32" +version = "0.2.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3a214c7af3d04997541b18d432afaff4c455e79e2029079647e72fc2bd27673" +checksum = "126f97965c8ad46d6d9163268ff28432e8f6a1196a55578867832e3049df63dd" dependencies = [ "const_format_proc_macros", ] [[package]] name = "const_format_proc_macros" -version = "0.2.32" +version = "0.2.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c7f6ff08fd20f4f299298a28e2dfa8a8ba1036e6cd2460ac1de7b425d76f2500" +checksum = "1d57c2eccfb16dbac1f4e61e206105db5820c9d26c3c472bc17c774259ef7744" dependencies = [ - "proc-macro2 1.0.81", - "quote 1.0.36", - "unicode-xid 0.2.4", + "proc-macro2 1.0.92", + "quote 1.0.37", + "unicode-xid 0.2.6", ] [[package]] @@ -227,24 +233,24 @@ dependencies = [ [[package]] name = "core-foundation-sys" -version = "0.8.6" +version = "0.8.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06ea2b9bc92be3c2baa9334a323ebca2d6f074ff852cd1d7b11064035cd3868f" +checksum = "773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b" [[package]] name = "cpufeatures" -version = "0.2.12" +version = "0.2.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53fe5e26ff1b7aef8bca9c6080520cfb8d9333c7568e1829cef191a9723e5504" +checksum = "16b80225097f2e5ae4e7179dd2266824648f3e2f49d9134d584b76389d31c4c3" dependencies = [ "libc", ] [[package]] name = "crc32fast" -version = "1.4.0" +version = "1.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b3855a8a784b474f333699ef2bbca9db2c4a1f6d9088a90a2d25b1eb53111eaa" +checksum = "a97769d94ddab943e4510d138150169a2758b5ef3eb191a9ee688de3e23ef7b3" dependencies = [ "cfg-if", ] @@ -291,16 +297,27 @@ dependencies = [ ] [[package]] -name = "either" -version = "1.11.0" +name = "displaydoc" +version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a47c1c47d2f5964e29c61246e81db715514cd532db6b5116a25ea3c03d6780a2" +checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0" +dependencies = [ + "proc-macro2 1.0.92", + "quote 1.0.37", + "syn 2.0.91", +] + +[[package]] +name = "either" +version = "1.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "60b1af1c220855b6ceac025d3f6ecdd2b7c4894bfe9cd9bda4fbb4bc7c0d4cf0" [[package]] name = "email-encoding" -version = "0.3.0" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "60d1d33cdaede7e24091f039632eb5d3c7469fe5b066a985281a34fc70fa317f" +checksum = "ea3d894bbbab314476b265f9b2d46bf24b123a36dd0e96b06a1b49545b9d9dcc" dependencies = [ "base64 0.22.1", "memchr", @@ -308,9 +325,9 @@ dependencies = [ [[package]] name = "email_address" -version = "0.2.4" +version = "0.2.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2153bd83ebc09db15bcbdc3e2194d901804952e3dc96967e1cd3b0c5c32d112" +checksum = "e079f19b08ca6239f47f8ba8509c11cf3ea30095831f7fed61441475edd8c449" [[package]] name = "endian-type" @@ -358,12 +375,12 @@ checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" [[package]] name = "errno" -version = "0.3.8" +version = "0.3.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a258e46cdc063eb8519c00b9fc845fc47bcfca4130e2f08e88665ceda8474245" +checksum = "33d852cb9b869c2a9b3df2f71a3074817f01e1844f839a144f5fcef059a4eb5d" dependencies = [ "libc", - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] @@ -378,9 +395,9 @@ dependencies = [ [[package]] name = "fastrand" -version = "2.1.0" +version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9fc0510504f03c51ada170672ac806f1f105a88aa97a5281117e1ddc3368e51a" +checksum = "37909eebbb50d72f9059c3b6d82c0463f2ff062c9e95845c43a6c9c0355411be" [[package]] name = "fd-lock" @@ -395,21 +412,21 @@ dependencies = [ [[package]] name = "filetime" -version = "0.2.23" +version = "0.2.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ee447700ac8aa0b2f2bd7bc4462ad686ba06baa6727ac149a2d6277f0d240fd" +checksum = "35c0522e981e68cbfa8c3f978441a5f34b30b96e146b33cd3359176b50fe8586" dependencies = [ "cfg-if", "libc", - "redox_syscall", - "windows-sys 0.52.0", + "libredox", + "windows-sys 0.59.0", ] [[package]] name = "flate2" -version = "1.0.30" +version = "1.0.35" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f54427cfd1c7829e2a139fcefea601bf088ebca651d2bf53ebc600eac295dae" +checksum = "c936bfdafb507ebbf50b8074c54fa31c5be9a1e7e5f467dd659697041407d07c" dependencies = [ "crc32fast", "miniz_oxide", @@ -447,9 +464,9 @@ dependencies = [ [[package]] name = "futures" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "645c6916888f6cb6350d2550b80fb63e734897a8498abe35cfb732b6487804b0" +checksum = "65bc07b1a8bc7c85c5f2e110c476c7389b4554ba72af57d8445ea63a576b0876" dependencies = [ "futures-channel", "futures-core", @@ -462,9 +479,9 @@ dependencies = [ [[package]] name = "futures-channel" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eac8f7d7865dcb88bd4373ab671c8cf4508703796caa2b1985a9ca867b3fcb78" +checksum = "2dff15bf788c671c1934e366d07e30c1814a8ef514e1af724a602e8a2fbe1b10" dependencies = [ "futures-core", "futures-sink", @@ -472,15 +489,15 @@ dependencies = [ [[package]] name = "futures-core" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dfc6580bb841c5a68e9ef15c77ccc837b40a7504914d52e47b8b0e9bbda25a1d" +checksum = "05f29059c0c2090612e8d742178b0580d2dc940c837851ad723096f87af6663e" [[package]] name = "futures-executor" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a576fc72ae164fca6b9db127eaa9a9dda0d61316034f33a0a0d4eda41f02b01d" +checksum = "1e28d1d997f585e54aebc3f97d39e72338912123a67330d723fdbb564d646c9f" dependencies = [ "futures-core", "futures-task", @@ -489,38 +506,38 @@ dependencies = [ [[package]] name = "futures-io" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a44623e20b9681a318efdd71c299b6b222ed6f231972bfe2f224ebad6311f0c1" +checksum = "9e5c1b78ca4aae1ac06c48a526a655760685149f0d465d21f37abfe57ce075c6" [[package]] name = "futures-macro" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" +checksum = "162ee34ebcb7c64a8abebc059ce0fee27c2262618d7b60ed8faf72fef13c3650" dependencies = [ - "proc-macro2 1.0.81", - "quote 1.0.36", - "syn 2.0.60", + "proc-macro2 1.0.92", + "quote 1.0.37", + "syn 2.0.91", ] [[package]] name = "futures-sink" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9fb8e00e87438d937621c1c6269e53f536c14d3fbd6a042bb24879e57d474fb5" +checksum = "e575fab7d1e0dcb8d0c7bcf9a63ee213816ab51902e6d244a95819acacf1d4f7" [[package]] name = "futures-task" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38d84fa142264698cdce1a9f9172cf383a0c82de1bddcf3092901442c4097004" +checksum = "f90f7dce0722e95104fcb095585910c0977252f286e354b5e3bd38902cd99988" [[package]] name = "futures-util" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d6401deb83407ab3da39eba7e33987a73c3df0c82b4bb5813ee871c19c41d48" +checksum = "9fa08315bb612088cc391249efdc3bc77536f16c91f6cf495e6fbe85b20a4a81" dependencies = [ "futures-channel", "futures-core", @@ -546,9 +563,9 @@ dependencies = [ [[package]] name = "getrandom" -version = "0.2.14" +version = "0.2.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94b22e06ecb0110981051723910cbf0b5f5e09a2062dd7663334ee79a9d1286c" +checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7" dependencies = [ "cfg-if", "libc", @@ -557,9 +574,9 @@ dependencies = [ [[package]] name = "gimli" -version = "0.28.1" +version = "0.31.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4271d37baee1b8c7e4b708028c57d816cf9d2434acb33a549475f78c181f6253" +checksum = "07e28edb80900c19c28f1072f2e8aeca7fa06b23cd4169cefe1af5aa3260783f" [[package]] name = "glob" @@ -586,6 +603,23 @@ dependencies = [ "tracing", ] +[[package]] +name = "h2" +version = "0.4.7" +dependencies = [ + "atomic-waker", + "bytes", + "fnv", + "futures-core", + "futures-sink", + "http", + "indexmap", + "slab", + "tokio", + "tokio-util", + "tracing", +] + [[package]] name = "handlebars" version = "3.5.5" @@ -611,10 +645,16 @@ dependencies = [ ] [[package]] -name = "hermit-abi" -version = "0.3.9" +name = "hashbrown" +version = "0.15.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024" +checksum = "bf151400ff0baff5465007dd2f3e717f3fe502074ca563069ce3a6629d07b289" + +[[package]] +name = "hermit-abi" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fbf6a919d6cf397374f7dfeeea91d974c7c0a7221d0d0f4f20d859d329e53fcc" [[package]] name = "hex" @@ -627,11 +667,11 @@ dependencies = [ [[package]] name = "home" -version = "0.5.9" +version = "0.5.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3d1354bf6b7235cb4a0576c2619fd4ed18183f689b12b006a0ee7329eeff9a5" +checksum = "589533453244b0995c858700322199b2becb13b627df2851f64a2775d024abcf" dependencies = [ - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] @@ -669,9 +709,9 @@ dependencies = [ [[package]] name = "httparse" -version = "1.8.0" +version = "1.9.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d897f394bad6a705d5f4104762e116a75639e470d80901eed05a860a95cb1904" +checksum = "7d71d3574edd2771538b901e6549113b4006ece66150fb69c0fb6d9a2adae946" [[package]] name = "httpdate" @@ -687,15 +727,15 @@ checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" [[package]] name = "hyper" -version = "0.14.28" +version = "0.14.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf96e135eb83a2a8ddf766e426a841d8ddd7449d5f00d34ea02b41d2f19eef80" +checksum = "41dfc780fdec9373c01bae43289ea34c972e40ee3c9f6b3c8801a35f35586ce7" dependencies = [ "bytes", "futures-channel", "futures-core", "futures-util", - "h2", + "h2 0.3.26", "http", "http-body", "httparse", @@ -710,30 +750,159 @@ dependencies = [ ] [[package]] -name = "idna" -version = "0.5.0" +name = "icu_collections" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "634d9b1461af396cad843f47fdba5597a4f9e6ddd4bfb6ff5d85028c25cb12f6" +checksum = "db2fa452206ebee18c4b5c2274dbf1de17008e874b4dc4f0aea9d01ca79e4526" dependencies = [ - "unicode-bidi", - "unicode-normalization", + "displaydoc", + "yoke", + "zerofrom", + "zerovec", +] + +[[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_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", + "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", + "stable_deref_trait", + "tinystr", + "writeable", + "yoke", + "zerofrom", + "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 1.0.92", + "quote 1.0.37", + "syn 2.0.91", +] + +[[package]] +name = "idna" +version = "1.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "686f825264d630750a544639377bae737628043f20d38bbc029e8f29ea968a7e" +dependencies = [ + "idna_adapter", + "smallvec", + "utf8_iter", +] + +[[package]] +name = "idna_adapter" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "daca1df1c957320b2cf139ac61e7bd64fed304c5040df000a745aa1de3b4ef71" +dependencies = [ + "icu_normalizer", + "icu_properties", ] [[package]] name = "indexmap" -version = "2.2.6" +version = "2.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "168fb715dda47215e360912c096649d23d58bf392ac62f73919e831745e40f26" +checksum = "62f822373a4fe84d4bb149bf54e584a7f4abec90e072ed49cda0edea5b95471f" dependencies = [ "equivalent", - "hashbrown", + "hashbrown 0.15.2", ] [[package]] name = "is-terminal" -version = "0.4.12" +version = "0.4.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f23ff5ef2b80d608d61efee834934d862cd92461afc0560dedf493e4c033738b" +checksum = "261f68e344040fbd0edea105bef17c66edf46f984ddb1115b775ce31be948f4b" dependencies = [ "hermit-abi", "libc", @@ -751,33 +920,34 @@ dependencies = [ [[package]] name = "itoa" -version = "1.0.11" +version = "1.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b" +checksum = "d75a2a4b1b190afb6f5425f10f6a8f959d2ea0b9c2b1d79553551850539e4674" [[package]] name = "jobserver" -version = "0.1.31" +version = "0.1.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2b099aaa34a9751c5bf0878add70444e1ed2dd73f347be99003d4577277de6e" +checksum = "48d1dbcbbeb6a7fec7e059840aa538bd62aaccf972c7346c4d9d2059312853d0" dependencies = [ "libc", ] [[package]] name = "js-sys" -version = "0.3.69" +version = "0.3.76" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "29c15563dc2726973df627357ce0c9ddddbea194836909d655df6a75d2cf296d" +checksum = "6717b6b5b077764fb5966237269cb3c64edddde4b14ce42647430a78ced9e7b7" dependencies = [ + "once_cell", "wasm-bindgen", ] [[package]] name = "lazy_static" -version = "1.4.0" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" +checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe" [[package]] name = "lazycell" @@ -787,9 +957,9 @@ checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55" [[package]] name = "lettre" -version = "0.11.7" +version = "0.11.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a62049a808f1c4e2356a2a380bd5f2aca3b011b0b482cf3b914ba1731426969" +checksum = "ab4c9a167ff73df98a5ecc07e8bf5ce90b583665da3d1762eb1f775ad4d0d6f5" dependencies = [ "base64 0.22.1", "chumsky", @@ -812,18 +982,18 @@ dependencies = [ [[package]] name = "libc" -version = "0.2.154" +version = "0.2.169" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae743338b92ff9146ce83992f766a31066a91a8c84a45e0e9f21e7cf6de6d346" +checksum = "b5aba8db14291edd000dfcc4d620c7ebfb122c613afb886ca8803fa4e128a20a" [[package]] name = "libloading" -version = "0.8.3" +version = "0.8.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c2a198fb6b0eada2a8df47933734e6d35d350665a33a3593d7164fa52c75c19" +checksum = "fc2f4eb4bc735547cfed7c0a4922cbd04a4655978c09b54f1f7b228750664c34" dependencies = [ "cfg-if", - "windows-targets 0.52.5", + "windows-targets 0.52.6", ] [[package]] @@ -832,8 +1002,9 @@ version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c0ff37bd590ca25063e35af745c343cb7a0271906fb7b37e4813e8f79f00268d" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "libc", + "redox_syscall", ] [[package]] @@ -848,21 +1019,27 @@ dependencies = [ [[package]] name = "linux-raw-sys" -version = "0.4.13" +version = "0.4.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "01cda141df6706de531b6c46c3a33ecca755538219bd484262fa09410c13539c" +checksum = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89" + +[[package]] +name = "litemap" +version = "0.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4ee93343901ab17bd981295f2cf0026d4ad018c7c31ba84549a4ddbb47a45104" [[package]] name = "log" -version = "0.4.21" +version = "0.4.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90ed8c1e510134f979dbc4f070f87d4313098b704861a105fe34231c70a3901c" +checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24" [[package]] name = "memchr" -version = "2.7.2" +version = "2.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c8640c5d730cb13ebd907d8d04b52f55ac9a2eec55b440c8892f40d56c76c1d" +checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3" [[package]] name = "memoffset" @@ -896,31 +1073,30 @@ checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" [[package]] name = "miniz_oxide" -version = "0.7.2" +version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d811f3e15f28568be3407c8e7fdb6514c1cda3cb30683f15b6a1a1dc4ea14a7" +checksum = "4ffbe83022cedc1d264172192511ae958937694cd57ce297164951b8b3568394" dependencies = [ - "adler", + "adler2", ] [[package]] name = "mio" -version = "0.8.11" +version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4a650543ca06a924e8b371db273b2756685faae30f8487da1b56505a8f78b0c" +checksum = "2886843bf800fba2e3377cff24abf6379b4c4d5c6681eaf9ea5b0d15090450bd" dependencies = [ "libc", "wasi", - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] name = "native-tls" -version = "0.2.11" +version = "0.2.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "07226173c32f2926027b63cce4bcd8076c3552846cbe7925f3aaffeac0a3b92e" +checksum = "a8614eb2c83d59d1c8cc974dd3f920198647674a0a035e1af1fa58707e317466" dependencies = [ - "lazy_static", "libc", "log", "openssl", @@ -978,37 +1154,37 @@ dependencies = [ ] [[package]] -name = "num_cpus" -version = "1.16.0" +name = "nu-ansi-term" +version = "0.46.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43" +checksum = "77a8165726e8236064dbb45459242600304b42a5ea24ee2948e18e023bf7ba84" dependencies = [ - "hermit-abi", - "libc", + "overload", + "winapi", ] [[package]] name = "object" -version = "0.32.2" +version = "0.36.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a6a622008b6e321afc04970976f62ee297fdbaa6f95318ca343e3eebb9648441" +checksum = "62948e14d923ea95ea2c7c86c71013138b66525b86bdc08d2dcc262bdb497b87" dependencies = [ "memchr", ] [[package]] name = "once_cell" -version = "1.19.0" +version = "1.20.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" +checksum = "1261fe7e33c73b354eab43b1273a57c8f967d0391e80353e51f764ac02cf6775" [[package]] name = "openssl" -version = "0.10.64" +version = "0.10.68" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95a0481286a310808298130d22dd1fef0fa571e05a8f44ec801801e84b216b1f" +checksum = "6174bc48f102d208783c2c84bf931bb75927a617866870de8a4ea85597f871f5" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "cfg-if", "foreign-types", "libc", @@ -1023,9 +1199,9 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" dependencies = [ - "proc-macro2 1.0.81", - "quote 1.0.36", - "syn 2.0.60", + "proc-macro2 1.0.92", + "quote 1.0.37", + "syn 2.0.91", ] [[package]] @@ -1036,9 +1212,9 @@ checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" [[package]] name = "openssl-sys" -version = "0.9.102" +version = "0.9.104" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c597637d56fbc83893a35eb0dd04b2b8e7a50c91e64e9493e398b5df4fb45fa2" +checksum = "45abf306cbf99debc8195b66b7346498d7b10c210de50418b5ccd7ceba08c741" dependencies = [ "cc", "libc", @@ -1046,6 +1222,12 @@ dependencies = [ "vcpkg", ] +[[package]] +name = "overload" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39" + [[package]] name = "pathpatterns" version = "0.3.0" @@ -1061,8 +1243,8 @@ dependencies = [ "anyhow", "const_format", "hex", - "lazy_static", "percent-encoding", + "proxmox-apt-api-types", "proxmox-auth-api", "proxmox-human-byte", "proxmox-lang", @@ -1077,28 +1259,25 @@ dependencies = [ [[package]] name = "pbs-buildcfg" -version = "3.2.2" +version = "3.3.2" [[package]] name = "pbs-client" version = "0.1.0" dependencies = [ "anyhow", - "bitflags 1.3.2", + "bitflags 2.6.0", "bytes", "futures", - "h2", + "h2 0.4.7", "hex", "http", "hyper", - "lazy_static", "libc", - "log", "nix 0.26.4", "openssl", "pathpatterns", "pbs-api-types", - "pbs-buildcfg", "pbs-datastore", "pbs-tools", "percent-encoding", @@ -1109,7 +1288,7 @@ dependencies = [ "proxmox-http", "proxmox-human-byte", "proxmox-io", - "proxmox-lang", + "proxmox-log", "proxmox-router", "proxmox-schema", "proxmox-sys", @@ -1132,7 +1311,6 @@ version = "0.1.0" dependencies = [ "anyhow", "const_format", - "lazy_static", "libc", "nix 0.26.4", "once_cell", @@ -1161,7 +1339,6 @@ dependencies = [ "endian_trait", "futures", "hex", - "lazy_static", "libc", "log", "nix 0.26.4", @@ -1181,12 +1358,15 @@ dependencies = [ "proxmox-sys", "proxmox-time", "proxmox-uuid", + "proxmox-worker-task", "pxar", "serde", "serde_json", "tokio", + "tracing", "walkdir", "zstd", + "zstd-safe", ] [[package]] @@ -1195,7 +1375,6 @@ version = "0.1.0" dependencies = [ "anyhow", "futures", - "lazy_static", "libc", "log", "nix 0.26.4", @@ -1244,18 +1423,19 @@ name = "pbs-tape" version = "0.1.0" dependencies = [ "anyhow", - "bitflags 1.3.2", + "bitflags 2.6.0", "endian_trait", "hex", - "lazy_static", "libc", "log", "nix 0.26.4", "openssl", "pbs-api-types", + "pbs-buildcfg", "pbs-config", "proxmox-io", "proxmox-lang", + "proxmox-log", "proxmox-router", "proxmox-schema", "proxmox-sys", @@ -1264,7 +1444,7 @@ dependencies = [ "regex", "serde", "serde_json", - "thiserror", + "thiserror 1.0.69", "udev", ] @@ -1273,34 +1453,19 @@ name = "pbs-tools" version = "0.1.0" dependencies = [ "anyhow", - "base64 0.13.1", "bytes", - "crc32fast", - "endian_trait", - "flate2", "foreign-types", - "futures", "hex", - "lazy_static", "libc", - "log", - "nix 0.26.4", "nom", "openssl", - "pbs-api-types", - "pbs-buildcfg", "proxmox-async", "proxmox-human-byte", "proxmox-io", - "proxmox-lang", "proxmox-sys", "proxmox-time", - "regex", "serde_json", "tokio", - "url", - "walkdir", - "zstd", ] [[package]] @@ -1311,20 +1476,20 @@ checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" [[package]] name = "pest" -version = "2.7.10" +version = "2.7.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "560131c633294438da9f7c4b08189194b20946c8274c6b9e38881a7874dc8ee8" +checksum = "8b7cafe60d6cf8e62e1b9b2ea516a089c008945bb5a275416789e7db0bc199dc" dependencies = [ "memchr", - "thiserror", + "thiserror 2.0.9", "ucd-trie", ] [[package]] name = "pest_derive" -version = "2.7.10" +version = "2.7.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26293c9193fbca7b1a3bf9b79dc1e388e927e6cacaa78b4a3ab705a1d3d41459" +checksum = "816518421cfc6887a0d62bf441b6ffb4536fcc926395a69e1a85852d4363f57e" dependencies = [ "pest", "pest_generator", @@ -1332,22 +1497,22 @@ dependencies = [ [[package]] name = "pest_generator" -version = "2.7.10" +version = "2.7.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3ec22af7d3fb470a85dd2ca96b7c577a1eb4ef6f1683a9fe9a8c16e136c04687" +checksum = "7d1396fd3a870fc7838768d171b4616d5c91f6cc25e377b673d714567d99377b" dependencies = [ "pest", "pest_meta", - "proc-macro2 1.0.81", - "quote 1.0.36", - "syn 2.0.60", + "proc-macro2 1.0.92", + "quote 1.0.37", + "syn 2.0.91", ] [[package]] name = "pest_meta" -version = "2.7.10" +version = "2.7.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d7a240022f37c361ec1878d646fc5b7d7c4d28d5946e1a80ad5a7a4f4ca0bdcd" +checksum = "e1e58089ea25d717bfd31fb534e4f3afcc2cc569c70de3e239778991ea3b7dea" dependencies = [ "once_cell", "pest", @@ -1356,9 +1521,9 @@ dependencies = [ [[package]] name = "pin-project-lite" -version = "0.2.14" +version = "0.2.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bda66fc9667c18cb2758a2ac84d1167245054bcf85d5d1aaa6923f45801bdd02" +checksum = "915a1e146535de9163f3987b8944ed8cf49a18bb0056bcebcdcece385cece4ff" [[package]] name = "pin-utils" @@ -1368,9 +1533,9 @@ checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" [[package]] name = "pkg-config" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec" +checksum = "953ec861398dccce10c670dfeaf3ec4911ca479e9c02154b3a215178c5f566f2" [[package]] name = "proc-macro2" @@ -1383,30 +1548,39 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.81" +version = "1.0.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d1597b0c024618f09a9c3b8655b7e430397a36d23fdafec26d6965e9eec3eba" +checksum = "37d3544b3f2748c54e147655edb5025752e2303145b5aefb3c3ea2c78b973bb0" dependencies = [ "unicode-ident", ] [[package]] name = "proxmox-api-macro" -version = "1.0.8" +version = "1.2.1" dependencies = [ "anyhow", - "proc-macro2 1.0.81", - "quote 1.0.36", - "syn 2.0.60", + "proc-macro2 1.0.92", + "quote 1.0.37", + "syn 2.0.91", +] + +[[package]] +name = "proxmox-apt-api-types" +version = "1.0.2" +dependencies = [ + "proxmox-config-digest", + "proxmox-schema", + "serde", + "serde_plain", ] [[package]] name = "proxmox-async" -version = "0.4.1" +version = "0.4.3" dependencies = [ "anyhow", "futures", - "lazy_static", "pin-utils", "proxmox-io", "proxmox-lang", @@ -1415,11 +1589,10 @@ dependencies = [ [[package]] name = "proxmox-auth-api" -version = "0.3.5" +version = "0.4.6" dependencies = [ "anyhow", "const_format", - "lazy_static", "proxmox-schema", "regex", "serde", @@ -1428,7 +1601,7 @@ dependencies = [ [[package]] name = "proxmox-backup" -version = "3.2.2" +version = "3.3.2" [[package]] name = "proxmox-backup-banner" @@ -1445,7 +1618,6 @@ dependencies = [ "anyhow", "futures", "hyper", - "libc", "log", "nix 0.26.4", "openssl", @@ -1453,20 +1625,20 @@ dependencies = [ "pbs-api-types", "pbs-buildcfg", "pbs-client", - "pbs-config", "pbs-datastore", "pbs-fuse-loop", "pbs-key-config", "pbs-pxar-fuse", "pbs-tools", "proxmox-async", - "proxmox-fuse", "proxmox-human-byte", "proxmox-io", + "proxmox-log", "proxmox-router", "proxmox-schema", "proxmox-sortable-macro", "proxmox-sys", + "proxmox-systemd", "proxmox-time", "pxar", "serde", @@ -1484,7 +1656,7 @@ version = "1.0.1" [[package]] name = "proxmox-compression" -version = "0.2.1" +version = "0.2.4" dependencies = [ "anyhow", "bytes", @@ -1502,6 +1674,17 @@ dependencies = [ "zstd", ] +[[package]] +name = "proxmox-config-digest" +version = "0.1.0" +dependencies = [ + "anyhow", + "hex", + "proxmox-schema", + "serde", + "serde_plain", +] + [[package]] name = "proxmox-fuse" version = "0.1.7" @@ -1516,14 +1699,16 @@ dependencies = [ [[package]] name = "proxmox-http" -version = "0.9.1" +version = "0.9.4" dependencies = [ "anyhow", "base64 0.13.1", "futures", "http", "hyper", + "native-tls", "openssl", + "proxmox-compression", "proxmox-io", "proxmox-lang", "proxmox-sys", @@ -1555,7 +1740,7 @@ dependencies = [ [[package]] name = "proxmox-io" -version = "1.0.1" +version = "1.1.0" dependencies = [ "endian_trait", "tokio", @@ -1563,23 +1748,41 @@ dependencies = [ [[package]] name = "proxmox-lang" -version = "1.1.0" +version = "1.4.0" + +[[package]] +name = "proxmox-log" +version = "0.2.7" +dependencies = [ + "anyhow", + "nix 0.26.4", + "proxmox-sys", + "proxmox-time", + "tokio", + "tracing", + "tracing-journald", + "tracing-log", + "tracing-subscriber", +] [[package]] name = "proxmox-notify" -version = "0.4.0" +version = "0.5.1" dependencies = [ "anyhow", + "base64 0.13.1", "const_format", "handlebars", + "http", "lettre", - "log", "openssl", + "percent-encoding", "proxmox-http", "proxmox-http-error", "proxmox-human-byte", "proxmox-schema", "proxmox-section-config", + "proxmox-sendmail", "proxmox-serde", "proxmox-sys", "proxmox-time", @@ -1587,14 +1790,16 @@ dependencies = [ "regex", "serde", "serde_json", + "tracing", ] [[package]] name = "proxmox-router" -version = "2.1.3" +version = "3.0.0" dependencies = [ "anyhow", "env_logger", + "futures", "http", "hyper", "libc", @@ -1602,22 +1807,20 @@ dependencies = [ "percent-encoding", "proxmox-async", "proxmox-http-error", - "proxmox-lang", "proxmox-schema", "rustyline", "serde", "serde_json", - "tokio", + "serde_plain", "unicode-width", ] [[package]] name = "proxmox-schema" -version = "3.1.0" +version = "3.2.0" dependencies = [ "anyhow", "const_format", - "lazy_static", "proxmox-api-macro", "regex", "serde", @@ -1627,7 +1830,7 @@ dependencies = [ [[package]] name = "proxmox-section-config" -version = "2.0.1" +version = "2.1.1" dependencies = [ "anyhow", "hex", @@ -1637,9 +1840,19 @@ dependencies = [ "serde_json", ] +[[package]] +name = "proxmox-sendmail" +version = "0.1.0" +dependencies = [ + "anyhow", + "base64 0.13.1", + "percent-encoding", + "proxmox-time", +] + [[package]] name = "proxmox-serde" -version = "0.1.1" +version = "0.1.2" dependencies = [ "anyhow", "base64 0.13.1", @@ -1650,7 +1863,7 @@ dependencies = [ [[package]] name = "proxmox-shared-memory" -version = "0.3.0" +version = "0.3.1" dependencies = [ "anyhow", "libc", @@ -1662,64 +1875,73 @@ dependencies = [ name = "proxmox-sortable-macro" version = "0.1.3" dependencies = [ - "proc-macro2 1.0.81", - "quote 1.0.36", - "syn 2.0.60", + "proc-macro2 1.0.92", + "quote 1.0.37", + "syn 2.0.91", ] [[package]] name = "proxmox-sys" -version = "0.5.3" +version = "0.6.5" dependencies = [ "anyhow", - "base64 0.13.1", - "lazy_static", "libc", "log", "nix 0.26.4", + "openssl", "proxmox-io", "proxmox-lang", - "proxmox-time", "regex", "serde", "serde_json", ] +[[package]] +name = "proxmox-systemd" +version = "0.1.0" +dependencies = [ + "libc", +] + [[package]] name = "proxmox-time" -version = "1.1.6" +version = "2.0.3" dependencies = [ "anyhow", - "bitflags 1.3.2", + "bitflags 2.6.0", "js-sys", - "lazy_static", "libc", "nom", ] [[package]] name = "proxmox-uuid" -version = "1.0.2" +version = "1.0.3" dependencies = [ "js-sys", - "libc", "serde", ] +[[package]] +name = "proxmox-worker-task" +version = "0.1.0" +dependencies = [ + "anyhow", +] + [[package]] name = "psm" -version = "0.1.21" +version = "0.1.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5787f7cda34e3033a72192c018bc5883100330f362ef279a8cbccfce8bb4e874" +checksum = "200b9ff220857e53e184257720a14553b2f4aa02577d2ed9842d45d4b9654810" dependencies = [ "cc", ] [[package]] name = "pxar" -version = "0.10.2" +version = "0.12.1" dependencies = [ - "bitflags 1.3.2", "endian_trait", "libc", "siphasher", @@ -1732,13 +1954,14 @@ version = "0.1.0" dependencies = [ "anyhow", "futures", - "log", "nix 0.26.4", "pathpatterns", + "pbs-api-types", "pbs-client", "pbs-pxar-fuse", - "pbs-tools", "proxmox-async", + "proxmox-human-byte", + "proxmox-log", "proxmox-router", "proxmox-schema", "proxmox-sys", @@ -1764,18 +1987,18 @@ dependencies = [ [[package]] name = "quote" -version = "1.0.36" +version = "1.0.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7" +checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af" dependencies = [ - "proc-macro2 1.0.81", + "proc-macro2 1.0.92", ] [[package]] name = "quoted_printable" -version = "0.5.0" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "79ec282e887b434b68c18fe5c121d38e72a5cf35119b59e54ec5b992ea9c8eb0" +checksum = "640c9bd8497b02465aeef5375144c26062e0dcd5939dfcbb0f5db76cb8c17c73" [[package]] name = "radix_trie" @@ -1789,29 +2012,29 @@ dependencies = [ [[package]] name = "redox_syscall" -version = "0.4.1" +version = "0.5.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4722d768eff46b75989dd134e5c353f0d6296e5aaa3132e776cbdb56be7731aa" +checksum = "03a862b389f93e68874fbf580b9de08dd02facb9a788ebadaf4a3fd33cf58834" dependencies = [ - "bitflags 1.3.2", + "bitflags 2.6.0", ] [[package]] name = "redox_users" -version = "0.4.5" +version = "0.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd283d9651eeda4b2a83a43c1c91b266c40fd76ecd39a50a8c630ae69dc72891" +checksum = "ba009ff324d1fc1b900bd1fdb31564febe58a8ccc8a6fdbb93b543d33b13ca43" dependencies = [ "getrandom", "libredox", - "thiserror", + "thiserror 1.0.69", ] [[package]] name = "regex" -version = "1.10.4" +version = "1.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c117dbdfde9c8308975b6a18d71f3f385c89461f7b3fb054288ecf2a2058ba4c" +checksum = "b544ef1b4eac5dc2db33ea63606ae9ffcfac26c1416a2806ae0bf5f56b201191" dependencies = [ "aho-corasick", "memchr", @@ -1821,9 +2044,9 @@ dependencies = [ [[package]] name = "regex-automata" -version = "0.4.6" +version = "0.4.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86b83b8b9847f9bf95ef68afb0b8e6cdb80f498442f5179a29fad448fcc1eaea" +checksum = "809e8dc61f6de73b46c85f4c96486310fe304c434cfa43669d7b40f711150908" dependencies = [ "aho-corasick", "memchr", @@ -1832,30 +2055,15 @@ dependencies = [ [[package]] name = "regex-syntax" -version = "0.8.3" +version = "0.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "adad44e29e4c806119491a7f06f03de4d1af22c3a680dd47f1e6e179439d1f56" - -[[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", -] +checksum = "2b15c43186be67a4fd63bee50d0303afffcef381492ebe2c5d87f324e1b8815c" [[package]] name = "rustc-demangle" -version = "0.1.23" +version = "0.1.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76" +checksum = "719b953e2095829ee67db738b3bfa9fa368c94900df327b3f07fe6e794d2fe1f" [[package]] name = "rustc-hash" @@ -1865,36 +2073,22 @@ checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" [[package]] name = "rustix" -version = "0.38.34" +version = "0.38.42" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70dc5ec042f7a43c4a73241207cecc9873a06d45debb38b329f8541d85c2730f" +checksum = "f93dc38ecbab2eb790ff964bb77fa94faf256fd3e73285fd7ba0903b76bedb85" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "errno", "libc", "linux-raw-sys", - "windows-sys 0.52.0", -] - -[[package]] -name = "rustls" -version = "0.22.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf4ef73721ac7bcd79b2b315da7779d8fc09718c6b3d2d1b2d94850eb8c18432" -dependencies = [ - "log", - "ring", - "rustls-pki-types", - "rustls-webpki", - "subtle", - "zeroize", + "windows-sys 0.59.0", ] [[package]] name = "rustls-native-certs" -version = "0.7.0" +version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f1fb85efa936c42c6d5fc28d2629bb51e4b2f4b8a5211e297d599cc5a093792" +checksum = "e5bfb394eeed242e909609f56089eecfe5fda225042e8b171791b9c95f5931e5" dependencies = [ "openssl-probe", "rustls-pemfile", @@ -1905,30 +2099,18 @@ dependencies = [ [[package]] name = "rustls-pemfile" -version = "2.1.2" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "29993a25686778eb88d4189742cd713c9bce943bc54251a33509dc63cbacf73d" +checksum = "dce314e5fee3f39953d46bb63bb8a46d40c2f8fb7cc5a3b6cab2bde9721d6e50" dependencies = [ - "base64 0.22.1", "rustls-pki-types", ] [[package]] name = "rustls-pki-types" -version = "1.5.0" +version = "1.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "beb461507cee2c2ff151784c52762cf4d9ff6a61f3e80968600ed24fa837fa54" - -[[package]] -name = "rustls-webpki" -version = "0.102.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f3bce581c0dd41bce533ce695a1437fa16a7ab5ac3ccfa99fe1a620a7885eabf" -dependencies = [ - "ring", - "rustls-pki-types", - "untrusted", -] +checksum = "d2bf47e6ff922db3825eb750c4e2ff784c6ff8fb9e13046ef6a1d1c5401b0b37" [[package]] name = "rustyline" @@ -1956,9 +2138,9 @@ dependencies = [ [[package]] name = "ryu" -version = "1.0.17" +version = "1.0.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e86697c916019a8588c99b5fac3cead74ec0b4b819707a682fd4d23fa0ce1ba1" +checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f" [[package]] name = "same-file" @@ -1971,11 +2153,11 @@ dependencies = [ [[package]] name = "schannel" -version = "0.1.23" +version = "0.1.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fbc91545643bcf3a0bbb6569265615222618bdf33ce4ffbbd13c4bbd4c093534" +checksum = "1f29ebaa345f945cec9fbbc532eb307f0fdad8161f281b6369539c8d84876b3d" dependencies = [ - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] @@ -1986,11 +2168,11 @@ checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" [[package]] name = "security-framework" -version = "2.10.0" +version = "2.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "770452e37cad93e0a50d5abc3990d2bc351c36d0328f86cefec2f2fb206eaef6" +checksum = "897b2245f0b511c87893af39b033e5ca9cce68824c4d7e7630b5a1d339658d02" dependencies = [ - "bitflags 1.3.2", + "bitflags 2.6.0", "core-foundation", "core-foundation-sys", "libc", @@ -1999,9 +2181,9 @@ dependencies = [ [[package]] name = "security-framework-sys" -version = "2.10.0" +version = "2.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41f3cc463c0ef97e11c3461a9d3787412d30e8e7eb907c79180c4a57bf7c04ef" +checksum = "1863fd3768cd83c56a7f60faa4dc0d403f1b6df0a38c3c25f44b7894e45370d5" dependencies = [ "core-foundation-sys", "libc", @@ -2009,31 +2191,32 @@ dependencies = [ [[package]] name = "serde" -version = "1.0.200" +version = "1.0.216" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ddc6f9cc94d67c0e21aaf7eda3a010fd3af78ebf6e096aa6e2e13c79749cce4f" +checksum = "0b9781016e935a97e8beecf0c933758c97a5520d32930e460142b4cd80c6338e" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.200" +version = "1.0.216" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "856f046b9400cee3c8c94ed572ecdb752444c24528c035cd35882aad6f492bcb" +checksum = "46f859dbbf73865c6627ed570e78961cd3ac92407a2d117204c49232485da55e" dependencies = [ - "proc-macro2 1.0.81", - "quote 1.0.36", - "syn 2.0.60", + "proc-macro2 1.0.92", + "quote 1.0.37", + "syn 2.0.91", ] [[package]] name = "serde_json" -version = "1.0.116" +version = "1.0.134" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3e17db7126d17feb94eb3fad46bf1a96b034e8aacbc2e775fe81505f8b0b2813" +checksum = "d00f4175c42ee48b15416f6193a959ba3a0d67fc699a0db9ad12df9f83991c7d" dependencies = [ "itoa", + "memchr", "ryu", "serde", ] @@ -2058,6 +2241,15 @@ dependencies = [ "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 = "shlex" version = "1.3.0" @@ -2102,31 +2294,31 @@ checksum = "b7c388c1b5e93756d0c740965c41e8822f866621d41acbdf6336a6a168f8840c" [[package]] name = "socket2" -version = "0.5.7" +version = "0.5.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce305eb0b4296696835b71df73eb912e0f1ffd2556a501fcede6e0c50349191c" +checksum = "c970269d99b64e60ec3bd6ad27270092a5394c4e309314b18ae3fe575695fbe8" dependencies = [ "libc", "windows-sys 0.52.0", ] [[package]] -name = "spin" -version = "0.9.8" +name = "stable_deref_trait" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67" +checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3" [[package]] name = "stacker" -version = "0.1.15" +version = "0.1.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c886bd4480155fd3ef527d45e9ac8dd7118a898a46530b7b94c3e21866259fce" +checksum = "799c883d55abdb5e98af1a7b3f23b9b6de8ecada0ecac058672d7635eb48ca7b" dependencies = [ "cc", "cfg-if", "libc", "psm", - "winapi", + "windows-sys 0.59.0", ] [[package]] @@ -2135,12 +2327,6 @@ version = "1.0.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9e08d8363704e6c71fc928674353e6b7c23dcea9d82d7012c8faf2a3a025f8d0" -[[package]] -name = "subtle" -version = "2.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81cdd64d312baedb58e21336b31bc043b77e01cc99033ce76ef539f78e965ebc" - [[package]] name = "syn" version = "0.12.15" @@ -2154,20 +2340,31 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.60" +version = "2.0.91" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "909518bc7b1c9b779f1bbf07f2929d35af9f0f37e47c6e9ef7f9dddc1e1821f3" +checksum = "d53cbcb5a243bd33b7858b1d7f4aca2153490815872d86d955d6ea29f743c035" dependencies = [ - "proc-macro2 1.0.81", - "quote 1.0.36", + "proc-macro2 1.0.92", + "quote 1.0.37", "unicode-ident", ] [[package]] -name = "tar" -version = "0.4.40" +name = "synstructure" +version = "0.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b16afcea1f22891c49a00c751c7b63b2233284064f11a200fc624137c51e2ddb" +checksum = "c8af7666ab7b6390ab78131fb5b0fce11d6b7a6951602017c35fa82800708971" +dependencies = [ + "proc-macro2 1.0.92", + "quote 1.0.37", + "syn 2.0.91", +] + +[[package]] +name = "tar" +version = "0.4.43" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c65998313f8e17d0d553d28f91a0df93e4dbbbf770279c7bc21ca0f09ea1a1f6" dependencies = [ "filetime", "libc", @@ -2176,14 +2373,15 @@ dependencies = [ [[package]] name = "tempfile" -version = "3.10.1" +version = "3.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85b77fafb263dd9d05cbeac119526425676db3784113aa9295c88498cbf8bff1" +checksum = "28cce251fcbc87fac86a866eeb0d6c2d536fc16d06f184bb61aeae11aa4cee0c" dependencies = [ "cfg-if", "fastrand", + "once_cell", "rustix", - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] @@ -2208,75 +2406,98 @@ dependencies = [ [[package]] name = "thiserror" -version = "1.0.59" +version = "1.0.69" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0126ad08bff79f29fc3ae6a55cc72352056dfff61e3ff8bb7129476d44b23aa" +checksum = "b6aaf5339b578ea85b50e080feb250a3e8ae8cfcdff9a461c9ec2904bc923f52" dependencies = [ - "thiserror-impl", + "thiserror-impl 1.0.69", +] + +[[package]] +name = "thiserror" +version = "2.0.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f072643fd0190df67a8bab670c20ef5d8737177d6ac6b2e9a236cb096206b2cc" +dependencies = [ + "thiserror-impl 2.0.9", ] [[package]] name = "thiserror-impl" -version = "1.0.59" +version = "1.0.69" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d1cd413b5d558b4c5bf3680e324a6fa5014e7b7c067a51e69dbdf47eb7148b66" +checksum = "4fee6c4efc90059e10f81e6d42c60a18f76588c3d74cb83a0b242a2b6c7504c1" dependencies = [ - "proc-macro2 1.0.81", - "quote 1.0.36", - "syn 2.0.60", + "proc-macro2 1.0.92", + "quote 1.0.37", + "syn 2.0.91", ] [[package]] -name = "tinyvec" -version = "1.6.0" +name = "thiserror-impl" +version = "2.0.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87cc5ceb3875bb20c2890005a4e226a4651264a5c75edb2421b52861a0a0cb50" +checksum = "7b50fa271071aae2e6ee85f842e2e28ba8cd2c5fb67f11fcb1fd70b276f9e7d4" dependencies = [ - "tinyvec_macros", + "proc-macro2 1.0.92", + "quote 1.0.37", + "syn 2.0.91", ] [[package]] -name = "tinyvec_macros" -version = "0.1.1" +name = "thread_local" +version = "1.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" +checksum = "8b9ef9bad013ada3808854ceac7b46812a6465ba368859a37e2100283d2d719c" +dependencies = [ + "cfg-if", + "once_cell", +] + +[[package]] +name = "tinystr" +version = "0.7.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9117f5d4db391c1cf6927e7bea3db74b9a1c1add8f7eda9ffd5364f40f57b82f" +dependencies = [ + "displaydoc", + "zerovec", +] [[package]] name = "tokio" -version = "1.37.0" +version = "1.42.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1adbebffeca75fcfd058afa480fb6c0b81e165a0323f9c9d39c9697e37c46787" +checksum = "5cec9b21b0450273377fc97bd4c33a8acffc8c996c987a7c5b319a0083707551" dependencies = [ "backtrace", "bytes", "libc", "mio", - "num_cpus", "pin-project-lite", "signal-hook-registry", "socket2", "tokio-macros", - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] name = "tokio-macros" -version = "2.2.0" +version = "2.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b8a1e28f2deaa14e508979454cb3a223b10b938b45af148bc0986de36f1923b" +checksum = "693d596312e88961bc67d7f1f97af8a70227d9f90c31bba5806eec004978d752" dependencies = [ - "proc-macro2 1.0.81", - "quote 1.0.36", - "syn 2.0.60", + "proc-macro2 1.0.92", + "quote 1.0.37", + "syn 2.0.91", ] [[package]] name = "tokio-openssl" -version = "0.6.4" +version = "0.6.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ffab79df67727f6acf57f1ff743091873c24c579b1e2ce4d8f53e47ded4d63d" +checksum = "59df6849caa43bb7567f9a36f863c447d95a11d5903c9cc334ba32576a27eadd" dependencies = [ - "futures-util", "openssl", "openssl-sys", "tokio", @@ -2284,9 +2505,9 @@ dependencies = [ [[package]] name = "tokio-stream" -version = "0.1.15" +version = "0.1.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "267ac89e0bec6e691e5813911606935d77c476ff49024f98abcea3e7b15e37af" +checksum = "eca58d7bba4a75707817a2c44174253f9236b2d5fbd055602e9d5c07c139a047" dependencies = [ "futures-core", "pin-project-lite", @@ -2295,41 +2516,89 @@ dependencies = [ [[package]] name = "tokio-util" -version = "0.7.10" +version = "0.7.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5419f34732d9eb6ee4c3578b7989078579b7f039cbbb9ca2c4da015749371e15" +checksum = "d7fcaa8d55a2bdd6b83ace262b016eca0d79ee02818c5c1bcdf0305114081078" dependencies = [ "bytes", "futures-core", "futures-sink", "pin-project-lite", "tokio", - "tracing", ] [[package]] name = "tower-service" -version = "0.3.2" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6bc1c9ce2b5135ac7f93c72918fc37feb872bdc6a5533a8b85eb4b86bfdae52" +checksum = "8df9b6e13f2d32c91b9bd719c00d1958837bc7dec474d94952798cc8e69eeec3" [[package]] name = "tracing" -version = "0.1.40" +version = "0.1.41" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef" +checksum = "784e0ac535deb450455cbfa28a6f0df145ea1bb7ae51b821cf5e7927fdcfbdd0" dependencies = [ "pin-project-lite", + "tracing-attributes", "tracing-core", ] [[package]] -name = "tracing-core" -version = "0.1.32" +name = "tracing-attributes" +version = "0.1.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c06d3da6113f116aaee68e4d601191614c9053067f9ab7f6edbcb161237daa54" +checksum = "395ae124c09f9e6918a2310af6038fba074bcf474ac352496d5910dd59a2226d" +dependencies = [ + "proc-macro2 1.0.92", + "quote 1.0.37", + "syn 2.0.91", +] + +[[package]] +name = "tracing-core" +version = "0.1.33" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e672c95779cf947c5311f83787af4fa8fffd12fb27e4993211a84bdfd9610f9c" dependencies = [ "once_cell", + "valuable", +] + +[[package]] +name = "tracing-journald" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fc0b4143302cf1022dac868d521e36e8b27691f72c84b3311750d5188ebba657" +dependencies = [ + "libc", + "tracing-core", + "tracing-subscriber", +] + +[[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-subscriber" +version = "0.3.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e8189decb5ac0fa7bc8b96b7cb9b2701d60d48805aca84a238004d665fcc4008" +dependencies = [ + "nu-ansi-term", + "sharded-slab", + "smallvec", + "thread_local", + "tracing-core", + "tracing-log", ] [[package]] @@ -2346,9 +2615,9 @@ checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825" [[package]] name = "ucd-trie" -version = "0.1.6" +version = "0.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed646292ffc8188ef8ea4d1e0e0150fb15a5c2e12ad9b8fc191ae7a8a7f3c4b9" +checksum = "2896d95c02a80c6d6a5d6e953d479f5ddf2dfdb6a244441010e373ac0fb88971" [[package]] name = "udev" @@ -2360,17 +2629,11 @@ dependencies = [ "libudev-sys", ] -[[package]] -name = "unicode-bidi" -version = "0.3.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08f95100a766bf4f8f28f90d77e0a5461bbdb219042e7679bebe79004fed8d75" - [[package]] name = "unicode-ident" -version = "1.0.12" +version = "1.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" +checksum = "adb9e6ca4f869e1180728b7950e35922a7fc6397f7b641499e8f3ef06e50dc83" [[package]] name = "unicode-linebreak" @@ -2378,26 +2641,17 @@ version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3b09c83c3c29d37506a3e260c08c03743a6bb66a9cd432c6934ab501a190571f" -[[package]] -name = "unicode-normalization" -version = "0.1.23" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a56d1686db2308d901306f92a263857ef59ea39678a5458e7cb17f01415101f5" -dependencies = [ - "tinyvec", -] - [[package]] name = "unicode-segmentation" -version = "1.11.0" +version = "1.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d4c87d22b6e3f4a18d4d40ef354e97c90fcb14dd91d7dc0aa9d8a1172ebf7202" +checksum = "f6ccf251212114b54433ec949fd6a7841275f9ada20dddd2f29e9ceea4501493" [[package]] name = "unicode-width" -version = "0.1.12" +version = "0.1.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68f5e5f3158ecfd4b8ff6fe086db7c8467a2dfdac97fe420f2b7c4aa97af66d6" +checksum = "7dd6e30e90baa6f72411720665d41d89b9a3d039dc45b8faea1ddd07f617f6af" [[package]] name = "unicode-xid" @@ -2407,39 +2661,29 @@ checksum = "fc72304796d0818e357ead4e000d19c9c174ab23dc11093ac919054d20a6a7fc" [[package]] name = "unicode-xid" -version = "0.2.4" +version = "0.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f962df74c8c05a667b5ee8bcf162993134c104e96440b663c8daa176dc772d8c" - -[[package]] -name = "untrusted" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1" +checksum = "ebc1c04c71510c7f702b52b7c350734c9ff1295c464a03335b00bb84fc54f853" [[package]] name = "ureq" -version = "2.9.7" +version = "2.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d11a831e3c0b56e438a28308e7c810799e3c118417f342d30ecec080105395cd" +checksum = "02d1a66277ed75f640d608235660df48c8e3c19f3b4edb6a263315626cc3c01d" dependencies = [ "base64 0.22.1", - "flate2", "log", + "native-tls", "once_cell", - "rustls", "rustls-native-certs", - "rustls-pki-types", - "rustls-webpki", "url", - "webpki-roots", ] [[package]] name = "url" -version = "2.5.0" +version = "2.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31e6302e3bb753d46e83516cae55ae196fc0c309407cf11ab35cc51a4c2a4633" +checksum = "32f8b686cadd1473f4bd0117a5d28d36b1ade384ea9b5069a1c40aefed7fda60" dependencies = [ "form_urlencoded", "idna", @@ -2447,10 +2691,28 @@ dependencies = [ ] [[package]] -name = "utf8parse" -version = "0.2.1" +name = "utf16_iter" +version = "1.0.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a" +checksum = "c8232dd3cdaed5356e0f716d285e4b40b932ac434100fe9b7e0e8e935b9e6246" + +[[package]] +name = "utf8_iter" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b6c140620e7ffbb22c2dee59cafe6084a59b5ffc27a8859a5f0d494b5d52b6be" + +[[package]] +name = "utf8parse" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821" + +[[package]] +name = "valuable" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d" [[package]] name = "vcpkg" @@ -2460,9 +2722,9 @@ checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426" [[package]] name = "version_check" -version = "0.9.4" +version = "0.9.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" +checksum = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a" [[package]] name = "walkdir" @@ -2491,66 +2753,57 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] name = "wasm-bindgen" -version = "0.2.92" +version = "0.2.99" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4be2531df63900aeb2bca0daaaddec08491ee64ceecbee5076636a3b026795a8" +checksum = "a474f6281d1d70c17ae7aa6a613c87fce69a127e2624002df63dcb39d6cf6396" dependencies = [ "cfg-if", + "once_cell", "wasm-bindgen-macro", ] [[package]] name = "wasm-bindgen-backend" -version = "0.2.92" +version = "0.2.99" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "614d787b966d3989fa7bb98a654e369c762374fd3213d212cfc0251257e747da" +checksum = "5f89bb38646b4f81674e8f5c3fb81b562be1fd936d84320f3264486418519c79" dependencies = [ "bumpalo", "log", - "once_cell", - "proc-macro2 1.0.81", - "quote 1.0.36", - "syn 2.0.60", + "proc-macro2 1.0.92", + "quote 1.0.37", + "syn 2.0.91", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-macro" -version = "0.2.92" +version = "0.2.99" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1f8823de937b71b9460c0c34e25f3da88250760bec0ebac694b49997550d726" +checksum = "2cc6181fd9a7492eef6fef1f33961e3695e4579b9872a6f7c83aee556666d4fe" dependencies = [ - "quote 1.0.36", + "quote 1.0.37", "wasm-bindgen-macro-support", ] [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.92" +version = "0.2.99" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7" +checksum = "30d7a95b763d3c45903ed6c81f156801839e5ee968bb07e534c44df0fcd330c2" dependencies = [ - "proc-macro2 1.0.81", - "quote 1.0.36", - "syn 2.0.60", + "proc-macro2 1.0.92", + "quote 1.0.37", + "syn 2.0.91", "wasm-bindgen-backend", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-shared" -version = "0.2.92" +version = "0.2.99" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af190c94f2773fdb3729c55b007a722abb5384da03bc0986df4c289bf5567e96" - -[[package]] -name = "webpki-roots" -version = "0.26.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b3de34ae270483955a94f4b21bdaaeb83d508bb84a01435f393818edb0012009" -dependencies = [ - "rustls-pki-types", -] +checksum = "943aab3fdaaa029a6e0271b35ea10b72b943135afe9bffca82384098ad0e06a6" [[package]] name = "which" @@ -2582,11 +2835,11 @@ checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" [[package]] name = "winapi-util" -version = "0.1.8" +version = "0.1.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d4cc384e1e73b93bafa6fb4f1df8c41695c8a91cf9c4c64358067d15a7b6c6b" +checksum = "cf221c93e13a30d793f7645a0e7762c55d169dbb0a49671918a2319d289b10bb" dependencies = [ - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] @@ -2602,7 +2855,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e48a53791691ab099e5e2ad123536d0fff50652600abaf43bbf952894110d0be" dependencies = [ "windows-core", - "windows-targets 0.52.5", + "windows-targets 0.52.6", ] [[package]] @@ -2611,7 +2864,7 @@ version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9" dependencies = [ - "windows-targets 0.52.5", + "windows-targets 0.52.6", ] [[package]] @@ -2629,7 +2882,16 @@ version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" dependencies = [ - "windows-targets 0.52.5", + "windows-targets 0.52.6", +] + +[[package]] +name = "windows-sys" +version = "0.59.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b" +dependencies = [ + "windows-targets 0.52.6", ] [[package]] @@ -2649,18 +2911,18 @@ dependencies = [ [[package]] name = "windows-targets" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f0713a46559409d202e70e28227288446bf7841d3211583a4b53e3f6d96e7eb" +checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973" dependencies = [ - "windows_aarch64_gnullvm 0.52.5", - "windows_aarch64_msvc 0.52.5", - "windows_i686_gnu 0.52.5", + "windows_aarch64_gnullvm 0.52.6", + "windows_aarch64_msvc 0.52.6", + "windows_i686_gnu 0.52.6", "windows_i686_gnullvm", - "windows_i686_msvc 0.52.5", - "windows_x86_64_gnu 0.52.5", - "windows_x86_64_gnullvm 0.52.5", - "windows_x86_64_msvc 0.52.5", + "windows_i686_msvc 0.52.6", + "windows_x86_64_gnu 0.52.6", + "windows_x86_64_gnullvm 0.52.6", + "windows_x86_64_msvc 0.52.6", ] [[package]] @@ -2671,9 +2933,9 @@ checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" [[package]] name = "windows_aarch64_gnullvm" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7088eed71e8b8dda258ecc8bac5fb1153c5cffaf2578fc8ff5d61e23578d3263" +checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3" [[package]] name = "windows_aarch64_msvc" @@ -2683,9 +2945,9 @@ checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" [[package]] name = "windows_aarch64_msvc" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9985fd1504e250c615ca5f281c3f7a6da76213ebd5ccc9561496568a2752afb6" +checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469" [[package]] name = "windows_i686_gnu" @@ -2695,15 +2957,15 @@ checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" [[package]] name = "windows_i686_gnu" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "88ba073cf16d5372720ec942a8ccbf61626074c6d4dd2e745299726ce8b89670" +checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b" [[package]] name = "windows_i686_gnullvm" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87f4261229030a858f36b459e748ae97545d6f1ec60e5e0d6a3d32e0dc232ee9" +checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66" [[package]] name = "windows_i686_msvc" @@ -2713,9 +2975,9 @@ checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" [[package]] name = "windows_i686_msvc" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db3c2bf3d13d5b658be73463284eaf12830ac9a26a90c717b7f771dfe97487bf" +checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66" [[package]] name = "windows_x86_64_gnu" @@ -2725,9 +2987,9 @@ checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" [[package]] name = "windows_x86_64_gnu" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e4246f76bdeff09eb48875a0fd3e2af6aada79d409d33011886d3e1581517d9" +checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78" [[package]] name = "windows_x86_64_gnullvm" @@ -2737,9 +2999,9 @@ checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" [[package]] name = "windows_x86_64_gnullvm" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "852298e482cd67c356ddd9570386e2862b5673c85bd5f88df9ab6802b334c596" +checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d" [[package]] name = "windows_x86_64_msvc" @@ -2749,9 +3011,21 @@ checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" [[package]] name = "windows_x86_64_msvc" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bec47e5bfd1bff0eeaf6d8b485cc1074891a197ab4225d504cb7a1ab88b02bf0" +checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" + +[[package]] +name = "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" [[package]] name = "xattr" @@ -2771,30 +3045,91 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "213b7324336b53d2414b2db8537e56544d981803139155afa84f76eeebb7a546" [[package]] -name = "zerocopy" -version = "0.7.32" +name = "yoke" +version = "0.7.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "74d4d3961e53fa4c9a25a8637fc2bfaf2595b3d3ae34875568a5cf64787716be" +checksum = "120e6aef9aa629e3d4f52dc8cc43a015c7724194c97dfaf45180d2daf2b77f40" +dependencies = [ + "serde", + "stable_deref_trait", + "yoke-derive", + "zerofrom", +] + +[[package]] +name = "yoke-derive" +version = "0.7.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2380878cad4ac9aac1e2435f3eb4020e8374b5f13c296cb75b4620ff8e229154" +dependencies = [ + "proc-macro2 1.0.92", + "quote 1.0.37", + "syn 2.0.91", + "synstructure", +] + +[[package]] +name = "zerocopy" +version = "0.7.35" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1b9b4fd18abc82b8136838da5d50bae7bdea537c574d8dc1a34ed098d6c166f0" dependencies = [ "zerocopy-derive", ] [[package]] name = "zerocopy-derive" -version = "0.7.32" +version = "0.7.35" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ce1b18ccd8e73a9321186f97e46f9f04b778851177567b1975109d26a08d2a6" +checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e" dependencies = [ - "proc-macro2 1.0.81", - "quote 1.0.36", - "syn 2.0.60", + "proc-macro2 1.0.92", + "quote 1.0.37", + "syn 2.0.91", ] [[package]] -name = "zeroize" -version = "1.7.0" +name = "zerofrom" +version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "525b4ec142c6b68a2d10f01f7bbf6755599ca3f81ea53b8431b7dd348f5fdb2d" +checksum = "cff3ee08c995dee1859d998dea82f7374f2826091dd9cd47def953cae446cd2e" +dependencies = [ + "zerofrom-derive", +] + +[[package]] +name = "zerofrom-derive" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "595eed982f7d355beb85837f651fa22e90b3c044842dc7f2c2842c086f295808" +dependencies = [ + "proc-macro2 1.0.92", + "quote 1.0.37", + "syn 2.0.91", + "synstructure", +] + +[[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 1.0.92", + "quote 1.0.37", + "syn 2.0.91", +] [[package]] name = "zstd" @@ -2817,27 +3152,11 @@ dependencies = [ [[package]] name = "zstd-sys" -version = "2.0.10+zstd.1.5.6" +version = "2.0.13+zstd.1.5.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c253a4914af5bafc8fa8c86ee400827e83cf6ec01195ec1f1ed8441bf00d65aa" +checksum = "38ff0f21cfee8f97d94cef41359e0c89aa6113028ab0291aa8ca0038995a95aa" dependencies = [ "bindgen", "cc", "pkg-config", ] - -[[patch.unused]] -name = "proxmox-apt" -version = "0.10.9" - -[[patch.unused]] -name = "proxmox-rest-server" -version = "0.5.2" - -[[patch.unused]] -name = "proxmox-subscription" -version = "0.4.3" - -[[patch.unused]] -name = "proxmox-tfa" -version = "4.1.2" diff --git a/pkgs/by-name/pr/proxmox-backup-client/package.nix b/pkgs/by-name/pr/proxmox-backup-client/package.nix index c6cde45e9859..540d9b5ae08d 100644 --- a/pkgs/by-name/pr/proxmox-backup-client/package.nix +++ b/pkgs/by-name/pr/proxmox-backup-client/package.nix @@ -1,6 +1,7 @@ { lib, fetchgit, + fetchFromGitHub, rustPlatform, pkg-config, pkgconf, @@ -12,6 +13,7 @@ git, installShellFiles, sphinx, + systemd, stdenv, fetchpatch, testers, @@ -20,22 +22,20 @@ let pname = "proxmox-backup-client"; - version = "3.2.2"; + version = "3.3.2"; proxmox-backup_src = fetchgit { url = "git://git.proxmox.com/git/proxmox-backup.git"; - rev = "v${version}"; + rev = "ed8bc69a50301ad420366d8431a7891b4992408d"; # no version tag unfortunately name = "proxmox-backup"; - hash = "sha256-9rzUGaUoc87VkB4XJUwI0BjuvxdemE6fjTIR7VRp55Y="; + hash = "sha256-0piUftzuK9e8KbOe+bc3SXWa0DlnEgk5iNGWGn4fw7Y="; }; - # Same revision as used in - # https://aur.archlinux.org/cgit/aur.git/tree/PKGBUILD?h=proxmox-backup-client proxmox_src = fetchgit { url = "git://git.proxmox.com/git/proxmox.git"; - rev = "863d7603403405ccbf8e841b875bf3c9a7a76116"; + rev = "df6b705f564ff145faa14770db6493bc5da8cab3"; name = "proxmox"; - hash = "sha256-aSBT0TGhmM7QDux4gDY1k4HQhAMNWvxX+IVIsq6KeuM="; + hash = "sha256-6fQVK+G5FMPy+29hScMkvQ+MQQryYs8f8oooq1YGXbg="; }; proxmox-fuse_src = fetchgit { @@ -47,9 +47,9 @@ let proxmox-pxar_src = fetchgit { url = "git://git.proxmox.com/git/pxar.git"; - rev = "675ecff32fbeff0973eaea016c4b8f3877015adb"; + rev = "410f326a08ef6c08141af5c7431beb2e16f0c666"; # 0.12.1 name = "pxar"; - hash = "sha256-P5fblRCFq7NI1UkP/jkg38bamM1yuJYX+YhCKPgS15Y="; + hash = "sha256-USvtrWTbP3VUiy9MB9Ym6s4wXBNZ4Ooyg4MRDwRVOtU="; }; proxmox-pathpatterns_src = fetchgit { @@ -59,7 +59,16 @@ let hash = "sha256-717XSlvQdvP0Q516fEx04rsrLCk3QI8frTD5NMmkSr4="; }; - aurPatchCommit = "12c04aa14ee09cb3dafcbe193da9d36a6809695d"; + # needs a patched version + h2_src = fetchFromGitHub { + name = "h2"; + owner = "hyperium"; + repo = "h2"; + rev = "v0.4.7"; + hash = "sha256-GcO4321Jqt1w7jbvQKd0GXIjptyz+tlN2SuxHoBJ/9k="; + }; + + aurPatchCommit = "6f83f58d54bc7186211d0cfa637c652b13e0dfee"; in rustPlatform.buildRustPackage { @@ -71,6 +80,7 @@ rustPlatform.buildRustPackage { proxmox-fuse_src proxmox-pxar_src proxmox-pathpatterns_src + h2_src ]; sourceRoot = proxmox-backup_src.name; @@ -81,27 +91,32 @@ rustPlatform.buildRustPackage { # A lot of Rust crates `proxmox-backup-client` depends on are only available through git (or # Debian packages). This patch redirects all these dependencies to a local, relative path, which # works in combination with the other three repos being checked out. - (fetchpatch { - name = "0001-re-route-dependencies-not-available-on-crates.io-to-.patch"; - url = "https://aur.archlinux.org/cgit/aur.git/plain/0001-re-route-dependencies-not-available-on-crates.io-to-.patch?h=proxmox-backup-client&id=${aurPatchCommit}"; - hash = "sha256-YOlC8A1FKIbNY9+q6n/gDV0efHx2i3kwsmIdZcYhf80="; - }) + ./0001-cargo-re-route-dependencies-not-available-on-crates..patch + # `make docs` assumes that the binaries are located under `target/{debug,release}`, but due + # to how `buildRustPackage` works, they get put under `target/$RUSTC_TARGET/{debug,release}`. + # This patch simply fixes that up. + ./0002-docs-Add-target-path-fixup-variable.patch + # Need to use a patched version of the `h2` crate (with a downgraded dependency, see also postPatch). + # This overrides it in the Cargo.toml as needed. + ./0003-cargo-use-local-patched-h2-dependency.patch # This patch prevents the generation of the man-pages for other components inside the repo, # which would require them too be built too. Thus avoid wasting resources and just skip them. (fetchpatch { name = "0002-docs-drop-all-but-client-man-pages.patch"; url = "https://aur.archlinux.org/cgit/aur.git/plain/0002-docs-drop-all-but-client-man-pages.patch?h=proxmox-backup-client&id=${aurPatchCommit}"; - hash = "sha256-vUGDBx+g05ipL+boY9DaWDAMmstY1IDZs5nILbCIBLY="; + hash = "sha256-AlIGfJZGaZl2NBVfuFxpDL6bgyvXA2Wcz7UWSrnQa24="; }) - # `make docs` assumes that the binaries are located under `target/{debug,release}`, but due - # to how `buildRustPackage` works, they get put under `target/$RUSTC_TARGET/{debug,release}`. - # This patch simply fixes that up. - ./0001-docs-Add-target-path-fixup-variable.patch ]; postPatch = '' + # need to downgrade the `http` crate for `h2` + # see https://aur.archlinux.org/cgit/aur.git/tree/0003-cargo-downgrade-http-to-0.2.12.patch?h=proxmox-backup-client + cp -r ../h2 . + chmod u+w ./h2 + (cd h2 && sed -i 's/^http = "1"$/http = "0.2.12"/' Cargo.toml) + cp ${./Cargo.lock} Cargo.lock - rm .cargo/config + rm .cargo/config.toml ''; postBuild = '' @@ -152,6 +167,7 @@ rustPlatform.buildRustPackage { libuuid acl libxcrypt + systemd.dev ]; passthru.tests.version = testers.testVersion { @@ -162,7 +178,7 @@ rustPlatform.buildRustPackage { meta = with lib; { description = "Command line client for Proxmox Backup Server"; homepage = "https://pbs.proxmox.com/docs/backup-client.html"; - changelog = "https://git.proxmox.com/?p=proxmox-backup.git;a=blob;f=debian/changelog;hb=refs/tags/v${version}"; + changelog = "https://git.proxmox.com/?p=proxmox-backup.git;a=blob;f=debian/changelog;hb=${proxmox-backup_src.rev}"; license = licenses.agpl3Only; maintainers = with maintainers; [ cofob From 422e761b67dce6bffded934153c5cc6f99ce9987 Mon Sep 17 00:00:00 2001 From: Christoph Heiss Date: Tue, 24 Dec 2024 23:00:24 +0100 Subject: [PATCH 144/429] proxmox-backup-client: switch to versionCheckHook Signed-off-by: Christoph Heiss --- pkgs/by-name/pr/proxmox-backup-client/package.nix | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/pkgs/by-name/pr/proxmox-backup-client/package.nix b/pkgs/by-name/pr/proxmox-backup-client/package.nix index 540d9b5ae08d..2ba4618160d0 100644 --- a/pkgs/by-name/pr/proxmox-backup-client/package.nix +++ b/pkgs/by-name/pr/proxmox-backup-client/package.nix @@ -16,8 +16,7 @@ systemd, stdenv, fetchpatch, - testers, - proxmox-backup-client, + versionCheckHook, }: let @@ -170,10 +169,9 @@ rustPlatform.buildRustPackage { systemd.dev ]; - passthru.tests.version = testers.testVersion { - package = proxmox-backup-client; - command = "${pname} version"; - }; + doInstallCheck = true; + nativeInstallCheckInputs = [ versionCheckHook ]; + versionCheckProgramArg = [ "version" ]; meta = with lib; { description = "Command line client for Proxmox Backup Server"; From 20a6e0c6ca89acea7f5208969e8515060dc52d25 Mon Sep 17 00:00:00 2001 From: Liam Murphy Date: Tue, 24 Dec 2024 21:22:59 +0000 Subject: [PATCH 145/429] newlib: 4.3.0.20230120 -> 4.4.0.20231231 This update allows newlib to compile with GCC 14, which in turn fixes the cross-compilers which use newlib for their libc (for example, `pkgsCross.riscv64-embedded.buildPackages.gcc`). --- pkgs/development/misc/newlib/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/misc/newlib/default.nix b/pkgs/development/misc/newlib/default.nix index ee34f56ebb5c..e891cf39dc3a 100644 --- a/pkgs/development/misc/newlib/default.nix +++ b/pkgs/development/misc/newlib/default.nix @@ -13,11 +13,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "newlib"; - version = "4.3.0.20230120"; + version = "4.4.0.20231231"; src = fetchurl { url = "ftp://sourceware.org/pub/newlib/newlib-${finalAttrs.version}.tar.gz"; - sha256 = "sha256-g6Yqma9Z4465sMWO0JLuJNcA//Q6IsA+QzlVET7zUVA="; + sha256 = "sha256-DBZqOeG/CVHfr81olJ/g5LbTZYCB1igvOa7vxjEPLxM="; }; patches = lib.optionals nanoizeNewlib [ From 0f05cd43aafd9f258880c156b921d4d0ab7b77ea Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 25 Dec 2024 13:46:11 +0000 Subject: [PATCH 146/429] paper-age: 1.3.3 -> 1.3.4 --- pkgs/by-name/pa/paper-age/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/pa/paper-age/package.nix b/pkgs/by-name/pa/paper-age/package.nix index 4d0332000bd4..0db8af43493c 100644 --- a/pkgs/by-name/pa/paper-age/package.nix +++ b/pkgs/by-name/pa/paper-age/package.nix @@ -6,16 +6,16 @@ rustPlatform.buildRustPackage rec { pname = "paper-age"; - version = "1.3.3"; + version = "1.3.4"; src = fetchFromGitHub { owner = "matiaskorhonen"; repo = "paper-age"; rev = "v${version}"; - hash = "sha256-XnJSsxWe4/NLOqBjU7++bwLtVfIR9n8hpBxL3K8Bmho="; + hash = "sha256-xoxrNNlpDFXuQwltZ52SkGe0z6+B4h1Jy4XRtvQDiAg="; }; - cargoHash = "sha256-808+lQxjE9dxgNZm/FuZwFuBFJgx/7kCpNn+FrMvuoY="; + cargoHash = "sha256-FmtExP4M6MiKNlekNZZRGs6Y/AY+OQrHC7dmkxkyPQQ="; meta = with lib; { description = "Easy and secure paper backups of secrets"; From e096f35165e77947d1bbf69d8dbdea2759d0ab64 Mon Sep 17 00:00:00 2001 From: merrkry Date: Wed, 25 Dec 2024 17:50:58 +0100 Subject: [PATCH 147/429] tsukimi: 0.17.3 -> 0.18.0 --- pkgs/by-name/ts/tsukimi/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ts/tsukimi/package.nix b/pkgs/by-name/ts/tsukimi/package.nix index a9ebde1eb854..24439218b890 100644 --- a/pkgs/by-name/ts/tsukimi/package.nix +++ b/pkgs/by-name/ts/tsukimi/package.nix @@ -15,18 +15,18 @@ }: rustPlatform.buildRustPackage rec { pname = "tsukimi"; - version = "0.17.3"; + version = "0.18.0"; src = fetchFromGitHub { owner = "tsukinaha"; repo = "tsukimi"; rev = "v${version}"; - hash = "sha256-2AmDP4R06toNrtjV0HSO+Fj8mrXbLgC7bMQPvl10un0="; + hash = "sha256-JHB1D94ymVjP3PEHZ4fTT4c6VOEkFgSdpanzs1AzJUc="; fetchSubmodules = true; }; useFetchCargoVendor = true; - cargoHash = "sha256-3xu4h9ZHlqnaB6Pgn2ixyBF3VS6OF8ZkLaNU4unir7A="; + cargoHash = "sha256-Gh9CPQ73+EpwZTixgQpV4rSwZnedVHQwZRlLQXr8EUo="; nativeBuildInputs = [ pkg-config From 1b3d2ac6f462995f4e2958313437cf94c81722b7 Mon Sep 17 00:00:00 2001 From: Yueh-Shun Li Date: Thu, 26 Dec 2024 08:39:10 +0800 Subject: [PATCH 148/429] stdenv.mkDerivation: inputDerivation: fix for __structuredAttrs = true --- pkgs/stdenv/generic/make-derivation.nix | 29 +++++++++++++++++-------- 1 file changed, 20 insertions(+), 9 deletions(-) diff --git a/pkgs/stdenv/generic/make-derivation.nix b/pkgs/stdenv/generic/make-derivation.nix index 087787055c1e..76c2cd3da4be 100644 --- a/pkgs/stdenv/generic/make-derivation.nix +++ b/pkgs/stdenv/generic/make-derivation.nix @@ -644,15 +644,26 @@ extendDerivation printf "%s" "$(< "''${!pathVar}")" >> $out done '' ]; - - # inputDerivation produces the inputs; not the outputs, so any - # restrictions on what used to be the outputs don't serve a purpose - # anymore. - allowedReferences = null; - allowedRequisites = null; - disallowedReferences = [ ]; - disallowedRequisites = [ ]; - }); + } + // ( + let + sharedOutputChecks = { + # inputDerivation produces the inputs; not the outputs, so any + # restrictions on what used to be the outputs don't serve a purpose + # anymore. + allowedReferences = null; + allowedRequisites = null; + disallowedReferences = [ ]; + disallowedRequisites = [ ]; + }; + in + if __structuredAttrs then + { + outputChecks.out = sharedOutputChecks; + } + else + sharedOutputChecks + )); inherit passthru overrideAttrs; inherit meta; From 4f9faeddf5fc7f9d42c5a7958cc99af61964c940 Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Thu, 26 Dec 2024 02:06:09 +0100 Subject: [PATCH 149/429] vale: 3.9.1 -> 3.9.2 Diff: https://github.com/errata-ai/vale/compare/v3.9.1...v3.9.2 Changelog: https://github.com/errata-ai/vale/releases/tag/v3.9.2 --- pkgs/by-name/va/vale/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/va/vale/package.nix b/pkgs/by-name/va/vale/package.nix index 0bae85aa2015..c4afbd084e49 100644 --- a/pkgs/by-name/va/vale/package.nix +++ b/pkgs/by-name/va/vale/package.nix @@ -10,7 +10,7 @@ buildGoModule rec { pname = "vale"; - version = "3.9.1"; + version = "3.9.2"; subPackages = [ "cmd/vale" ]; @@ -18,7 +18,7 @@ buildGoModule rec { owner = "errata-ai"; repo = "vale"; rev = "v${version}"; - hash = "sha256-WGI5PiAZosMO88pXbNapnxvVJ1ays4XBRPkUtCaZUMI="; + hash = "sha256-2LiuzO1Fha4uS0WNs2mihE/EOSTZa0fOWPzuBw22VlM="; }; vendorHash = "sha256-EWAgzb3ruxYqaP+owcyGDzNnkPDYp0ttHwCgNXuuTbk="; From e560123760f902c4d3005d1bac65370d9bc8fa9d Mon Sep 17 00:00:00 2001 From: Toast <39011842+toast003@users.noreply.github.com> Date: Thu, 26 Dec 2024 12:40:39 +0100 Subject: [PATCH 150/429] handheld-daemon: 3.8.1 -> 3.9.0 --- pkgs/by-name/ha/handheld-daemon/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ha/handheld-daemon/package.nix b/pkgs/by-name/ha/handheld-daemon/package.nix index 3372b3976987..1c11cd3b59b2 100644 --- a/pkgs/by-name/ha/handheld-daemon/package.nix +++ b/pkgs/by-name/ha/handheld-daemon/package.nix @@ -14,14 +14,14 @@ }: python3Packages.buildPythonApplication rec { pname = "handheld-daemon"; - version = "3.8.1"; + version = "3.9.0"; pyproject = true; src = fetchFromGitHub { owner = "hhd-dev"; repo = "hhd"; tag = "v${version}"; - hash = "sha256-LDZ3z1IZTkqdJ/xli9b65yO9t1Pj6a4F0DrYdOnOgNU="; + hash = "sha256-y3CxdWqQEwdNYs4m1NEUeRjTvvhEpS5S739wyFlluWo="; }; # This package relies on several programs expected to be on the user's PATH. From a923c6407996108af3a76c5aeb29d3b5926981b1 Mon Sep 17 00:00:00 2001 From: ZHAO Jin-Xiang Date: Thu, 26 Dec 2024 23:04:34 +0800 Subject: [PATCH 151/429] affine: fix build --- pkgs/by-name/af/affine/package.nix | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/af/affine/package.nix b/pkgs/by-name/af/affine/package.nix index 1fb002189e08..5b6e9caa9e79 100644 --- a/pkgs/by-name/af/affine/package.nix +++ b/pkgs/by-name/af/affine/package.nix @@ -2,7 +2,6 @@ cacert, cargo, copyDesktopItems, - electron_33, fetchFromGitHub, fetchurl, findutils, @@ -10,14 +9,15 @@ lib, makeDesktopItem, makeWrapper, - nodejs_20, rsync, rustPlatform, rustc, stdenv, stdenvNoCC, - yarn, + yarn-berry, zip, + electron_33, + nodejs_20, buildType ? "stable", commandLineArgs ? "", }: @@ -32,6 +32,8 @@ let .${hostPlatform.parsed.cpu.name} or (throw "affine(${buildType}): unsupported CPU family ${hostPlatform.parsed.cpu.name}"); electron = electron_33; + nodejs = nodejs_20; + yarn = yarn-berry.override { inherit nodejs; }; in stdenv.mkDerivation ( finalAttrs: @@ -121,7 +123,7 @@ stdenv.mkDerivation ( }; nativeBuildInputs = [ - nodejs_20 + nodejs yarn cargo rustc From fcb64662061adc87195f122d6a76e588445470a1 Mon Sep 17 00:00:00 2001 From: NAHO <90870942+trueNAHO@users.noreply.github.com> Date: Thu, 26 Dec 2024 17:41:50 +0100 Subject: [PATCH 152/429] antora-ui-default: use correct version naming convention Fixes: c5f5cc355f8b ("antora-ui-default: init at 0") Link: pkgs/README.md --- pkgs/by-name/an/antora-ui-default/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/an/antora-ui-default/package.nix b/pkgs/by-name/an/antora-ui-default/package.nix index 5c7781488fe4..6609ac08a4d8 100644 --- a/pkgs/by-name/an/antora-ui-default/package.nix +++ b/pkgs/by-name/an/antora-ui-default/package.nix @@ -13,7 +13,7 @@ let in stdenvNoCC.mkDerivation { pname = "antora-ui-default"; - version = "0"; + version = "0-unstable-2024-09-20"; # The UI bundle is fetched from lib.maintainers.naho's antora-ui-default fork # for the following reasons: From 518ba1789aa216d697a320bf6b40defdd1c18993 Mon Sep 17 00:00:00 2001 From: NAHO <90870942+trueNAHO@users.noreply.github.com> Date: Thu, 26 Dec 2024 18:22:59 +0100 Subject: [PATCH 153/429] antora-ui-default: 0-unstable-2024-09-20 -> 0-unstable-2024-12-26 --- pkgs/by-name/an/antora-ui-default/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/an/antora-ui-default/package.nix b/pkgs/by-name/an/antora-ui-default/package.nix index 6609ac08a4d8..329841bd4d43 100644 --- a/pkgs/by-name/an/antora-ui-default/package.nix +++ b/pkgs/by-name/an/antora-ui-default/package.nix @@ -8,12 +8,12 @@ let hash = "sha256-q2FwkwzjanxTIxjMpCyMpzPt782uYZiWVdZ7Eev79oM="; owner = "trueNAHO"; repo = "antora-ui-default"; - rev = "83bf9bf5f22a6dee397f8b089eb0315c14a278b5"; + rev = "11f563294248e9b64124b9289d639e349f2e9f5f"; }; in stdenvNoCC.mkDerivation { pname = "antora-ui-default"; - version = "0-unstable-2024-09-20"; + version = "0-unstable-2024-12-26"; # The UI bundle is fetched from lib.maintainers.naho's antora-ui-default fork # for the following reasons: @@ -37,7 +37,7 @@ stdenvNoCC.mkDerivation { # # For reference, the UI bundle from [3] is 300K large. # - # [3]: https://gitlab.com/trueNAHO/antora-ui-default/-/commit/83bf9bf5f22a6dee397f8b089eb0315c14a278b5 + # [3]: https://gitlab.com/trueNAHO/antora-ui-default/-/commit/11f563294248e9b64124b9289d639e349f2e9f5f src = fetchFromGitLab srcFetchFromGitLab; phases = [ "installPhase" ]; From 3001b69c7491f1e282b65a774cccf0fa1b0c08a5 Mon Sep 17 00:00:00 2001 From: jdev082 Date: Thu, 26 Dec 2024 12:43:39 -0600 Subject: [PATCH 154/429] catalyst-browser: 3.9.5 -> 3.9.6 Signed-off-by: jdev082 --- pkgs/by-name/ca/catalyst-browser/package.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ca/catalyst-browser/package.nix b/pkgs/by-name/ca/catalyst-browser/package.nix index 9769000f2fff..97c53a44a57c 100644 --- a/pkgs/by-name/ca/catalyst-browser/package.nix +++ b/pkgs/by-name/ca/catalyst-browser/package.nix @@ -14,12 +14,11 @@ let in stdenv.mkDerivation rec { pname = "catalyst-browser"; - version = "3.9.5"; + version = "3.9.6"; src = fetchurl { url = "https://github.com/CatalystDevOrg/Catalyst/releases/download/v${version}/catalyst-${version}.AppImage"; - hash = "sha256-7lODV9qbl3gcJ5v/0EiJ2IgGCW7pY6RQFlMzClGt2DU= -"; + hash = "sha256-aqEwVykPt6p3HjDAsr7N/+uHnEK5yTUAgCsaT7OmI0w="; name = "catalyst-${version}.AppImage"; }; From f1d8b891b83758e8d3809484cba6d96a3ce83b47 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Fri, 27 Dec 2024 00:30:43 +0100 Subject: [PATCH 155/429] youtube-music: 3.6.2 -> 3.7.1 Changelog: https://github.com/th-ch/youtube-music/releases/tag/v3.7.0 Changelog: https://github.com/th-ch/youtube-music/releases/tag/v3.7.1 --- pkgs/applications/audio/youtube-music/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/audio/youtube-music/default.nix b/pkgs/applications/audio/youtube-music/default.nix index b3cf7a032fad..8f9deb27dd5e 100644 --- a/pkgs/applications/audio/youtube-music/default.nix +++ b/pkgs/applications/audio/youtube-music/default.nix @@ -13,18 +13,18 @@ stdenv.mkDerivation (finalAttrs: { pname = "youtube-music"; - version = "3.6.2"; + version = "3.7.1"; src = fetchFromGitHub { owner = "th-ch"; repo = "youtube-music"; rev = "v${finalAttrs.version}"; - hash = "sha256-S13f3vGMQJvpJbdfUstJlA8MfY5Q1efRA7QcPXYvhMI="; + hash = "sha256-IV8uTfogy4LchZYIMqDDT96N+5NYE/jwSFc18EhFCb0="; }; pnpmDeps = pnpm.fetchDeps { inherit (finalAttrs) pname version src; - hash = "sha256-brHNp19BEYzgxhdNnn7n1GYhBdyi3S/2VqvKWXmKGX8="; + hash = "sha256-ET4NDUtsTTY3t06VSJLa8Cjd6fP4zs71w83FlsJnq1U="; }; nativeBuildInputs = [ From 8a14cf90433ce40055b332a4efc827f6fef1fb1d Mon Sep 17 00:00:00 2001 From: Lucas David Traverso Date: Fri, 27 Dec 2024 03:22:29 -0300 Subject: [PATCH 156/429] dotbot: 1.20.1 -> 1.20.4 --- pkgs/by-name/do/dotbot/0001-fix-build.patch | 30 --------------------- pkgs/by-name/do/dotbot/package.nix | 11 +++----- 2 files changed, 3 insertions(+), 38 deletions(-) delete mode 100644 pkgs/by-name/do/dotbot/0001-fix-build.patch diff --git a/pkgs/by-name/do/dotbot/0001-fix-build.patch b/pkgs/by-name/do/dotbot/0001-fix-build.patch deleted file mode 100644 index d960db1a5846..000000000000 --- a/pkgs/by-name/do/dotbot/0001-fix-build.patch +++ /dev/null @@ -1,30 +0,0 @@ -From c82a6e988594e6bb703df1f39d31451ea5be6967 Mon Sep 17 00:00:00 2001 -From: wxt <3264117476@qq.com> -Date: Sun, 3 Nov 2024 16:23:50 +0800 -Subject: [PATCH] fix build - ---- - tests/conftest.py | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/tests/conftest.py b/tests/conftest.py -index 162781b..d13808d 100644 ---- a/tests/conftest.py -+++ b/tests/conftest.py -@@ -47,11 +47,12 @@ def wrap_function(function, function_path, arg_index, kwarg_key, root): - - msg = "The '{0}' argument to {1}() must be an absolute path" - msg = msg.format(kwarg_key, function_path) -+ value = os.path.join(value) - assert value == os.path.abspath(value), msg - - msg = "The '{0}' argument to {1}() must be rooted in {2}" - msg = msg.format(kwarg_key, function_path, root) -- assert value[: len(str(root))] == str(root), msg -+ assert value[: len(str(root))] == str(root) or value.find("pytest-cache")!=-1, msg - - return function(*args, **kwargs) - --- -2.46.1 - diff --git a/pkgs/by-name/do/dotbot/package.nix b/pkgs/by-name/do/dotbot/package.nix index bdf9ecd8eeaf..7bb4b99872d5 100644 --- a/pkgs/by-name/do/dotbot/package.nix +++ b/pkgs/by-name/do/dotbot/package.nix @@ -6,25 +6,20 @@ python3Packages.buildPythonApplication rec { pname = "dotbot"; - version = "1.20.1"; + version = "1.20.4"; pyproject = true; src = fetchFromGitHub { owner = "anishathalye"; repo = "dotbot"; - rev = "v${version}"; - hash = "sha256-Gy+LVGG/BAqXoM6GDuKBkGKxxAkmoYtBRA33y/ihdRE="; + tag = "v${version}"; + hash = "sha256-GnzN8z7LP9rVD0DnKkPxJ0BxiO1YDY7MyMWBt1CAh6g="; }; preCheck = '' patchShebangs bin/dotbot ''; - patches = [ - # ignore pytest-cache because it was not at /tmp/nix-shell and it was used by pytest itself not our program - ./0001-fix-build.patch - ]; - nativeBuildInputs = with python3Packages; [ setuptools ]; propagatedBuildInputs = with python3Packages; [ pyyaml ]; From 21c9539299eef26e2d5d7e47ab891ecb5a790a90 Mon Sep 17 00:00:00 2001 From: John Titor <50095635+JohnRTitor@users.noreply.github.com> Date: Fri, 27 Dec 2024 13:39:46 +0530 Subject: [PATCH 157/429] schedtool: fix build with gcc 13 > error: pointer/integer type mismatch in conditional expression [-Wint-conversion] Point meta.homepage to the GitHub repo Signed-off-by: John Titor <50095635+JohnRTitor@users.noreply.github.com> --- pkgs/by-name/sc/schedtool/package.nix | 24 +++++++++++++++--------- 1 file changed, 15 insertions(+), 9 deletions(-) diff --git a/pkgs/by-name/sc/schedtool/package.nix b/pkgs/by-name/sc/schedtool/package.nix index fbbbee1c0968..11c4e958f05f 100644 --- a/pkgs/by-name/sc/schedtool/package.nix +++ b/pkgs/by-name/sc/schedtool/package.nix @@ -4,28 +4,34 @@ fetchFromGitHub, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "schedtool"; version = "1.3.0"; src = fetchFromGitHub { owner = "freequaos"; repo = "schedtool"; - rev = "${pname}-${version}"; - sha256 = "1wdw6fnf9a01xfjhdah3mn8bp1bvahf2lfq74i6hk5b2cagkppyp"; + rev = "schedtool-${finalAttrs.version}"; + hash = "sha256-1987n2JilQlNJAc7KhxUe4W7kK0Dqgal6wGo5KwzvPE="; }; + # Fix build with GCC 13 + postPatch = '' + substituteInPlace schedtool.c \ + --replace-fail 'TAB[policy] : policy' 'TAB[policy] : (char*)(intptr_t)policy' + ''; + makeFlags = [ "DESTDIR=$(out)" "DESTPREFIX=" ]; - meta = with lib; { + meta = { description = "Query or alter a process' scheduling policy under Linux"; mainProgram = "schedtool"; - homepage = "https://freequaos.host.sk/schedtool/"; - license = licenses.gpl2Only; - platforms = platforms.linux; - maintainers = with maintainers; [ abbradar ]; + homepage = "https://github.com/freequaos/schedtool"; + license = lib.licenses.gpl2Only; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ abbradar ]; }; -} +}) From b5f3b26810c22da6c7b6f85a1a15f1fd79d738ec Mon Sep 17 00:00:00 2001 From: Petr Portnov Date: Wed, 18 Dec 2024 21:07:51 +0300 Subject: [PATCH 158/429] anydesk: add missing dependencies --- pkgs/by-name/an/anydesk/package.nix | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/pkgs/by-name/an/anydesk/package.nix b/pkgs/by-name/an/anydesk/package.nix index 00f6c2354a45..c9b5b8e7ef52 100644 --- a/pkgs/by-name/an/anydesk/package.nix +++ b/pkgs/by-name/an/anydesk/package.nix @@ -10,8 +10,10 @@ cairo, gdk-pixbuf, glib, - gnome2, - gtk2, + gtk3, + dbus, + harfbuzz, + libz, libGLU, libGL, pango, @@ -48,10 +50,12 @@ stdenv.mkDerivation (finalAttrs: { cairo gdk-pixbuf glib - gtk2 + gtk3 + dbus + harfbuzz + libz stdenv.cc.cc pango - gnome2.gtkglext libGLU libGL minizip @@ -112,18 +116,15 @@ stdenv.mkDerivation (finalAttrs: { --set-rpath "${lib.makeLibraryPath finalAttrs.buildInputs}" \ $out/bin/anydesk - # pangox is not actually necessary (it was only added as a part of gtkglext) - patchelf \ - --remove-needed libpangox-1.0.so.0 \ - $out/bin/anydesk - wrapProgram $out/bin/anydesk \ --prefix PATH : ${ lib.makeBinPath [ lsb-release pciutils ] - } + } \ + --prefix GDK_BACKEND : x11 \ + --set GTK_THEME Adwaita ''; passthru = { From eb90b7b3812c0c453dd45ebe8da10c80ed48eb36 Mon Sep 17 00:00:00 2001 From: Moraxyc Date: Fri, 27 Dec 2024 23:06:38 +0800 Subject: [PATCH 159/429] nezha-theme-admin: 1.2.0 -> 1.4.4 --- .../ne/nezha-theme-admin/package-lock.json | 7114 +++++++++++++++++ pkgs/by-name/ne/nezha-theme-admin/package.nix | 13 +- 2 files changed, 7121 insertions(+), 6 deletions(-) create mode 100644 pkgs/by-name/ne/nezha-theme-admin/package-lock.json diff --git a/pkgs/by-name/ne/nezha-theme-admin/package-lock.json b/pkgs/by-name/ne/nezha-theme-admin/package-lock.json new file mode 100644 index 000000000000..8ac35d6f0c6c --- /dev/null +++ b/pkgs/by-name/ne/nezha-theme-admin/package-lock.json @@ -0,0 +1,7114 @@ +{ + "name": "admin-frontend", + "version": "0.0.0", + "lockfileVersion": 3, + "requires": true, + "packages": { + "": { + "name": "admin-frontend", + "version": "0.0.0", + "dependencies": { + "@hookform/resolvers": "^3.9.1", + "@radix-ui/react-alert-dialog": "^1.1.2", + "@radix-ui/react-avatar": "^1.1.1", + "@radix-ui/react-checkbox": "^1.1.2", + "@radix-ui/react-dialog": "^1.1.2", + "@radix-ui/react-dropdown-menu": "^2.1.2", + "@radix-ui/react-label": "^2.1.0", + "@radix-ui/react-navigation-menu": "^1.2.1", + "@radix-ui/react-popover": "^1.1.2", + "@radix-ui/react-scroll-area": "^1.2.1", + "@radix-ui/react-select": "^2.1.2", + "@radix-ui/react-separator": "^1.1.0", + "@radix-ui/react-slot": "^1.1.1", + "@radix-ui/react-tabs": "^1.1.1", + "@tanstack/react-table": "^8.20.5", + "@trivago/prettier-plugin-sort-imports": "^5.2.0", + "@types/luxon": "^3.4.2", + "@xterm/addon-attach": "^0.11.0", + "@xterm/addon-fit": "^0.10.0", + "@xterm/xterm": "^5.5.0", + "class-variance-authority": "^0.7.0", + "clsx": "^2.1.1", + "cmdk": "^1.0.0", + "copy-to-clipboard": "^3.3.3", + "framer-motion": "^11.14.1", + "i18next": "^24.0.2", + "i18next-browser-languagedetector": "^8.0.0", + "jotai-zustand": "^0.6.0", + "lucide-react": "^0.454.0", + "luxon": "^3.5.0", + "next-themes": "^0.3.0", + "prettier-plugin-tailwindcss": "^0.6.9", + "react": "^18.3.1", + "react-dom": "^18.3.1", + "react-hook-form": "^7.53.1", + "react-i18next": "^15.1.2", + "react-router-dom": "^6.27.0", + "react-virtuoso": "^4.12.0", + "sonner": "^1.6.1", + "swr": "^2.2.5", + "tailwind-merge": "^2.5.4", + "tailwindcss-animate": "^1.0.7", + "vaul": "^1.1.1", + "zod": "^3.23.8", + "zustand": "^5.0.1" + }, + "devDependencies": { + "@eslint/js": "^9.13.0", + "@types/node": "^22.8.6", + "@types/react": "^18.3.12", + "@types/react-dom": "^18.3.1", + "@vitejs/plugin-react": "^4.3.3", + "autoprefixer": "^10.4.20", + "eslint": "^9.13.0", + "eslint-plugin-react-hooks": "^5.0.0", + "eslint-plugin-react-refresh": "^0.4.14", + "globals": "^15.11.0", + "postcss": "^8.4.47", + "swagger-typescript-api": "^13.0.22", + "tailwindcss": "^3.4.14", + "typescript": "~5.6.2", + "typescript-eslint": "^8.11.0", + "vite": "^5.4.10" + } + }, + "node_modules/@alloc/quick-lru": { + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/@alloc/quick-lru/-/quick-lru-5.2.0.tgz", + "integrity": "sha512-UrcABB+4bUrFABwbluTIBErXwvbsU/V7TZWfmbgJfbkwiBuziS9gxdODUyuiecfdGQ85jglMW6juS3+z5TsKLw==", + "license": "MIT", + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/@ampproject/remapping": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/@ampproject/remapping/-/remapping-2.3.0.tgz", + "integrity": "sha512-30iZtAPgz+LTIYoeivqYo853f02jBYSd5uGnGpkFV0M3xOt9aN73erkgYAmZU43x4VfqcnLxW9Kpg3R5LC4YYw==", + "dev": true, + "license": "Apache-2.0", + "dependencies": { + "@jridgewell/gen-mapping": "^0.3.5", + "@jridgewell/trace-mapping": "^0.3.24" + }, + "engines": { + "node": ">=6.0.0" + } + }, + "node_modules/@babel/code-frame": { + "version": "7.26.2", + "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.26.2.tgz", + "integrity": "sha512-RJlIHRueQgwWitWgF8OdFYGZX328Ax5BCemNGlqHfplnRT9ESi8JkFlvaVYbS+UubVY6dpv87Fs2u5M29iNFVQ==", + "license": "MIT", + "dependencies": { + "@babel/helper-validator-identifier": "^7.25.9", + "js-tokens": "^4.0.0", + "picocolors": "^1.0.0" + }, + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/@babel/compat-data": { + "version": "7.26.2", + "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.26.2.tgz", + "integrity": "sha512-Z0WgzSEa+aUcdiJuCIqgujCshpMWgUpgOxXotrYPSA53hA3qopNaqcJpyr0hVb1FeWdnqFA35/fUtXgBK8srQg==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/@babel/core": { + "version": "7.26.0", + "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.26.0.tgz", + "integrity": "sha512-i1SLeK+DzNnQ3LL/CswPCa/E5u4lh1k6IAEphON8F+cXt0t9euTshDru0q7/IqMa1PMPz5RnHuHscF8/ZJsStg==", + "dev": true, + "license": "MIT", + "dependencies": { + "@ampproject/remapping": "^2.2.0", + "@babel/code-frame": "^7.26.0", + "@babel/generator": "^7.26.0", + "@babel/helper-compilation-targets": "^7.25.9", + "@babel/helper-module-transforms": "^7.26.0", + "@babel/helpers": "^7.26.0", + "@babel/parser": "^7.26.0", + "@babel/template": "^7.25.9", + "@babel/traverse": "^7.25.9", + "@babel/types": "^7.26.0", + "convert-source-map": "^2.0.0", + "debug": "^4.1.0", + "gensync": "^1.0.0-beta.2", + "json5": "^2.2.3", + "semver": "^6.3.1" + }, + "engines": { + "node": ">=6.9.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/babel" + } + }, + "node_modules/@babel/generator": { + "version": "7.26.2", + "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.26.2.tgz", + "integrity": "sha512-zevQbhbau95nkoxSq3f/DC/SC+EEOUZd3DYqfSkMhY2/wfSeaHV1Ew4vk8e+x8lja31IbyuUa2uQ3JONqKbysw==", + "license": "MIT", + "dependencies": { + "@babel/parser": "^7.26.2", + "@babel/types": "^7.26.0", + "@jridgewell/gen-mapping": "^0.3.5", + "@jridgewell/trace-mapping": "^0.3.25", + "jsesc": "^3.0.2" + }, + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/@babel/helper-compilation-targets": { + "version": "7.25.9", + "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.25.9.tgz", + "integrity": "sha512-j9Db8Suy6yV/VHa4qzrj9yZfZxhLWQdVnRlXxmKLYlhWUVB1sB2G5sxuWYXk/whHD9iW76PmNzxZ4UCnTQTVEQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "@babel/compat-data": "^7.25.9", + "@babel/helper-validator-option": "^7.25.9", + "browserslist": "^4.24.0", + "lru-cache": "^5.1.1", + "semver": "^6.3.1" + }, + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/@babel/helper-module-imports": { + "version": "7.25.9", + "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.25.9.tgz", + "integrity": "sha512-tnUA4RsrmflIM6W6RFTLFSXITtl0wKjgpnLgXyowocVPrbYrLUXSBXDgTs8BlbmIzIdlBySRQjINYs2BAkiLtw==", + "dev": true, + "license": "MIT", + "dependencies": { + "@babel/traverse": "^7.25.9", + "@babel/types": "^7.25.9" + }, + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/@babel/helper-module-transforms": { + "version": "7.26.0", + "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.26.0.tgz", + "integrity": "sha512-xO+xu6B5K2czEnQye6BHA7DolFFmS3LB7stHZFaOLb1pAwO1HWLS8fXA+eh0A2yIvltPVmx3eNNDBJA2SLHXFw==", + "dev": true, + "license": "MIT", + "dependencies": { + "@babel/helper-module-imports": "^7.25.9", + "@babel/helper-validator-identifier": "^7.25.9", + "@babel/traverse": "^7.25.9" + }, + "engines": { + "node": ">=6.9.0" + }, + "peerDependencies": { + "@babel/core": "^7.0.0" + } + }, + "node_modules/@babel/helper-plugin-utils": { + "version": "7.25.9", + "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.25.9.tgz", + "integrity": "sha512-kSMlyUVdWe25rEsRGviIgOWnoT/nfABVWlqt9N19/dIPWViAOW2s9wznP5tURbs/IDuNk4gPy3YdYRgH3uxhBw==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/@babel/helper-string-parser": { + "version": "7.25.9", + "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.25.9.tgz", + "integrity": "sha512-4A/SCr/2KLd5jrtOMFzaKjVtAei3+2r/NChoBNoZ3EyP/+GlhoaEGoWOZUmFmoITP7zOJyHIMm+DYRd8o3PvHA==", + "license": "MIT", + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/@babel/helper-validator-identifier": { + "version": "7.25.9", + "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.25.9.tgz", + "integrity": "sha512-Ed61U6XJc3CVRfkERJWDz4dJwKe7iLmmJsbOGu9wSloNSFttHV0I8g6UAgb7qnK5ly5bGLPd4oXZlxCdANBOWQ==", + "license": "MIT", + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/@babel/helper-validator-option": { + "version": "7.25.9", + "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.25.9.tgz", + "integrity": "sha512-e/zv1co8pp55dNdEcCynfj9X7nyUKUXoUEwfXqaZt0omVOmDe9oOTdKStH4GmAw6zxMFs50ZayuMfHDKlO7Tfw==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/@babel/helpers": { + "version": "7.26.0", + "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.26.0.tgz", + "integrity": "sha512-tbhNuIxNcVb21pInl3ZSjksLCvgdZy9KwJ8brv993QtIVKJBBkYXz4q4ZbAv31GdnC+R90np23L5FbEBlthAEw==", + "dev": true, + "license": "MIT", + "dependencies": { + "@babel/template": "^7.25.9", + "@babel/types": "^7.26.0" + }, + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/@babel/parser": { + "version": "7.26.2", + "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.26.2.tgz", + "integrity": "sha512-DWMCZH9WA4Maitz2q21SRKHo9QXZxkDsbNZoVD62gusNtNBBqDg9i7uOhASfTfIGNzW+O+r7+jAlM8dwphcJKQ==", + "license": "MIT", + "dependencies": { + "@babel/types": "^7.26.0" + }, + "bin": { + "parser": "bin/babel-parser.js" + }, + "engines": { + "node": ">=6.0.0" + } + }, + "node_modules/@babel/plugin-transform-react-jsx-self": { + "version": "7.25.9", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-jsx-self/-/plugin-transform-react-jsx-self-7.25.9.tgz", + "integrity": "sha512-y8quW6p0WHkEhmErnfe58r7x0A70uKphQm8Sp8cV7tjNQwK56sNVK0M73LK3WuYmsuyrftut4xAkjjgU0twaMg==", + "dev": true, + "license": "MIT", + "dependencies": { + "@babel/helper-plugin-utils": "^7.25.9" + }, + "engines": { + "node": ">=6.9.0" + }, + "peerDependencies": { + "@babel/core": "^7.0.0-0" + } + }, + "node_modules/@babel/plugin-transform-react-jsx-source": { + "version": "7.25.9", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-jsx-source/-/plugin-transform-react-jsx-source-7.25.9.tgz", + "integrity": "sha512-+iqjT8xmXhhYv4/uiYd8FNQsraMFZIfxVSqxxVSZP0WbbSAWvBXAul0m/zu+7Vv4O/3WtApy9pmaTMiumEZgfg==", + "dev": true, + "license": "MIT", + "dependencies": { + "@babel/helper-plugin-utils": "^7.25.9" + }, + "engines": { + "node": ">=6.9.0" + }, + "peerDependencies": { + "@babel/core": "^7.0.0-0" + } + }, + "node_modules/@babel/runtime": { + "version": "7.26.0", + "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.26.0.tgz", + "integrity": "sha512-FDSOghenHTiToteC/QRlv2q3DhPZ/oOXTBoirfWNx1Cx3TMVcGWQtMMmQcSvb/JjpNeGzx8Pq/b4fKEJuWm1sw==", + "license": "MIT", + "dependencies": { + "regenerator-runtime": "^0.14.0" + }, + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/@babel/template": { + "version": "7.25.9", + "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.25.9.tgz", + "integrity": "sha512-9DGttpmPvIxBb/2uwpVo3dqJ+O6RooAFOS+lB+xDqoE2PVCE8nfoHMdZLpfCQRLwvohzXISPZcgxt80xLfsuwg==", + "license": "MIT", + "dependencies": { + "@babel/code-frame": "^7.25.9", + "@babel/parser": "^7.25.9", + "@babel/types": "^7.25.9" + }, + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/@babel/traverse": { + "version": "7.25.9", + "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.25.9.tgz", + "integrity": "sha512-ZCuvfwOwlz/bawvAuvcj8rrithP2/N55Tzz342AkTvq4qaWbGfmCk/tKhNaV2cthijKrPAA8SRJV5WWe7IBMJw==", + "license": "MIT", + "dependencies": { + "@babel/code-frame": "^7.25.9", + "@babel/generator": "^7.25.9", + "@babel/parser": "^7.25.9", + "@babel/template": "^7.25.9", + "@babel/types": "^7.25.9", + "debug": "^4.3.1", + "globals": "^11.1.0" + }, + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/@babel/traverse/node_modules/globals": { + "version": "11.12.0", + "resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz", + "integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==", + "license": "MIT", + "engines": { + "node": ">=4" + } + }, + "node_modules/@babel/types": { + "version": "7.26.0", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.26.0.tgz", + "integrity": "sha512-Z/yiTPj+lDVnF7lWeKCIJzaIkI0vYO87dMpZ4bg4TDrFe4XXLFWL1TbXU27gBP3QccxV9mZICCrnjnYlJjXHOA==", + "license": "MIT", + "dependencies": { + "@babel/helper-string-parser": "^7.25.9", + "@babel/helper-validator-identifier": "^7.25.9" + }, + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/@esbuild/aix-ppc64": { + "version": "0.21.5", + "resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.21.5.tgz", + "integrity": "sha512-1SDgH6ZSPTlggy1yI6+Dbkiz8xzpHJEVAlF/AM1tHPLsf5STom9rwtjE4hKAF20FfXXNTFqEYXyJNWh1GiZedQ==", + "cpu": [ + "ppc64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "aix" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/@esbuild/android-arm": { + "version": "0.21.5", + "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.21.5.tgz", + "integrity": "sha512-vCPvzSjpPHEi1siZdlvAlsPxXl7WbOVUBBAowWug4rJHb68Ox8KualB+1ocNvT5fjv6wpkX6o/iEpbDrf68zcg==", + "cpu": [ + "arm" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "android" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/@esbuild/android-arm64": { + "version": "0.21.5", + "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.21.5.tgz", + "integrity": "sha512-c0uX9VAUBQ7dTDCjq+wdyGLowMdtR/GoC2U5IYk/7D1H1JYC0qseD7+11iMP2mRLN9RcCMRcjC4YMclCzGwS/A==", + "cpu": [ + "arm64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "android" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/@esbuild/android-x64": { + "version": "0.21.5", + "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.21.5.tgz", + "integrity": "sha512-D7aPRUUNHRBwHxzxRvp856rjUHRFW1SdQATKXH2hqA0kAZb1hKmi02OpYRacl0TxIGz/ZmXWlbZgjwWYaCakTA==", + "cpu": [ + "x64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "android" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/@esbuild/darwin-arm64": { + "version": "0.21.5", + "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.21.5.tgz", + "integrity": "sha512-DwqXqZyuk5AiWWf3UfLiRDJ5EDd49zg6O9wclZ7kUMv2WRFr4HKjXp/5t8JZ11QbQfUS6/cRCKGwYhtNAY88kQ==", + "cpu": [ + "arm64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "darwin" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/@esbuild/darwin-x64": { + "version": "0.21.5", + "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.21.5.tgz", + "integrity": "sha512-se/JjF8NlmKVG4kNIuyWMV/22ZaerB+qaSi5MdrXtd6R08kvs2qCN4C09miupktDitvh8jRFflwGFBQcxZRjbw==", + "cpu": [ + "x64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "darwin" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/@esbuild/freebsd-arm64": { + "version": "0.21.5", + "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.21.5.tgz", + "integrity": "sha512-5JcRxxRDUJLX8JXp/wcBCy3pENnCgBR9bN6JsY4OmhfUtIHe3ZW0mawA7+RDAcMLrMIZaf03NlQiX9DGyB8h4g==", + "cpu": [ + "arm64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "freebsd" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/@esbuild/freebsd-x64": { + "version": "0.21.5", + "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.21.5.tgz", + "integrity": "sha512-J95kNBj1zkbMXtHVH29bBriQygMXqoVQOQYA+ISs0/2l3T9/kj42ow2mpqerRBxDJnmkUDCaQT/dfNXWX/ZZCQ==", + "cpu": [ + "x64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "freebsd" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/@esbuild/linux-arm": { + "version": "0.21.5", + "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.21.5.tgz", + "integrity": "sha512-bPb5AHZtbeNGjCKVZ9UGqGwo8EUu4cLq68E95A53KlxAPRmUyYv2D6F0uUI65XisGOL1hBP5mTronbgo+0bFcA==", + "cpu": [ + "arm" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/@esbuild/linux-arm64": { + "version": "0.21.5", + "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.21.5.tgz", + "integrity": "sha512-ibKvmyYzKsBeX8d8I7MH/TMfWDXBF3db4qM6sy+7re0YXya+K1cem3on9XgdT2EQGMu4hQyZhan7TeQ8XkGp4Q==", + "cpu": [ + "arm64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/@esbuild/linux-ia32": { + "version": "0.21.5", + "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.21.5.tgz", + "integrity": "sha512-YvjXDqLRqPDl2dvRODYmmhz4rPeVKYvppfGYKSNGdyZkA01046pLWyRKKI3ax8fbJoK5QbxblURkwK/MWY18Tg==", + "cpu": [ + "ia32" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/@esbuild/linux-loong64": { + "version": "0.21.5", + "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.21.5.tgz", + "integrity": "sha512-uHf1BmMG8qEvzdrzAqg2SIG/02+4/DHB6a9Kbya0XDvwDEKCoC8ZRWI5JJvNdUjtciBGFQ5PuBlpEOXQj+JQSg==", + "cpu": [ + "loong64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/@esbuild/linux-mips64el": { + "version": "0.21.5", + "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.21.5.tgz", + "integrity": "sha512-IajOmO+KJK23bj52dFSNCMsz1QP1DqM6cwLUv3W1QwyxkyIWecfafnI555fvSGqEKwjMXVLokcV5ygHW5b3Jbg==", + "cpu": [ + "mips64el" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/@esbuild/linux-ppc64": { + "version": "0.21.5", + "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.21.5.tgz", + "integrity": "sha512-1hHV/Z4OEfMwpLO8rp7CvlhBDnjsC3CttJXIhBi+5Aj5r+MBvy4egg7wCbe//hSsT+RvDAG7s81tAvpL2XAE4w==", + "cpu": [ + "ppc64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/@esbuild/linux-riscv64": { + "version": "0.21.5", + "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.21.5.tgz", + "integrity": "sha512-2HdXDMd9GMgTGrPWnJzP2ALSokE/0O5HhTUvWIbD3YdjME8JwvSCnNGBnTThKGEB91OZhzrJ4qIIxk/SBmyDDA==", + "cpu": [ + "riscv64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/@esbuild/linux-s390x": { + "version": "0.21.5", + "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.21.5.tgz", + "integrity": "sha512-zus5sxzqBJD3eXxwvjN1yQkRepANgxE9lgOW2qLnmr8ikMTphkjgXu1HR01K4FJg8h1kEEDAqDcZQtbrRnB41A==", + "cpu": [ + "s390x" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/@esbuild/linux-x64": { + "version": "0.21.5", + "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.21.5.tgz", + "integrity": "sha512-1rYdTpyv03iycF1+BhzrzQJCdOuAOtaqHTWJZCWvijKD2N5Xu0TtVC8/+1faWqcP9iBCWOmjmhoH94dH82BxPQ==", + "cpu": [ + "x64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/@esbuild/netbsd-x64": { + "version": "0.21.5", + "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.21.5.tgz", + "integrity": "sha512-Woi2MXzXjMULccIwMnLciyZH4nCIMpWQAs049KEeMvOcNADVxo0UBIQPfSmxB3CWKedngg7sWZdLvLczpe0tLg==", + "cpu": [ + "x64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "netbsd" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/@esbuild/openbsd-x64": { + "version": "0.21.5", + "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.21.5.tgz", + "integrity": "sha512-HLNNw99xsvx12lFBUwoT8EVCsSvRNDVxNpjZ7bPn947b8gJPzeHWyNVhFsaerc0n3TsbOINvRP2byTZ5LKezow==", + "cpu": [ + "x64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "openbsd" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/@esbuild/sunos-x64": { + "version": "0.21.5", + "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.21.5.tgz", + "integrity": "sha512-6+gjmFpfy0BHU5Tpptkuh8+uw3mnrvgs+dSPQXQOv3ekbordwnzTVEb4qnIvQcYXq6gzkyTnoZ9dZG+D4garKg==", + "cpu": [ + "x64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "sunos" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/@esbuild/win32-arm64": { + "version": "0.21.5", + "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.21.5.tgz", + "integrity": "sha512-Z0gOTd75VvXqyq7nsl93zwahcTROgqvuAcYDUr+vOv8uHhNSKROyU961kgtCD1e95IqPKSQKH7tBTslnS3tA8A==", + "cpu": [ + "arm64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "win32" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/@esbuild/win32-ia32": { + "version": "0.21.5", + "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.21.5.tgz", + "integrity": "sha512-SWXFF1CL2RVNMaVs+BBClwtfZSvDgtL//G/smwAc5oVK/UPu2Gu9tIaRgFmYFFKrmg3SyAjSrElf0TiJ1v8fYA==", + "cpu": [ + "ia32" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "win32" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/@esbuild/win32-x64": { + "version": "0.21.5", + "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.21.5.tgz", + "integrity": "sha512-tQd/1efJuzPC6rCFwEvLtci/xNFcTZknmXs98FYDfGE4wP9ClFV98nyKrzJKVPMhdDnjzLhdUyMX4PsQAPjwIw==", + "cpu": [ + "x64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "win32" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/@eslint-community/eslint-utils": { + "version": "4.4.1", + "resolved": "https://registry.npmjs.org/@eslint-community/eslint-utils/-/eslint-utils-4.4.1.tgz", + "integrity": "sha512-s3O3waFUrMV8P/XaF/+ZTp1X9XBZW1a4B97ZnjQF2KYWaFD2A8KyFBsrsfSjEmjn3RGWAIuvlneuZm3CUK3jbA==", + "dev": true, + "license": "MIT", + "dependencies": { + "eslint-visitor-keys": "^3.4.3" + }, + "engines": { + "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + }, + "funding": { + "url": "https://opencollective.com/eslint" + }, + "peerDependencies": { + "eslint": "^6.0.0 || ^7.0.0 || >=8.0.0" + } + }, + "node_modules/@eslint-community/eslint-utils/node_modules/eslint-visitor-keys": { + "version": "3.4.3", + "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.3.tgz", + "integrity": "sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag==", + "dev": true, + "license": "Apache-2.0", + "engines": { + "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + }, + "funding": { + "url": "https://opencollective.com/eslint" + } + }, + "node_modules/@eslint-community/regexpp": { + "version": "4.12.1", + "resolved": "https://registry.npmjs.org/@eslint-community/regexpp/-/regexpp-4.12.1.tgz", + "integrity": "sha512-CCZCDJuduB9OUkFkY2IgppNZMi2lBQgD2qzwXkEia16cge2pijY/aXi96CJMquDMn3nJdlPV1A5KrJEXwfLNzQ==", + "dev": true, + "license": "MIT", + "engines": { + "node": "^12.0.0 || ^14.0.0 || >=16.0.0" + } + }, + "node_modules/@eslint/config-array": { + "version": "0.18.0", + "resolved": "https://registry.npmjs.org/@eslint/config-array/-/config-array-0.18.0.tgz", + "integrity": "sha512-fTxvnS1sRMu3+JjXwJG0j/i4RT9u4qJ+lqS/yCGap4lH4zZGzQ7tu+xZqQmcMZq5OBZDL4QRxQzRjkWcGt8IVw==", + "dev": true, + "license": "Apache-2.0", + "dependencies": { + "@eslint/object-schema": "^2.1.4", + "debug": "^4.3.1", + "minimatch": "^3.1.2" + }, + "engines": { + "node": "^18.18.0 || ^20.9.0 || >=21.1.0" + } + }, + "node_modules/@eslint/core": { + "version": "0.7.0", + "resolved": "https://registry.npmjs.org/@eslint/core/-/core-0.7.0.tgz", + "integrity": "sha512-xp5Jirz5DyPYlPiKat8jaq0EmYvDXKKpzTbxXMpT9eqlRJkRKIz9AGMdlvYjih+im+QlhWrpvVjl8IPC/lHlUw==", + "dev": true, + "license": "Apache-2.0", + "engines": { + "node": "^18.18.0 || ^20.9.0 || >=21.1.0" + } + }, + "node_modules/@eslint/eslintrc": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-3.1.0.tgz", + "integrity": "sha512-4Bfj15dVJdoy3RfZmmo86RK1Fwzn6SstsvK9JS+BaVKqC6QQQQyXekNaC+g+LKNgkQ+2VhGAzm6hO40AhMR3zQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "ajv": "^6.12.4", + "debug": "^4.3.2", + "espree": "^10.0.1", + "globals": "^14.0.0", + "ignore": "^5.2.0", + "import-fresh": "^3.2.1", + "js-yaml": "^4.1.0", + "minimatch": "^3.1.2", + "strip-json-comments": "^3.1.1" + }, + "engines": { + "node": "^18.18.0 || ^20.9.0 || >=21.1.0" + }, + "funding": { + "url": "https://opencollective.com/eslint" + } + }, + "node_modules/@eslint/eslintrc/node_modules/globals": { + "version": "14.0.0", + "resolved": "https://registry.npmjs.org/globals/-/globals-14.0.0.tgz", + "integrity": "sha512-oahGvuMGQlPw/ivIYBjVSrWAfWLBeku5tpPE2fOPLi+WHffIWbuh2tCjhyQhTBPMf5E9jDEH4FOmTYgYwbKwtQ==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=18" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/@eslint/js": { + "version": "9.13.0", + "resolved": "https://registry.npmjs.org/@eslint/js/-/js-9.13.0.tgz", + "integrity": "sha512-IFLyoY4d72Z5y/6o/BazFBezupzI/taV8sGumxTAVw3lXG9A6md1Dc34T9s1FoD/an9pJH8RHbAxsaEbBed9lA==", + "dev": true, + "license": "MIT", + "engines": { + "node": "^18.18.0 || ^20.9.0 || >=21.1.0" + } + }, + "node_modules/@eslint/object-schema": { + "version": "2.1.4", + "resolved": "https://registry.npmjs.org/@eslint/object-schema/-/object-schema-2.1.4.tgz", + "integrity": "sha512-BsWiH1yFGjXXS2yvrf5LyuoSIIbPrGUWob917o+BTKuZ7qJdxX8aJLRxs1fS9n6r7vESrq1OUqb68dANcFXuQQ==", + "dev": true, + "license": "Apache-2.0", + "engines": { + "node": "^18.18.0 || ^20.9.0 || >=21.1.0" + } + }, + "node_modules/@eslint/plugin-kit": { + "version": "0.2.3", + "resolved": "https://registry.npmjs.org/@eslint/plugin-kit/-/plugin-kit-0.2.3.tgz", + "integrity": "sha512-2b/g5hRmpbb1o4GnTZax9N9m0FXzz9OV42ZzI4rDDMDuHUqigAiQCEWChBWCY4ztAGVRjoWT19v0yMmc5/L5kA==", + "dev": true, + "license": "Apache-2.0", + "dependencies": { + "levn": "^0.4.1" + }, + "engines": { + "node": "^18.18.0 || ^20.9.0 || >=21.1.0" + } + }, + "node_modules/@exodus/schemasafe": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/@exodus/schemasafe/-/schemasafe-1.3.0.tgz", + "integrity": "sha512-5Aap/GaRupgNx/feGBwLLTVv8OQFfv3pq2lPRzPg9R+IOBnDgghTGW7l7EuVXOvg5cc/xSAlRW8rBrjIC3Nvqw==", + "dev": true, + "license": "MIT" + }, + "node_modules/@floating-ui/core": { + "version": "1.6.8", + "resolved": "https://registry.npmjs.org/@floating-ui/core/-/core-1.6.8.tgz", + "integrity": "sha512-7XJ9cPU+yI2QeLS+FCSlqNFZJq8arvswefkZrYI1yQBbftw6FyrZOxYSh+9S7z7TpeWlRt9zJ5IhM1WIL334jA==", + "license": "MIT", + "dependencies": { + "@floating-ui/utils": "^0.2.8" + } + }, + "node_modules/@floating-ui/dom": { + "version": "1.6.12", + "resolved": "https://registry.npmjs.org/@floating-ui/dom/-/dom-1.6.12.tgz", + "integrity": "sha512-NP83c0HjokcGVEMeoStg317VD9W7eDlGK7457dMBANbKA6GJZdc7rjujdgqzTaz93jkGgc5P/jeWbaCHnMNc+w==", + "license": "MIT", + "dependencies": { + "@floating-ui/core": "^1.6.0", + "@floating-ui/utils": "^0.2.8" + } + }, + "node_modules/@floating-ui/react-dom": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/@floating-ui/react-dom/-/react-dom-2.1.2.tgz", + "integrity": "sha512-06okr5cgPzMNBy+Ycse2A6udMi4bqwW/zgBF/rwjcNqWkyr82Mcg8b0vjX8OJpZFy/FKjJmw6wV7t44kK6kW7A==", + "license": "MIT", + "dependencies": { + "@floating-ui/dom": "^1.0.0" + }, + "peerDependencies": { + "react": ">=16.8.0", + "react-dom": ">=16.8.0" + } + }, + "node_modules/@floating-ui/utils": { + "version": "0.2.8", + "resolved": "https://registry.npmjs.org/@floating-ui/utils/-/utils-0.2.8.tgz", + "integrity": "sha512-kym7SodPp8/wloecOpcmSnWJsK7M0E5Wg8UcFA+uO4B9s5d0ywXOEro/8HM9x0rW+TljRzul/14UYz3TleT3ig==", + "license": "MIT" + }, + "node_modules/@hookform/resolvers": { + "version": "3.9.1", + "resolved": "https://registry.npmjs.org/@hookform/resolvers/-/resolvers-3.9.1.tgz", + "integrity": "sha512-ud2HqmGBM0P0IABqoskKWI6PEf6ZDDBZkFqe2Vnl+mTHCEHzr3ISjjZyCwTjC/qpL25JC9aIDkloQejvMeq0ug==", + "license": "MIT", + "peerDependencies": { + "react-hook-form": "^7.0.0" + } + }, + "node_modules/@humanfs/core": { + "version": "0.19.1", + "resolved": "https://registry.npmjs.org/@humanfs/core/-/core-0.19.1.tgz", + "integrity": "sha512-5DyQ4+1JEUzejeK1JGICcideyfUbGixgS9jNgex5nqkW+cY7WZhxBigmieN5Qnw9ZosSNVC9KQKyb+GUaGyKUA==", + "dev": true, + "license": "Apache-2.0", + "engines": { + "node": ">=18.18.0" + } + }, + "node_modules/@humanfs/node": { + "version": "0.16.6", + "resolved": "https://registry.npmjs.org/@humanfs/node/-/node-0.16.6.tgz", + "integrity": "sha512-YuI2ZHQL78Q5HbhDiBA1X4LmYdXCKCMQIfw0pw7piHJwyREFebJUvrQN4cMssyES6x+vfUbx1CIpaQUKYdQZOw==", + "dev": true, + "license": "Apache-2.0", + "dependencies": { + "@humanfs/core": "^0.19.1", + "@humanwhocodes/retry": "^0.3.0" + }, + "engines": { + "node": ">=18.18.0" + } + }, + "node_modules/@humanwhocodes/module-importer": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/@humanwhocodes/module-importer/-/module-importer-1.0.1.tgz", + "integrity": "sha512-bxveV4V8v5Yb4ncFTT3rPSgZBOpCkjfK0y4oVVVJwIuDVBRMDXrPyXRL988i5ap9m9bnyEEjWfm5WkBmtffLfA==", + "dev": true, + "license": "Apache-2.0", + "engines": { + "node": ">=12.22" + }, + "funding": { + "type": "github", + "url": "https://github.com/sponsors/nzakas" + } + }, + "node_modules/@humanwhocodes/retry": { + "version": "0.3.1", + "resolved": "https://registry.npmjs.org/@humanwhocodes/retry/-/retry-0.3.1.tgz", + "integrity": "sha512-JBxkERygn7Bv/GbN5Rv8Ul6LVknS+5Bp6RgDC/O8gEBU/yeH5Ui5C/OlWrTb6qct7LjjfT6Re2NxB0ln0yYybA==", + "dev": true, + "license": "Apache-2.0", + "engines": { + "node": ">=18.18" + }, + "funding": { + "type": "github", + "url": "https://github.com/sponsors/nzakas" + } + }, + "node_modules/@isaacs/cliui": { + "version": "8.0.2", + "resolved": "https://registry.npmjs.org/@isaacs/cliui/-/cliui-8.0.2.tgz", + "integrity": "sha512-O8jcjabXaleOG9DQ0+ARXWZBTfnP4WNAqzuiJK7ll44AmxGKv/J2M4TPjxjY3znBCfvBXFzucm1twdyFybFqEA==", + "license": "ISC", + "dependencies": { + "string-width": "^5.1.2", + "string-width-cjs": "npm:string-width@^4.2.0", + "strip-ansi": "^7.0.1", + "strip-ansi-cjs": "npm:strip-ansi@^6.0.1", + "wrap-ansi": "^8.1.0", + "wrap-ansi-cjs": "npm:wrap-ansi@^7.0.0" + }, + "engines": { + "node": ">=12" + } + }, + "node_modules/@jridgewell/gen-mapping": { + "version": "0.3.5", + "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.5.tgz", + "integrity": "sha512-IzL8ZoEDIBRWEzlCcRhOaCupYyN5gdIK+Q6fbFdPDg6HqX6jpkItn7DFIpW9LQzXG6Df9sA7+OKnq0qlz/GaQg==", + "license": "MIT", + "dependencies": { + "@jridgewell/set-array": "^1.2.1", + "@jridgewell/sourcemap-codec": "^1.4.10", + "@jridgewell/trace-mapping": "^0.3.24" + }, + "engines": { + "node": ">=6.0.0" + } + }, + "node_modules/@jridgewell/resolve-uri": { + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.2.tgz", + "integrity": "sha512-bRISgCIjP20/tbWSPWMEi54QVPRZExkuD9lJL+UIxUKtwVJA8wW1Trb1jMs1RFXo1CBTNZ/5hpC9QvmKWdopKw==", + "license": "MIT", + "engines": { + "node": ">=6.0.0" + } + }, + "node_modules/@jridgewell/set-array": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/@jridgewell/set-array/-/set-array-1.2.1.tgz", + "integrity": "sha512-R8gLRTZeyp03ymzP/6Lil/28tGeGEzhx1q2k703KGWRAI1VdvPIXdG70VJc2pAMw3NA6JKL5hhFu1sJX0Mnn/A==", + "license": "MIT", + "engines": { + "node": ">=6.0.0" + } + }, + "node_modules/@jridgewell/sourcemap-codec": { + "version": "1.5.0", + "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.5.0.tgz", + "integrity": "sha512-gv3ZRaISU3fjPAgNsriBRqGWQL6quFx04YMPW/zD8XMLsU32mhCCbfbO6KZFLjvYpCZ8zyDEgqsgf+PwPaM7GQ==", + "license": "MIT" + }, + "node_modules/@jridgewell/trace-mapping": { + "version": "0.3.25", + "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.25.tgz", + "integrity": "sha512-vNk6aEwybGtawWmy/PzwnGDOjCkLWSD2wqvjGGAgOAwCGWySYXfYoxt00IJkTF+8Lb57DwOb3Aa0o9CApepiYQ==", + "license": "MIT", + "dependencies": { + "@jridgewell/resolve-uri": "^3.1.0", + "@jridgewell/sourcemap-codec": "^1.4.14" + } + }, + "node_modules/@nodelib/fs.scandir": { + "version": "2.1.5", + "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz", + "integrity": "sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==", + "license": "MIT", + "dependencies": { + "@nodelib/fs.stat": "2.0.5", + "run-parallel": "^1.1.9" + }, + "engines": { + "node": ">= 8" + } + }, + "node_modules/@nodelib/fs.stat": { + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz", + "integrity": "sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A==", + "license": "MIT", + "engines": { + "node": ">= 8" + } + }, + "node_modules/@nodelib/fs.walk": { + "version": "1.2.8", + "resolved": "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz", + "integrity": "sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==", + "license": "MIT", + "dependencies": { + "@nodelib/fs.scandir": "2.1.5", + "fastq": "^1.6.0" + }, + "engines": { + "node": ">= 8" + } + }, + "node_modules/@pkgjs/parseargs": { + "version": "0.11.0", + "resolved": "https://registry.npmjs.org/@pkgjs/parseargs/-/parseargs-0.11.0.tgz", + "integrity": "sha512-+1VkjdD0QBLPodGrJUeqarH8VAIvQODIbwh9XpP5Syisf7YoQgsJKPNFoqqLQlu+VQ/tVSshMR6loPMn8U+dPg==", + "license": "MIT", + "optional": true, + "engines": { + "node": ">=14" + } + }, + "node_modules/@radix-ui/number": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/@radix-ui/number/-/number-1.1.0.tgz", + "integrity": "sha512-V3gRzhVNU1ldS5XhAPTom1fOIo4ccrjjJgmE+LI2h/WaFpHmx0MQApT+KZHnx8abG6Avtfcz4WoEciMnpFT3HQ==", + "license": "MIT" + }, + "node_modules/@radix-ui/primitive": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/@radix-ui/primitive/-/primitive-1.1.0.tgz", + "integrity": "sha512-4Z8dn6Upk0qk4P74xBhZ6Hd/w0mPEzOOLxy4xiPXOXqjF7jZS0VAKk7/x/H6FyY2zCkYJqePf1G5KmkmNJ4RBA==", + "license": "MIT" + }, + "node_modules/@radix-ui/react-alert-dialog": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/@radix-ui/react-alert-dialog/-/react-alert-dialog-1.1.2.tgz", + "integrity": "sha512-eGSlLzPhKO+TErxkiGcCZGuvbVMnLA1MTnyBksGOeGRGkxHiiJUujsjmNTdWTm4iHVSRaUao9/4Ur671auMghQ==", + "license": "MIT", + "dependencies": { + "@radix-ui/primitive": "1.1.0", + "@radix-ui/react-compose-refs": "1.1.0", + "@radix-ui/react-context": "1.1.1", + "@radix-ui/react-dialog": "1.1.2", + "@radix-ui/react-primitive": "2.0.0", + "@radix-ui/react-slot": "1.1.0" + }, + "peerDependencies": { + "@types/react": "*", + "@types/react-dom": "*", + "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc", + "react-dom": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc" + }, + "peerDependenciesMeta": { + "@types/react": { + "optional": true + }, + "@types/react-dom": { + "optional": true + } + } + }, + "node_modules/@radix-ui/react-alert-dialog/node_modules/@radix-ui/react-slot": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/@radix-ui/react-slot/-/react-slot-1.1.0.tgz", + "integrity": "sha512-FUCf5XMfmW4dtYl69pdS4DbxKy8nj4M7SafBgPllysxmdachynNflAdp/gCsnYWNDnge6tI9onzMp5ARYc1KNw==", + "license": "MIT", + "dependencies": { + "@radix-ui/react-compose-refs": "1.1.0" + }, + "peerDependencies": { + "@types/react": "*", + "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc" + }, + "peerDependenciesMeta": { + "@types/react": { + "optional": true + } + } + }, + "node_modules/@radix-ui/react-arrow": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/@radix-ui/react-arrow/-/react-arrow-1.1.0.tgz", + "integrity": "sha512-FmlW1rCg7hBpEBwFbjHwCW6AmWLQM6g/v0Sn8XbP9NvmSZ2San1FpQeyPtufzOMSIx7Y4dzjlHoifhp+7NkZhw==", + "license": "MIT", + "dependencies": { + "@radix-ui/react-primitive": "2.0.0" + }, + "peerDependencies": { + "@types/react": "*", + "@types/react-dom": "*", + "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc", + "react-dom": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc" + }, + "peerDependenciesMeta": { + "@types/react": { + "optional": true + }, + "@types/react-dom": { + "optional": true + } + } + }, + "node_modules/@radix-ui/react-avatar": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/@radix-ui/react-avatar/-/react-avatar-1.1.1.tgz", + "integrity": "sha512-eoOtThOmxeoizxpX6RiEsQZ2wj5r4+zoeqAwO0cBaFQGjJwIH3dIX0OCxNrCyrrdxG+vBweMETh3VziQG7c1kw==", + "license": "MIT", + "dependencies": { + "@radix-ui/react-context": "1.1.1", + "@radix-ui/react-primitive": "2.0.0", + "@radix-ui/react-use-callback-ref": "1.1.0", + "@radix-ui/react-use-layout-effect": "1.1.0" + }, + "peerDependencies": { + "@types/react": "*", + "@types/react-dom": "*", + "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc", + "react-dom": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc" + }, + "peerDependenciesMeta": { + "@types/react": { + "optional": true + }, + "@types/react-dom": { + "optional": true + } + } + }, + "node_modules/@radix-ui/react-checkbox": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/@radix-ui/react-checkbox/-/react-checkbox-1.1.2.tgz", + "integrity": "sha512-/i0fl686zaJbDQLNKrkCbMyDm6FQMt4jg323k7HuqitoANm9sE23Ql8yOK3Wusk34HSLKDChhMux05FnP6KUkw==", + "license": "MIT", + "dependencies": { + "@radix-ui/primitive": "1.1.0", + "@radix-ui/react-compose-refs": "1.1.0", + "@radix-ui/react-context": "1.1.1", + "@radix-ui/react-presence": "1.1.1", + "@radix-ui/react-primitive": "2.0.0", + "@radix-ui/react-use-controllable-state": "1.1.0", + "@radix-ui/react-use-previous": "1.1.0", + "@radix-ui/react-use-size": "1.1.0" + }, + "peerDependencies": { + "@types/react": "*", + "@types/react-dom": "*", + "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc", + "react-dom": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc" + }, + "peerDependenciesMeta": { + "@types/react": { + "optional": true + }, + "@types/react-dom": { + "optional": true + } + } + }, + "node_modules/@radix-ui/react-collection": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/@radix-ui/react-collection/-/react-collection-1.1.0.tgz", + "integrity": "sha512-GZsZslMJEyo1VKm5L1ZJY8tGDxZNPAoUeQUIbKeJfoi7Q4kmig5AsgLMYYuyYbfjd8fBmFORAIwYAkXMnXZgZw==", + "license": "MIT", + "dependencies": { + "@radix-ui/react-compose-refs": "1.1.0", + "@radix-ui/react-context": "1.1.0", + "@radix-ui/react-primitive": "2.0.0", + "@radix-ui/react-slot": "1.1.0" + }, + "peerDependencies": { + "@types/react": "*", + "@types/react-dom": "*", + "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc", + "react-dom": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc" + }, + "peerDependenciesMeta": { + "@types/react": { + "optional": true + }, + "@types/react-dom": { + "optional": true + } + } + }, + "node_modules/@radix-ui/react-collection/node_modules/@radix-ui/react-context": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/@radix-ui/react-context/-/react-context-1.1.0.tgz", + "integrity": "sha512-OKrckBy+sMEgYM/sMmqmErVn0kZqrHPJze+Ql3DzYsDDp0hl0L62nx/2122/Bvps1qz645jlcu2tD9lrRSdf8A==", + "license": "MIT", + "peerDependencies": { + "@types/react": "*", + "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc" + }, + "peerDependenciesMeta": { + "@types/react": { + "optional": true + } + } + }, + "node_modules/@radix-ui/react-collection/node_modules/@radix-ui/react-slot": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/@radix-ui/react-slot/-/react-slot-1.1.0.tgz", + "integrity": "sha512-FUCf5XMfmW4dtYl69pdS4DbxKy8nj4M7SafBgPllysxmdachynNflAdp/gCsnYWNDnge6tI9onzMp5ARYc1KNw==", + "license": "MIT", + "dependencies": { + "@radix-ui/react-compose-refs": "1.1.0" + }, + "peerDependencies": { + "@types/react": "*", + "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc" + }, + "peerDependenciesMeta": { + "@types/react": { + "optional": true + } + } + }, + "node_modules/@radix-ui/react-compose-refs": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/@radix-ui/react-compose-refs/-/react-compose-refs-1.1.0.tgz", + "integrity": "sha512-b4inOtiaOnYf9KWyO3jAeeCG6FeyfY6ldiEPanbUjWd+xIk5wZeHa8yVwmrJ2vderhu/BQvzCrJI0lHd+wIiqw==", + "license": "MIT", + "peerDependencies": { + "@types/react": "*", + "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc" + }, + "peerDependenciesMeta": { + "@types/react": { + "optional": true + } + } + }, + "node_modules/@radix-ui/react-context": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/@radix-ui/react-context/-/react-context-1.1.1.tgz", + "integrity": "sha512-UASk9zi+crv9WteK/NU4PLvOoL3OuE6BWVKNF6hPRBtYBDXQ2u5iu3O59zUlJiTVvkyuycnqrztsHVJwcK9K+Q==", + "license": "MIT", + "peerDependencies": { + "@types/react": "*", + "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc" + }, + "peerDependenciesMeta": { + "@types/react": { + "optional": true + } + } + }, + "node_modules/@radix-ui/react-dialog": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/@radix-ui/react-dialog/-/react-dialog-1.1.2.tgz", + "integrity": "sha512-Yj4dZtqa2o+kG61fzB0H2qUvmwBA2oyQroGLyNtBj1beo1khoQ3q1a2AO8rrQYjd8256CO9+N8L9tvsS+bnIyA==", + "license": "MIT", + "dependencies": { + "@radix-ui/primitive": "1.1.0", + "@radix-ui/react-compose-refs": "1.1.0", + "@radix-ui/react-context": "1.1.1", + "@radix-ui/react-dismissable-layer": "1.1.1", + "@radix-ui/react-focus-guards": "1.1.1", + "@radix-ui/react-focus-scope": "1.1.0", + "@radix-ui/react-id": "1.1.0", + "@radix-ui/react-portal": "1.1.2", + "@radix-ui/react-presence": "1.1.1", + "@radix-ui/react-primitive": "2.0.0", + "@radix-ui/react-slot": "1.1.0", + "@radix-ui/react-use-controllable-state": "1.1.0", + "aria-hidden": "^1.1.1", + "react-remove-scroll": "2.6.0" + }, + "peerDependencies": { + "@types/react": "*", + "@types/react-dom": "*", + "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc", + "react-dom": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc" + }, + "peerDependenciesMeta": { + "@types/react": { + "optional": true + }, + "@types/react-dom": { + "optional": true + } + } + }, + "node_modules/@radix-ui/react-dialog/node_modules/@radix-ui/react-slot": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/@radix-ui/react-slot/-/react-slot-1.1.0.tgz", + "integrity": "sha512-FUCf5XMfmW4dtYl69pdS4DbxKy8nj4M7SafBgPllysxmdachynNflAdp/gCsnYWNDnge6tI9onzMp5ARYc1KNw==", + "license": "MIT", + "dependencies": { + "@radix-ui/react-compose-refs": "1.1.0" + }, + "peerDependencies": { + "@types/react": "*", + "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc" + }, + "peerDependenciesMeta": { + "@types/react": { + "optional": true + } + } + }, + "node_modules/@radix-ui/react-direction": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/@radix-ui/react-direction/-/react-direction-1.1.0.tgz", + "integrity": "sha512-BUuBvgThEiAXh2DWu93XsT+a3aWrGqolGlqqw5VU1kG7p/ZH2cuDlM1sRLNnY3QcBS69UIz2mcKhMxDsdewhjg==", + "license": "MIT", + "peerDependencies": { + "@types/react": "*", + "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc" + }, + "peerDependenciesMeta": { + "@types/react": { + "optional": true + } + } + }, + "node_modules/@radix-ui/react-dismissable-layer": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/@radix-ui/react-dismissable-layer/-/react-dismissable-layer-1.1.1.tgz", + "integrity": "sha512-QSxg29lfr/xcev6kSz7MAlmDnzbP1eI/Dwn3Tp1ip0KT5CUELsxkekFEMVBEoykI3oV39hKT4TKZzBNMbcTZYQ==", + "license": "MIT", + "dependencies": { + "@radix-ui/primitive": "1.1.0", + "@radix-ui/react-compose-refs": "1.1.0", + "@radix-ui/react-primitive": "2.0.0", + "@radix-ui/react-use-callback-ref": "1.1.0", + "@radix-ui/react-use-escape-keydown": "1.1.0" + }, + "peerDependencies": { + "@types/react": "*", + "@types/react-dom": "*", + "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc", + "react-dom": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc" + }, + "peerDependenciesMeta": { + "@types/react": { + "optional": true + }, + "@types/react-dom": { + "optional": true + } + } + }, + "node_modules/@radix-ui/react-dropdown-menu": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/@radix-ui/react-dropdown-menu/-/react-dropdown-menu-2.1.2.tgz", + "integrity": "sha512-GVZMR+eqK8/Kes0a36Qrv+i20bAPXSn8rCBTHx30w+3ECnR5o3xixAlqcVaYvLeyKUsm0aqyhWfmUcqufM8nYA==", + "license": "MIT", + "dependencies": { + "@radix-ui/primitive": "1.1.0", + "@radix-ui/react-compose-refs": "1.1.0", + "@radix-ui/react-context": "1.1.1", + "@radix-ui/react-id": "1.1.0", + "@radix-ui/react-menu": "2.1.2", + "@radix-ui/react-primitive": "2.0.0", + "@radix-ui/react-use-controllable-state": "1.1.0" + }, + "peerDependencies": { + "@types/react": "*", + "@types/react-dom": "*", + "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc", + "react-dom": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc" + }, + "peerDependenciesMeta": { + "@types/react": { + "optional": true + }, + "@types/react-dom": { + "optional": true + } + } + }, + "node_modules/@radix-ui/react-focus-guards": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/@radix-ui/react-focus-guards/-/react-focus-guards-1.1.1.tgz", + "integrity": "sha512-pSIwfrT1a6sIoDASCSpFwOasEwKTZWDw/iBdtnqKO7v6FeOzYJ7U53cPzYFVR3geGGXgVHaH+CdngrrAzqUGxg==", + "license": "MIT", + "peerDependencies": { + "@types/react": "*", + "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc" + }, + "peerDependenciesMeta": { + "@types/react": { + "optional": true + } + } + }, + "node_modules/@radix-ui/react-focus-scope": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/@radix-ui/react-focus-scope/-/react-focus-scope-1.1.0.tgz", + "integrity": "sha512-200UD8zylvEyL8Bx+z76RJnASR2gRMuxlgFCPAe/Q/679a/r0eK3MBVYMb7vZODZcffZBdob1EGnky78xmVvcA==", + "license": "MIT", + "dependencies": { + "@radix-ui/react-compose-refs": "1.1.0", + "@radix-ui/react-primitive": "2.0.0", + "@radix-ui/react-use-callback-ref": "1.1.0" + }, + "peerDependencies": { + "@types/react": "*", + "@types/react-dom": "*", + "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc", + "react-dom": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc" + }, + "peerDependenciesMeta": { + "@types/react": { + "optional": true + }, + "@types/react-dom": { + "optional": true + } + } + }, + "node_modules/@radix-ui/react-id": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/@radix-ui/react-id/-/react-id-1.1.0.tgz", + "integrity": "sha512-EJUrI8yYh7WOjNOqpoJaf1jlFIH2LvtgAl+YcFqNCa+4hj64ZXmPkAKOFs/ukjz3byN6bdb/AVUqHkI8/uWWMA==", + "license": "MIT", + "dependencies": { + "@radix-ui/react-use-layout-effect": "1.1.0" + }, + "peerDependencies": { + "@types/react": "*", + "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc" + }, + "peerDependenciesMeta": { + "@types/react": { + "optional": true + } + } + }, + "node_modules/@radix-ui/react-label": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/@radix-ui/react-label/-/react-label-2.1.0.tgz", + "integrity": "sha512-peLblDlFw/ngk3UWq0VnYaOLy6agTZZ+MUO/WhVfm14vJGML+xH4FAl2XQGLqdefjNb7ApRg6Yn7U42ZhmYXdw==", + "license": "MIT", + "dependencies": { + "@radix-ui/react-primitive": "2.0.0" + }, + "peerDependencies": { + "@types/react": "*", + "@types/react-dom": "*", + "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc", + "react-dom": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc" + }, + "peerDependenciesMeta": { + "@types/react": { + "optional": true + }, + "@types/react-dom": { + "optional": true + } + } + }, + "node_modules/@radix-ui/react-menu": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/@radix-ui/react-menu/-/react-menu-2.1.2.tgz", + "integrity": "sha512-lZ0R4qR2Al6fZ4yCCZzu/ReTFrylHFxIqy7OezIpWF4bL0o9biKo0pFIvkaew3TyZ9Fy5gYVrR5zCGZBVbO1zg==", + "license": "MIT", + "dependencies": { + "@radix-ui/primitive": "1.1.0", + "@radix-ui/react-collection": "1.1.0", + "@radix-ui/react-compose-refs": "1.1.0", + "@radix-ui/react-context": "1.1.1", + "@radix-ui/react-direction": "1.1.0", + "@radix-ui/react-dismissable-layer": "1.1.1", + "@radix-ui/react-focus-guards": "1.1.1", + "@radix-ui/react-focus-scope": "1.1.0", + "@radix-ui/react-id": "1.1.0", + "@radix-ui/react-popper": "1.2.0", + "@radix-ui/react-portal": "1.1.2", + "@radix-ui/react-presence": "1.1.1", + "@radix-ui/react-primitive": "2.0.0", + "@radix-ui/react-roving-focus": "1.1.0", + "@radix-ui/react-slot": "1.1.0", + "@radix-ui/react-use-callback-ref": "1.1.0", + "aria-hidden": "^1.1.1", + "react-remove-scroll": "2.6.0" + }, + "peerDependencies": { + "@types/react": "*", + "@types/react-dom": "*", + "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc", + "react-dom": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc" + }, + "peerDependenciesMeta": { + "@types/react": { + "optional": true + }, + "@types/react-dom": { + "optional": true + } + } + }, + "node_modules/@radix-ui/react-menu/node_modules/@radix-ui/react-slot": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/@radix-ui/react-slot/-/react-slot-1.1.0.tgz", + "integrity": "sha512-FUCf5XMfmW4dtYl69pdS4DbxKy8nj4M7SafBgPllysxmdachynNflAdp/gCsnYWNDnge6tI9onzMp5ARYc1KNw==", + "license": "MIT", + "dependencies": { + "@radix-ui/react-compose-refs": "1.1.0" + }, + "peerDependencies": { + "@types/react": "*", + "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc" + }, + "peerDependenciesMeta": { + "@types/react": { + "optional": true + } + } + }, + "node_modules/@radix-ui/react-navigation-menu": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/@radix-ui/react-navigation-menu/-/react-navigation-menu-1.2.1.tgz", + "integrity": "sha512-egDo0yJD2IK8L17gC82vptkvW1jLeni1VuqCyzY727dSJdk5cDjINomouLoNk8RVF7g2aNIfENKWL4UzeU9c8Q==", + "license": "MIT", + "dependencies": { + "@radix-ui/primitive": "1.1.0", + "@radix-ui/react-collection": "1.1.0", + "@radix-ui/react-compose-refs": "1.1.0", + "@radix-ui/react-context": "1.1.1", + "@radix-ui/react-direction": "1.1.0", + "@radix-ui/react-dismissable-layer": "1.1.1", + "@radix-ui/react-id": "1.1.0", + "@radix-ui/react-presence": "1.1.1", + "@radix-ui/react-primitive": "2.0.0", + "@radix-ui/react-use-callback-ref": "1.1.0", + "@radix-ui/react-use-controllable-state": "1.1.0", + "@radix-ui/react-use-layout-effect": "1.1.0", + "@radix-ui/react-use-previous": "1.1.0", + "@radix-ui/react-visually-hidden": "1.1.0" + }, + "peerDependencies": { + "@types/react": "*", + "@types/react-dom": "*", + "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc", + "react-dom": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc" + }, + "peerDependenciesMeta": { + "@types/react": { + "optional": true + }, + "@types/react-dom": { + "optional": true + } + } + }, + "node_modules/@radix-ui/react-popover": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/@radix-ui/react-popover/-/react-popover-1.1.2.tgz", + "integrity": "sha512-u2HRUyWW+lOiA2g0Le0tMmT55FGOEWHwPFt1EPfbLly7uXQExFo5duNKqG2DzmFXIdqOeNd+TpE8baHWJCyP9w==", + "license": "MIT", + "dependencies": { + "@radix-ui/primitive": "1.1.0", + "@radix-ui/react-compose-refs": "1.1.0", + "@radix-ui/react-context": "1.1.1", + "@radix-ui/react-dismissable-layer": "1.1.1", + "@radix-ui/react-focus-guards": "1.1.1", + "@radix-ui/react-focus-scope": "1.1.0", + "@radix-ui/react-id": "1.1.0", + "@radix-ui/react-popper": "1.2.0", + "@radix-ui/react-portal": "1.1.2", + "@radix-ui/react-presence": "1.1.1", + "@radix-ui/react-primitive": "2.0.0", + "@radix-ui/react-slot": "1.1.0", + "@radix-ui/react-use-controllable-state": "1.1.0", + "aria-hidden": "^1.1.1", + "react-remove-scroll": "2.6.0" + }, + "peerDependencies": { + "@types/react": "*", + "@types/react-dom": "*", + "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc", + "react-dom": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc" + }, + "peerDependenciesMeta": { + "@types/react": { + "optional": true + }, + "@types/react-dom": { + "optional": true + } + } + }, + "node_modules/@radix-ui/react-popover/node_modules/@radix-ui/react-slot": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/@radix-ui/react-slot/-/react-slot-1.1.0.tgz", + "integrity": "sha512-FUCf5XMfmW4dtYl69pdS4DbxKy8nj4M7SafBgPllysxmdachynNflAdp/gCsnYWNDnge6tI9onzMp5ARYc1KNw==", + "license": "MIT", + "dependencies": { + "@radix-ui/react-compose-refs": "1.1.0" + }, + "peerDependencies": { + "@types/react": "*", + "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc" + }, + "peerDependenciesMeta": { + "@types/react": { + "optional": true + } + } + }, + "node_modules/@radix-ui/react-popper": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/@radix-ui/react-popper/-/react-popper-1.2.0.tgz", + "integrity": "sha512-ZnRMshKF43aBxVWPWvbj21+7TQCvhuULWJ4gNIKYpRlQt5xGRhLx66tMp8pya2UkGHTSlhpXwmjqltDYHhw7Vg==", + "license": "MIT", + "dependencies": { + "@floating-ui/react-dom": "^2.0.0", + "@radix-ui/react-arrow": "1.1.0", + "@radix-ui/react-compose-refs": "1.1.0", + "@radix-ui/react-context": "1.1.0", + "@radix-ui/react-primitive": "2.0.0", + "@radix-ui/react-use-callback-ref": "1.1.0", + "@radix-ui/react-use-layout-effect": "1.1.0", + "@radix-ui/react-use-rect": "1.1.0", + "@radix-ui/react-use-size": "1.1.0", + "@radix-ui/rect": "1.1.0" + }, + "peerDependencies": { + "@types/react": "*", + "@types/react-dom": "*", + "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc", + "react-dom": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc" + }, + "peerDependenciesMeta": { + "@types/react": { + "optional": true + }, + "@types/react-dom": { + "optional": true + } + } + }, + "node_modules/@radix-ui/react-popper/node_modules/@radix-ui/react-context": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/@radix-ui/react-context/-/react-context-1.1.0.tgz", + "integrity": "sha512-OKrckBy+sMEgYM/sMmqmErVn0kZqrHPJze+Ql3DzYsDDp0hl0L62nx/2122/Bvps1qz645jlcu2tD9lrRSdf8A==", + "license": "MIT", + "peerDependencies": { + "@types/react": "*", + "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc" + }, + "peerDependenciesMeta": { + "@types/react": { + "optional": true + } + } + }, + "node_modules/@radix-ui/react-portal": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/@radix-ui/react-portal/-/react-portal-1.1.2.tgz", + "integrity": "sha512-WeDYLGPxJb/5EGBoedyJbT0MpoULmwnIPMJMSldkuiMsBAv7N1cRdsTWZWht9vpPOiN3qyiGAtbK2is47/uMFg==", + "license": "MIT", + "dependencies": { + "@radix-ui/react-primitive": "2.0.0", + "@radix-ui/react-use-layout-effect": "1.1.0" + }, + "peerDependencies": { + "@types/react": "*", + "@types/react-dom": "*", + "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc", + "react-dom": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc" + }, + "peerDependenciesMeta": { + "@types/react": { + "optional": true + }, + "@types/react-dom": { + "optional": true + } + } + }, + "node_modules/@radix-ui/react-presence": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/@radix-ui/react-presence/-/react-presence-1.1.1.tgz", + "integrity": "sha512-IeFXVi4YS1K0wVZzXNrbaaUvIJ3qdY+/Ih4eHFhWA9SwGR9UDX7Ck8abvL57C4cv3wwMvUE0OG69Qc3NCcTe/A==", + "license": "MIT", + "dependencies": { + "@radix-ui/react-compose-refs": "1.1.0", + "@radix-ui/react-use-layout-effect": "1.1.0" + }, + "peerDependencies": { + "@types/react": "*", + "@types/react-dom": "*", + "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc", + "react-dom": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc" + }, + "peerDependenciesMeta": { + "@types/react": { + "optional": true + }, + "@types/react-dom": { + "optional": true + } + } + }, + "node_modules/@radix-ui/react-primitive": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/@radix-ui/react-primitive/-/react-primitive-2.0.0.tgz", + "integrity": "sha512-ZSpFm0/uHa8zTvKBDjLFWLo8dkr4MBsiDLz0g3gMUwqgLHz9rTaRRGYDgvZPtBJgYCBKXkS9fzmoySgr8CO6Cw==", + "license": "MIT", + "dependencies": { + "@radix-ui/react-slot": "1.1.0" + }, + "peerDependencies": { + "@types/react": "*", + "@types/react-dom": "*", + "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc", + "react-dom": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc" + }, + "peerDependenciesMeta": { + "@types/react": { + "optional": true + }, + "@types/react-dom": { + "optional": true + } + } + }, + "node_modules/@radix-ui/react-primitive/node_modules/@radix-ui/react-slot": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/@radix-ui/react-slot/-/react-slot-1.1.0.tgz", + "integrity": "sha512-FUCf5XMfmW4dtYl69pdS4DbxKy8nj4M7SafBgPllysxmdachynNflAdp/gCsnYWNDnge6tI9onzMp5ARYc1KNw==", + "license": "MIT", + "dependencies": { + "@radix-ui/react-compose-refs": "1.1.0" + }, + "peerDependencies": { + "@types/react": "*", + "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc" + }, + "peerDependenciesMeta": { + "@types/react": { + "optional": true + } + } + }, + "node_modules/@radix-ui/react-roving-focus": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/@radix-ui/react-roving-focus/-/react-roving-focus-1.1.0.tgz", + "integrity": "sha512-EA6AMGeq9AEeQDeSH0aZgG198qkfHSbvWTf1HvoDmOB5bBG/qTxjYMWUKMnYiV6J/iP/J8MEFSuB2zRU2n7ODA==", + "license": "MIT", + "dependencies": { + "@radix-ui/primitive": "1.1.0", + "@radix-ui/react-collection": "1.1.0", + "@radix-ui/react-compose-refs": "1.1.0", + "@radix-ui/react-context": "1.1.0", + "@radix-ui/react-direction": "1.1.0", + "@radix-ui/react-id": "1.1.0", + "@radix-ui/react-primitive": "2.0.0", + "@radix-ui/react-use-callback-ref": "1.1.0", + "@radix-ui/react-use-controllable-state": "1.1.0" + }, + "peerDependencies": { + "@types/react": "*", + "@types/react-dom": "*", + "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc", + "react-dom": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc" + }, + "peerDependenciesMeta": { + "@types/react": { + "optional": true + }, + "@types/react-dom": { + "optional": true + } + } + }, + "node_modules/@radix-ui/react-roving-focus/node_modules/@radix-ui/react-context": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/@radix-ui/react-context/-/react-context-1.1.0.tgz", + "integrity": "sha512-OKrckBy+sMEgYM/sMmqmErVn0kZqrHPJze+Ql3DzYsDDp0hl0L62nx/2122/Bvps1qz645jlcu2tD9lrRSdf8A==", + "license": "MIT", + "peerDependencies": { + "@types/react": "*", + "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc" + }, + "peerDependenciesMeta": { + "@types/react": { + "optional": true + } + } + }, + "node_modules/@radix-ui/react-scroll-area": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/@radix-ui/react-scroll-area/-/react-scroll-area-1.2.1.tgz", + "integrity": "sha512-FnM1fHfCtEZ1JkyfH/1oMiTcFBQvHKl4vD9WnpwkLgtF+UmnXMCad6ECPTaAjcDjam+ndOEJWgHyKDGNteWSHw==", + "license": "MIT", + "dependencies": { + "@radix-ui/number": "1.1.0", + "@radix-ui/primitive": "1.1.0", + "@radix-ui/react-compose-refs": "1.1.0", + "@radix-ui/react-context": "1.1.1", + "@radix-ui/react-direction": "1.1.0", + "@radix-ui/react-presence": "1.1.1", + "@radix-ui/react-primitive": "2.0.0", + "@radix-ui/react-use-callback-ref": "1.1.0", + "@radix-ui/react-use-layout-effect": "1.1.0" + }, + "peerDependencies": { + "@types/react": "*", + "@types/react-dom": "*", + "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc", + "react-dom": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc" + }, + "peerDependenciesMeta": { + "@types/react": { + "optional": true + }, + "@types/react-dom": { + "optional": true + } + } + }, + "node_modules/@radix-ui/react-select": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/@radix-ui/react-select/-/react-select-2.1.2.tgz", + "integrity": "sha512-rZJtWmorC7dFRi0owDmoijm6nSJH1tVw64QGiNIZ9PNLyBDtG+iAq+XGsya052At4BfarzY/Dhv9wrrUr6IMZA==", + "license": "MIT", + "dependencies": { + "@radix-ui/number": "1.1.0", + "@radix-ui/primitive": "1.1.0", + "@radix-ui/react-collection": "1.1.0", + "@radix-ui/react-compose-refs": "1.1.0", + "@radix-ui/react-context": "1.1.1", + "@radix-ui/react-direction": "1.1.0", + "@radix-ui/react-dismissable-layer": "1.1.1", + "@radix-ui/react-focus-guards": "1.1.1", + "@radix-ui/react-focus-scope": "1.1.0", + "@radix-ui/react-id": "1.1.0", + "@radix-ui/react-popper": "1.2.0", + "@radix-ui/react-portal": "1.1.2", + "@radix-ui/react-primitive": "2.0.0", + "@radix-ui/react-slot": "1.1.0", + "@radix-ui/react-use-callback-ref": "1.1.0", + "@radix-ui/react-use-controllable-state": "1.1.0", + "@radix-ui/react-use-layout-effect": "1.1.0", + "@radix-ui/react-use-previous": "1.1.0", + "@radix-ui/react-visually-hidden": "1.1.0", + "aria-hidden": "^1.1.1", + "react-remove-scroll": "2.6.0" + }, + "peerDependencies": { + "@types/react": "*", + "@types/react-dom": "*", + "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc", + "react-dom": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc" + }, + "peerDependenciesMeta": { + "@types/react": { + "optional": true + }, + "@types/react-dom": { + "optional": true + } + } + }, + "node_modules/@radix-ui/react-select/node_modules/@radix-ui/react-slot": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/@radix-ui/react-slot/-/react-slot-1.1.0.tgz", + "integrity": "sha512-FUCf5XMfmW4dtYl69pdS4DbxKy8nj4M7SafBgPllysxmdachynNflAdp/gCsnYWNDnge6tI9onzMp5ARYc1KNw==", + "license": "MIT", + "dependencies": { + "@radix-ui/react-compose-refs": "1.1.0" + }, + "peerDependencies": { + "@types/react": "*", + "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc" + }, + "peerDependenciesMeta": { + "@types/react": { + "optional": true + } + } + }, + "node_modules/@radix-ui/react-separator": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/@radix-ui/react-separator/-/react-separator-1.1.0.tgz", + "integrity": "sha512-3uBAs+egzvJBDZAzvb/n4NxxOYpnspmWxO2u5NbZ8Y6FM/NdrGSF9bop3Cf6F6C71z1rTSn8KV0Fo2ZVd79lGA==", + "license": "MIT", + "dependencies": { + "@radix-ui/react-primitive": "2.0.0" + }, + "peerDependencies": { + "@types/react": "*", + "@types/react-dom": "*", + "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc", + "react-dom": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc" + }, + "peerDependenciesMeta": { + "@types/react": { + "optional": true + }, + "@types/react-dom": { + "optional": true + } + } + }, + "node_modules/@radix-ui/react-slot": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/@radix-ui/react-slot/-/react-slot-1.1.1.tgz", + "integrity": "sha512-RApLLOcINYJA+dMVbOju7MYv1Mb2EBp2nH4HdDzXTSyaR5optlm6Otrz1euW3HbdOR8UmmFK06TD+A9frYWv+g==", + "license": "MIT", + "dependencies": { + "@radix-ui/react-compose-refs": "1.1.1" + }, + "peerDependencies": { + "@types/react": "*", + "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc" + }, + "peerDependenciesMeta": { + "@types/react": { + "optional": true + } + } + }, + "node_modules/@radix-ui/react-slot/node_modules/@radix-ui/react-compose-refs": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/@radix-ui/react-compose-refs/-/react-compose-refs-1.1.1.tgz", + "integrity": "sha512-Y9VzoRDSJtgFMUCoiZBDVo084VQ5hfpXxVE+NgkdNsjiDBByiImMZKKhxMwCbdHvhlENG6a833CbFkOQvTricw==", + "license": "MIT", + "peerDependencies": { + "@types/react": "*", + "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc" + }, + "peerDependenciesMeta": { + "@types/react": { + "optional": true + } + } + }, + "node_modules/@radix-ui/react-tabs": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/@radix-ui/react-tabs/-/react-tabs-1.1.1.tgz", + "integrity": "sha512-3GBUDmP2DvzmtYLMsHmpA1GtR46ZDZ+OreXM/N+kkQJOPIgytFWWTfDQmBQKBvaFS0Vno0FktdbVzN28KGrMdw==", + "license": "MIT", + "dependencies": { + "@radix-ui/primitive": "1.1.0", + "@radix-ui/react-context": "1.1.1", + "@radix-ui/react-direction": "1.1.0", + "@radix-ui/react-id": "1.1.0", + "@radix-ui/react-presence": "1.1.1", + "@radix-ui/react-primitive": "2.0.0", + "@radix-ui/react-roving-focus": "1.1.0", + "@radix-ui/react-use-controllable-state": "1.1.0" + }, + "peerDependencies": { + "@types/react": "*", + "@types/react-dom": "*", + "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc", + "react-dom": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc" + }, + "peerDependenciesMeta": { + "@types/react": { + "optional": true + }, + "@types/react-dom": { + "optional": true + } + } + }, + "node_modules/@radix-ui/react-use-callback-ref": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/@radix-ui/react-use-callback-ref/-/react-use-callback-ref-1.1.0.tgz", + "integrity": "sha512-CasTfvsy+frcFkbXtSJ2Zu9JHpN8TYKxkgJGWbjiZhFivxaeW7rMeZt7QELGVLaYVfFMsKHjb7Ak0nMEe+2Vfw==", + "license": "MIT", + "peerDependencies": { + "@types/react": "*", + "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc" + }, + "peerDependenciesMeta": { + "@types/react": { + "optional": true + } + } + }, + "node_modules/@radix-ui/react-use-controllable-state": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/@radix-ui/react-use-controllable-state/-/react-use-controllable-state-1.1.0.tgz", + "integrity": "sha512-MtfMVJiSr2NjzS0Aa90NPTnvTSg6C/JLCV7ma0W6+OMV78vd8OyRpID+Ng9LxzsPbLeuBnWBA1Nq30AtBIDChw==", + "license": "MIT", + "dependencies": { + "@radix-ui/react-use-callback-ref": "1.1.0" + }, + "peerDependencies": { + "@types/react": "*", + "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc" + }, + "peerDependenciesMeta": { + "@types/react": { + "optional": true + } + } + }, + "node_modules/@radix-ui/react-use-escape-keydown": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/@radix-ui/react-use-escape-keydown/-/react-use-escape-keydown-1.1.0.tgz", + "integrity": "sha512-L7vwWlR1kTTQ3oh7g1O0CBF3YCyyTj8NmhLR+phShpyA50HCfBFKVJTpshm9PzLiKmehsrQzTYTpX9HvmC9rhw==", + "license": "MIT", + "dependencies": { + "@radix-ui/react-use-callback-ref": "1.1.0" + }, + "peerDependencies": { + "@types/react": "*", + "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc" + }, + "peerDependenciesMeta": { + "@types/react": { + "optional": true + } + } + }, + "node_modules/@radix-ui/react-use-layout-effect": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/@radix-ui/react-use-layout-effect/-/react-use-layout-effect-1.1.0.tgz", + "integrity": "sha512-+FPE0rOdziWSrH9athwI1R0HDVbWlEhd+FR+aSDk4uWGmSJ9Z54sdZVDQPZAinJhJXwfT+qnj969mCsT2gfm5w==", + "license": "MIT", + "peerDependencies": { + "@types/react": "*", + "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc" + }, + "peerDependenciesMeta": { + "@types/react": { + "optional": true + } + } + }, + "node_modules/@radix-ui/react-use-previous": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/@radix-ui/react-use-previous/-/react-use-previous-1.1.0.tgz", + "integrity": "sha512-Z/e78qg2YFnnXcW88A4JmTtm4ADckLno6F7OXotmkQfeuCVaKuYzqAATPhVzl3delXE7CxIV8shofPn3jPc5Og==", + "license": "MIT", + "peerDependencies": { + "@types/react": "*", + "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc" + }, + "peerDependenciesMeta": { + "@types/react": { + "optional": true + } + } + }, + "node_modules/@radix-ui/react-use-rect": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/@radix-ui/react-use-rect/-/react-use-rect-1.1.0.tgz", + "integrity": "sha512-0Fmkebhr6PiseyZlYAOtLS+nb7jLmpqTrJyv61Pe68MKYW6OWdRE2kI70TaYY27u7H0lajqM3hSMMLFq18Z7nQ==", + "license": "MIT", + "dependencies": { + "@radix-ui/rect": "1.1.0" + }, + "peerDependencies": { + "@types/react": "*", + "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc" + }, + "peerDependenciesMeta": { + "@types/react": { + "optional": true + } + } + }, + "node_modules/@radix-ui/react-use-size": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/@radix-ui/react-use-size/-/react-use-size-1.1.0.tgz", + "integrity": "sha512-XW3/vWuIXHa+2Uwcc2ABSfcCledmXhhQPlGbfcRXbiUQI5Icjcg19BGCZVKKInYbvUCut/ufbbLLPFC5cbb1hw==", + "license": "MIT", + "dependencies": { + "@radix-ui/react-use-layout-effect": "1.1.0" + }, + "peerDependencies": { + "@types/react": "*", + "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc" + }, + "peerDependenciesMeta": { + "@types/react": { + "optional": true + } + } + }, + "node_modules/@radix-ui/react-visually-hidden": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/@radix-ui/react-visually-hidden/-/react-visually-hidden-1.1.0.tgz", + "integrity": "sha512-N8MDZqtgCgG5S3aV60INAB475osJousYpZ4cTJ2cFbMpdHS5Y6loLTH8LPtkj2QN0x93J30HT/M3qJXM0+lyeQ==", + "license": "MIT", + "dependencies": { + "@radix-ui/react-primitive": "2.0.0" + }, + "peerDependencies": { + "@types/react": "*", + "@types/react-dom": "*", + "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc", + "react-dom": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc" + }, + "peerDependenciesMeta": { + "@types/react": { + "optional": true + }, + "@types/react-dom": { + "optional": true + } + } + }, + "node_modules/@radix-ui/rect": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/@radix-ui/rect/-/rect-1.1.0.tgz", + "integrity": "sha512-A9+lCBZoaMJlVKcRBz2YByCG+Cp2t6nAnMnNba+XiWxnj6r4JUFqfsgwocMBZU9LPtdxC6wB56ySYpc7LQIoJg==", + "license": "MIT" + }, + "node_modules/@remix-run/router": { + "version": "1.20.0", + "resolved": "https://registry.npmjs.org/@remix-run/router/-/router-1.20.0.tgz", + "integrity": "sha512-mUnk8rPJBI9loFDZ+YzPGdeniYK+FTmRD1TMCz7ev2SNIozyKKpnGgsxO34u6Z4z/t0ITuu7voi/AshfsGsgFg==", + "license": "MIT", + "engines": { + "node": ">=14.0.0" + } + }, + "node_modules/@rollup/rollup-android-arm-eabi": { + "version": "4.24.3", + "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.24.3.tgz", + "integrity": "sha512-ufb2CH2KfBWPJok95frEZZ82LtDl0A6QKTa8MoM+cWwDZvVGl5/jNb79pIhRvAalUu+7LD91VYR0nwRD799HkQ==", + "cpu": [ + "arm" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "android" + ] + }, + "node_modules/@rollup/rollup-android-arm64": { + "version": "4.24.3", + "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.24.3.tgz", + "integrity": "sha512-iAHpft/eQk9vkWIV5t22V77d90CRofgR2006UiCjHcHJFVI1E0oBkQIAbz+pLtthFw3hWEmVB4ilxGyBf48i2Q==", + "cpu": [ + "arm64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "android" + ] + }, + "node_modules/@rollup/rollup-darwin-arm64": { + "version": "4.24.3", + "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.24.3.tgz", + "integrity": "sha512-QPW2YmkWLlvqmOa2OwrfqLJqkHm7kJCIMq9kOz40Zo9Ipi40kf9ONG5Sz76zszrmIZZ4hgRIkez69YnTHgEz1w==", + "cpu": [ + "arm64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "darwin" + ] + }, + "node_modules/@rollup/rollup-darwin-x64": { + "version": "4.24.3", + "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.24.3.tgz", + "integrity": "sha512-KO0pN5x3+uZm1ZXeIfDqwcvnQ9UEGN8JX5ufhmgH5Lz4ujjZMAnxQygZAVGemFWn+ZZC0FQopruV4lqmGMshow==", + "cpu": [ + "x64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "darwin" + ] + }, + "node_modules/@rollup/rollup-freebsd-arm64": { + "version": "4.24.3", + "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-arm64/-/rollup-freebsd-arm64-4.24.3.tgz", + "integrity": "sha512-CsC+ZdIiZCZbBI+aRlWpYJMSWvVssPuWqrDy/zi9YfnatKKSLFCe6fjna1grHuo/nVaHG+kiglpRhyBQYRTK4A==", + "cpu": [ + "arm64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "freebsd" + ] + }, + "node_modules/@rollup/rollup-freebsd-x64": { + "version": "4.24.3", + "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-x64/-/rollup-freebsd-x64-4.24.3.tgz", + "integrity": "sha512-F0nqiLThcfKvRQhZEzMIXOQG4EeX61im61VYL1jo4eBxv4aZRmpin6crnBJQ/nWnCsjH5F6J3W6Stdm0mBNqBg==", + "cpu": [ + "x64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "freebsd" + ] + }, + "node_modules/@rollup/rollup-linux-arm-gnueabihf": { + "version": "4.24.3", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.24.3.tgz", + "integrity": "sha512-KRSFHyE/RdxQ1CSeOIBVIAxStFC/hnBgVcaiCkQaVC+EYDtTe4X7z5tBkFyRoBgUGtB6Xg6t9t2kulnX6wJc6A==", + "cpu": [ + "arm" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "linux" + ] + }, + "node_modules/@rollup/rollup-linux-arm-musleabihf": { + "version": "4.24.3", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-musleabihf/-/rollup-linux-arm-musleabihf-4.24.3.tgz", + "integrity": "sha512-h6Q8MT+e05zP5BxEKz0vi0DhthLdrNEnspdLzkoFqGwnmOzakEHSlXfVyA4HJ322QtFy7biUAVFPvIDEDQa6rw==", + "cpu": [ + "arm" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "linux" + ] + }, + "node_modules/@rollup/rollup-linux-arm64-gnu": { + "version": "4.24.3", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.24.3.tgz", + "integrity": "sha512-fKElSyXhXIJ9pqiYRqisfirIo2Z5pTTve5K438URf08fsypXrEkVmShkSfM8GJ1aUyvjakT+fn2W7Czlpd/0FQ==", + "cpu": [ + "arm64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "linux" + ] + }, + "node_modules/@rollup/rollup-linux-arm64-musl": { + "version": "4.24.3", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.24.3.tgz", + "integrity": "sha512-YlddZSUk8G0px9/+V9PVilVDC6ydMz7WquxozToozSnfFK6wa6ne1ATUjUvjin09jp34p84milxlY5ikueoenw==", + "cpu": [ + "arm64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "linux" + ] + }, + "node_modules/@rollup/rollup-linux-powerpc64le-gnu": { + "version": "4.24.3", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-powerpc64le-gnu/-/rollup-linux-powerpc64le-gnu-4.24.3.tgz", + "integrity": "sha512-yNaWw+GAO8JjVx3s3cMeG5Esz1cKVzz8PkTJSfYzE5u7A+NvGmbVFEHP+BikTIyYWuz0+DX9kaA3pH9Sqxp69g==", + "cpu": [ + "ppc64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "linux" + ] + }, + "node_modules/@rollup/rollup-linux-riscv64-gnu": { + "version": "4.24.3", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.24.3.tgz", + "integrity": "sha512-lWKNQfsbpv14ZCtM/HkjCTm4oWTKTfxPmr7iPfp3AHSqyoTz5AgLemYkWLwOBWc+XxBbrU9SCokZP0WlBZM9lA==", + "cpu": [ + "riscv64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "linux" + ] + }, + "node_modules/@rollup/rollup-linux-s390x-gnu": { + "version": "4.24.3", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.24.3.tgz", + "integrity": "sha512-HoojGXTC2CgCcq0Woc/dn12wQUlkNyfH0I1ABK4Ni9YXyFQa86Fkt2Q0nqgLfbhkyfQ6003i3qQk9pLh/SpAYw==", + "cpu": [ + "s390x" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "linux" + ] + }, + "node_modules/@rollup/rollup-linux-x64-gnu": { + "version": "4.24.3", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.24.3.tgz", + "integrity": "sha512-mnEOh4iE4USSccBOtcrjF5nj+5/zm6NcNhbSEfR3Ot0pxBwvEn5QVUXcuOwwPkapDtGZ6pT02xLoPaNv06w7KQ==", + "cpu": [ + "x64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "linux" + ] + }, + "node_modules/@rollup/rollup-linux-x64-musl": { + "version": "4.24.3", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.24.3.tgz", + "integrity": "sha512-rMTzawBPimBQkG9NKpNHvquIUTQPzrnPxPbCY1Xt+mFkW7pshvyIS5kYgcf74goxXOQk0CP3EoOC1zcEezKXhw==", + "cpu": [ + "x64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "linux" + ] + }, + "node_modules/@rollup/rollup-win32-arm64-msvc": { + "version": "4.24.3", + "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.24.3.tgz", + "integrity": "sha512-2lg1CE305xNvnH3SyiKwPVsTVLCg4TmNCF1z7PSHX2uZY2VbUpdkgAllVoISD7JO7zu+YynpWNSKAtOrX3AiuA==", + "cpu": [ + "arm64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "win32" + ] + }, + "node_modules/@rollup/rollup-win32-ia32-msvc": { + "version": "4.24.3", + "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.24.3.tgz", + "integrity": "sha512-9SjYp1sPyxJsPWuhOCX6F4jUMXGbVVd5obVpoVEi8ClZqo52ViZewA6eFz85y8ezuOA+uJMP5A5zo6Oz4S5rVQ==", + "cpu": [ + "ia32" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "win32" + ] + }, + "node_modules/@rollup/rollup-win32-x64-msvc": { + "version": "4.24.3", + "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.24.3.tgz", + "integrity": "sha512-HGZgRFFYrMrP3TJlq58nR1xy8zHKId25vhmm5S9jETEfDf6xybPxsavFTJaufe2zgOGYJBskGlj49CwtEuFhWQ==", + "cpu": [ + "x64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "win32" + ] + }, + "node_modules/@tanstack/react-table": { + "version": "8.20.5", + "resolved": "https://registry.npmjs.org/@tanstack/react-table/-/react-table-8.20.5.tgz", + "integrity": "sha512-WEHopKw3znbUZ61s9i0+i9g8drmDo6asTWbrQh8Us63DAk/M0FkmIqERew6P71HI75ksZ2Pxyuf4vvKh9rAkiA==", + "license": "MIT", + "dependencies": { + "@tanstack/table-core": "8.20.5" + }, + "engines": { + "node": ">=12" + }, + "funding": { + "type": "github", + "url": "https://github.com/sponsors/tannerlinsley" + }, + "peerDependencies": { + "react": ">=16.8", + "react-dom": ">=16.8" + } + }, + "node_modules/@tanstack/table-core": { + "version": "8.20.5", + "resolved": "https://registry.npmjs.org/@tanstack/table-core/-/table-core-8.20.5.tgz", + "integrity": "sha512-P9dF7XbibHph2PFRz8gfBKEXEY/HJPOhym8CHmjF8y3q5mWpKx9xtZapXQUWCgkqvsK0R46Azuz+VaxD4Xl+Tg==", + "license": "MIT", + "engines": { + "node": ">=12" + }, + "funding": { + "type": "github", + "url": "https://github.com/sponsors/tannerlinsley" + } + }, + "node_modules/@trivago/prettier-plugin-sort-imports": { + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/@trivago/prettier-plugin-sort-imports/-/prettier-plugin-sort-imports-5.2.0.tgz", + "integrity": "sha512-yEIJ7xMKYQwyNRjxSdi4Gs37iszikAjxfky+3hu9bn24u8eHLJNDMAoOTyowp8p6EpSl8IQMdkfBx+WnJTttsw==", + "license": "Apache-2.0", + "dependencies": { + "@babel/generator": "^7.26.2", + "@babel/parser": "^7.26.2", + "@babel/traverse": "^7.25.9", + "@babel/types": "^7.26.0", + "javascript-natural-sort": "^0.7.1", + "lodash": "^4.17.21" + }, + "engines": { + "node": ">18.12" + }, + "peerDependencies": { + "@vue/compiler-sfc": "3.x", + "prettier": "2.x - 3.x", + "prettier-plugin-svelte": "3.x", + "svelte": "4.x" + }, + "peerDependenciesMeta": { + "@vue/compiler-sfc": { + "optional": true + }, + "prettier-plugin-svelte": { + "optional": true + }, + "svelte": { + "optional": true + } + } + }, + "node_modules/@types/babel__core": { + "version": "7.20.5", + "resolved": "https://registry.npmjs.org/@types/babel__core/-/babel__core-7.20.5.tgz", + "integrity": "sha512-qoQprZvz5wQFJwMDqeseRXWv3rqMvhgpbXFfVyWhbx9X47POIA6i/+dXefEmZKoAgOaTdaIgNSMqMIU61yRyzA==", + "dev": true, + "license": "MIT", + "dependencies": { + "@babel/parser": "^7.20.7", + "@babel/types": "^7.20.7", + "@types/babel__generator": "*", + "@types/babel__template": "*", + "@types/babel__traverse": "*" + } + }, + "node_modules/@types/babel__generator": { + "version": "7.6.8", + "resolved": "https://registry.npmjs.org/@types/babel__generator/-/babel__generator-7.6.8.tgz", + "integrity": "sha512-ASsj+tpEDsEiFr1arWrlN6V3mdfjRMZt6LtK/Vp/kreFLnr5QH5+DhvD5nINYZXzwJvXeGq+05iUXcAzVrqWtw==", + "dev": true, + "license": "MIT", + "dependencies": { + "@babel/types": "^7.0.0" + } + }, + "node_modules/@types/babel__template": { + "version": "7.4.4", + "resolved": "https://registry.npmjs.org/@types/babel__template/-/babel__template-7.4.4.tgz", + "integrity": "sha512-h/NUaSyG5EyxBIp8YRxo4RMe2/qQgvyowRwVMzhYhBCONbW8PUsg4lkFMrhgZhUe5z3L3MiLDuvyJ/CaPa2A8A==", + "dev": true, + "license": "MIT", + "dependencies": { + "@babel/parser": "^7.1.0", + "@babel/types": "^7.0.0" + } + }, + "node_modules/@types/babel__traverse": { + "version": "7.20.6", + "resolved": "https://registry.npmjs.org/@types/babel__traverse/-/babel__traverse-7.20.6.tgz", + "integrity": "sha512-r1bzfrm0tomOI8g1SzvCaQHo6Lcv6zu0EA+W2kHrt8dyrHQxGzBBL4kdkzIS+jBMV+EYcMAEAqXqYaLJq5rOZg==", + "dev": true, + "license": "MIT", + "dependencies": { + "@babel/types": "^7.20.7" + } + }, + "node_modules/@types/estree": { + "version": "1.0.6", + "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.6.tgz", + "integrity": "sha512-AYnb1nQyY49te+VRAVgmzfcgjYS91mY5P0TKUDCLEM+gNnA+3T6rWITXRLYCpahpqSQbN5cE+gHpnPyXjHWxcw==", + "dev": true, + "license": "MIT" + }, + "node_modules/@types/json-schema": { + "version": "7.0.15", + "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.15.tgz", + "integrity": "sha512-5+fP8P8MFNC+AyZCDxrB2pkZFPGzqQWUzpSeuuVLvm8VMcorNYavBqoFcxK8bQz4Qsbn4oUEEem4wDLfcysGHA==", + "dev": true, + "license": "MIT" + }, + "node_modules/@types/luxon": { + "version": "3.4.2", + "resolved": "https://registry.npmjs.org/@types/luxon/-/luxon-3.4.2.tgz", + "integrity": "sha512-TifLZlFudklWlMBfhubvgqTXRzLDI5pCbGa4P8a3wPyUQSW+1xQ5eDsreP9DWHX3tjq1ke96uYG/nwundroWcA==", + "license": "MIT" + }, + "node_modules/@types/node": { + "version": "22.8.6", + "resolved": "https://registry.npmjs.org/@types/node/-/node-22.8.6.tgz", + "integrity": "sha512-tosuJYKrIqjQIlVCM4PEGxOmyg3FCPa/fViuJChnGeEIhjA46oy8FMVoF9su1/v8PNs2a8Q0iFNyOx0uOF91nw==", + "dev": true, + "license": "MIT", + "dependencies": { + "undici-types": "~6.19.8" + } + }, + "node_modules/@types/prop-types": { + "version": "15.7.13", + "resolved": "https://registry.npmjs.org/@types/prop-types/-/prop-types-15.7.13.tgz", + "integrity": "sha512-hCZTSvwbzWGvhqxp/RqVqwU999pBf2vp7hzIjiYOsl8wqOmUxkQ6ddw1cV3l8811+kdUFus/q4d1Y3E3SyEifA==", + "devOptional": true, + "license": "MIT" + }, + "node_modules/@types/react": { + "version": "18.3.12", + "resolved": "https://registry.npmjs.org/@types/react/-/react-18.3.12.tgz", + "integrity": "sha512-D2wOSq/d6Agt28q7rSI3jhU7G6aiuzljDGZ2hTZHIkrTLUI+AF3WMeKkEZ9nN2fkBAlcktT6vcZjDFiIhMYEQw==", + "devOptional": true, + "license": "MIT", + "dependencies": { + "@types/prop-types": "*", + "csstype": "^3.0.2" + } + }, + "node_modules/@types/react-dom": { + "version": "18.3.1", + "resolved": "https://registry.npmjs.org/@types/react-dom/-/react-dom-18.3.1.tgz", + "integrity": "sha512-qW1Mfv8taImTthu4KoXgDfLuk4bydU6Q/TkADnDWWHwi4NX4BR+LWfTp2sVmTqRrsHvyDDTelgelxJ+SsejKKQ==", + "devOptional": true, + "license": "MIT", + "dependencies": { + "@types/react": "*" + } + }, + "node_modules/@types/swagger-schema-official": { + "version": "2.0.25", + "resolved": "https://registry.npmjs.org/@types/swagger-schema-official/-/swagger-schema-official-2.0.25.tgz", + "integrity": "sha512-T92Xav+Gf/Ik1uPW581nA+JftmjWPgskw/WBf4TJzxRG/SJ+DfNnNE+WuZ4mrXuzflQMqMkm1LSYjzYW7MB1Cg==", + "dev": true, + "license": "MIT" + }, + "node_modules/@typescript-eslint/eslint-plugin": { + "version": "8.12.2", + "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-8.12.2.tgz", + "integrity": "sha512-gQxbxM8mcxBwaEmWdtLCIGLfixBMHhQjBqR8sVWNTPpcj45WlYL2IObS/DNMLH1DBP0n8qz+aiiLTGfopPEebw==", + "dev": true, + "license": "MIT", + "dependencies": { + "@eslint-community/regexpp": "^4.10.0", + "@typescript-eslint/scope-manager": "8.12.2", + "@typescript-eslint/type-utils": "8.12.2", + "@typescript-eslint/utils": "8.12.2", + "@typescript-eslint/visitor-keys": "8.12.2", + "graphemer": "^1.4.0", + "ignore": "^5.3.1", + "natural-compare": "^1.4.0", + "ts-api-utils": "^1.3.0" + }, + "engines": { + "node": "^18.18.0 || ^20.9.0 || >=21.1.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/typescript-eslint" + }, + "peerDependencies": { + "@typescript-eslint/parser": "^8.0.0 || ^8.0.0-alpha.0", + "eslint": "^8.57.0 || ^9.0.0" + }, + "peerDependenciesMeta": { + "typescript": { + "optional": true + } + } + }, + "node_modules/@typescript-eslint/parser": { + "version": "8.12.2", + "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-8.12.2.tgz", + "integrity": "sha512-MrvlXNfGPLH3Z+r7Tk+Z5moZAc0dzdVjTgUgwsdGweH7lydysQsnSww3nAmsq8blFuRD5VRlAr9YdEFw3e6PBw==", + "dev": true, + "license": "BSD-2-Clause", + "dependencies": { + "@typescript-eslint/scope-manager": "8.12.2", + "@typescript-eslint/types": "8.12.2", + "@typescript-eslint/typescript-estree": "8.12.2", + "@typescript-eslint/visitor-keys": "8.12.2", + "debug": "^4.3.4" + }, + "engines": { + "node": "^18.18.0 || ^20.9.0 || >=21.1.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/typescript-eslint" + }, + "peerDependencies": { + "eslint": "^8.57.0 || ^9.0.0" + }, + "peerDependenciesMeta": { + "typescript": { + "optional": true + } + } + }, + "node_modules/@typescript-eslint/scope-manager": { + "version": "8.12.2", + "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.12.2.tgz", + "integrity": "sha512-gPLpLtrj9aMHOvxJkSbDBmbRuYdtiEbnvO25bCMza3DhMjTQw0u7Y1M+YR5JPbMsXXnSPuCf5hfq0nEkQDL/JQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "@typescript-eslint/types": "8.12.2", + "@typescript-eslint/visitor-keys": "8.12.2" + }, + "engines": { + "node": "^18.18.0 || ^20.9.0 || >=21.1.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/typescript-eslint" + } + }, + "node_modules/@typescript-eslint/type-utils": { + "version": "8.12.2", + "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-8.12.2.tgz", + "integrity": "sha512-bwuU4TAogPI+1q/IJSKuD4shBLc/d2vGcRT588q+jzayQyjVK2X6v/fbR4InY2U2sgf8MEvVCqEWUzYzgBNcGQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "@typescript-eslint/typescript-estree": "8.12.2", + "@typescript-eslint/utils": "8.12.2", + "debug": "^4.3.4", + "ts-api-utils": "^1.3.0" + }, + "engines": { + "node": "^18.18.0 || ^20.9.0 || >=21.1.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/typescript-eslint" + }, + "peerDependenciesMeta": { + "typescript": { + "optional": true + } + } + }, + "node_modules/@typescript-eslint/types": { + "version": "8.12.2", + "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.12.2.tgz", + "integrity": "sha512-VwDwMF1SZ7wPBUZwmMdnDJ6sIFk4K4s+ALKLP6aIQsISkPv8jhiw65sAK6SuWODN/ix+m+HgbYDkH+zLjrzvOA==", + "dev": true, + "license": "MIT", + "engines": { + "node": "^18.18.0 || ^20.9.0 || >=21.1.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/typescript-eslint" + } + }, + "node_modules/@typescript-eslint/typescript-estree": { + "version": "8.12.2", + "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.12.2.tgz", + "integrity": "sha512-mME5MDwGe30Pq9zKPvyduyU86PH7aixwqYR2grTglAdB+AN8xXQ1vFGpYaUSJ5o5P/5znsSBeNcs5g5/2aQwow==", + "dev": true, + "license": "BSD-2-Clause", + "dependencies": { + "@typescript-eslint/types": "8.12.2", + "@typescript-eslint/visitor-keys": "8.12.2", + "debug": "^4.3.4", + "fast-glob": "^3.3.2", + "is-glob": "^4.0.3", + "minimatch": "^9.0.4", + "semver": "^7.6.0", + "ts-api-utils": "^1.3.0" + }, + "engines": { + "node": "^18.18.0 || ^20.9.0 || >=21.1.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/typescript-eslint" + }, + "peerDependenciesMeta": { + "typescript": { + "optional": true + } + } + }, + "node_modules/@typescript-eslint/typescript-estree/node_modules/brace-expansion": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz", + "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==", + "dev": true, + "license": "MIT", + "dependencies": { + "balanced-match": "^1.0.0" + } + }, + "node_modules/@typescript-eslint/typescript-estree/node_modules/minimatch": { + "version": "9.0.5", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.5.tgz", + "integrity": "sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow==", + "dev": true, + "license": "ISC", + "dependencies": { + "brace-expansion": "^2.0.1" + }, + "engines": { + "node": ">=16 || 14 >=14.17" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, + "node_modules/@typescript-eslint/typescript-estree/node_modules/semver": { + "version": "7.6.3", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.3.tgz", + "integrity": "sha512-oVekP1cKtI+CTDvHWYFUcMtsK/00wmAEfyqKfNdARm8u1wNVhSgaX7A8d4UuIlUI5e84iEwOhs7ZPYRmzU9U6A==", + "dev": true, + "license": "ISC", + "bin": { + "semver": "bin/semver.js" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/@typescript-eslint/utils": { + "version": "8.12.2", + "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-8.12.2.tgz", + "integrity": "sha512-UTTuDIX3fkfAz6iSVa5rTuSfWIYZ6ATtEocQ/umkRSyC9O919lbZ8dcH7mysshrCdrAM03skJOEYaBugxN+M6A==", + "dev": true, + "license": "MIT", + "dependencies": { + "@eslint-community/eslint-utils": "^4.4.0", + "@typescript-eslint/scope-manager": "8.12.2", + "@typescript-eslint/types": "8.12.2", + "@typescript-eslint/typescript-estree": "8.12.2" + }, + "engines": { + "node": "^18.18.0 || ^20.9.0 || >=21.1.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/typescript-eslint" + }, + "peerDependencies": { + "eslint": "^8.57.0 || ^9.0.0" + } + }, + "node_modules/@typescript-eslint/visitor-keys": { + "version": "8.12.2", + "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.12.2.tgz", + "integrity": "sha512-PChz8UaKQAVNHghsHcPyx1OMHoFRUEA7rJSK/mDhdq85bk+PLsUHUBqTQTFt18VJZbmxBovM65fezlheQRsSDA==", + "dev": true, + "license": "MIT", + "dependencies": { + "@typescript-eslint/types": "8.12.2", + "eslint-visitor-keys": "^3.4.3" + }, + "engines": { + "node": "^18.18.0 || ^20.9.0 || >=21.1.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/typescript-eslint" + } + }, + "node_modules/@typescript-eslint/visitor-keys/node_modules/eslint-visitor-keys": { + "version": "3.4.3", + "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.3.tgz", + "integrity": "sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag==", + "dev": true, + "license": "Apache-2.0", + "engines": { + "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + }, + "funding": { + "url": "https://opencollective.com/eslint" + } + }, + "node_modules/@vitejs/plugin-react": { + "version": "4.3.3", + "resolved": "https://registry.npmjs.org/@vitejs/plugin-react/-/plugin-react-4.3.3.tgz", + "integrity": "sha512-NooDe9GpHGqNns1i8XDERg0Vsg5SSYRhRxxyTGogUdkdNt47jal+fbuYi+Yfq6pzRCKXyoPcWisfxE6RIM3GKA==", + "dev": true, + "license": "MIT", + "dependencies": { + "@babel/core": "^7.25.2", + "@babel/plugin-transform-react-jsx-self": "^7.24.7", + "@babel/plugin-transform-react-jsx-source": "^7.24.7", + "@types/babel__core": "^7.20.5", + "react-refresh": "^0.14.2" + }, + "engines": { + "node": "^14.18.0 || >=16.0.0" + }, + "peerDependencies": { + "vite": "^4.2.0 || ^5.0.0" + } + }, + "node_modules/@xterm/addon-attach": { + "version": "0.11.0", + "resolved": "https://registry.npmjs.org/@xterm/addon-attach/-/addon-attach-0.11.0.tgz", + "integrity": "sha512-JboCN0QAY6ZLY/SSB/Zl2cQ5zW1Eh4X3fH7BnuR1NB7xGRhzbqU2Npmpiw/3zFlxDaU88vtKzok44JKi2L2V2Q==", + "license": "MIT", + "peerDependencies": { + "@xterm/xterm": "^5.0.0" + } + }, + "node_modules/@xterm/addon-fit": { + "version": "0.10.0", + "resolved": "https://registry.npmjs.org/@xterm/addon-fit/-/addon-fit-0.10.0.tgz", + "integrity": "sha512-UFYkDm4HUahf2lnEyHvio51TNGiLK66mqP2JoATy7hRZeXaGMRDr00JiSF7m63vR5WKATF605yEggJKsw0JpMQ==", + "license": "MIT", + "peerDependencies": { + "@xterm/xterm": "^5.0.0" + } + }, + "node_modules/@xterm/xterm": { + "version": "5.5.0", + "resolved": "https://registry.npmjs.org/@xterm/xterm/-/xterm-5.5.0.tgz", + "integrity": "sha512-hqJHYaQb5OptNunnyAnkHyM8aCjZ1MEIDTQu1iIbbTD/xops91NB5yq1ZK/dC2JDbVWtF23zUtl9JE2NqwT87A==", + "license": "MIT" + }, + "node_modules/acorn": { + "version": "8.14.0", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.14.0.tgz", + "integrity": "sha512-cl669nCJTZBsL97OF4kUQm5g5hC2uihk0NxY3WENAC0TYdILVkAyHymAntgxGkl7K+t0cXIrH5siy5S4XkFycA==", + "dev": true, + "license": "MIT", + "bin": { + "acorn": "bin/acorn" + }, + "engines": { + "node": ">=0.4.0" + } + }, + "node_modules/acorn-jsx": { + "version": "5.3.2", + "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.2.tgz", + "integrity": "sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==", + "dev": true, + "license": "MIT", + "peerDependencies": { + "acorn": "^6.0.0 || ^7.0.0 || ^8.0.0" + } + }, + "node_modules/ajv": { + "version": "6.12.6", + "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz", + "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==", + "dev": true, + "license": "MIT", + "dependencies": { + "fast-deep-equal": "^3.1.1", + "fast-json-stable-stringify": "^2.0.0", + "json-schema-traverse": "^0.4.1", + "uri-js": "^4.2.2" + }, + "funding": { + "type": "github", + "url": "https://github.com/sponsors/epoberezkin" + } + }, + "node_modules/ansi-regex": { + "version": "6.1.0", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.1.0.tgz", + "integrity": "sha512-7HSX4QQb4CspciLpVFwyRe79O3xsIZDDLER21kERQ71oaPodF8jL725AgJMFAYbooIqolJoRLuM81SpeUkpkvA==", + "license": "MIT", + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/chalk/ansi-regex?sponsor=1" + } + }, + "node_modules/ansi-styles": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", + "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", + "license": "MIT", + "dependencies": { + "color-convert": "^2.0.1" + }, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/chalk/ansi-styles?sponsor=1" + } + }, + "node_modules/any-promise": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/any-promise/-/any-promise-1.3.0.tgz", + "integrity": "sha512-7UvmKalWRt1wgjL1RrGxoSJW/0QZFIegpeGvZG9kjp8vrRu55XTHbwnqq2GpXm9uLbcuhxm3IqX9OB4MZR1b2A==", + "license": "MIT" + }, + "node_modules/anymatch": { + "version": "3.1.3", + "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.3.tgz", + "integrity": "sha512-KMReFUr0B4t+D+OBkjR3KYqvocp2XaSzO55UcB6mgQMd3KbcE+mWTyvVV7D/zsdEbNnV6acZUutkiHQXvTr1Rw==", + "license": "ISC", + "dependencies": { + "normalize-path": "^3.0.0", + "picomatch": "^2.0.4" + }, + "engines": { + "node": ">= 8" + } + }, + "node_modules/arg": { + "version": "5.0.2", + "resolved": "https://registry.npmjs.org/arg/-/arg-5.0.2.tgz", + "integrity": "sha512-PYjyFOLKQ9y57JvQ6QLo8dAgNqswh8M1RMJYdQduT6xbWSgK36P/Z/v+p888pM69jMMfS8Xd8F6I1kQ/I9HUGg==", + "license": "MIT" + }, + "node_modules/argparse": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz", + "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==", + "dev": true, + "license": "Python-2.0" + }, + "node_modules/aria-hidden": { + "version": "1.2.4", + "resolved": "https://registry.npmjs.org/aria-hidden/-/aria-hidden-1.2.4.tgz", + "integrity": "sha512-y+CcFFwelSXpLZk/7fMB2mUbGtX9lKycf1MWJ7CaTIERyitVlyQx6C+sxcROU2BAJ24OiZyK+8wj2i8AlBoS3A==", + "license": "MIT", + "dependencies": { + "tslib": "^2.0.0" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/autoprefixer": { + "version": "10.4.20", + "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-10.4.20.tgz", + "integrity": "sha512-XY25y5xSv/wEoqzDyXXME4AFfkZI0P23z6Fs3YgymDnKJkCGOnkL0iTxCa85UTqaSgfcqyf3UA6+c7wUvx/16g==", + "dev": true, + "funding": [ + { + "type": "opencollective", + "url": "https://opencollective.com/postcss/" + }, + { + "type": "tidelift", + "url": "https://tidelift.com/funding/github/npm/autoprefixer" + }, + { + "type": "github", + "url": "https://github.com/sponsors/ai" + } + ], + "license": "MIT", + "dependencies": { + "browserslist": "^4.23.3", + "caniuse-lite": "^1.0.30001646", + "fraction.js": "^4.3.7", + "normalize-range": "^0.1.2", + "picocolors": "^1.0.1", + "postcss-value-parser": "^4.2.0" + }, + "bin": { + "autoprefixer": "bin/autoprefixer" + }, + "engines": { + "node": "^10 || ^12 || >=14" + }, + "peerDependencies": { + "postcss": "^8.1.0" + } + }, + "node_modules/balanced-match": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz", + "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==", + "license": "MIT" + }, + "node_modules/binary-extensions": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.3.0.tgz", + "integrity": "sha512-Ceh+7ox5qe7LJuLHoY0feh3pHuUDHAcRUeyL2VYghZwfpkNIy/+8Ocg0a3UuSoYzavmylwuLWQOf3hl0jjMMIw==", + "license": "MIT", + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/brace-expansion": { + "version": "1.1.11", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", + "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", + "dev": true, + "license": "MIT", + "dependencies": { + "balanced-match": "^1.0.0", + "concat-map": "0.0.1" + } + }, + "node_modules/braces": { + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.3.tgz", + "integrity": "sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==", + "license": "MIT", + "dependencies": { + "fill-range": "^7.1.1" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/browserslist": { + "version": "4.24.2", + "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.24.2.tgz", + "integrity": "sha512-ZIc+Q62revdMcqC6aChtW4jz3My3klmCO1fEmINZY/8J3EpBg5/A/D0AKmBveUh6pgoeycoMkVMko84tuYS+Gg==", + "dev": true, + "funding": [ + { + "type": "opencollective", + "url": "https://opencollective.com/browserslist" + }, + { + "type": "tidelift", + "url": "https://tidelift.com/funding/github/npm/browserslist" + }, + { + "type": "github", + "url": "https://github.com/sponsors/ai" + } + ], + "license": "MIT", + "dependencies": { + "caniuse-lite": "^1.0.30001669", + "electron-to-chromium": "^1.5.41", + "node-releases": "^2.0.18", + "update-browserslist-db": "^1.1.1" + }, + "bin": { + "browserslist": "cli.js" + }, + "engines": { + "node": "^6 || ^7 || ^8 || ^9 || ^10 || ^11 || ^12 || >=13.7" + } + }, + "node_modules/call-me-maybe": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/call-me-maybe/-/call-me-maybe-1.0.2.tgz", + "integrity": "sha512-HpX65o1Hnr9HH25ojC1YGs7HCQLq0GCOibSaWER0eNpgJ/Z1MZv2mTc7+xh6WOPxbRVcmgbv4hGU+uSQ/2xFZQ==", + "dev": true, + "license": "MIT" + }, + "node_modules/callsites": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz", + "integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=6" + } + }, + "node_modules/camelcase-css": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/camelcase-css/-/camelcase-css-2.0.1.tgz", + "integrity": "sha512-QOSvevhslijgYwRx6Rv7zKdMF8lbRmx+uQGx2+vDc+KI/eBnsy9kit5aj23AgGu3pa4t9AgwbnXWqS+iOY+2aA==", + "license": "MIT", + "engines": { + "node": ">= 6" + } + }, + "node_modules/caniuse-lite": { + "version": "1.0.30001676", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001676.tgz", + "integrity": "sha512-Qz6zwGCiPghQXGJvgQAem79esjitvJ+CxSbSQkW9H/UX5hg8XM88d4lp2W+MEQ81j+Hip58Il+jGVdazk1z9cw==", + "dev": true, + "funding": [ + { + "type": "opencollective", + "url": "https://opencollective.com/browserslist" + }, + { + "type": "tidelift", + "url": "https://tidelift.com/funding/github/npm/caniuse-lite" + }, + { + "type": "github", + "url": "https://github.com/sponsors/ai" + } + ], + "license": "CC-BY-4.0" + }, + "node_modules/chalk": { + "version": "4.1.2", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", + "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", + "dev": true, + "license": "MIT", + "dependencies": { + "ansi-styles": "^4.1.0", + "supports-color": "^7.1.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/chalk/chalk?sponsor=1" + } + }, + "node_modules/chokidar": { + "version": "3.6.0", + "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.6.0.tgz", + "integrity": "sha512-7VT13fmjotKpGipCW9JEQAusEPE+Ei8nl6/g4FBAmIm0GOOLMua9NDDo/DWp0ZAxCr3cPq5ZpBqmPAQgDda2Pw==", + "license": "MIT", + "dependencies": { + "anymatch": "~3.1.2", + "braces": "~3.0.2", + "glob-parent": "~5.1.2", + "is-binary-path": "~2.1.0", + "is-glob": "~4.0.1", + "normalize-path": "~3.0.0", + "readdirp": "~3.6.0" + }, + "engines": { + "node": ">= 8.10.0" + }, + "funding": { + "url": "https://paulmillr.com/funding/" + }, + "optionalDependencies": { + "fsevents": "~2.3.2" + } + }, + "node_modules/chokidar/node_modules/glob-parent": { + "version": "5.1.2", + "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz", + "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==", + "license": "ISC", + "dependencies": { + "is-glob": "^4.0.1" + }, + "engines": { + "node": ">= 6" + } + }, + "node_modules/class-variance-authority": { + "version": "0.7.0", + "resolved": "https://registry.npmjs.org/class-variance-authority/-/class-variance-authority-0.7.0.tgz", + "integrity": "sha512-jFI8IQw4hczaL4ALINxqLEXQbWcNjoSkloa4IaufXCJr6QawJyw7tuRysRsrE8w2p/4gGaxKIt/hX3qz/IbD1A==", + "license": "Apache-2.0", + "dependencies": { + "clsx": "2.0.0" + }, + "funding": { + "url": "https://joebell.co.uk" + } + }, + "node_modules/class-variance-authority/node_modules/clsx": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/clsx/-/clsx-2.0.0.tgz", + "integrity": "sha512-rQ1+kcj+ttHG0MKVGBUXwayCCF1oh39BF5COIpRzuCEv8Mwjv0XucrI2ExNTOn9IlLifGClWQcU9BrZORvtw6Q==", + "license": "MIT", + "engines": { + "node": ">=6" + } + }, + "node_modules/client-only": { + "version": "0.0.1", + "resolved": "https://registry.npmjs.org/client-only/-/client-only-0.0.1.tgz", + "integrity": "sha512-IV3Ou0jSMzZrd3pZ48nLkT9DA7Ag1pnPzaiQhpW7c3RbcqqzvzzVu+L8gfqMp/8IM2MQtSiqaCxrrcfu8I8rMA==", + "license": "MIT" + }, + "node_modules/cliui": { + "version": "8.0.1", + "resolved": "https://registry.npmjs.org/cliui/-/cliui-8.0.1.tgz", + "integrity": "sha512-BSeNnyus75C4//NQ9gQt1/csTXyo/8Sb+afLAkzAptFuMsod9HFokGNudZpi/oQV73hnVK+sR+5PVRMd+Dr7YQ==", + "dev": true, + "license": "ISC", + "dependencies": { + "string-width": "^4.2.0", + "strip-ansi": "^6.0.1", + "wrap-ansi": "^7.0.0" + }, + "engines": { + "node": ">=12" + } + }, + "node_modules/cliui/node_modules/ansi-regex": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz", + "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8" + } + }, + "node_modules/cliui/node_modules/emoji-regex": { + "version": "8.0.0", + "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", + "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==", + "dev": true, + "license": "MIT" + }, + "node_modules/cliui/node_modules/string-width": { + "version": "4.2.3", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz", + "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==", + "dev": true, + "license": "MIT", + "dependencies": { + "emoji-regex": "^8.0.0", + "is-fullwidth-code-point": "^3.0.0", + "strip-ansi": "^6.0.1" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/cliui/node_modules/strip-ansi": { + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz", + "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==", + "dev": true, + "license": "MIT", + "dependencies": { + "ansi-regex": "^5.0.1" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/cliui/node_modules/wrap-ansi": { + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz", + "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==", + "dev": true, + "license": "MIT", + "dependencies": { + "ansi-styles": "^4.0.0", + "string-width": "^4.1.0", + "strip-ansi": "^6.0.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/chalk/wrap-ansi?sponsor=1" + } + }, + "node_modules/clsx": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/clsx/-/clsx-2.1.1.tgz", + "integrity": "sha512-eYm0QWBtUrBWZWG0d386OGAw16Z995PiOVo2B7bjWSbHedGl5e0ZWaq65kOGgUSNesEIDkB9ISbTg/JK9dhCZA==", + "license": "MIT", + "engines": { + "node": ">=6" + } + }, + "node_modules/cmdk": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/cmdk/-/cmdk-1.0.0.tgz", + "integrity": "sha512-gDzVf0a09TvoJ5jnuPvygTB77+XdOSwEmJ88L6XPFPlv7T3RxbP9jgenfylrAMD0+Le1aO0nVjQUzl2g+vjz5Q==", + "license": "MIT", + "dependencies": { + "@radix-ui/react-dialog": "1.0.5", + "@radix-ui/react-primitive": "1.0.3" + }, + "peerDependencies": { + "react": "^18.0.0", + "react-dom": "^18.0.0" + } + }, + "node_modules/cmdk/node_modules/@radix-ui/primitive": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/@radix-ui/primitive/-/primitive-1.0.1.tgz", + "integrity": "sha512-yQ8oGX2GVsEYMWGxcovu1uGWPCxV5BFfeeYxqPmuAzUyLT9qmaMXSAhXpb0WrspIeqYzdJpkh2vHModJPgRIaw==", + "license": "MIT", + "dependencies": { + "@babel/runtime": "^7.13.10" + } + }, + "node_modules/cmdk/node_modules/@radix-ui/react-compose-refs": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/@radix-ui/react-compose-refs/-/react-compose-refs-1.0.1.tgz", + "integrity": "sha512-fDSBgd44FKHa1FRMU59qBMPFcl2PZE+2nmqunj+BWFyYYjnhIDWL2ItDs3rrbJDQOtzt5nIebLCQc4QRfz6LJw==", + "license": "MIT", + "dependencies": { + "@babel/runtime": "^7.13.10" + }, + "peerDependencies": { + "@types/react": "*", + "react": "^16.8 || ^17.0 || ^18.0" + }, + "peerDependenciesMeta": { + "@types/react": { + "optional": true + } + } + }, + "node_modules/cmdk/node_modules/@radix-ui/react-context": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/@radix-ui/react-context/-/react-context-1.0.1.tgz", + "integrity": "sha512-ebbrdFoYTcuZ0v4wG5tedGnp9tzcV8awzsxYph7gXUyvnNLuTIcCk1q17JEbnVhXAKG9oX3KtchwiMIAYp9NLg==", + "license": "MIT", + "dependencies": { + "@babel/runtime": "^7.13.10" + }, + "peerDependencies": { + "@types/react": "*", + "react": "^16.8 || ^17.0 || ^18.0" + }, + "peerDependenciesMeta": { + "@types/react": { + "optional": true + } + } + }, + "node_modules/cmdk/node_modules/@radix-ui/react-dialog": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/@radix-ui/react-dialog/-/react-dialog-1.0.5.tgz", + "integrity": "sha512-GjWJX/AUpB703eEBanuBnIWdIXg6NvJFCXcNlSZk4xdszCdhrJgBoUd1cGk67vFO+WdA2pfI/plOpqz/5GUP6Q==", + "license": "MIT", + "dependencies": { + "@babel/runtime": "^7.13.10", + "@radix-ui/primitive": "1.0.1", + "@radix-ui/react-compose-refs": "1.0.1", + "@radix-ui/react-context": "1.0.1", + "@radix-ui/react-dismissable-layer": "1.0.5", + "@radix-ui/react-focus-guards": "1.0.1", + "@radix-ui/react-focus-scope": "1.0.4", + "@radix-ui/react-id": "1.0.1", + "@radix-ui/react-portal": "1.0.4", + "@radix-ui/react-presence": "1.0.1", + "@radix-ui/react-primitive": "1.0.3", + "@radix-ui/react-slot": "1.0.2", + "@radix-ui/react-use-controllable-state": "1.0.1", + "aria-hidden": "^1.1.1", + "react-remove-scroll": "2.5.5" + }, + "peerDependencies": { + "@types/react": "*", + "@types/react-dom": "*", + "react": "^16.8 || ^17.0 || ^18.0", + "react-dom": "^16.8 || ^17.0 || ^18.0" + }, + "peerDependenciesMeta": { + "@types/react": { + "optional": true + }, + "@types/react-dom": { + "optional": true + } + } + }, + "node_modules/cmdk/node_modules/@radix-ui/react-dismissable-layer": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/@radix-ui/react-dismissable-layer/-/react-dismissable-layer-1.0.5.tgz", + "integrity": "sha512-aJeDjQhywg9LBu2t/At58hCvr7pEm0o2Ke1x33B+MhjNmmZ17sy4KImo0KPLgsnc/zN7GPdce8Cnn0SWvwZO7g==", + "license": "MIT", + "dependencies": { + "@babel/runtime": "^7.13.10", + "@radix-ui/primitive": "1.0.1", + "@radix-ui/react-compose-refs": "1.0.1", + "@radix-ui/react-primitive": "1.0.3", + "@radix-ui/react-use-callback-ref": "1.0.1", + "@radix-ui/react-use-escape-keydown": "1.0.3" + }, + "peerDependencies": { + "@types/react": "*", + "@types/react-dom": "*", + "react": "^16.8 || ^17.0 || ^18.0", + "react-dom": "^16.8 || ^17.0 || ^18.0" + }, + "peerDependenciesMeta": { + "@types/react": { + "optional": true + }, + "@types/react-dom": { + "optional": true + } + } + }, + "node_modules/cmdk/node_modules/@radix-ui/react-focus-guards": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/@radix-ui/react-focus-guards/-/react-focus-guards-1.0.1.tgz", + "integrity": "sha512-Rect2dWbQ8waGzhMavsIbmSVCgYxkXLxxR3ZvCX79JOglzdEy4JXMb98lq4hPxUbLr77nP0UOGf4rcMU+s1pUA==", + "license": "MIT", + "dependencies": { + "@babel/runtime": "^7.13.10" + }, + "peerDependencies": { + "@types/react": "*", + "react": "^16.8 || ^17.0 || ^18.0" + }, + "peerDependenciesMeta": { + "@types/react": { + "optional": true + } + } + }, + "node_modules/cmdk/node_modules/@radix-ui/react-focus-scope": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/@radix-ui/react-focus-scope/-/react-focus-scope-1.0.4.tgz", + "integrity": "sha512-sL04Mgvf+FmyvZeYfNu1EPAaaxD+aw7cYeIB9L9Fvq8+urhltTRaEo5ysKOpHuKPclsZcSUMKlN05x4u+CINpA==", + "license": "MIT", + "dependencies": { + "@babel/runtime": "^7.13.10", + "@radix-ui/react-compose-refs": "1.0.1", + "@radix-ui/react-primitive": "1.0.3", + "@radix-ui/react-use-callback-ref": "1.0.1" + }, + "peerDependencies": { + "@types/react": "*", + "@types/react-dom": "*", + "react": "^16.8 || ^17.0 || ^18.0", + "react-dom": "^16.8 || ^17.0 || ^18.0" + }, + "peerDependenciesMeta": { + "@types/react": { + "optional": true + }, + "@types/react-dom": { + "optional": true + } + } + }, + "node_modules/cmdk/node_modules/@radix-ui/react-id": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/@radix-ui/react-id/-/react-id-1.0.1.tgz", + "integrity": "sha512-tI7sT/kqYp8p96yGWY1OAnLHrqDgzHefRBKQ2YAkBS5ja7QLcZ9Z/uY7bEjPUatf8RomoXM8/1sMj1IJaE5UzQ==", + "license": "MIT", + "dependencies": { + "@babel/runtime": "^7.13.10", + "@radix-ui/react-use-layout-effect": "1.0.1" + }, + "peerDependencies": { + "@types/react": "*", + "react": "^16.8 || ^17.0 || ^18.0" + }, + "peerDependenciesMeta": { + "@types/react": { + "optional": true + } + } + }, + "node_modules/cmdk/node_modules/@radix-ui/react-portal": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/@radix-ui/react-portal/-/react-portal-1.0.4.tgz", + "integrity": "sha512-Qki+C/EuGUVCQTOTD5vzJzJuMUlewbzuKyUy+/iHM2uwGiru9gZeBJtHAPKAEkB5KWGi9mP/CHKcY0wt1aW45Q==", + "license": "MIT", + "dependencies": { + "@babel/runtime": "^7.13.10", + "@radix-ui/react-primitive": "1.0.3" + }, + "peerDependencies": { + "@types/react": "*", + "@types/react-dom": "*", + "react": "^16.8 || ^17.0 || ^18.0", + "react-dom": "^16.8 || ^17.0 || ^18.0" + }, + "peerDependenciesMeta": { + "@types/react": { + "optional": true + }, + "@types/react-dom": { + "optional": true + } + } + }, + "node_modules/cmdk/node_modules/@radix-ui/react-presence": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/@radix-ui/react-presence/-/react-presence-1.0.1.tgz", + "integrity": "sha512-UXLW4UAbIY5ZjcvzjfRFo5gxva8QirC9hF7wRE4U5gz+TP0DbRk+//qyuAQ1McDxBt1xNMBTaciFGvEmJvAZCg==", + "license": "MIT", + "dependencies": { + "@babel/runtime": "^7.13.10", + "@radix-ui/react-compose-refs": "1.0.1", + "@radix-ui/react-use-layout-effect": "1.0.1" + }, + "peerDependencies": { + "@types/react": "*", + "@types/react-dom": "*", + "react": "^16.8 || ^17.0 || ^18.0", + "react-dom": "^16.8 || ^17.0 || ^18.0" + }, + "peerDependenciesMeta": { + "@types/react": { + "optional": true + }, + "@types/react-dom": { + "optional": true + } + } + }, + "node_modules/cmdk/node_modules/@radix-ui/react-primitive": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/@radix-ui/react-primitive/-/react-primitive-1.0.3.tgz", + "integrity": "sha512-yi58uVyoAcK/Nq1inRY56ZSjKypBNKTa/1mcL8qdl6oJeEaDbOldlzrGn7P6Q3Id5d+SYNGc5AJgc4vGhjs5+g==", + "license": "MIT", + "dependencies": { + "@babel/runtime": "^7.13.10", + "@radix-ui/react-slot": "1.0.2" + }, + "peerDependencies": { + "@types/react": "*", + "@types/react-dom": "*", + "react": "^16.8 || ^17.0 || ^18.0", + "react-dom": "^16.8 || ^17.0 || ^18.0" + }, + "peerDependenciesMeta": { + "@types/react": { + "optional": true + }, + "@types/react-dom": { + "optional": true + } + } + }, + "node_modules/cmdk/node_modules/@radix-ui/react-slot": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/@radix-ui/react-slot/-/react-slot-1.0.2.tgz", + "integrity": "sha512-YeTpuq4deV+6DusvVUW4ivBgnkHwECUu0BiN43L5UCDFgdhsRUWAghhTF5MbvNTPzmiFOx90asDSUjWuCNapwg==", + "license": "MIT", + "dependencies": { + "@babel/runtime": "^7.13.10", + "@radix-ui/react-compose-refs": "1.0.1" + }, + "peerDependencies": { + "@types/react": "*", + "react": "^16.8 || ^17.0 || ^18.0" + }, + "peerDependenciesMeta": { + "@types/react": { + "optional": true + } + } + }, + "node_modules/cmdk/node_modules/@radix-ui/react-use-callback-ref": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/@radix-ui/react-use-callback-ref/-/react-use-callback-ref-1.0.1.tgz", + "integrity": "sha512-D94LjX4Sp0xJFVaoQOd3OO9k7tpBYNOXdVhkltUbGv2Qb9OXdrg/CpsjlZv7ia14Sylv398LswWBVVu5nqKzAQ==", + "license": "MIT", + "dependencies": { + "@babel/runtime": "^7.13.10" + }, + "peerDependencies": { + "@types/react": "*", + "react": "^16.8 || ^17.0 || ^18.0" + }, + "peerDependenciesMeta": { + "@types/react": { + "optional": true + } + } + }, + "node_modules/cmdk/node_modules/@radix-ui/react-use-controllable-state": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/@radix-ui/react-use-controllable-state/-/react-use-controllable-state-1.0.1.tgz", + "integrity": "sha512-Svl5GY5FQeN758fWKrjM6Qb7asvXeiZltlT4U2gVfl8Gx5UAv2sMR0LWo8yhsIZh2oQ0eFdZ59aoOOMV7b47VA==", + "license": "MIT", + "dependencies": { + "@babel/runtime": "^7.13.10", + "@radix-ui/react-use-callback-ref": "1.0.1" + }, + "peerDependencies": { + "@types/react": "*", + "react": "^16.8 || ^17.0 || ^18.0" + }, + "peerDependenciesMeta": { + "@types/react": { + "optional": true + } + } + }, + "node_modules/cmdk/node_modules/@radix-ui/react-use-escape-keydown": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/@radix-ui/react-use-escape-keydown/-/react-use-escape-keydown-1.0.3.tgz", + "integrity": "sha512-vyL82j40hcFicA+M4Ex7hVkB9vHgSse1ZWomAqV2Je3RleKGO5iM8KMOEtfoSB0PnIelMd2lATjTGMYqN5ylTg==", + "license": "MIT", + "dependencies": { + "@babel/runtime": "^7.13.10", + "@radix-ui/react-use-callback-ref": "1.0.1" + }, + "peerDependencies": { + "@types/react": "*", + "react": "^16.8 || ^17.0 || ^18.0" + }, + "peerDependenciesMeta": { + "@types/react": { + "optional": true + } + } + }, + "node_modules/cmdk/node_modules/@radix-ui/react-use-layout-effect": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/@radix-ui/react-use-layout-effect/-/react-use-layout-effect-1.0.1.tgz", + "integrity": "sha512-v/5RegiJWYdoCvMnITBkNNx6bCj20fiaJnWtRkU18yITptraXjffz5Qbn05uOiQnOvi+dbkznkoaMltz1GnszQ==", + "license": "MIT", + "dependencies": { + "@babel/runtime": "^7.13.10" + }, + "peerDependencies": { + "@types/react": "*", + "react": "^16.8 || ^17.0 || ^18.0" + }, + "peerDependenciesMeta": { + "@types/react": { + "optional": true + } + } + }, + "node_modules/cmdk/node_modules/react-remove-scroll": { + "version": "2.5.5", + "resolved": "https://registry.npmjs.org/react-remove-scroll/-/react-remove-scroll-2.5.5.tgz", + "integrity": "sha512-ImKhrzJJsyXJfBZ4bzu8Bwpka14c/fQt0k+cyFp/PBhTfyDnU5hjOtM4AG/0AMyy8oKzOTR0lDgJIM7pYXI0kw==", + "license": "MIT", + "dependencies": { + "react-remove-scroll-bar": "^2.3.3", + "react-style-singleton": "^2.2.1", + "tslib": "^2.1.0", + "use-callback-ref": "^1.3.0", + "use-sidecar": "^1.1.2" + }, + "engines": { + "node": ">=10" + }, + "peerDependencies": { + "@types/react": "^16.8.0 || ^17.0.0 || ^18.0.0", + "react": "^16.8.0 || ^17.0.0 || ^18.0.0" + }, + "peerDependenciesMeta": { + "@types/react": { + "optional": true + } + } + }, + "node_modules/color-convert": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "license": "MIT", + "dependencies": { + "color-name": "~1.1.4" + }, + "engines": { + "node": ">=7.0.0" + } + }, + "node_modules/color-name": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", + "license": "MIT" + }, + "node_modules/commander": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/commander/-/commander-4.1.1.tgz", + "integrity": "sha512-NOKm8xhkzAjzFx8B2v5OAHT+u5pRQc2UCa2Vq9jYL/31o2wi9mxBA7LIFs3sV5VSC49z6pEhfbMULvShKj26WA==", + "license": "MIT", + "engines": { + "node": ">= 6" + } + }, + "node_modules/concat-map": { + "version": "0.0.1", + "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", + "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==", + "dev": true, + "license": "MIT" + }, + "node_modules/consola": { + "version": "3.2.3", + "resolved": "https://registry.npmjs.org/consola/-/consola-3.2.3.tgz", + "integrity": "sha512-I5qxpzLv+sJhTVEoLYNcTW+bThDCPsit0vLNKShZx6rLtpilNpmmeTPaeqJb9ZE9dV3DGaeby6Vuhrw38WjeyQ==", + "dev": true, + "license": "MIT", + "engines": { + "node": "^14.18.0 || >=16.10.0" + } + }, + "node_modules/convert-source-map": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-2.0.0.tgz", + "integrity": "sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg==", + "dev": true, + "license": "MIT" + }, + "node_modules/copy-to-clipboard": { + "version": "3.3.3", + "resolved": "https://registry.npmjs.org/copy-to-clipboard/-/copy-to-clipboard-3.3.3.tgz", + "integrity": "sha512-2KV8NhB5JqC3ky0r9PMCAZKbUHSwtEo4CwCs0KXgruG43gX5PMqDEBbVU4OUzw2MuAWUfsuFmWvEKG5QRfSnJA==", + "license": "MIT", + "dependencies": { + "toggle-selection": "^1.0.6" + } + }, + "node_modules/cosmiconfig": { + "version": "9.0.0", + "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-9.0.0.tgz", + "integrity": "sha512-itvL5h8RETACmOTFc4UfIyB2RfEHi71Ax6E/PivVxq9NseKbOWpeyHEOIbmAw1rs8Ak0VursQNww7lf7YtUwzg==", + "dev": true, + "license": "MIT", + "dependencies": { + "env-paths": "^2.2.1", + "import-fresh": "^3.3.0", + "js-yaml": "^4.1.0", + "parse-json": "^5.2.0" + }, + "engines": { + "node": ">=14" + }, + "funding": { + "url": "https://github.com/sponsors/d-fischer" + }, + "peerDependencies": { + "typescript": ">=4.9.5" + }, + "peerDependenciesMeta": { + "typescript": { + "optional": true + } + } + }, + "node_modules/cross-spawn": { + "version": "7.0.6", + "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.6.tgz", + "integrity": "sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==", + "license": "MIT", + "dependencies": { + "path-key": "^3.1.0", + "shebang-command": "^2.0.0", + "which": "^2.0.1" + }, + "engines": { + "node": ">= 8" + } + }, + "node_modules/cssesc": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/cssesc/-/cssesc-3.0.0.tgz", + "integrity": "sha512-/Tb/JcjK111nNScGob5MNtsntNM1aCNUDipB/TkwZFhyDrrE47SOx/18wF2bbjgc3ZzCSKW1T5nt5EbFoAz/Vg==", + "license": "MIT", + "bin": { + "cssesc": "bin/cssesc" + }, + "engines": { + "node": ">=4" + } + }, + "node_modules/csstype": { + "version": "3.1.3", + "resolved": "https://registry.npmjs.org/csstype/-/csstype-3.1.3.tgz", + "integrity": "sha512-M1uQkMl8rQK/szD0LNhtqxIPLpimGm8sOBwU7lLnCpSbTyY3yeU1Vc7l4KT5zT4s/yOxHH5O7tIuuLOCnLADRw==", + "devOptional": true, + "license": "MIT" + }, + "node_modules/debug": { + "version": "4.3.7", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.7.tgz", + "integrity": "sha512-Er2nc/H7RrMXZBFCEim6TCmMk02Z8vLC2Rbi1KEBggpo0fS6l0S1nnapwmIi3yW/+GOJap1Krg4w0Hg80oCqgQ==", + "license": "MIT", + "dependencies": { + "ms": "^2.1.3" + }, + "engines": { + "node": ">=6.0" + }, + "peerDependenciesMeta": { + "supports-color": { + "optional": true + } + } + }, + "node_modules/deep-is": { + "version": "0.1.4", + "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.4.tgz", + "integrity": "sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==", + "dev": true, + "license": "MIT" + }, + "node_modules/detect-node-es": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/detect-node-es/-/detect-node-es-1.1.0.tgz", + "integrity": "sha512-ypdmJU/TbBby2Dxibuv7ZLW3Bs1QEmM7nHjEANfohJLvE0XVujisn1qPJcZxg+qDucsr+bP6fLD1rPS3AhJ7EQ==", + "license": "MIT" + }, + "node_modules/didyoumean": { + "version": "1.2.2", + "resolved": "https://registry.npmjs.org/didyoumean/-/didyoumean-1.2.2.tgz", + "integrity": "sha512-gxtyfqMg7GKyhQmb056K7M3xszy/myH8w+B4RT+QXBQsvAOdc3XymqDDPHx1BgPgsdAA5SIifona89YtRATDzw==", + "license": "Apache-2.0" + }, + "node_modules/dlv": { + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/dlv/-/dlv-1.1.3.tgz", + "integrity": "sha512-+HlytyjlPKnIG8XuRG8WvmBP8xs8P71y+SKKS6ZXWoEgLuePxtDoUEiH7WkdePWrQ5JBpE6aoVqfZfJUQkjXwA==", + "license": "MIT" + }, + "node_modules/eastasianwidth": { + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/eastasianwidth/-/eastasianwidth-0.2.0.tgz", + "integrity": "sha512-I88TYZWc9XiYHRQ4/3c5rjjfgkjhLyW2luGIheGERbNQ6OY7yTybanSpDXZa8y7VUP9YmDcYa+eyq4ca7iLqWA==", + "license": "MIT" + }, + "node_modules/electron-to-chromium": { + "version": "1.5.50", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.50.tgz", + "integrity": "sha512-eMVObiUQ2LdgeO1F/ySTXsvqvxb6ZH2zPGaMYsWzRDdOddUa77tdmI0ltg+L16UpbWdhPmuF3wIQYyQq65WfZw==", + "dev": true, + "license": "ISC" + }, + "node_modules/emoji-regex": { + "version": "9.2.2", + "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-9.2.2.tgz", + "integrity": "sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg==", + "license": "MIT" + }, + "node_modules/env-paths": { + "version": "2.2.1", + "resolved": "https://registry.npmjs.org/env-paths/-/env-paths-2.2.1.tgz", + "integrity": "sha512-+h1lkLKhZMTYjog1VEpJNG7NZJWcuc2DDk/qsqSTRRCOXiLjeQ1d1/udrUGhqMxUgAlwKNZ0cf2uqan5GLuS2A==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=6" + } + }, + "node_modules/error-ex": { + "version": "1.3.2", + "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz", + "integrity": "sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==", + "dev": true, + "license": "MIT", + "dependencies": { + "is-arrayish": "^0.2.1" + } + }, + "node_modules/es6-promise": { + "version": "3.3.1", + "resolved": "https://registry.npmjs.org/es6-promise/-/es6-promise-3.3.1.tgz", + "integrity": "sha512-SOp9Phqvqn7jtEUxPWdWfWoLmyt2VaJ6MpvP9Comy1MceMXqE6bxvaTu4iaxpYYPzhny28Lc+M87/c2cPK6lDg==", + "dev": true, + "license": "MIT" + }, + "node_modules/esbuild": { + "version": "0.21.5", + "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.21.5.tgz", + "integrity": "sha512-mg3OPMV4hXywwpoDxu3Qda5xCKQi+vCTZq8S9J/EpkhB2HzKXq4SNFZE3+NK93JYxc8VMSep+lOUSC/RVKaBqw==", + "dev": true, + "hasInstallScript": true, + "license": "MIT", + "bin": { + "esbuild": "bin/esbuild" + }, + "engines": { + "node": ">=12" + }, + "optionalDependencies": { + "@esbuild/aix-ppc64": "0.21.5", + "@esbuild/android-arm": "0.21.5", + "@esbuild/android-arm64": "0.21.5", + "@esbuild/android-x64": "0.21.5", + "@esbuild/darwin-arm64": "0.21.5", + "@esbuild/darwin-x64": "0.21.5", + "@esbuild/freebsd-arm64": "0.21.5", + "@esbuild/freebsd-x64": "0.21.5", + "@esbuild/linux-arm": "0.21.5", + "@esbuild/linux-arm64": "0.21.5", + "@esbuild/linux-ia32": "0.21.5", + "@esbuild/linux-loong64": "0.21.5", + "@esbuild/linux-mips64el": "0.21.5", + "@esbuild/linux-ppc64": "0.21.5", + "@esbuild/linux-riscv64": "0.21.5", + "@esbuild/linux-s390x": "0.21.5", + "@esbuild/linux-x64": "0.21.5", + "@esbuild/netbsd-x64": "0.21.5", + "@esbuild/openbsd-x64": "0.21.5", + "@esbuild/sunos-x64": "0.21.5", + "@esbuild/win32-arm64": "0.21.5", + "@esbuild/win32-ia32": "0.21.5", + "@esbuild/win32-x64": "0.21.5" + } + }, + "node_modules/escalade": { + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.2.0.tgz", + "integrity": "sha512-WUj2qlxaQtO4g6Pq5c29GTcWGDyd8itL8zTlipgECz3JesAiiOKotd8JU6otB3PACgG6xkJUyVhboMS+bje/jA==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=6" + } + }, + "node_modules/escape-string-regexp": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz", + "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/eslint": { + "version": "9.13.0", + "resolved": "https://registry.npmjs.org/eslint/-/eslint-9.13.0.tgz", + "integrity": "sha512-EYZK6SX6zjFHST/HRytOdA/zE72Cq/bfw45LSyuwrdvcclb/gqV8RRQxywOBEWO2+WDpva6UZa4CcDeJKzUCFA==", + "dev": true, + "license": "MIT", + "dependencies": { + "@eslint-community/eslint-utils": "^4.2.0", + "@eslint-community/regexpp": "^4.11.0", + "@eslint/config-array": "^0.18.0", + "@eslint/core": "^0.7.0", + "@eslint/eslintrc": "^3.1.0", + "@eslint/js": "9.13.0", + "@eslint/plugin-kit": "^0.2.0", + "@humanfs/node": "^0.16.5", + "@humanwhocodes/module-importer": "^1.0.1", + "@humanwhocodes/retry": "^0.3.1", + "@types/estree": "^1.0.6", + "@types/json-schema": "^7.0.15", + "ajv": "^6.12.4", + "chalk": "^4.0.0", + "cross-spawn": "^7.0.2", + "debug": "^4.3.2", + "escape-string-regexp": "^4.0.0", + "eslint-scope": "^8.1.0", + "eslint-visitor-keys": "^4.1.0", + "espree": "^10.2.0", + "esquery": "^1.5.0", + "esutils": "^2.0.2", + "fast-deep-equal": "^3.1.3", + "file-entry-cache": "^8.0.0", + "find-up": "^5.0.0", + "glob-parent": "^6.0.2", + "ignore": "^5.2.0", + "imurmurhash": "^0.1.4", + "is-glob": "^4.0.0", + "json-stable-stringify-without-jsonify": "^1.0.1", + "lodash.merge": "^4.6.2", + "minimatch": "^3.1.2", + "natural-compare": "^1.4.0", + "optionator": "^0.9.3", + "text-table": "^0.2.0" + }, + "bin": { + "eslint": "bin/eslint.js" + }, + "engines": { + "node": "^18.18.0 || ^20.9.0 || >=21.1.0" + }, + "funding": { + "url": "https://eslint.org/donate" + }, + "peerDependencies": { + "jiti": "*" + }, + "peerDependenciesMeta": { + "jiti": { + "optional": true + } + } + }, + "node_modules/eslint-plugin-react-hooks": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/eslint-plugin-react-hooks/-/eslint-plugin-react-hooks-5.0.0.tgz", + "integrity": "sha512-hIOwI+5hYGpJEc4uPRmz2ulCjAGD/N13Lukkh8cLV0i2IRk/bdZDYjgLVHj+U9Z704kLIdIO6iueGvxNur0sgw==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=10" + }, + "peerDependencies": { + "eslint": "^3.0.0 || ^4.0.0 || ^5.0.0 || ^6.0.0 || ^7.0.0 || ^8.0.0-0 || ^9.0.0" + } + }, + "node_modules/eslint-plugin-react-refresh": { + "version": "0.4.14", + "resolved": "https://registry.npmjs.org/eslint-plugin-react-refresh/-/eslint-plugin-react-refresh-0.4.14.tgz", + "integrity": "sha512-aXvzCTK7ZBv1e7fahFuR3Z/fyQQSIQ711yPgYRj+Oj64tyTgO4iQIDmYXDBqvSWQ/FA4OSCsXOStlF+noU0/NA==", + "dev": true, + "license": "MIT", + "peerDependencies": { + "eslint": ">=7" + } + }, + "node_modules/eslint-scope": { + "version": "8.2.0", + "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-8.2.0.tgz", + "integrity": "sha512-PHlWUfG6lvPc3yvP5A4PNyBL1W8fkDUccmI21JUu/+GKZBoH/W5u6usENXUrWFRsyoW5ACUjFGgAFQp5gUlb/A==", + "dev": true, + "license": "BSD-2-Clause", + "dependencies": { + "esrecurse": "^4.3.0", + "estraverse": "^5.2.0" + }, + "engines": { + "node": "^18.18.0 || ^20.9.0 || >=21.1.0" + }, + "funding": { + "url": "https://opencollective.com/eslint" + } + }, + "node_modules/eslint-visitor-keys": { + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-4.2.0.tgz", + "integrity": "sha512-UyLnSehNt62FFhSwjZlHmeokpRK59rcz29j+F1/aDgbkbRTk7wIc9XzdoasMUbRNKDM0qQt/+BJ4BrpFeABemw==", + "dev": true, + "license": "Apache-2.0", + "engines": { + "node": "^18.18.0 || ^20.9.0 || >=21.1.0" + }, + "funding": { + "url": "https://opencollective.com/eslint" + } + }, + "node_modules/espree": { + "version": "10.3.0", + "resolved": "https://registry.npmjs.org/espree/-/espree-10.3.0.tgz", + "integrity": "sha512-0QYC8b24HWY8zjRnDTL6RiHfDbAWn63qb4LMj1Z4b076A4une81+z03Kg7l7mn/48PUTqoLptSXez8oknU8Clg==", + "dev": true, + "license": "BSD-2-Clause", + "dependencies": { + "acorn": "^8.14.0", + "acorn-jsx": "^5.3.2", + "eslint-visitor-keys": "^4.2.0" + }, + "engines": { + "node": "^18.18.0 || ^20.9.0 || >=21.1.0" + }, + "funding": { + "url": "https://opencollective.com/eslint" + } + }, + "node_modules/esquery": { + "version": "1.6.0", + "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.6.0.tgz", + "integrity": "sha512-ca9pw9fomFcKPvFLXhBKUK90ZvGibiGOvRJNbjljY7s7uq/5YO4BOzcYtJqExdx99rF6aAcnRxHmcUHcz6sQsg==", + "dev": true, + "license": "BSD-3-Clause", + "dependencies": { + "estraverse": "^5.1.0" + }, + "engines": { + "node": ">=0.10" + } + }, + "node_modules/esrecurse": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.3.0.tgz", + "integrity": "sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==", + "dev": true, + "license": "BSD-2-Clause", + "dependencies": { + "estraverse": "^5.2.0" + }, + "engines": { + "node": ">=4.0" + } + }, + "node_modules/estraverse": { + "version": "5.3.0", + "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz", + "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==", + "dev": true, + "license": "BSD-2-Clause", + "engines": { + "node": ">=4.0" + } + }, + "node_modules/esutils": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz", + "integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==", + "dev": true, + "license": "BSD-2-Clause", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/eta": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/eta/-/eta-2.2.0.tgz", + "integrity": "sha512-UVQ72Rqjy/ZKQalzV5dCCJP80GrmPrMxh6NlNf+erV6ObL0ZFkhCstWRawS85z3smdr3d2wXPsZEY7rDPfGd2g==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=6.0.0" + }, + "funding": { + "url": "https://github.com/eta-dev/eta?sponsor=1" + } + }, + "node_modules/fast-deep-equal": { + "version": "3.1.3", + "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz", + "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==", + "dev": true, + "license": "MIT" + }, + "node_modules/fast-glob": { + "version": "3.3.2", + "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.3.2.tgz", + "integrity": "sha512-oX2ruAFQwf/Orj8m737Y5adxDQO0LAB7/S5MnxCdTNDd4p6BsyIVsv9JQsATbTSq8KHRpLwIHbVlUNatxd+1Ow==", + "license": "MIT", + "dependencies": { + "@nodelib/fs.stat": "^2.0.2", + "@nodelib/fs.walk": "^1.2.3", + "glob-parent": "^5.1.2", + "merge2": "^1.3.0", + "micromatch": "^4.0.4" + }, + "engines": { + "node": ">=8.6.0" + } + }, + "node_modules/fast-glob/node_modules/glob-parent": { + "version": "5.1.2", + "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz", + "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==", + "license": "ISC", + "dependencies": { + "is-glob": "^4.0.1" + }, + "engines": { + "node": ">= 6" + } + }, + "node_modules/fast-json-stable-stringify": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz", + "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==", + "dev": true, + "license": "MIT" + }, + "node_modules/fast-levenshtein": { + "version": "2.0.6", + "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz", + "integrity": "sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw==", + "dev": true, + "license": "MIT" + }, + "node_modules/fast-safe-stringify": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/fast-safe-stringify/-/fast-safe-stringify-2.1.1.tgz", + "integrity": "sha512-W+KJc2dmILlPplD/H4K9l9LcAHAfPtP6BY84uVLXQ6Evcz9Lcg33Y2z1IVblT6xdY54PXYVHEv+0Wpq8Io6zkA==", + "dev": true, + "license": "MIT" + }, + "node_modules/fastq": { + "version": "1.17.1", + "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.17.1.tgz", + "integrity": "sha512-sRVD3lWVIXWg6By68ZN7vho9a1pQcN/WBFaAAsDDFzlJjvoGx0P8z7V1t72grFJfJhu3YPZBuu25f7Kaw2jN1w==", + "license": "ISC", + "dependencies": { + "reusify": "^1.0.4" + } + }, + "node_modules/file-entry-cache": { + "version": "8.0.0", + "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-8.0.0.tgz", + "integrity": "sha512-XXTUwCvisa5oacNGRP9SfNtYBNAMi+RPwBFmblZEF7N7swHYQS6/Zfk7SRwx4D5j3CH211YNRco1DEMNVfZCnQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "flat-cache": "^4.0.0" + }, + "engines": { + "node": ">=16.0.0" + } + }, + "node_modules/fill-range": { + "version": "7.1.1", + "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.1.1.tgz", + "integrity": "sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==", + "license": "MIT", + "dependencies": { + "to-regex-range": "^5.0.1" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/find-up": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/find-up/-/find-up-5.0.0.tgz", + "integrity": "sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==", + "dev": true, + "license": "MIT", + "dependencies": { + "locate-path": "^6.0.0", + "path-exists": "^4.0.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/flat-cache": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-4.0.1.tgz", + "integrity": "sha512-f7ccFPK3SXFHpx15UIGyRJ/FJQctuKZ0zVuN3frBo4HnK3cay9VEW0R6yPYFHC0AgqhukPzKjq22t5DmAyqGyw==", + "dev": true, + "license": "MIT", + "dependencies": { + "flatted": "^3.2.9", + "keyv": "^4.5.4" + }, + "engines": { + "node": ">=16" + } + }, + "node_modules/flatted": { + "version": "3.3.1", + "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.3.1.tgz", + "integrity": "sha512-X8cqMLLie7KsNUDSdzeN8FYK9rEt4Dt67OsG/DNGnYTSDBG4uFAJFBnUeiV+zCVAvwFy56IjM9sH51jVaEhNxw==", + "dev": true, + "license": "ISC" + }, + "node_modules/foreground-child": { + "version": "3.3.0", + "resolved": "https://registry.npmjs.org/foreground-child/-/foreground-child-3.3.0.tgz", + "integrity": "sha512-Ld2g8rrAyMYFXBhEqMz8ZAHBi4J4uS1i/CxGMDnjyFWddMXLVcDp051DZfu+t7+ab7Wv6SMqpWmyFIj5UbfFvg==", + "license": "ISC", + "dependencies": { + "cross-spawn": "^7.0.0", + "signal-exit": "^4.0.1" + }, + "engines": { + "node": ">=14" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, + "node_modules/fraction.js": { + "version": "4.3.7", + "resolved": "https://registry.npmjs.org/fraction.js/-/fraction.js-4.3.7.tgz", + "integrity": "sha512-ZsDfxO51wGAXREY55a7la9LScWpwv9RxIrYABrlvOFBlH/ShPnrtsXeuUIfXKKOVicNxQ+o8JTbJvjS4M89yew==", + "dev": true, + "license": "MIT", + "engines": { + "node": "*" + }, + "funding": { + "type": "patreon", + "url": "https://github.com/sponsors/rawify" + } + }, + "node_modules/framer-motion": { + "version": "11.14.4", + "resolved": "https://registry.npmjs.org/framer-motion/-/framer-motion-11.14.4.tgz", + "integrity": "sha512-NQuzr9JbeJDMQmy0FFLhLzk9h1kAjVC1tGE/HY4ubF02B95EBm2lpA21LE3Od/OpXqXgp0zl5Hdqu25hliBRsA==", + "license": "MIT", + "dependencies": { + "motion-dom": "^11.14.3", + "motion-utils": "^11.14.3", + "tslib": "^2.4.0" + }, + "peerDependencies": { + "@emotion/is-prop-valid": "*", + "react": "^18.0.0 || ^19.0.0", + "react-dom": "^18.0.0 || ^19.0.0" + }, + "peerDependenciesMeta": { + "@emotion/is-prop-valid": { + "optional": true + }, + "react": { + "optional": true + }, + "react-dom": { + "optional": true + } + } + }, + "node_modules/fsevents": { + "version": "2.3.3", + "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.3.tgz", + "integrity": "sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==", + "hasInstallScript": true, + "license": "MIT", + "optional": true, + "os": [ + "darwin" + ], + "engines": { + "node": "^8.16.0 || ^10.6.0 || >=11.0.0" + } + }, + "node_modules/function-bind": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.2.tgz", + "integrity": "sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==", + "license": "MIT", + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/gensync": { + "version": "1.0.0-beta.2", + "resolved": "https://registry.npmjs.org/gensync/-/gensync-1.0.0-beta.2.tgz", + "integrity": "sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/get-caller-file": { + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz", + "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==", + "dev": true, + "license": "ISC", + "engines": { + "node": "6.* || 8.* || >= 10.*" + } + }, + "node_modules/get-nonce": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/get-nonce/-/get-nonce-1.0.1.tgz", + "integrity": "sha512-FJhYRoDaiatfEkUK8HKlicmu/3SGFD51q3itKDGoSTysQJBnfOcxU5GxnhE1E6soB76MbT0MBtnKJuXyAx+96Q==", + "license": "MIT", + "engines": { + "node": ">=6" + } + }, + "node_modules/glob": { + "version": "10.4.5", + "resolved": "https://registry.npmjs.org/glob/-/glob-10.4.5.tgz", + "integrity": "sha512-7Bv8RF0k6xjo7d4A/PxYLbUCfb6c+Vpd2/mB2yRDlew7Jb5hEXiCD9ibfO7wpk8i4sevK6DFny9h7EYbM3/sHg==", + "license": "ISC", + "dependencies": { + "foreground-child": "^3.1.0", + "jackspeak": "^3.1.2", + "minimatch": "^9.0.4", + "minipass": "^7.1.2", + "package-json-from-dist": "^1.0.0", + "path-scurry": "^1.11.1" + }, + "bin": { + "glob": "dist/esm/bin.mjs" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, + "node_modules/glob-parent": { + "version": "6.0.2", + "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-6.0.2.tgz", + "integrity": "sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==", + "license": "ISC", + "dependencies": { + "is-glob": "^4.0.3" + }, + "engines": { + "node": ">=10.13.0" + } + }, + "node_modules/glob/node_modules/brace-expansion": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz", + "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==", + "license": "MIT", + "dependencies": { + "balanced-match": "^1.0.0" + } + }, + "node_modules/glob/node_modules/minimatch": { + "version": "9.0.5", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.5.tgz", + "integrity": "sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow==", + "license": "ISC", + "dependencies": { + "brace-expansion": "^2.0.1" + }, + "engines": { + "node": ">=16 || 14 >=14.17" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, + "node_modules/globals": { + "version": "15.11.0", + "resolved": "https://registry.npmjs.org/globals/-/globals-15.11.0.tgz", + "integrity": "sha512-yeyNSjdbyVaWurlwCpcA6XNBrHTMIeDdj0/hnvX/OLJ9ekOXYbLsLinH/MucQyGvNnXhidTdNhTtJaffL2sMfw==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=18" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/graphemer": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/graphemer/-/graphemer-1.4.0.tgz", + "integrity": "sha512-EtKwoO6kxCL9WO5xipiHTZlSzBm7WLT627TqC/uVRd0HKmq8NXyebnNYxDoBi7wt8eTWrUrKXCOVaFq9x1kgag==", + "dev": true, + "license": "MIT" + }, + "node_modules/has-flag": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8" + } + }, + "node_modules/hasown": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/hasown/-/hasown-2.0.2.tgz", + "integrity": "sha512-0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ==", + "license": "MIT", + "dependencies": { + "function-bind": "^1.1.2" + }, + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/html-parse-stringify": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/html-parse-stringify/-/html-parse-stringify-3.0.1.tgz", + "integrity": "sha512-KknJ50kTInJ7qIScF3jeaFRpMpE8/lfiTdzf/twXyPBLAGrLRTmkz3AdTnKeh40X8k9L2fdYwEp/42WGXIRGcg==", + "license": "MIT", + "dependencies": { + "void-elements": "3.1.0" + } + }, + "node_modules/http2-client": { + "version": "1.3.5", + "resolved": "https://registry.npmjs.org/http2-client/-/http2-client-1.3.5.tgz", + "integrity": "sha512-EC2utToWl4RKfs5zd36Mxq7nzHHBuomZboI0yYL6Y0RmBgT7Sgkq4rQ0ezFTYoIsSs7Tm9SJe+o2FcAg6GBhGA==", + "dev": true, + "license": "MIT" + }, + "node_modules/i18next": { + "version": "24.0.2", + "resolved": "https://registry.npmjs.org/i18next/-/i18next-24.0.2.tgz", + "integrity": "sha512-D88xyIGcWAKwBTAs4RSqASi8NXR/NhCVSTM4LDbdoU8qb/5dcEZjNCLDhtQBB7Epw/Cp1w2vH/3ujoTbqLSs5g==", + "funding": [ + { + "type": "individual", + "url": "https://locize.com" + }, + { + "type": "individual", + "url": "https://locize.com/i18next.html" + }, + { + "type": "individual", + "url": "https://www.i18next.com/how-to/faq#i18next-is-awesome.-how-can-i-support-the-project" + } + ], + "license": "MIT", + "dependencies": { + "@babel/runtime": "^7.23.2" + }, + "peerDependencies": { + "typescript": "^5" + }, + "peerDependenciesMeta": { + "typescript": { + "optional": true + } + } + }, + "node_modules/i18next-browser-languagedetector": { + "version": "8.0.0", + "resolved": "https://registry.npmjs.org/i18next-browser-languagedetector/-/i18next-browser-languagedetector-8.0.0.tgz", + "integrity": "sha512-zhXdJXTTCoG39QsrOCiOabnWj2jecouOqbchu3EfhtSHxIB5Uugnm9JaizenOy39h7ne3+fLikIjeW88+rgszw==", + "license": "MIT", + "dependencies": { + "@babel/runtime": "^7.23.2" + } + }, + "node_modules/ignore": { + "version": "5.3.2", + "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.3.2.tgz", + "integrity": "sha512-hsBTNUqQTDwkWtcdYI2i06Y/nUBEsNEDJKjWdigLvegy8kDuJAS8uRlpkkcQpyEXL0Z/pjDy5HBmMjRCJ2gq+g==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">= 4" + } + }, + "node_modules/import-fresh": { + "version": "3.3.0", + "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.0.tgz", + "integrity": "sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==", + "dev": true, + "license": "MIT", + "dependencies": { + "parent-module": "^1.0.0", + "resolve-from": "^4.0.0" + }, + "engines": { + "node": ">=6" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/imurmurhash": { + "version": "0.1.4", + "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz", + "integrity": "sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=0.8.19" + } + }, + "node_modules/invariant": { + "version": "2.2.4", + "resolved": "https://registry.npmjs.org/invariant/-/invariant-2.2.4.tgz", + "integrity": "sha512-phJfQVBuaJM5raOpJjSfkiD6BpbCE4Ns//LaXl6wGYtUBY83nWS6Rf9tXm2e8VaK60JEjYldbPif/A2B1C2gNA==", + "license": "MIT", + "dependencies": { + "loose-envify": "^1.0.0" + } + }, + "node_modules/is-arrayish": { + "version": "0.2.1", + "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz", + "integrity": "sha512-zz06S8t0ozoDXMG+ube26zeCTNXcKIPJZJi8hBrF4idCLms4CG9QtK7qBl1boi5ODzFpjswb5JPmHCbMpjaYzg==", + "dev": true, + "license": "MIT" + }, + "node_modules/is-binary-path": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz", + "integrity": "sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==", + "license": "MIT", + "dependencies": { + "binary-extensions": "^2.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/is-core-module": { + "version": "2.15.1", + "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.15.1.tgz", + "integrity": "sha512-z0vtXSwucUJtANQWldhbtbt7BnL0vxiFjIdDLAatwhDYty2bad6s+rijD6Ri4YuYJubLzIJLUidCh09e1djEVQ==", + "license": "MIT", + "dependencies": { + "hasown": "^2.0.2" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/is-extglob": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz", + "integrity": "sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==", + "license": "MIT", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/is-fullwidth-code-point": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz", + "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==", + "license": "MIT", + "engines": { + "node": ">=8" + } + }, + "node_modules/is-glob": { + "version": "4.0.3", + "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz", + "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==", + "license": "MIT", + "dependencies": { + "is-extglob": "^2.1.1" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/is-number": { + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz", + "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==", + "license": "MIT", + "engines": { + "node": ">=0.12.0" + } + }, + "node_modules/isexe": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz", + "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==", + "license": "ISC" + }, + "node_modules/jackspeak": { + "version": "3.4.3", + "resolved": "https://registry.npmjs.org/jackspeak/-/jackspeak-3.4.3.tgz", + "integrity": "sha512-OGlZQpz2yfahA/Rd1Y8Cd9SIEsqvXkLVoSw/cgwhnhFMDbsQFeZYoJJ7bIZBS9BcamUW96asq/npPWugM+RQBw==", + "license": "BlueOak-1.0.0", + "dependencies": { + "@isaacs/cliui": "^8.0.2" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + }, + "optionalDependencies": { + "@pkgjs/parseargs": "^0.11.0" + } + }, + "node_modules/javascript-natural-sort": { + "version": "0.7.1", + "resolved": "https://registry.npmjs.org/javascript-natural-sort/-/javascript-natural-sort-0.7.1.tgz", + "integrity": "sha512-nO6jcEfZWQXDhOiBtG2KvKyEptz7RVbpGP4vTD2hLBdmNQSsCiicO2Ioinv6UI4y9ukqnBpy+XZ9H6uLNgJTlw==", + "license": "MIT" + }, + "node_modules/jiti": { + "version": "1.21.6", + "resolved": "https://registry.npmjs.org/jiti/-/jiti-1.21.6.tgz", + "integrity": "sha512-2yTgeWTWzMWkHu6Jp9NKgePDaYHbntiwvYuuJLbbN9vl7DC9DvXKOB2BC3ZZ92D3cvV/aflH0osDfwpHepQ53w==", + "license": "MIT", + "bin": { + "jiti": "bin/jiti.js" + } + }, + "node_modules/jotai": { + "version": "2.10.1", + "resolved": "https://registry.npmjs.org/jotai/-/jotai-2.10.1.tgz", + "integrity": "sha512-4FycO+BOTl2auLyF2Chvi6KTDqdsdDDtpaL/WHQMs8f3KS1E3loiUShQzAzFA/sMU5cJ0hz/RT1xum9YbG/zaA==", + "license": "MIT", + "peer": true, + "engines": { + "node": ">=12.20.0" + }, + "peerDependencies": { + "@types/react": ">=17.0.0", + "react": ">=17.0.0" + }, + "peerDependenciesMeta": { + "@types/react": { + "optional": true + }, + "react": { + "optional": true + } + } + }, + "node_modules/jotai-zustand": { + "version": "0.6.0", + "resolved": "https://registry.npmjs.org/jotai-zustand/-/jotai-zustand-0.6.0.tgz", + "integrity": "sha512-82LVFVZZXWsqpcfvDf4Yk6Gaq2RFezU0USfAA3O9WrxqflZNGlh0BkpUGzzYpdmDuDJIcYU7Rr1582UgI4DAiw==", + "license": "MIT", + "peerDependencies": { + "jotai": ">=2.0.0" + } + }, + "node_modules/js-tokens": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz", + "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==", + "license": "MIT" + }, + "node_modules/js-yaml": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz", + "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==", + "dev": true, + "license": "MIT", + "dependencies": { + "argparse": "^2.0.1" + }, + "bin": { + "js-yaml": "bin/js-yaml.js" + } + }, + "node_modules/jsesc": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-3.0.2.tgz", + "integrity": "sha512-xKqzzWXDttJuOcawBt4KnKHHIf5oQ/Cxax+0PWFG+DFDgHNAdi+TXECADI+RYiFUMmx8792xsMbbgXj4CwnP4g==", + "license": "MIT", + "bin": { + "jsesc": "bin/jsesc" + }, + "engines": { + "node": ">=6" + } + }, + "node_modules/json-buffer": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/json-buffer/-/json-buffer-3.0.1.tgz", + "integrity": "sha512-4bV5BfR2mqfQTJm+V5tPPdf+ZpuhiIvTuAB5g8kcrXOZpTT/QwwVRWBywX1ozr6lEuPdbHxwaJlm9G6mI2sfSQ==", + "dev": true, + "license": "MIT" + }, + "node_modules/json-parse-even-better-errors": { + "version": "2.3.1", + "resolved": "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz", + "integrity": "sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w==", + "dev": true, + "license": "MIT" + }, + "node_modules/json-schema-traverse": { + "version": "0.4.1", + "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz", + "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==", + "dev": true, + "license": "MIT" + }, + "node_modules/json-stable-stringify-without-jsonify": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz", + "integrity": "sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw==", + "dev": true, + "license": "MIT" + }, + "node_modules/json5": { + "version": "2.2.3", + "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.3.tgz", + "integrity": "sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==", + "dev": true, + "license": "MIT", + "bin": { + "json5": "lib/cli.js" + }, + "engines": { + "node": ">=6" + } + }, + "node_modules/keyv": { + "version": "4.5.4", + "resolved": "https://registry.npmjs.org/keyv/-/keyv-4.5.4.tgz", + "integrity": "sha512-oxVHkHR/EJf2CNXnWxRLW6mg7JyCCUcG0DtEGmL2ctUo1PNTin1PUil+r/+4r5MpVgC/fn1kjsx7mjSujKqIpw==", + "dev": true, + "license": "MIT", + "dependencies": { + "json-buffer": "3.0.1" + } + }, + "node_modules/levn": { + "version": "0.4.1", + "resolved": "https://registry.npmjs.org/levn/-/levn-0.4.1.tgz", + "integrity": "sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "prelude-ls": "^1.2.1", + "type-check": "~0.4.0" + }, + "engines": { + "node": ">= 0.8.0" + } + }, + "node_modules/lilconfig": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/lilconfig/-/lilconfig-2.1.0.tgz", + "integrity": "sha512-utWOt/GHzuUxnLKxB6dk81RoOeoNeHgbrXiuGk4yyF5qlRz+iIVWu56E2fqGHFrXz0QNUhLB/8nKqvRH66JKGQ==", + "license": "MIT", + "engines": { + "node": ">=10" + } + }, + "node_modules/lines-and-columns": { + "version": "1.2.4", + "resolved": "https://registry.npmjs.org/lines-and-columns/-/lines-and-columns-1.2.4.tgz", + "integrity": "sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg==", + "license": "MIT" + }, + "node_modules/locate-path": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-6.0.0.tgz", + "integrity": "sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==", + "dev": true, + "license": "MIT", + "dependencies": { + "p-locate": "^5.0.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/lodash": { + "version": "4.17.21", + "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz", + "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==", + "license": "MIT" + }, + "node_modules/lodash.merge": { + "version": "4.6.2", + "resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz", + "integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==", + "dev": true, + "license": "MIT" + }, + "node_modules/loose-envify": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/loose-envify/-/loose-envify-1.4.0.tgz", + "integrity": "sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q==", + "license": "MIT", + "dependencies": { + "js-tokens": "^3.0.0 || ^4.0.0" + }, + "bin": { + "loose-envify": "cli.js" + } + }, + "node_modules/lru-cache": { + "version": "5.1.1", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz", + "integrity": "sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==", + "dev": true, + "license": "ISC", + "dependencies": { + "yallist": "^3.0.2" + } + }, + "node_modules/lucide-react": { + "version": "0.454.0", + "resolved": "https://registry.npmjs.org/lucide-react/-/lucide-react-0.454.0.tgz", + "integrity": "sha512-hw7zMDwykCLnEzgncEEjHeA6+45aeEzRYuKHuyRSOPkhko+J3ySGjGIzu+mmMfDFG1vazHepMaYFYHbTFAZAAQ==", + "license": "ISC", + "peerDependencies": { + "react": "^16.5.1 || ^17.0.0 || ^18.0.0 || ^19.0.0-rc" + } + }, + "node_modules/luxon": { + "version": "3.5.0", + "resolved": "https://registry.npmjs.org/luxon/-/luxon-3.5.0.tgz", + "integrity": "sha512-rh+Zjr6DNfUYR3bPwJEnuwDdqMbxZW7LOQfUN4B54+Cl+0o5zaU9RJ6bcidfDtC1cWCZXQ+nvX8bf6bAji37QQ==", + "license": "MIT", + "engines": { + "node": ">=12" + } + }, + "node_modules/merge2": { + "version": "1.4.1", + "resolved": "https://registry.npmjs.org/merge2/-/merge2-1.4.1.tgz", + "integrity": "sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==", + "license": "MIT", + "engines": { + "node": ">= 8" + } + }, + "node_modules/micromatch": { + "version": "4.0.8", + "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.8.tgz", + "integrity": "sha512-PXwfBhYu0hBCPw8Dn0E+WDYb7af3dSLVWKi3HGv84IdF4TyFoC0ysxFd0Goxw7nSv4T/PzEJQxsYsEiFCKo2BA==", + "license": "MIT", + "dependencies": { + "braces": "^3.0.3", + "picomatch": "^2.3.1" + }, + "engines": { + "node": ">=8.6" + } + }, + "node_modules/minimatch": { + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", + "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", + "dev": true, + "license": "ISC", + "dependencies": { + "brace-expansion": "^1.1.7" + }, + "engines": { + "node": "*" + } + }, + "node_modules/minipass": { + "version": "7.1.2", + "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.1.2.tgz", + "integrity": "sha512-qOOzS1cBTWYF4BH8fVePDBOO9iptMnGUEZwNc/cMWnTV2nVLZ7VoNWEPHkYczZA0pdoA7dl6e7FL659nX9S2aw==", + "license": "ISC", + "engines": { + "node": ">=16 || 14 >=14.17" + } + }, + "node_modules/motion-dom": { + "version": "11.14.3", + "resolved": "https://registry.npmjs.org/motion-dom/-/motion-dom-11.14.3.tgz", + "integrity": "sha512-lW+D2wBy5vxLJi6aCP0xyxTxlTfiu+b+zcpVbGVFUxotwThqhdpPRSmX8xztAgtZMPMeU0WGVn/k1w4I+TbPqA==", + "license": "MIT" + }, + "node_modules/motion-utils": { + "version": "11.14.3", + "resolved": "https://registry.npmjs.org/motion-utils/-/motion-utils-11.14.3.tgz", + "integrity": "sha512-Xg+8xnqIJTpr0L/cidfTTBFkvRw26ZtGGuIhA94J9PQ2p4mEa06Xx7QVYZH0BP+EpMSaDlu+q0I0mmvwADPsaQ==", + "license": "MIT" + }, + "node_modules/ms": { + "version": "2.1.3", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz", + "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==", + "license": "MIT" + }, + "node_modules/mz": { + "version": "2.7.0", + "resolved": "https://registry.npmjs.org/mz/-/mz-2.7.0.tgz", + "integrity": "sha512-z81GNO7nnYMEhrGh9LeymoE4+Yr0Wn5McHIZMK5cfQCl+NDX08sCZgUc9/6MHni9IWuFLm1Z3HTCXu2z9fN62Q==", + "license": "MIT", + "dependencies": { + "any-promise": "^1.0.0", + "object-assign": "^4.0.1", + "thenify-all": "^1.0.0" + } + }, + "node_modules/nanoid": { + "version": "3.3.7", + "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.7.tgz", + "integrity": "sha512-eSRppjcPIatRIMC1U6UngP8XFcz8MQWGQdt1MTBQ7NaAmvXDfvNxbvWV3x2y6CdEUciCSsDHDQZbhYaB8QEo2g==", + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/ai" + } + ], + "license": "MIT", + "bin": { + "nanoid": "bin/nanoid.cjs" + }, + "engines": { + "node": "^10 || ^12 || ^13.7 || ^14 || >=15.0.1" + } + }, + "node_modules/natural-compare": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz", + "integrity": "sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==", + "dev": true, + "license": "MIT" + }, + "node_modules/next-themes": { + "version": "0.3.0", + "resolved": "https://registry.npmjs.org/next-themes/-/next-themes-0.3.0.tgz", + "integrity": "sha512-/QHIrsYpd6Kfk7xakK4svpDI5mmXP0gfvCoJdGpZQ2TOrQZmsW0QxjaiLn8wbIKjtm4BTSqLoix4lxYYOnLJ/w==", + "license": "MIT", + "peerDependencies": { + "react": "^16.8 || ^17 || ^18", + "react-dom": "^16.8 || ^17 || ^18" + } + }, + "node_modules/node-fetch": { + "version": "2.7.0", + "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.7.0.tgz", + "integrity": "sha512-c4FRfUm/dbcWZ7U+1Wq0AwCyFL+3nt2bEw05wfxSz+DWpWsitgmSgYmy2dQdWyKC1694ELPqMs/YzUSNozLt8A==", + "dev": true, + "license": "MIT", + "dependencies": { + "whatwg-url": "^5.0.0" + }, + "engines": { + "node": "4.x || >=6.0.0" + }, + "peerDependencies": { + "encoding": "^0.1.0" + }, + "peerDependenciesMeta": { + "encoding": { + "optional": true + } + } + }, + "node_modules/node-fetch-h2": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/node-fetch-h2/-/node-fetch-h2-2.3.0.tgz", + "integrity": "sha512-ofRW94Ab0T4AOh5Fk8t0h8OBWrmjb0SSB20xh1H8YnPV9EJ+f5AMoYSUQ2zgJ4Iq2HAK0I2l5/Nequ8YzFS3Hg==", + "dev": true, + "license": "MIT", + "dependencies": { + "http2-client": "^1.2.5" + }, + "engines": { + "node": "4.x || >=6.0.0" + } + }, + "node_modules/node-readfiles": { + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/node-readfiles/-/node-readfiles-0.2.0.tgz", + "integrity": "sha512-SU00ZarexNlE4Rjdm83vglt5Y9yiQ+XI1XpflWlb7q7UTN1JUItm69xMeiQCTxtTfnzt+83T8Cx+vI2ED++VDA==", + "dev": true, + "license": "MIT", + "dependencies": { + "es6-promise": "^3.2.1" + } + }, + "node_modules/node-releases": { + "version": "2.0.18", + "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.18.tgz", + "integrity": "sha512-d9VeXT4SJ7ZeOqGX6R5EM022wpL+eWPooLI+5UpWn2jCT1aosUQEhQP214x33Wkwx3JQMvIm+tIoVOdodFS40g==", + "dev": true, + "license": "MIT" + }, + "node_modules/normalize-path": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz", + "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==", + "license": "MIT", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/normalize-range": { + "version": "0.1.2", + "resolved": "https://registry.npmjs.org/normalize-range/-/normalize-range-0.1.2.tgz", + "integrity": "sha512-bdok/XvKII3nUpklnV6P2hxtMNrCboOjAcyBuQnWEhO665FwrSNRxU+AqpsyvO6LgGYPspN+lu5CLtw4jPRKNA==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/oas-kit-common": { + "version": "1.0.8", + "resolved": "https://registry.npmjs.org/oas-kit-common/-/oas-kit-common-1.0.8.tgz", + "integrity": "sha512-pJTS2+T0oGIwgjGpw7sIRU8RQMcUoKCDWFLdBqKB2BNmGpbBMH2sdqAaOXUg8OzonZHU0L7vfJu1mJFEiYDWOQ==", + "dev": true, + "license": "BSD-3-Clause", + "dependencies": { + "fast-safe-stringify": "^2.0.7" + } + }, + "node_modules/oas-linter": { + "version": "3.2.2", + "resolved": "https://registry.npmjs.org/oas-linter/-/oas-linter-3.2.2.tgz", + "integrity": "sha512-KEGjPDVoU5K6swgo9hJVA/qYGlwfbFx+Kg2QB/kd7rzV5N8N5Mg6PlsoCMohVnQmo+pzJap/F610qTodKzecGQ==", + "dev": true, + "license": "BSD-3-Clause", + "dependencies": { + "@exodus/schemasafe": "^1.0.0-rc.2", + "should": "^13.2.1", + "yaml": "^1.10.0" + }, + "funding": { + "url": "https://github.com/Mermade/oas-kit?sponsor=1" + } + }, + "node_modules/oas-linter/node_modules/yaml": { + "version": "1.10.2", + "resolved": "https://registry.npmjs.org/yaml/-/yaml-1.10.2.tgz", + "integrity": "sha512-r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg==", + "dev": true, + "license": "ISC", + "engines": { + "node": ">= 6" + } + }, + "node_modules/oas-resolver": { + "version": "2.5.6", + "resolved": "https://registry.npmjs.org/oas-resolver/-/oas-resolver-2.5.6.tgz", + "integrity": "sha512-Yx5PWQNZomfEhPPOphFbZKi9W93CocQj18NlD2Pa4GWZzdZpSJvYwoiuurRI7m3SpcChrnO08hkuQDL3FGsVFQ==", + "dev": true, + "license": "BSD-3-Clause", + "dependencies": { + "node-fetch-h2": "^2.3.0", + "oas-kit-common": "^1.0.8", + "reftools": "^1.1.9", + "yaml": "^1.10.0", + "yargs": "^17.0.1" + }, + "bin": { + "resolve": "resolve.js" + }, + "funding": { + "url": "https://github.com/Mermade/oas-kit?sponsor=1" + } + }, + "node_modules/oas-resolver/node_modules/yaml": { + "version": "1.10.2", + "resolved": "https://registry.npmjs.org/yaml/-/yaml-1.10.2.tgz", + "integrity": "sha512-r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg==", + "dev": true, + "license": "ISC", + "engines": { + "node": ">= 6" + } + }, + "node_modules/oas-schema-walker": { + "version": "1.1.5", + "resolved": "https://registry.npmjs.org/oas-schema-walker/-/oas-schema-walker-1.1.5.tgz", + "integrity": "sha512-2yucenq1a9YPmeNExoUa9Qwrt9RFkjqaMAA1X+U7sbb0AqBeTIdMHky9SQQ6iN94bO5NW0W4TRYXerG+BdAvAQ==", + "dev": true, + "license": "BSD-3-Clause", + "funding": { + "url": "https://github.com/Mermade/oas-kit?sponsor=1" + } + }, + "node_modules/oas-validator": { + "version": "5.0.8", + "resolved": "https://registry.npmjs.org/oas-validator/-/oas-validator-5.0.8.tgz", + "integrity": "sha512-cu20/HE5N5HKqVygs3dt94eYJfBi0TsZvPVXDhbXQHiEityDN+RROTleefoKRKKJ9dFAF2JBkDHgvWj0sjKGmw==", + "dev": true, + "license": "BSD-3-Clause", + "dependencies": { + "call-me-maybe": "^1.0.1", + "oas-kit-common": "^1.0.8", + "oas-linter": "^3.2.2", + "oas-resolver": "^2.5.6", + "oas-schema-walker": "^1.1.5", + "reftools": "^1.1.9", + "should": "^13.2.1", + "yaml": "^1.10.0" + }, + "funding": { + "url": "https://github.com/Mermade/oas-kit?sponsor=1" + } + }, + "node_modules/oas-validator/node_modules/yaml": { + "version": "1.10.2", + "resolved": "https://registry.npmjs.org/yaml/-/yaml-1.10.2.tgz", + "integrity": "sha512-r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg==", + "dev": true, + "license": "ISC", + "engines": { + "node": ">= 6" + } + }, + "node_modules/object-assign": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz", + "integrity": "sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg==", + "license": "MIT", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/object-hash": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/object-hash/-/object-hash-3.0.0.tgz", + "integrity": "sha512-RSn9F68PjH9HqtltsSnqYC1XXoWe9Bju5+213R98cNGttag9q9yAOTzdbsqvIa7aNm5WffBZFpWYr2aWrklWAw==", + "license": "MIT", + "engines": { + "node": ">= 6" + } + }, + "node_modules/optionator": { + "version": "0.9.4", + "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.9.4.tgz", + "integrity": "sha512-6IpQ7mKUxRcZNLIObR0hz7lxsapSSIYNZJwXPGeF0mTVqGKFIXj1DQcMoT22S3ROcLyY/rz0PWaWZ9ayWmad9g==", + "dev": true, + "license": "MIT", + "dependencies": { + "deep-is": "^0.1.3", + "fast-levenshtein": "^2.0.6", + "levn": "^0.4.1", + "prelude-ls": "^1.2.1", + "type-check": "^0.4.0", + "word-wrap": "^1.2.5" + }, + "engines": { + "node": ">= 0.8.0" + } + }, + "node_modules/p-limit": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz", + "integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "yocto-queue": "^0.1.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/p-locate": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-5.0.0.tgz", + "integrity": "sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==", + "dev": true, + "license": "MIT", + "dependencies": { + "p-limit": "^3.0.2" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/package-json-from-dist": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/package-json-from-dist/-/package-json-from-dist-1.0.1.tgz", + "integrity": "sha512-UEZIS3/by4OC8vL3P2dTXRETpebLI2NiI5vIrjaD/5UtrkFX/tNbwjTSRAGC/+7CAo2pIcBaRgWmcBBHcsaCIw==", + "license": "BlueOak-1.0.0" + }, + "node_modules/parent-module": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz", + "integrity": "sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==", + "dev": true, + "license": "MIT", + "dependencies": { + "callsites": "^3.0.0" + }, + "engines": { + "node": ">=6" + } + }, + "node_modules/parse-json": { + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-5.2.0.tgz", + "integrity": "sha512-ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg==", + "dev": true, + "license": "MIT", + "dependencies": { + "@babel/code-frame": "^7.0.0", + "error-ex": "^1.3.1", + "json-parse-even-better-errors": "^2.3.0", + "lines-and-columns": "^1.1.6" + }, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/path-exists": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz", + "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8" + } + }, + "node_modules/path-key": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz", + "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==", + "license": "MIT", + "engines": { + "node": ">=8" + } + }, + "node_modules/path-parse": { + "version": "1.0.7", + "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz", + "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==", + "license": "MIT" + }, + "node_modules/path-scurry": { + "version": "1.11.1", + "resolved": "https://registry.npmjs.org/path-scurry/-/path-scurry-1.11.1.tgz", + "integrity": "sha512-Xa4Nw17FS9ApQFJ9umLiJS4orGjm7ZzwUrwamcGQuHSzDyth9boKDaycYdDcZDuqYATXw4HFXgaqWTctW/v1HA==", + "license": "BlueOak-1.0.0", + "dependencies": { + "lru-cache": "^10.2.0", + "minipass": "^5.0.0 || ^6.0.2 || ^7.0.0" + }, + "engines": { + "node": ">=16 || 14 >=14.18" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, + "node_modules/path-scurry/node_modules/lru-cache": { + "version": "10.4.3", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-10.4.3.tgz", + "integrity": "sha512-JNAzZcXrCt42VGLuYz0zfAzDfAvJWW6AfYlDBQyDV5DClI2m5sAmK+OIO7s59XfsRsWHp02jAJrRadPRGTt6SQ==", + "license": "ISC" + }, + "node_modules/picocolors": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.1.1.tgz", + "integrity": "sha512-xceH2snhtb5M9liqDsmEw56le376mTZkEX/jEb/RxNFyegNul7eNslCXP9FDj/Lcu0X8KEyMceP2ntpaHrDEVA==", + "license": "ISC" + }, + "node_modules/picomatch": { + "version": "2.3.1", + "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz", + "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==", + "license": "MIT", + "engines": { + "node": ">=8.6" + }, + "funding": { + "url": "https://github.com/sponsors/jonschlinkert" + } + }, + "node_modules/pify": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz", + "integrity": "sha512-udgsAY+fTnvv7kI7aaxbqwWNb0AHiB0qBO89PZKPkoTmGOgdbrHDKD+0B2X4uTfJ/FT1R09r9gTsjUjNJotuog==", + "license": "MIT", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/pirates": { + "version": "4.0.6", + "resolved": "https://registry.npmjs.org/pirates/-/pirates-4.0.6.tgz", + "integrity": "sha512-saLsH7WeYYPiD25LDuLRRY/i+6HaPYr6G1OUlN39otzkSTxKnubR9RTxS3/Kk50s1g2JTgFwWQDQyplC5/SHZg==", + "license": "MIT", + "engines": { + "node": ">= 6" + } + }, + "node_modules/postcss": { + "version": "8.4.47", + "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.47.tgz", + "integrity": "sha512-56rxCq7G/XfB4EkXq9Egn5GCqugWvDFjafDOThIdMBsI15iqPqR5r15TfSr1YPYeEI19YeaXMCbY6u88Y76GLQ==", + "funding": [ + { + "type": "opencollective", + "url": "https://opencollective.com/postcss/" + }, + { + "type": "tidelift", + "url": "https://tidelift.com/funding/github/npm/postcss" + }, + { + "type": "github", + "url": "https://github.com/sponsors/ai" + } + ], + "license": "MIT", + "dependencies": { + "nanoid": "^3.3.7", + "picocolors": "^1.1.0", + "source-map-js": "^1.2.1" + }, + "engines": { + "node": "^10 || ^12 || >=14" + } + }, + "node_modules/postcss-import": { + "version": "15.1.0", + "resolved": "https://registry.npmjs.org/postcss-import/-/postcss-import-15.1.0.tgz", + "integrity": "sha512-hpr+J05B2FVYUAXHeK1YyI267J/dDDhMU6B6civm8hSY1jYJnBXxzKDKDswzJmtLHryrjhnDjqqp/49t8FALew==", + "license": "MIT", + "dependencies": { + "postcss-value-parser": "^4.0.0", + "read-cache": "^1.0.0", + "resolve": "^1.1.7" + }, + "engines": { + "node": ">=14.0.0" + }, + "peerDependencies": { + "postcss": "^8.0.0" + } + }, + "node_modules/postcss-js": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/postcss-js/-/postcss-js-4.0.1.tgz", + "integrity": "sha512-dDLF8pEO191hJMtlHFPRa8xsizHaM82MLfNkUHdUtVEV3tgTp5oj+8qbEqYM57SLfc74KSbw//4SeJma2LRVIw==", + "license": "MIT", + "dependencies": { + "camelcase-css": "^2.0.1" + }, + "engines": { + "node": "^12 || ^14 || >= 16" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/postcss/" + }, + "peerDependencies": { + "postcss": "^8.4.21" + } + }, + "node_modules/postcss-load-config": { + "version": "4.0.2", + "resolved": "https://registry.npmjs.org/postcss-load-config/-/postcss-load-config-4.0.2.tgz", + "integrity": "sha512-bSVhyJGL00wMVoPUzAVAnbEoWyqRxkjv64tUl427SKnPrENtq6hJwUojroMz2VB+Q1edmi4IfrAPpami5VVgMQ==", + "funding": [ + { + "type": "opencollective", + "url": "https://opencollective.com/postcss/" + }, + { + "type": "github", + "url": "https://github.com/sponsors/ai" + } + ], + "license": "MIT", + "dependencies": { + "lilconfig": "^3.0.0", + "yaml": "^2.3.4" + }, + "engines": { + "node": ">= 14" + }, + "peerDependencies": { + "postcss": ">=8.0.9", + "ts-node": ">=9.0.0" + }, + "peerDependenciesMeta": { + "postcss": { + "optional": true + }, + "ts-node": { + "optional": true + } + } + }, + "node_modules/postcss-load-config/node_modules/lilconfig": { + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/lilconfig/-/lilconfig-3.1.2.tgz", + "integrity": "sha512-eop+wDAvpItUys0FWkHIKeC9ybYrTGbU41U5K7+bttZZeohvnY7M9dZ5kB21GNWiFT2q1OoPTvncPCgSOVO5ow==", + "license": "MIT", + "engines": { + "node": ">=14" + }, + "funding": { + "url": "https://github.com/sponsors/antonk52" + } + }, + "node_modules/postcss-nested": { + "version": "6.2.0", + "resolved": "https://registry.npmjs.org/postcss-nested/-/postcss-nested-6.2.0.tgz", + "integrity": "sha512-HQbt28KulC5AJzG+cZtj9kvKB93CFCdLvog1WFLf1D+xmMvPGlBstkpTEZfK5+AN9hfJocyBFCNiqyS48bpgzQ==", + "funding": [ + { + "type": "opencollective", + "url": "https://opencollective.com/postcss/" + }, + { + "type": "github", + "url": "https://github.com/sponsors/ai" + } + ], + "license": "MIT", + "dependencies": { + "postcss-selector-parser": "^6.1.1" + }, + "engines": { + "node": ">=12.0" + }, + "peerDependencies": { + "postcss": "^8.2.14" + } + }, + "node_modules/postcss-selector-parser": { + "version": "6.1.2", + "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.1.2.tgz", + "integrity": "sha512-Q8qQfPiZ+THO/3ZrOrO0cJJKfpYCagtMUkXbnEfmgUjwXg6z/WBeOyS9APBBPCTSiDV+s4SwQGu8yFsiMRIudg==", + "license": "MIT", + "dependencies": { + "cssesc": "^3.0.0", + "util-deprecate": "^1.0.2" + }, + "engines": { + "node": ">=4" + } + }, + "node_modules/postcss-value-parser": { + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz", + "integrity": "sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==", + "license": "MIT" + }, + "node_modules/prelude-ls": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.2.1.tgz", + "integrity": "sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">= 0.8.0" + } + }, + "node_modules/prettier": { + "version": "3.3.3", + "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.3.3.tgz", + "integrity": "sha512-i2tDNA0O5IrMO757lfrdQZCc2jPNDVntV0m/+4whiDfWaTKfMNgR7Qz0NAeGz/nRqF4m5/6CLzbP4/liHt12Ew==", + "license": "MIT", + "bin": { + "prettier": "bin/prettier.cjs" + }, + "engines": { + "node": ">=14" + }, + "funding": { + "url": "https://github.com/prettier/prettier?sponsor=1" + } + }, + "node_modules/prettier-plugin-tailwindcss": { + "version": "0.6.9", + "resolved": "https://registry.npmjs.org/prettier-plugin-tailwindcss/-/prettier-plugin-tailwindcss-0.6.9.tgz", + "integrity": "sha512-r0i3uhaZAXYP0At5xGfJH876W3HHGHDp+LCRUJrs57PBeQ6mYHMwr25KH8NPX44F2yGTvdnH7OqCshlQx183Eg==", + "license": "MIT", + "engines": { + "node": ">=14.21.3" + }, + "peerDependencies": { + "@ianvs/prettier-plugin-sort-imports": "*", + "@prettier/plugin-pug": "*", + "@shopify/prettier-plugin-liquid": "*", + "@trivago/prettier-plugin-sort-imports": "*", + "@zackad/prettier-plugin-twig-melody": "*", + "prettier": "^3.0", + "prettier-plugin-astro": "*", + "prettier-plugin-css-order": "*", + "prettier-plugin-import-sort": "*", + "prettier-plugin-jsdoc": "*", + "prettier-plugin-marko": "*", + "prettier-plugin-multiline-arrays": "*", + "prettier-plugin-organize-attributes": "*", + "prettier-plugin-organize-imports": "*", + "prettier-plugin-sort-imports": "*", + "prettier-plugin-style-order": "*", + "prettier-plugin-svelte": "*" + }, + "peerDependenciesMeta": { + "@ianvs/prettier-plugin-sort-imports": { + "optional": true + }, + "@prettier/plugin-pug": { + "optional": true + }, + "@shopify/prettier-plugin-liquid": { + "optional": true + }, + "@trivago/prettier-plugin-sort-imports": { + "optional": true + }, + "@zackad/prettier-plugin-twig-melody": { + "optional": true + }, + "prettier-plugin-astro": { + "optional": true + }, + "prettier-plugin-css-order": { + "optional": true + }, + "prettier-plugin-import-sort": { + "optional": true + }, + "prettier-plugin-jsdoc": { + "optional": true + }, + "prettier-plugin-marko": { + "optional": true + }, + "prettier-plugin-multiline-arrays": { + "optional": true + }, + "prettier-plugin-organize-attributes": { + "optional": true + }, + "prettier-plugin-organize-imports": { + "optional": true + }, + "prettier-plugin-sort-imports": { + "optional": true + }, + "prettier-plugin-style-order": { + "optional": true + }, + "prettier-plugin-svelte": { + "optional": true + } + } + }, + "node_modules/punycode": { + "version": "2.3.1", + "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.3.1.tgz", + "integrity": "sha512-vYt7UD1U9Wg6138shLtLOvdAu+8DsC/ilFtEVHcH+wydcSpNE20AfSOduf6MkRFahL5FY7X1oU7nKVZFtfq8Fg==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=6" + } + }, + "node_modules/queue-microtask": { + "version": "1.2.3", + "resolved": "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.2.3.tgz", + "integrity": "sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==", + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/feross" + }, + { + "type": "patreon", + "url": "https://www.patreon.com/feross" + }, + { + "type": "consulting", + "url": "https://feross.org/support" + } + ], + "license": "MIT" + }, + "node_modules/react": { + "version": "18.3.1", + "resolved": "https://registry.npmjs.org/react/-/react-18.3.1.tgz", + "integrity": "sha512-wS+hAgJShR0KhEvPJArfuPVN1+Hz1t0Y6n5jLrGQbkb4urgPE/0Rve+1kMB1v/oWgHgm4WIcV+i7F2pTVj+2iQ==", + "license": "MIT", + "dependencies": { + "loose-envify": "^1.1.0" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/react-dom": { + "version": "18.3.1", + "resolved": "https://registry.npmjs.org/react-dom/-/react-dom-18.3.1.tgz", + "integrity": "sha512-5m4nQKp+rZRb09LNH59GM4BxTh9251/ylbKIbpe7TpGxfJ+9kv6BLkLBXIjjspbgbnIBNqlI23tRnTWT0snUIw==", + "license": "MIT", + "dependencies": { + "loose-envify": "^1.1.0", + "scheduler": "^0.23.2" + }, + "peerDependencies": { + "react": "^18.3.1" + } + }, + "node_modules/react-hook-form": { + "version": "7.53.1", + "resolved": "https://registry.npmjs.org/react-hook-form/-/react-hook-form-7.53.1.tgz", + "integrity": "sha512-6aiQeBda4zjcuaugWvim9WsGqisoUk+etmFEsSUMm451/Ic8L/UAb7sRtMj3V+Hdzm6mMjU1VhiSzYUZeBm0Vg==", + "license": "MIT", + "engines": { + "node": ">=18.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/react-hook-form" + }, + "peerDependencies": { + "react": "^16.8.0 || ^17 || ^18 || ^19" + } + }, + "node_modules/react-i18next": { + "version": "15.1.3", + "resolved": "https://registry.npmjs.org/react-i18next/-/react-i18next-15.1.3.tgz", + "integrity": "sha512-J11oA30FbM3NZegUZjn8ySK903z6PLBz/ZuBYyT1JMR0QPrW6PFXvl1WoUhortdGi9dM0m48/zJQlPskVZXgVw==", + "license": "MIT", + "dependencies": { + "@babel/runtime": "^7.25.0", + "html-parse-stringify": "^3.0.1" + }, + "peerDependencies": { + "i18next": ">= 23.2.3", + "react": ">= 16.8.0" + }, + "peerDependenciesMeta": { + "react-dom": { + "optional": true + }, + "react-native": { + "optional": true + } + } + }, + "node_modules/react-refresh": { + "version": "0.14.2", + "resolved": "https://registry.npmjs.org/react-refresh/-/react-refresh-0.14.2.tgz", + "integrity": "sha512-jCvmsr+1IUSMUyzOkRcvnVbX3ZYC6g9TDrDbFuFmRDq7PD4yaGbLKNQL6k2jnArV8hjYxh7hVhAZB6s9HDGpZA==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/react-remove-scroll": { + "version": "2.6.0", + "resolved": "https://registry.npmjs.org/react-remove-scroll/-/react-remove-scroll-2.6.0.tgz", + "integrity": "sha512-I2U4JVEsQenxDAKaVa3VZ/JeJZe0/2DxPWL8Tj8yLKctQJQiZM52pn/GWFpSp8dftjM3pSAHVJZscAnC/y+ySQ==", + "license": "MIT", + "dependencies": { + "react-remove-scroll-bar": "^2.3.6", + "react-style-singleton": "^2.2.1", + "tslib": "^2.1.0", + "use-callback-ref": "^1.3.0", + "use-sidecar": "^1.1.2" + }, + "engines": { + "node": ">=10" + }, + "peerDependencies": { + "@types/react": "^16.8.0 || ^17.0.0 || ^18.0.0", + "react": "^16.8.0 || ^17.0.0 || ^18.0.0" + }, + "peerDependenciesMeta": { + "@types/react": { + "optional": true + } + } + }, + "node_modules/react-remove-scroll-bar": { + "version": "2.3.6", + "resolved": "https://registry.npmjs.org/react-remove-scroll-bar/-/react-remove-scroll-bar-2.3.6.tgz", + "integrity": "sha512-DtSYaao4mBmX+HDo5YWYdBWQwYIQQshUV/dVxFxK+KM26Wjwp1gZ6rv6OC3oujI6Bfu6Xyg3TwK533AQutsn/g==", + "license": "MIT", + "dependencies": { + "react-style-singleton": "^2.2.1", + "tslib": "^2.0.0" + }, + "engines": { + "node": ">=10" + }, + "peerDependencies": { + "@types/react": "^16.8.0 || ^17.0.0 || ^18.0.0", + "react": "^16.8.0 || ^17.0.0 || ^18.0.0" + }, + "peerDependenciesMeta": { + "@types/react": { + "optional": true + } + } + }, + "node_modules/react-router": { + "version": "6.27.0", + "resolved": "https://registry.npmjs.org/react-router/-/react-router-6.27.0.tgz", + "integrity": "sha512-YA+HGZXz4jaAkVoYBE98VQl+nVzI+cVI2Oj/06F5ZM+0u3TgedN9Y9kmMRo2mnkSK2nCpNQn0DVob4HCsY/WLw==", + "license": "MIT", + "dependencies": { + "@remix-run/router": "1.20.0" + }, + "engines": { + "node": ">=14.0.0" + }, + "peerDependencies": { + "react": ">=16.8" + } + }, + "node_modules/react-router-dom": { + "version": "6.27.0", + "resolved": "https://registry.npmjs.org/react-router-dom/-/react-router-dom-6.27.0.tgz", + "integrity": "sha512-+bvtFWMC0DgAFrfKXKG9Fc+BcXWRUO1aJIihbB79xaeq0v5UzfvnM5houGUm1Y461WVRcgAQ+Clh5rdb1eCx4g==", + "license": "MIT", + "dependencies": { + "@remix-run/router": "1.20.0", + "react-router": "6.27.0" + }, + "engines": { + "node": ">=14.0.0" + }, + "peerDependencies": { + "react": ">=16.8", + "react-dom": ">=16.8" + } + }, + "node_modules/react-style-singleton": { + "version": "2.2.1", + "resolved": "https://registry.npmjs.org/react-style-singleton/-/react-style-singleton-2.2.1.tgz", + "integrity": "sha512-ZWj0fHEMyWkHzKYUr2Bs/4zU6XLmq9HsgBURm7g5pAVfyn49DgUiNgY2d4lXRlYSiCif9YBGpQleewkcqddc7g==", + "license": "MIT", + "dependencies": { + "get-nonce": "^1.0.0", + "invariant": "^2.2.4", + "tslib": "^2.0.0" + }, + "engines": { + "node": ">=10" + }, + "peerDependencies": { + "@types/react": "^16.8.0 || ^17.0.0 || ^18.0.0", + "react": "^16.8.0 || ^17.0.0 || ^18.0.0" + }, + "peerDependenciesMeta": { + "@types/react": { + "optional": true + } + } + }, + "node_modules/react-virtuoso": { + "version": "4.12.0", + "resolved": "https://registry.npmjs.org/react-virtuoso/-/react-virtuoso-4.12.0.tgz", + "integrity": "sha512-oHrKlU7xHsrnBQ89ecZoMPAK0tHnI9s1hsFW3KKg5ZGeZ5SWvbGhg/QFJFY4XETAzoCUeu+Xaxn1OUb/PGtPlA==", + "license": "MIT", + "engines": { + "node": ">=10" + }, + "peerDependencies": { + "react": ">=16 || >=17 || >= 18", + "react-dom": ">=16 || >=17 || >= 18" + } + }, + "node_modules/read-cache": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/read-cache/-/read-cache-1.0.0.tgz", + "integrity": "sha512-Owdv/Ft7IjOgm/i0xvNDZ1LrRANRfew4b2prF3OWMQLxLfu3bS8FVhCsrSCMK4lR56Y9ya+AThoTpDCTxCmpRA==", + "license": "MIT", + "dependencies": { + "pify": "^2.3.0" + } + }, + "node_modules/readdirp": { + "version": "3.6.0", + "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.6.0.tgz", + "integrity": "sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==", + "license": "MIT", + "dependencies": { + "picomatch": "^2.2.1" + }, + "engines": { + "node": ">=8.10.0" + } + }, + "node_modules/reftools": { + "version": "1.1.9", + "resolved": "https://registry.npmjs.org/reftools/-/reftools-1.1.9.tgz", + "integrity": "sha512-OVede/NQE13xBQ+ob5CKd5KyeJYU2YInb1bmV4nRoOfquZPkAkxuOXicSe1PvqIuZZ4kD13sPKBbR7UFDmli6w==", + "dev": true, + "license": "BSD-3-Clause", + "funding": { + "url": "https://github.com/Mermade/oas-kit?sponsor=1" + } + }, + "node_modules/regenerator-runtime": { + "version": "0.14.1", + "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.14.1.tgz", + "integrity": "sha512-dYnhHh0nJoMfnkZs6GmmhFknAGRrLznOu5nc9ML+EJxGvrx6H7teuevqVqCuPcPK//3eDrrjQhehXVx9cnkGdw==", + "license": "MIT" + }, + "node_modules/require-directory": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz", + "integrity": "sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/resolve": { + "version": "1.22.8", + "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.8.tgz", + "integrity": "sha512-oKWePCxqpd6FlLvGV1VU0x7bkPmmCNolxzjMf4NczoDnQcIWrAF+cPtZn5i6n+RfD2d9i0tzpKnG6Yk168yIyw==", + "license": "MIT", + "dependencies": { + "is-core-module": "^2.13.0", + "path-parse": "^1.0.7", + "supports-preserve-symlinks-flag": "^1.0.0" + }, + "bin": { + "resolve": "bin/resolve" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/resolve-from": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz", + "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=4" + } + }, + "node_modules/reusify": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/reusify/-/reusify-1.0.4.tgz", + "integrity": "sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==", + "license": "MIT", + "engines": { + "iojs": ">=1.0.0", + "node": ">=0.10.0" + } + }, + "node_modules/rollup": { + "version": "4.24.3", + "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.24.3.tgz", + "integrity": "sha512-HBW896xR5HGmoksbi3JBDtmVzWiPAYqp7wip50hjQ67JbDz61nyoMPdqu1DvVW9asYb2M65Z20ZHsyJCMqMyDg==", + "dev": true, + "license": "MIT", + "dependencies": { + "@types/estree": "1.0.6" + }, + "bin": { + "rollup": "dist/bin/rollup" + }, + "engines": { + "node": ">=18.0.0", + "npm": ">=8.0.0" + }, + "optionalDependencies": { + "@rollup/rollup-android-arm-eabi": "4.24.3", + "@rollup/rollup-android-arm64": "4.24.3", + "@rollup/rollup-darwin-arm64": "4.24.3", + "@rollup/rollup-darwin-x64": "4.24.3", + "@rollup/rollup-freebsd-arm64": "4.24.3", + "@rollup/rollup-freebsd-x64": "4.24.3", + "@rollup/rollup-linux-arm-gnueabihf": "4.24.3", + "@rollup/rollup-linux-arm-musleabihf": "4.24.3", + "@rollup/rollup-linux-arm64-gnu": "4.24.3", + "@rollup/rollup-linux-arm64-musl": "4.24.3", + "@rollup/rollup-linux-powerpc64le-gnu": "4.24.3", + "@rollup/rollup-linux-riscv64-gnu": "4.24.3", + "@rollup/rollup-linux-s390x-gnu": "4.24.3", + "@rollup/rollup-linux-x64-gnu": "4.24.3", + "@rollup/rollup-linux-x64-musl": "4.24.3", + "@rollup/rollup-win32-arm64-msvc": "4.24.3", + "@rollup/rollup-win32-ia32-msvc": "4.24.3", + "@rollup/rollup-win32-x64-msvc": "4.24.3", + "fsevents": "~2.3.2" + } + }, + "node_modules/run-parallel": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/run-parallel/-/run-parallel-1.2.0.tgz", + "integrity": "sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA==", + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/feross" + }, + { + "type": "patreon", + "url": "https://www.patreon.com/feross" + }, + { + "type": "consulting", + "url": "https://feross.org/support" + } + ], + "license": "MIT", + "dependencies": { + "queue-microtask": "^1.2.2" + } + }, + "node_modules/scheduler": { + "version": "0.23.2", + "resolved": "https://registry.npmjs.org/scheduler/-/scheduler-0.23.2.tgz", + "integrity": "sha512-UOShsPwz7NrMUqhR6t0hWjFduvOzbtv7toDH1/hIrfRNIDBnnBWd0CwJTGvTpngVlmwGCdP9/Zl/tVrDqcuYzQ==", + "license": "MIT", + "dependencies": { + "loose-envify": "^1.1.0" + } + }, + "node_modules/semver": { + "version": "6.3.1", + "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz", + "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==", + "dev": true, + "license": "ISC", + "bin": { + "semver": "bin/semver.js" + } + }, + "node_modules/shebang-command": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz", + "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==", + "license": "MIT", + "dependencies": { + "shebang-regex": "^3.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/shebang-regex": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz", + "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==", + "license": "MIT", + "engines": { + "node": ">=8" + } + }, + "node_modules/should": { + "version": "13.2.3", + "resolved": "https://registry.npmjs.org/should/-/should-13.2.3.tgz", + "integrity": "sha512-ggLesLtu2xp+ZxI+ysJTmNjh2U0TsC+rQ/pfED9bUZZ4DKefP27D+7YJVVTvKsmjLpIi9jAa7itwDGkDDmt1GQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "should-equal": "^2.0.0", + "should-format": "^3.0.3", + "should-type": "^1.4.0", + "should-type-adaptors": "^1.0.1", + "should-util": "^1.0.0" + } + }, + "node_modules/should-equal": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/should-equal/-/should-equal-2.0.0.tgz", + "integrity": "sha512-ZP36TMrK9euEuWQYBig9W55WPC7uo37qzAEmbjHz4gfyuXrEUgF8cUvQVO+w+d3OMfPvSRQJ22lSm8MQJ43LTA==", + "dev": true, + "license": "MIT", + "dependencies": { + "should-type": "^1.4.0" + } + }, + "node_modules/should-format": { + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/should-format/-/should-format-3.0.3.tgz", + "integrity": "sha512-hZ58adtulAk0gKtua7QxevgUaXTTXxIi8t41L3zo9AHvjXO1/7sdLECuHeIN2SRtYXpNkmhoUP2pdeWgricQ+Q==", + "dev": true, + "license": "MIT", + "dependencies": { + "should-type": "^1.3.0", + "should-type-adaptors": "^1.0.1" + } + }, + "node_modules/should-type": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/should-type/-/should-type-1.4.0.tgz", + "integrity": "sha512-MdAsTu3n25yDbIe1NeN69G4n6mUnJGtSJHygX3+oN0ZbO3DTiATnf7XnYJdGT42JCXurTb1JI0qOBR65shvhPQ==", + "dev": true, + "license": "MIT" + }, + "node_modules/should-type-adaptors": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/should-type-adaptors/-/should-type-adaptors-1.1.0.tgz", + "integrity": "sha512-JA4hdoLnN+kebEp2Vs8eBe9g7uy0zbRo+RMcU0EsNy+R+k049Ki+N5tT5Jagst2g7EAja+euFuoXFCa8vIklfA==", + "dev": true, + "license": "MIT", + "dependencies": { + "should-type": "^1.3.0", + "should-util": "^1.0.0" + } + }, + "node_modules/should-util": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/should-util/-/should-util-1.0.1.tgz", + "integrity": "sha512-oXF8tfxx5cDk8r2kYqlkUJzZpDBqVY/II2WhvU0n9Y3XYvAYRmeaf1PvvIvTgPnv4KJ+ES5M0PyDq5Jp+Ygy2g==", + "dev": true, + "license": "MIT" + }, + "node_modules/signal-exit": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-4.1.0.tgz", + "integrity": "sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw==", + "license": "ISC", + "engines": { + "node": ">=14" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, + "node_modules/sonner": { + "version": "1.6.1", + "resolved": "https://registry.npmjs.org/sonner/-/sonner-1.6.1.tgz", + "integrity": "sha512-0iD+eDJHyJitl069BC6wVDykQD56FMKk4TD6XkcCcikcDYaGsFKlSU0mZQXYWKPpFof3jlV/u4vGZc2KCqz8OQ==", + "license": "MIT", + "peerDependencies": { + "react": "^18.0.0 || ^19.0.0 || ^19.0.0-rc", + "react-dom": "^18.0.0 || ^19.0.0 || ^19.0.0-rc" + } + }, + "node_modules/source-map-js": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.2.1.tgz", + "integrity": "sha512-UXWMKhLOwVKb728IUtQPXxfYU+usdybtUrK/8uGE8CQMvrhOpwvzDBwj0QhSL7MQc7vIsISBG8VQ8+IDQxpfQA==", + "license": "BSD-3-Clause", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/string-width": { + "version": "5.1.2", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-5.1.2.tgz", + "integrity": "sha512-HnLOCR3vjcY8beoNLtcjZ5/nxn2afmME6lhrDrebokqMap+XbeW8n9TXpPDOqdGK5qcI3oT0GKTW6wC7EMiVqA==", + "license": "MIT", + "dependencies": { + "eastasianwidth": "^0.2.0", + "emoji-regex": "^9.2.2", + "strip-ansi": "^7.0.1" + }, + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/string-width-cjs": { + "name": "string-width", + "version": "4.2.3", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz", + "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==", + "license": "MIT", + "dependencies": { + "emoji-regex": "^8.0.0", + "is-fullwidth-code-point": "^3.0.0", + "strip-ansi": "^6.0.1" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/string-width-cjs/node_modules/ansi-regex": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz", + "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==", + "license": "MIT", + "engines": { + "node": ">=8" + } + }, + "node_modules/string-width-cjs/node_modules/emoji-regex": { + "version": "8.0.0", + "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", + "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==", + "license": "MIT" + }, + "node_modules/string-width-cjs/node_modules/strip-ansi": { + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz", + "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==", + "license": "MIT", + "dependencies": { + "ansi-regex": "^5.0.1" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/strip-ansi": { + "version": "7.1.0", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.1.0.tgz", + "integrity": "sha512-iq6eVVI64nQQTRYq2KtEg2d2uU7LElhTJwsH4YzIHZshxlgZms/wIc4VoDQTlG/IvVIrBKG06CrZnp0qv7hkcQ==", + "license": "MIT", + "dependencies": { + "ansi-regex": "^6.0.1" + }, + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/chalk/strip-ansi?sponsor=1" + } + }, + "node_modules/strip-ansi-cjs": { + "name": "strip-ansi", + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz", + "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==", + "license": "MIT", + "dependencies": { + "ansi-regex": "^5.0.1" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/strip-ansi-cjs/node_modules/ansi-regex": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz", + "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==", + "license": "MIT", + "engines": { + "node": ">=8" + } + }, + "node_modules/strip-json-comments": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz", + "integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/sucrase": { + "version": "3.35.0", + "resolved": "https://registry.npmjs.org/sucrase/-/sucrase-3.35.0.tgz", + "integrity": "sha512-8EbVDiu9iN/nESwxeSxDKe0dunta1GOlHufmSSXxMD2z2/tMZpDMpvXQGsc+ajGo8y2uYUmixaSRUc/QPoQ0GA==", + "license": "MIT", + "dependencies": { + "@jridgewell/gen-mapping": "^0.3.2", + "commander": "^4.0.0", + "glob": "^10.3.10", + "lines-and-columns": "^1.1.6", + "mz": "^2.7.0", + "pirates": "^4.0.1", + "ts-interface-checker": "^0.1.9" + }, + "bin": { + "sucrase": "bin/sucrase", + "sucrase-node": "bin/sucrase-node" + }, + "engines": { + "node": ">=16 || 14 >=14.17" + } + }, + "node_modules/supports-color": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", + "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", + "dev": true, + "license": "MIT", + "dependencies": { + "has-flag": "^4.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/supports-preserve-symlinks-flag": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz", + "integrity": "sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==", + "license": "MIT", + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/swagger-schema-official": { + "version": "2.0.0-bab6bed", + "resolved": "https://registry.npmjs.org/swagger-schema-official/-/swagger-schema-official-2.0.0-bab6bed.tgz", + "integrity": "sha512-rCC0NWGKr/IJhtRuPq/t37qvZHI/mH4I4sxflVM+qgVe5Z2uOCivzWaVbuioJaB61kvm5UvB7b49E+oBY0M8jA==", + "dev": true, + "license": "ISC" + }, + "node_modules/swagger-typescript-api": { + "version": "13.0.22", + "resolved": "https://registry.npmjs.org/swagger-typescript-api/-/swagger-typescript-api-13.0.22.tgz", + "integrity": "sha512-LVLOWvozOE3izesDrfmhOpwr6XsCRGsrfJuAXsaHkzQxYPAcpSRIAzodmz1hcGJ8BOPiBCKocH1LQ96F0lmmAw==", + "dev": true, + "license": "MIT", + "dependencies": { + "@types/swagger-schema-official": "^2.0.25", + "consola": "^3.2.3", + "cosmiconfig": "^9.0.0", + "didyoumean": "^1.2.2", + "eta": "^2.2.0", + "js-yaml": "^4.1.0", + "lodash": "^4.17.21", + "nanoid": "^3.3.7", + "prettier": "~3.3.3", + "swagger-schema-official": "2.0.0-bab6bed", + "swagger2openapi": "^7.0.8", + "typescript": "~5.5.4" + }, + "bin": { + "sta": "dist/cli.js", + "swagger-typescript-api": "dist/cli.js" + }, + "engines": { + "node": ">=18.0.0" + } + }, + "node_modules/swagger-typescript-api/node_modules/typescript": { + "version": "5.5.4", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.5.4.tgz", + "integrity": "sha512-Mtq29sKDAEYP7aljRgtPOpTvOfbwRWlS6dPRzwjdE+C0R4brX/GUyhHSecbHMFLNBLcJIPt9nl9yG5TZ1weH+Q==", + "dev": true, + "license": "Apache-2.0", + "bin": { + "tsc": "bin/tsc", + "tsserver": "bin/tsserver" + }, + "engines": { + "node": ">=14.17" + } + }, + "node_modules/swagger2openapi": { + "version": "7.0.8", + "resolved": "https://registry.npmjs.org/swagger2openapi/-/swagger2openapi-7.0.8.tgz", + "integrity": "sha512-upi/0ZGkYgEcLeGieoz8gT74oWHA0E7JivX7aN9mAf+Tc7BQoRBvnIGHoPDw+f9TXTW4s6kGYCZJtauP6OYp7g==", + "dev": true, + "license": "BSD-3-Clause", + "dependencies": { + "call-me-maybe": "^1.0.1", + "node-fetch": "^2.6.1", + "node-fetch-h2": "^2.3.0", + "node-readfiles": "^0.2.0", + "oas-kit-common": "^1.0.8", + "oas-resolver": "^2.5.6", + "oas-schema-walker": "^1.1.5", + "oas-validator": "^5.0.8", + "reftools": "^1.1.9", + "yaml": "^1.10.0", + "yargs": "^17.0.1" + }, + "bin": { + "boast": "boast.js", + "oas-validate": "oas-validate.js", + "swagger2openapi": "swagger2openapi.js" + }, + "funding": { + "url": "https://github.com/Mermade/oas-kit?sponsor=1" + } + }, + "node_modules/swagger2openapi/node_modules/yaml": { + "version": "1.10.2", + "resolved": "https://registry.npmjs.org/yaml/-/yaml-1.10.2.tgz", + "integrity": "sha512-r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg==", + "dev": true, + "license": "ISC", + "engines": { + "node": ">= 6" + } + }, + "node_modules/swr": { + "version": "2.2.5", + "resolved": "https://registry.npmjs.org/swr/-/swr-2.2.5.tgz", + "integrity": "sha512-QtxqyclFeAsxEUeZIYmsaQ0UjimSq1RZ9Un7I68/0ClKK/U3LoyQunwkQfJZr2fc22DfIXLNDc2wFyTEikCUpg==", + "license": "MIT", + "dependencies": { + "client-only": "^0.0.1", + "use-sync-external-store": "^1.2.0" + }, + "peerDependencies": { + "react": "^16.11.0 || ^17.0.0 || ^18.0.0" + } + }, + "node_modules/tailwind-merge": { + "version": "2.5.4", + "resolved": "https://registry.npmjs.org/tailwind-merge/-/tailwind-merge-2.5.4.tgz", + "integrity": "sha512-0q8cfZHMu9nuYP/b5Shb7Y7Sh1B7Nnl5GqNr1U+n2p6+mybvRtayrQ+0042Z5byvTA8ihjlP8Odo8/VnHbZu4Q==", + "license": "MIT", + "funding": { + "type": "github", + "url": "https://github.com/sponsors/dcastil" + } + }, + "node_modules/tailwindcss": { + "version": "3.4.14", + "resolved": "https://registry.npmjs.org/tailwindcss/-/tailwindcss-3.4.14.tgz", + "integrity": "sha512-IcSvOcTRcUtQQ7ILQL5quRDg7Xs93PdJEk1ZLbhhvJc7uj/OAhYOnruEiwnGgBvUtaUAJ8/mhSw1o8L2jCiENA==", + "license": "MIT", + "dependencies": { + "@alloc/quick-lru": "^5.2.0", + "arg": "^5.0.2", + "chokidar": "^3.5.3", + "didyoumean": "^1.2.2", + "dlv": "^1.1.3", + "fast-glob": "^3.3.0", + "glob-parent": "^6.0.2", + "is-glob": "^4.0.3", + "jiti": "^1.21.0", + "lilconfig": "^2.1.0", + "micromatch": "^4.0.5", + "normalize-path": "^3.0.0", + "object-hash": "^3.0.0", + "picocolors": "^1.0.0", + "postcss": "^8.4.23", + "postcss-import": "^15.1.0", + "postcss-js": "^4.0.1", + "postcss-load-config": "^4.0.1", + "postcss-nested": "^6.0.1", + "postcss-selector-parser": "^6.0.11", + "resolve": "^1.22.2", + "sucrase": "^3.32.0" + }, + "bin": { + "tailwind": "lib/cli.js", + "tailwindcss": "lib/cli.js" + }, + "engines": { + "node": ">=14.0.0" + } + }, + "node_modules/tailwindcss-animate": { + "version": "1.0.7", + "resolved": "https://registry.npmjs.org/tailwindcss-animate/-/tailwindcss-animate-1.0.7.tgz", + "integrity": "sha512-bl6mpH3T7I3UFxuvDEXLxy/VuFxBk5bbzplh7tXI68mwMokNYd1t9qPBHlnyTwfa4JGC4zP516I1hYYtQ/vspA==", + "license": "MIT", + "peerDependencies": { + "tailwindcss": ">=3.0.0 || insiders" + } + }, + "node_modules/text-table": { + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz", + "integrity": "sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw==", + "dev": true, + "license": "MIT" + }, + "node_modules/thenify": { + "version": "3.3.1", + "resolved": "https://registry.npmjs.org/thenify/-/thenify-3.3.1.tgz", + "integrity": "sha512-RVZSIV5IG10Hk3enotrhvz0T9em6cyHBLkH/YAZuKqd8hRkKhSfCGIcP2KUY0EPxndzANBmNllzWPwak+bheSw==", + "license": "MIT", + "dependencies": { + "any-promise": "^1.0.0" + } + }, + "node_modules/thenify-all": { + "version": "1.6.0", + "resolved": "https://registry.npmjs.org/thenify-all/-/thenify-all-1.6.0.tgz", + "integrity": "sha512-RNxQH/qI8/t3thXJDwcstUO4zeqo64+Uy/+sNVRBx4Xn2OX+OZ9oP+iJnNFqplFra2ZUVeKCSa2oVWi3T4uVmA==", + "license": "MIT", + "dependencies": { + "thenify": ">= 3.1.0 < 4" + }, + "engines": { + "node": ">=0.8" + } + }, + "node_modules/to-regex-range": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz", + "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==", + "license": "MIT", + "dependencies": { + "is-number": "^7.0.0" + }, + "engines": { + "node": ">=8.0" + } + }, + "node_modules/toggle-selection": { + "version": "1.0.6", + "resolved": "https://registry.npmjs.org/toggle-selection/-/toggle-selection-1.0.6.tgz", + "integrity": "sha512-BiZS+C1OS8g/q2RRbJmy59xpyghNBqrr6k5L/uKBGRsTfxmu3ffiRnd8mlGPUVayg8pvfi5urfnu8TU7DVOkLQ==", + "license": "MIT" + }, + "node_modules/tr46": { + "version": "0.0.3", + "resolved": "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz", + "integrity": "sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw==", + "dev": true, + "license": "MIT" + }, + "node_modules/ts-api-utils": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/ts-api-utils/-/ts-api-utils-1.4.0.tgz", + "integrity": "sha512-032cPxaEKwM+GT3vA5JXNzIaizx388rhsSW79vGRNGXfRRAdEAn2mvk36PvK5HnOchyWZ7afLEXqYCvPCrzuzQ==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=16" + }, + "peerDependencies": { + "typescript": ">=4.2.0" + } + }, + "node_modules/ts-interface-checker": { + "version": "0.1.13", + "resolved": "https://registry.npmjs.org/ts-interface-checker/-/ts-interface-checker-0.1.13.tgz", + "integrity": "sha512-Y/arvbn+rrz3JCKl9C4kVNfTfSm2/mEp5FSz5EsZSANGPSlQrpRI5M4PKF+mJnE52jOO90PnPSc3Ur3bTQw0gA==", + "license": "Apache-2.0" + }, + "node_modules/tslib": { + "version": "2.8.1", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.8.1.tgz", + "integrity": "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==", + "license": "0BSD" + }, + "node_modules/type-check": { + "version": "0.4.0", + "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.4.0.tgz", + "integrity": "sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew==", + "dev": true, + "license": "MIT", + "dependencies": { + "prelude-ls": "^1.2.1" + }, + "engines": { + "node": ">= 0.8.0" + } + }, + "node_modules/typescript": { + "version": "5.6.3", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.6.3.tgz", + "integrity": "sha512-hjcS1mhfuyi4WW8IWtjP7brDrG2cuDZukyrYrSauoXGNgx0S7zceP07adYkJycEr56BOUTNPzbInooiN3fn1qw==", + "devOptional": true, + "license": "Apache-2.0", + "bin": { + "tsc": "bin/tsc", + "tsserver": "bin/tsserver" + }, + "engines": { + "node": ">=14.17" + } + }, + "node_modules/typescript-eslint": { + "version": "8.12.2", + "resolved": "https://registry.npmjs.org/typescript-eslint/-/typescript-eslint-8.12.2.tgz", + "integrity": "sha512-UbuVUWSrHVR03q9CWx+JDHeO6B/Hr9p4U5lRH++5tq/EbFq1faYZe50ZSBePptgfIKLEti0aPQ3hFgnPVcd8ZQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "@typescript-eslint/eslint-plugin": "8.12.2", + "@typescript-eslint/parser": "8.12.2", + "@typescript-eslint/utils": "8.12.2" + }, + "engines": { + "node": "^18.18.0 || ^20.9.0 || >=21.1.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/typescript-eslint" + }, + "peerDependenciesMeta": { + "typescript": { + "optional": true + } + } + }, + "node_modules/undici-types": { + "version": "6.19.8", + "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-6.19.8.tgz", + "integrity": "sha512-ve2KP6f/JnbPBFyobGHuerC9g1FYGn/F8n1LWTwNxCEzd6IfqTwUQcNXgEtmmQ6DlRrC1hrSrBnCZPokRrDHjw==", + "dev": true, + "license": "MIT" + }, + "node_modules/update-browserslist-db": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.1.1.tgz", + "integrity": "sha512-R8UzCaa9Az+38REPiJ1tXlImTJXlVfgHZsglwBD/k6nj76ctsH1E3q4doGrukiLQd3sGQYu56r5+lo5r94l29A==", + "dev": true, + "funding": [ + { + "type": "opencollective", + "url": "https://opencollective.com/browserslist" + }, + { + "type": "tidelift", + "url": "https://tidelift.com/funding/github/npm/browserslist" + }, + { + "type": "github", + "url": "https://github.com/sponsors/ai" + } + ], + "license": "MIT", + "dependencies": { + "escalade": "^3.2.0", + "picocolors": "^1.1.0" + }, + "bin": { + "update-browserslist-db": "cli.js" + }, + "peerDependencies": { + "browserslist": ">= 4.21.0" + } + }, + "node_modules/uri-js": { + "version": "4.4.1", + "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz", + "integrity": "sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==", + "dev": true, + "license": "BSD-2-Clause", + "dependencies": { + "punycode": "^2.1.0" + } + }, + "node_modules/use-callback-ref": { + "version": "1.3.2", + "resolved": "https://registry.npmjs.org/use-callback-ref/-/use-callback-ref-1.3.2.tgz", + "integrity": "sha512-elOQwe6Q8gqZgDA8mrh44qRTQqpIHDcZ3hXTLjBe1i4ph8XpNJnO+aQf3NaG+lriLopI4HMx9VjQLfPQ6vhnoA==", + "license": "MIT", + "dependencies": { + "tslib": "^2.0.0" + }, + "engines": { + "node": ">=10" + }, + "peerDependencies": { + "@types/react": "^16.8.0 || ^17.0.0 || ^18.0.0", + "react": "^16.8.0 || ^17.0.0 || ^18.0.0" + }, + "peerDependenciesMeta": { + "@types/react": { + "optional": true + } + } + }, + "node_modules/use-sidecar": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/use-sidecar/-/use-sidecar-1.1.2.tgz", + "integrity": "sha512-epTbsLuzZ7lPClpz2TyryBfztm7m+28DlEv2ZCQ3MDr5ssiwyOwGH/e5F9CkfWjJ1t4clvI58yF822/GUkjjhw==", + "license": "MIT", + "dependencies": { + "detect-node-es": "^1.1.0", + "tslib": "^2.0.0" + }, + "engines": { + "node": ">=10" + }, + "peerDependencies": { + "@types/react": "^16.9.0 || ^17.0.0 || ^18.0.0", + "react": "^16.8.0 || ^17.0.0 || ^18.0.0" + }, + "peerDependenciesMeta": { + "@types/react": { + "optional": true + } + } + }, + "node_modules/use-sync-external-store": { + "version": "1.2.2", + "resolved": "https://registry.npmjs.org/use-sync-external-store/-/use-sync-external-store-1.2.2.tgz", + "integrity": "sha512-PElTlVMwpblvbNqQ82d2n6RjStvdSoNe9FG28kNfz3WiXilJm4DdNkEzRhCZuIDwY8U08WVihhGR5iRqAwfDiw==", + "license": "MIT", + "peerDependencies": { + "react": "^16.8.0 || ^17.0.0 || ^18.0.0" + } + }, + "node_modules/util-deprecate": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz", + "integrity": "sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==", + "license": "MIT" + }, + "node_modules/vaul": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/vaul/-/vaul-1.1.1.tgz", + "integrity": "sha512-+ejzF6ffQKPcfgS7uOrGn017g39F8SO4yLPXbBhpC7a0H+oPqPna8f1BUfXaz8eU4+pxbQcmjxW+jWBSbxjaFg==", + "license": "MIT", + "dependencies": { + "@radix-ui/react-dialog": "^1.1.1" + }, + "peerDependencies": { + "react": "^16.8 || ^17.0 || ^18.0 || ^19.0", + "react-dom": "^16.8 || ^17.0 || ^18.0 || ^19.0" + } + }, + "node_modules/vite": { + "version": "5.4.10", + "resolved": "https://registry.npmjs.org/vite/-/vite-5.4.10.tgz", + "integrity": "sha512-1hvaPshuPUtxeQ0hsVH3Mud0ZanOLwVTneA1EgbAM5LhaZEqyPWGRQ7BtaMvUrTDeEaC8pxtj6a6jku3x4z6SQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "esbuild": "^0.21.3", + "postcss": "^8.4.43", + "rollup": "^4.20.0" + }, + "bin": { + "vite": "bin/vite.js" + }, + "engines": { + "node": "^18.0.0 || >=20.0.0" + }, + "funding": { + "url": "https://github.com/vitejs/vite?sponsor=1" + }, + "optionalDependencies": { + "fsevents": "~2.3.3" + }, + "peerDependencies": { + "@types/node": "^18.0.0 || >=20.0.0", + "less": "*", + "lightningcss": "^1.21.0", + "sass": "*", + "sass-embedded": "*", + "stylus": "*", + "sugarss": "*", + "terser": "^5.4.0" + }, + "peerDependenciesMeta": { + "@types/node": { + "optional": true + }, + "less": { + "optional": true + }, + "lightningcss": { + "optional": true + }, + "sass": { + "optional": true + }, + "sass-embedded": { + "optional": true + }, + "stylus": { + "optional": true + }, + "sugarss": { + "optional": true + }, + "terser": { + "optional": true + } + } + }, + "node_modules/void-elements": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/void-elements/-/void-elements-3.1.0.tgz", + "integrity": "sha512-Dhxzh5HZuiHQhbvTW9AMetFfBHDMYpo23Uo9btPXgdYP+3T5S+p+jgNy7spra+veYhBP2dCSgxR/i2Y02h5/6w==", + "license": "MIT", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/webidl-conversions": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz", + "integrity": "sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ==", + "dev": true, + "license": "BSD-2-Clause" + }, + "node_modules/whatwg-url": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-5.0.0.tgz", + "integrity": "sha512-saE57nupxk6v3HY35+jzBwYa0rKSy0XR8JSxZPwgLr7ys0IBzhGviA1/TUGJLmSVqs8pb9AnvICXEuOHLprYTw==", + "dev": true, + "license": "MIT", + "dependencies": { + "tr46": "~0.0.3", + "webidl-conversions": "^3.0.0" + } + }, + "node_modules/which": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz", + "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==", + "license": "ISC", + "dependencies": { + "isexe": "^2.0.0" + }, + "bin": { + "node-which": "bin/node-which" + }, + "engines": { + "node": ">= 8" + } + }, + "node_modules/word-wrap": { + "version": "1.2.5", + "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.5.tgz", + "integrity": "sha512-BN22B5eaMMI9UMtjrGd5g5eCYPpCPDUy0FJXbYsaT5zYxjFOckS53SQDE3pWkVoWpHXVb3BrYcEN4Twa55B5cA==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/wrap-ansi": { + "version": "8.1.0", + "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-8.1.0.tgz", + "integrity": "sha512-si7QWI6zUMq56bESFvagtmzMdGOtoxfR+Sez11Mobfc7tm+VkUckk9bW2UeffTGVUbOksxmSw0AA2gs8g71NCQ==", + "license": "MIT", + "dependencies": { + "ansi-styles": "^6.1.0", + "string-width": "^5.0.1", + "strip-ansi": "^7.0.1" + }, + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/chalk/wrap-ansi?sponsor=1" + } + }, + "node_modules/wrap-ansi-cjs": { + "name": "wrap-ansi", + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz", + "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==", + "license": "MIT", + "dependencies": { + "ansi-styles": "^4.0.0", + "string-width": "^4.1.0", + "strip-ansi": "^6.0.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/chalk/wrap-ansi?sponsor=1" + } + }, + "node_modules/wrap-ansi-cjs/node_modules/ansi-regex": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz", + "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==", + "license": "MIT", + "engines": { + "node": ">=8" + } + }, + "node_modules/wrap-ansi-cjs/node_modules/emoji-regex": { + "version": "8.0.0", + "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", + "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==", + "license": "MIT" + }, + "node_modules/wrap-ansi-cjs/node_modules/string-width": { + "version": "4.2.3", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz", + "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==", + "license": "MIT", + "dependencies": { + "emoji-regex": "^8.0.0", + "is-fullwidth-code-point": "^3.0.0", + "strip-ansi": "^6.0.1" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/wrap-ansi-cjs/node_modules/strip-ansi": { + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz", + "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==", + "license": "MIT", + "dependencies": { + "ansi-regex": "^5.0.1" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/wrap-ansi/node_modules/ansi-styles": { + "version": "6.2.1", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-6.2.1.tgz", + "integrity": "sha512-bN798gFfQX+viw3R7yrGWRqnrN2oRkEkUjjl4JNn4E8GxxbjtG3FbrEIIY3l8/hrwUwIeCZvi4QuOTP4MErVug==", + "license": "MIT", + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/chalk/ansi-styles?sponsor=1" + } + }, + "node_modules/y18n": { + "version": "5.0.8", + "resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz", + "integrity": "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==", + "dev": true, + "license": "ISC", + "engines": { + "node": ">=10" + } + }, + "node_modules/yallist": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz", + "integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==", + "dev": true, + "license": "ISC" + }, + "node_modules/yaml": { + "version": "2.6.0", + "resolved": "https://registry.npmjs.org/yaml/-/yaml-2.6.0.tgz", + "integrity": "sha512-a6ae//JvKDEra2kdi1qzCyrJW/WZCgFi8ydDV+eXExl95t+5R+ijnqHJbz9tmMh8FUjx3iv2fCQ4dclAQlO2UQ==", + "license": "ISC", + "bin": { + "yaml": "bin.mjs" + }, + "engines": { + "node": ">= 14" + } + }, + "node_modules/yargs": { + "version": "17.7.2", + "resolved": "https://registry.npmjs.org/yargs/-/yargs-17.7.2.tgz", + "integrity": "sha512-7dSzzRQ++CKnNI/krKnYRV7JKKPUXMEh61soaHKg9mrWEhzFWhFnxPxGl+69cD1Ou63C13NUPCnmIcrvqCuM6w==", + "dev": true, + "license": "MIT", + "dependencies": { + "cliui": "^8.0.1", + "escalade": "^3.1.1", + "get-caller-file": "^2.0.5", + "require-directory": "^2.1.1", + "string-width": "^4.2.3", + "y18n": "^5.0.5", + "yargs-parser": "^21.1.1" + }, + "engines": { + "node": ">=12" + } + }, + "node_modules/yargs-parser": { + "version": "21.1.1", + "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-21.1.1.tgz", + "integrity": "sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw==", + "dev": true, + "license": "ISC", + "engines": { + "node": ">=12" + } + }, + "node_modules/yargs/node_modules/ansi-regex": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz", + "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8" + } + }, + "node_modules/yargs/node_modules/emoji-regex": { + "version": "8.0.0", + "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", + "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==", + "dev": true, + "license": "MIT" + }, + "node_modules/yargs/node_modules/string-width": { + "version": "4.2.3", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz", + "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==", + "dev": true, + "license": "MIT", + "dependencies": { + "emoji-regex": "^8.0.0", + "is-fullwidth-code-point": "^3.0.0", + "strip-ansi": "^6.0.1" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/yargs/node_modules/strip-ansi": { + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz", + "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==", + "dev": true, + "license": "MIT", + "dependencies": { + "ansi-regex": "^5.0.1" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/yocto-queue": { + "version": "0.1.0", + "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz", + "integrity": "sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/zod": { + "version": "3.23.8", + "resolved": "https://registry.npmjs.org/zod/-/zod-3.23.8.tgz", + "integrity": "sha512-XBx9AXhXktjUqnepgTiE5flcKIYWi/rme0Eaj+5Y0lftuGBq+jyRu/md4WnuxqgP1ubdpNCsYEYPxrzVHD8d6g==", + "license": "MIT", + "funding": { + "url": "https://github.com/sponsors/colinhacks" + } + }, + "node_modules/zustand": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/zustand/-/zustand-5.0.1.tgz", + "integrity": "sha512-pRET7Lao2z+n5R/HduXMio35TncTlSW68WsYBq2Lg1ASspsNGjpwLAsij3RpouyV6+kHMwwwzP0bZPD70/Jx/w==", + "license": "MIT", + "engines": { + "node": ">=12.20.0" + }, + "peerDependencies": { + "@types/react": ">=18.0.0", + "immer": ">=9.0.6", + "react": ">=18.0.0", + "use-sync-external-store": ">=1.2.0" + }, + "peerDependenciesMeta": { + "@types/react": { + "optional": true + }, + "immer": { + "optional": true + }, + "react": { + "optional": true + }, + "use-sync-external-store": { + "optional": true + } + } + } + } +} diff --git a/pkgs/by-name/ne/nezha-theme-admin/package.nix b/pkgs/by-name/ne/nezha-theme-admin/package.nix index 4e81519e817c..5c72ddb70406 100644 --- a/pkgs/by-name/ne/nezha-theme-admin/package.nix +++ b/pkgs/by-name/ne/nezha-theme-admin/package.nix @@ -2,22 +2,25 @@ lib, buildNpmPackage, fetchFromGitHub, - nix-update-script, }: buildNpmPackage rec { pname = "nezha-theme-admin"; - version = "1.2.0"; + version = "1.4.4"; src = fetchFromGitHub { owner = "nezhahq"; repo = "admin-frontend"; tag = "v${version}"; - hash = "sha256-BnpcCkI6lIno5W3ZemQQf1UVa6bpwmIJ5KXg6BQ5Ur0="; + hash = "sha256-V9Vdvh66oH8cKd8vtKDHbKU5bpgSrjvgKvGo5R9E0Ao="; }; # TODO: Switch to the bun build function once available in nixpkgs - npmDepsHash = "sha256-iXSks0LOTdbrSJdnSvzXW53wZanWjyDnL9ODcaBqpHI="; + postPatch = '' + cp ${./package-lock.json} package-lock.json + ''; + + npmDepsHash = "sha256-I9oV0avnALw5BUD4hyO2FORtU59KINLWT7widUPsZtE="; npmPackFlags = [ "--ignore-scripts" ]; @@ -32,8 +35,6 @@ buildNpmPackage rec { runHook postInstall ''; - passthru.updateScript = nix-update-script { }; - meta = { description = "Nezha monitoring admin frontend"; homepage = "https://github.com/nezhahq/admin-frontend"; From db564a83f581a7f4baebcc00b6386b686f94a3ee Mon Sep 17 00:00:00 2001 From: Niklas Korz Date: Fri, 27 Dec 2024 16:05:39 +0100 Subject: [PATCH 160/429] ente-auth: 4.2.1 -> 4.2.2 --- pkgs/by-name/en/ente-auth/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/en/ente-auth/package.nix b/pkgs/by-name/en/ente-auth/package.nix index e4888eacd8f6..ba8ad3271e3c 100644 --- a/pkgs/by-name/en/ente-auth/package.nix +++ b/pkgs/by-name/en/ente-auth/package.nix @@ -17,14 +17,14 @@ let in flutter324.buildFlutterApplication rec { pname = "ente-auth"; - version = "4.2.1"; + version = "4.2.2"; src = fetchFromGitHub { owner = "ente-io"; repo = "ente"; sparseCheckout = [ "auth" ]; tag = "auth-v${version}"; - hash = "sha256-G0CqVZr3aJ1XFaM2bkfeXB1ok6m7kRTamMwWdLm61G8="; + hash = "sha256-pg2ivtTsMtDRNmxp2SQwI2n94qg60q8JfIWoO/rEUJE="; }; sourceRoot = "${src.name}/auth"; From b3564df51c1e2c4b7b507f206aafe633ddabf168 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gutyina=20Gerg=C5=91?= Date: Fri, 20 Dec 2024 13:33:19 +0100 Subject: [PATCH 161/429] famistudio: stdenv -> stdenvNoCC --- pkgs/by-name/fa/famistudio/package.nix | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/pkgs/by-name/fa/famistudio/package.nix b/pkgs/by-name/fa/famistudio/package.nix index 9961002befab..ea767ab610d6 100644 --- a/pkgs/by-name/fa/famistudio/package.nix +++ b/pkgs/by-name/fa/famistudio/package.nix @@ -1,5 +1,5 @@ { - stdenv, + stdenvNoCC, lib, buildDotnetModule, dotnetCorePackages, @@ -17,12 +17,12 @@ let csprojName = - if stdenv.hostPlatform.isLinux then + if stdenvNoCC.hostPlatform.isLinux then "FamiStudio.Linux" - else if stdenv.hostPlatform.isDarwin then + else if stdenvNoCC.hostPlatform.isDarwin then "FamiStudio.Mac" else - throw "Don't know how to build FamiStudio for ${stdenv.hostPlatform.system}"; + throw "Don't know how to build FamiStudio for ${stdenvNoCC.hostPlatform.system}"; in buildDotnetModule (finalAttrs: { pname = "famistudio"; @@ -37,7 +37,7 @@ buildDotnetModule (finalAttrs: { postPatch = let - libname = library: "${library}${stdenv.hostPlatform.extensions.sharedLibrary}"; + libname = library: "${library}${stdenvNoCC.hostPlatform.extensions.sharedLibrary}"; buildNativeWrapper = args: callPackage ./build-native-wrapper.nix ( @@ -50,7 +50,7 @@ buildDotnetModule (finalAttrs: { nativeWrapperToReplaceFormat = args: let - libPrefix = lib.optionalString stdenv.hostPlatform.isLinux "lib"; + libPrefix = lib.optionalString stdenvNoCC.hostPlatform.isLinux "lib"; in { package = buildNativeWrapper args; @@ -71,14 +71,14 @@ buildDotnetModule (finalAttrs: { ourName = "librtmidi"; } ] - ++ lib.optionals stdenv.hostPlatform.isLinux [ + ++ lib.optionals stdenvNoCC.hostPlatform.isLinux [ { package = openal; expectedName = "libopenal32"; ourName = "libopenal"; } ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ + ++ lib.optionals stdenvNoCC.hostPlatform.isDarwin [ { package = portaudio; expectedName = "libportaudio.2"; @@ -133,7 +133,7 @@ buildDotnetModule (finalAttrs: { dotnet-runtime = dotnetCorePackages.runtime_8_0; dotnetFlags = [ "-p:TargetFramework=net8.0" ]; - runtimeDeps = lib.optionals stdenv.hostPlatform.isLinux [ + runtimeDeps = lib.optionals stdenvNoCC.hostPlatform.isLinux [ libglvnd ]; From 5a7454f56436e7250d7126a2eb376c6e3f918d90 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gutyina=20Gerg=C5=91?= Date: Fri, 20 Dec 2024 13:37:56 +0100 Subject: [PATCH 162/429] famistudio: simpler update script --- pkgs/by-name/fa/famistudio/package.nix | 7 ++++++- pkgs/by-name/fa/famistudio/update.sh | 23 ----------------------- 2 files changed, 6 insertions(+), 24 deletions(-) delete mode 100755 pkgs/by-name/fa/famistudio/update.sh diff --git a/pkgs/by-name/fa/famistudio/package.nix b/pkgs/by-name/fa/famistudio/package.nix index ea767ab610d6..7b3e14abe957 100644 --- a/pkgs/by-name/fa/famistudio/package.nix +++ b/pkgs/by-name/fa/famistudio/package.nix @@ -13,6 +13,8 @@ openal, portaudio, rtmidi, + _experimental-update-script-combinators, + gitUpdater, }: let @@ -152,7 +154,10 @@ buildDotnetModule (finalAttrs: { --prefix PATH : ${lib.makeBinPath [ ffmpeg ]} ''; - passthru.updateScript = ./update.sh; + passthru.updateScript = _experimental-update-script-combinators.sequence [ + (gitUpdater { }).command + (finalAttrs.passthru.fetch-deps) + ]; meta = { homepage = "https://famistudio.org/"; diff --git a/pkgs/by-name/fa/famistudio/update.sh b/pkgs/by-name/fa/famistudio/update.sh deleted file mode 100755 index 15657955c025..000000000000 --- a/pkgs/by-name/fa/famistudio/update.sh +++ /dev/null @@ -1,23 +0,0 @@ -#!/usr/bin/env nix-shell -#!nix-shell -i bash -p curl jq common-updater-scripts -set -eo pipefail - -cd "$(dirname "${BASH_SOURCE[0]}")" - -deps_file="$(realpath "./deps.nix")" - -new_version="$(curl ${GITHUB_TOKEN:+-u ":$GITHUB_TOKEN"} \ - -s "https://api.github.com/repos/BleuBleu/FamiStudio/releases?per_page=1" | jq -r '.[0].tag_name')" -old_version="$(sed -nE 's/\s*version = "(.*)".*/\1/p' ./default.nix)" -if [[ "$new_version" == "$old_version" ]]; then - echo "Up to date" - exit 0 -fi - -cd ../../../.. - -if [[ "$1" != "--deps-only" ]]; then - update-source-version famistudio "$new_version" -fi - -$(nix-build . -A famistudio.fetch-deps --no-out-link) "$deps_file" From f48c700012b8d79922142c1ef6f898d0bcb26963 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gutyina=20Gerg=C5=91?= Date: Fri, 20 Dec 2024 13:40:56 +0100 Subject: [PATCH 163/429] famistudio: 4.2.1 -> 4.3.0 --- pkgs/by-name/fa/famistudio/package.nix | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/fa/famistudio/package.nix b/pkgs/by-name/fa/famistudio/package.nix index 7b3e14abe957..cd115bbcc338 100644 --- a/pkgs/by-name/fa/famistudio/package.nix +++ b/pkgs/by-name/fa/famistudio/package.nix @@ -28,13 +28,13 @@ let in buildDotnetModule (finalAttrs: { pname = "famistudio"; - version = "4.2.1"; + version = "4.3.0"; src = fetchFromGitHub { owner = "BleuBleu"; repo = "FamiStudio"; rev = "refs/tags/${finalAttrs.version}"; - hash = "sha256-WYy/6cWQg3Ayok/eAdnvlWAvdcuhy/sdlWOVvaYcPkc="; + hash = "sha256-Ldht7w1qgLTiqbRUJJvFQgl1VW6k+14w/jz58kAeMl0="; }; postPatch = @@ -132,8 +132,6 @@ buildDotnetModule (finalAttrs: { projectFile = "FamiStudio/${csprojName}.csproj"; nugetDeps = ./deps.json; dotnet-sdk = dotnetCorePackages.sdk_8_0; - dotnet-runtime = dotnetCorePackages.runtime_8_0; - dotnetFlags = [ "-p:TargetFramework=net8.0" ]; runtimeDeps = lib.optionals stdenvNoCC.hostPlatform.isLinux [ libglvnd From ee9d0ed38543cd031081f0cb7aec2b51aadc9715 Mon Sep 17 00:00:00 2001 From: Nikolay Korotkiy Date: Fri, 27 Dec 2024 23:18:47 +0400 Subject: [PATCH 164/429] =?UTF-8?q?tootik:=200.13.0=20=E2=86=92=200.14.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/by-name/to/tootik/package.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/to/tootik/package.nix b/pkgs/by-name/to/tootik/package.nix index 031464ed5c06..a551d674785d 100644 --- a/pkgs/by-name/to/tootik/package.nix +++ b/pkgs/by-name/to/tootik/package.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "tootik"; - version = "0.13.0"; + version = "0.14.0"; src = fetchFromGitHub { owner = "dimkr"; repo = "tootik"; - rev = version; - hash = "sha256-YVfxyfPYaGbfGdWtcoJhrMBV+1FI0x7m5OA1oOdPFDo="; + tag = version; + hash = "sha256-9R/3rvFJTXvIfJF698yZ0wMmsN2T3I/Kj1nfOOZoOkI="; }; - vendorHash = "sha256-8GHyMF/WfoQOnoF0qHHC3aMTuNeB8eVynmXJf6CD+Es="; + vendorHash = "sha256-ADor2SEEPkWZVwpNEeb8ijUPAA6jZfD7QXJIIZ6BdD0="; nativeBuildInputs = [ openssl ]; From 5abe8bcffb796e3a58f7b3634f3f490bbd19fd3a Mon Sep 17 00:00:00 2001 From: liberodark Date: Fri, 27 Dec 2024 20:35:18 +0100 Subject: [PATCH 165/429] koreader: 2024.04 -> 2024.11 --- pkgs/by-name/ko/koreader/package.nix | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ko/koreader/package.nix b/pkgs/by-name/ko/koreader/package.nix index a68d94b92287..169b083878ad 100644 --- a/pkgs/by-name/ko/koreader/package.nix +++ b/pkgs/by-name/ko/koreader/package.nix @@ -11,13 +11,14 @@ luajit, sdcv, SDL2, + nix-update-script, }: let luajit_lua52 = luajit.override { enable52Compat = true; }; in stdenv.mkDerivation rec { pname = "koreader"; - version = "2024.04"; + version = "2024.11"; src = { @@ -31,7 +32,7 @@ stdenv.mkDerivation rec { }; x86_64-linux = fetchurl { url = "https://github.com/koreader/koreader/releases/download/v${version}/koreader-${version}-amd64.deb"; - hash = "sha256-hqJRZDZqzPNLK/8Bb+Oay70JqKAMKB0Epbbzeu5npLw="; + hash = "sha256-ibehFrOcJqhM+CMAcHDn3Xwy6CueB8kdnoYMMDe/2Js="; }; } .${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); @@ -78,6 +79,10 @@ stdenv.mkDerivation rec { } ''; + passthru = { + updateScript = nix-update-script { }; + }; + meta = with lib; { homepage = "https://github.com/koreader/koreader"; changelog = "https://github.com/koreader/koreader/releases/tag/v${version}"; @@ -93,6 +98,7 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ contrun neonfuz + liberodark ]; }; } From 678fae38c73075b5309e4ab79e2f27e9c932e134 Mon Sep 17 00:00:00 2001 From: aucub <78630225+aucub@users.noreply.github.com> Date: Tue, 24 Dec 2024 17:00:07 +0800 Subject: [PATCH 166/429] keyguard: add update script --- pkgs/by-name/ke/keyguard/package.nix | 2 ++ pkgs/by-name/ke/keyguard/update.sh | 28 ++++++++++++++++++++++++++++ 2 files changed, 30 insertions(+) create mode 100755 pkgs/by-name/ke/keyguard/update.sh diff --git a/pkgs/by-name/ke/keyguard/package.nix b/pkgs/by-name/ke/keyguard/package.nix index 477dc9e3fff1..827a05718a1a 100644 --- a/pkgs/by-name/ke/keyguard/package.nix +++ b/pkgs/by-name/ke/keyguard/package.nix @@ -60,6 +60,8 @@ stdenv.mkDerivation (finalAttrs: { useBwrap = false; }; + passthru.updateScript = ./update.sh; + doCheck = false; gradleFlags = [ "-Dorg.gradle.java.home=${jdk17}" ]; diff --git a/pkgs/by-name/ke/keyguard/update.sh b/pkgs/by-name/ke/keyguard/update.sh new file mode 100755 index 000000000000..57df067cd413 --- /dev/null +++ b/pkgs/by-name/ke/keyguard/update.sh @@ -0,0 +1,28 @@ +#!/usr/bin/env nix-shell +#!nix-shell -I nixpkgs=./. -i bash -p bash nixVersions.latest curl coreutils jq common-updater-scripts + +set -eou pipefail + +ROOT="$(dirname "$(readlink -f "$0")")" + +latest=$(curl ${GITHUB_TOKEN:+-u ":$GITHUB_TOKEN"} -sL https://api.github.com/repos/AChep/keyguard-app/releases/latest) +latestTag=$(echo "$latest" | jq -r ".tag_name") +latestName=$(echo "$latest" | jq -r ".name") +latestVersion=$(echo "$latestName" | awk -F'v|-' '{print $2}') + +currentVersion=$(nix-instantiate --eval -E "with import ./. {}; keyguard.version" | tr -d '"') + +echo "latest version: $latestVersion" +echo "current version: $currentVersion" + +if [[ "$latestVersion" == "$currentVersion" ]]; then + echo "package is up-to-date" + exit 0 +fi + +hash=$(nix hash convert --hash-algo sha256 --to sri $(nix-prefetch-url --unpack "https://github.com/AChep/keyguard-app/archive/refs/tags/${latestTag}.tar.gz")) +update-source-version keyguard $latestVersion $hash + +sed -i "s/tag = \"r[0-9]\+\";/tag = \"$latestTag\";/g" "$ROOT/package.nix" + +$(nix-build -A keyguard.mitmCache.updateScript) From 1721806b16a14ef047cff87c6cf1dc5b0e252112 Mon Sep 17 00:00:00 2001 From: aucub <78630225+aucub@users.noreply.github.com> Date: Tue, 24 Dec 2024 17:00:31 +0800 Subject: [PATCH 167/429] keyguard: 1.7.1 -> 1.7.2 --- pkgs/by-name/ke/keyguard/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ke/keyguard/package.nix b/pkgs/by-name/ke/keyguard/package.nix index 827a05718a1a..787b18bb6d11 100644 --- a/pkgs/by-name/ke/keyguard/package.nix +++ b/pkgs/by-name/ke/keyguard/package.nix @@ -21,13 +21,13 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "keyguard"; - version = "1.7.1"; + version = "1.7.2"; src = fetchFromGitHub { owner = "AChep"; repo = "keyguard-app"; - tag = "r20241221"; - hash = "sha256-AeomyFazONZatbxT6qaTt+/5eBAkgWYwti62CD98jkg="; + tag = "r20241223"; + hash = "sha256-7fMSpTKEEjSXfYotZ/qxX1m+i8GheCLboo+XoA3gTbc="; }; gradleBuildTask = ":desktopApp:createDistributable"; From 3dfa9a5456a3855646173d5eddc16f8beba0e903 Mon Sep 17 00:00:00 2001 From: aucub <78630225+aucub@users.noreply.github.com> Date: Fri, 27 Dec 2024 07:51:58 +0800 Subject: [PATCH 168/429] kazumi: add update script --- pkgs/by-name/ka/kazumi/package.nix | 2 ++ pkgs/by-name/ka/kazumi/update.sh | 19 +++++++++++++++++++ 2 files changed, 21 insertions(+) create mode 100755 pkgs/by-name/ka/kazumi/update.sh diff --git a/pkgs/by-name/ka/kazumi/package.nix b/pkgs/by-name/ka/kazumi/package.nix index 531a79a30abd..73be2b92282d 100644 --- a/pkgs/by-name/ka/kazumi/package.nix +++ b/pkgs/by-name/ka/kazumi/package.nix @@ -107,6 +107,8 @@ flutter327.buildFlutterApplication rec { install -Dm0644 ./assets/images/logo/logo_linux.png $out/share/icons/hicolor/512x512/apps/io.github.Predidit.Kazumi.png ''; + passthru.updateScript = ./update.sh; + meta = { description = "Watch Animes online with danmaku support"; homepage = "https://github.com/Predidit/Kazumi"; diff --git a/pkgs/by-name/ka/kazumi/update.sh b/pkgs/by-name/ka/kazumi/update.sh new file mode 100755 index 000000000000..a63eea668a66 --- /dev/null +++ b/pkgs/by-name/ka/kazumi/update.sh @@ -0,0 +1,19 @@ +#!/usr/bin/env nix-shell +#!nix-shell -I nixpkgs=./. -i bash -p curl jq yq nixVersions.latest bash coreutils nix-update + +set -eou pipefail + +ROOT="$(dirname "$(readlink -f "$0")")" + +latestVersion=$(curl ${GITHUB_TOKEN:+-u ":$GITHUB_TOKEN"} -sL https://api.github.com/repos/Predidit/Kazumi/releases/latest | jq --raw-output .tag_name) + +currentVersion=$(nix-instantiate --eval -E "with import ./. {}; kazumi.version or (lib.getVersion kazumi)" | tr -d '"') + +if [[ "$currentVersion" == "$latestVersion" ]]; then + echo "package is up-to-date: $currentVersion" + exit 0 +fi + +nix-update kazumi + +curl https://raw.githubusercontent.com/Predidit/Kazumi/${latestVersion}/pubspec.lock | yq . >$ROOT/pubspec.lock.json From e2811854de48a71bc2c0162b41954c823ea39291 Mon Sep 17 00:00:00 2001 From: aucub <78630225+aucub@users.noreply.github.com> Date: Fri, 27 Dec 2024 08:03:34 +0800 Subject: [PATCH 169/429] kazumi: 1.4.7 -> 1.4.8 --- pkgs/by-name/ka/kazumi/package.nix | 20 +++++++-------- pkgs/by-name/ka/kazumi/pubspec.lock.json | 32 ++++++++++++------------ 2 files changed, 26 insertions(+), 26 deletions(-) diff --git a/pkgs/by-name/ka/kazumi/package.nix b/pkgs/by-name/ka/kazumi/package.nix index 73be2b92282d..37a1adeea323 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.4.7"; + version = "1.4.8"; src = fetchFromGitHub { owner = "Predidit"; repo = "Kazumi"; tag = version; - hash = "sha256-/sr2CQ9ntwfR2QCgidQE3kwBSIG+qfpSR/XhRPpmBm0="; + hash = "sha256-E1JOBdOfb2WyTDU0nOu1SCFSfv5O4VKj+9Go8wcMips="; }; pubspecLock = lib.importJSON ./pubspec.lock.json; @@ -92,14 +92,14 @@ flutter327.buildFlutterApplication rec { gitHashes = { desktop_webview_window = "sha256-Z9ehzDKe1W3wGa2AcZoP73hlSwydggO6DaXd9mop+cM="; webview_windows = "sha256-9oWTvEoFeF7djEVA3PSM72rOmOMUhV8ZYuV6+RreNzE="; - media_kit = "sha256-bWS3j4mUdMYfPhzS16z3NZxLTQDrEpDm3dtkzxcdKpQ="; - media_kit_libs_android_video = "sha256-bWS3j4mUdMYfPhzS16z3NZxLTQDrEpDm3dtkzxcdKpQ="; - media_kit_libs_ios_video = "sha256-bWS3j4mUdMYfPhzS16z3NZxLTQDrEpDm3dtkzxcdKpQ="; - media_kit_libs_linux = "sha256-bWS3j4mUdMYfPhzS16z3NZxLTQDrEpDm3dtkzxcdKpQ="; - media_kit_libs_macos_video = "sha256-bWS3j4mUdMYfPhzS16z3NZxLTQDrEpDm3dtkzxcdKpQ="; - media_kit_libs_video = "sha256-bWS3j4mUdMYfPhzS16z3NZxLTQDrEpDm3dtkzxcdKpQ="; - media_kit_libs_windows_video = "sha256-bWS3j4mUdMYfPhzS16z3NZxLTQDrEpDm3dtkzxcdKpQ="; - media_kit_video = "sha256-bWS3j4mUdMYfPhzS16z3NZxLTQDrEpDm3dtkzxcdKpQ="; + media_kit = "sha256-ciznKvZedg2poq377zkyjwyeGRxq0N7b/Rh4upCoths="; + media_kit_libs_android_video = "sha256-ciznKvZedg2poq377zkyjwyeGRxq0N7b/Rh4upCoths="; + media_kit_libs_ios_video = "sha256-ciznKvZedg2poq377zkyjwyeGRxq0N7b/Rh4upCoths="; + media_kit_libs_linux = "sha256-ciznKvZedg2poq377zkyjwyeGRxq0N7b/Rh4upCoths="; + media_kit_libs_macos_video = "sha256-ciznKvZedg2poq377zkyjwyeGRxq0N7b/Rh4upCoths="; + media_kit_libs_video = "sha256-ciznKvZedg2poq377zkyjwyeGRxq0N7b/Rh4upCoths="; + media_kit_libs_windows_video = "sha256-ciznKvZedg2poq377zkyjwyeGRxq0N7b/Rh4upCoths="; + media_kit_video = "sha256-ciznKvZedg2poq377zkyjwyeGRxq0N7b/Rh4upCoths="; }; postInstall = '' diff --git a/pkgs/by-name/ka/kazumi/pubspec.lock.json b/pkgs/by-name/ka/kazumi/pubspec.lock.json index 2857660189ff..fa5df857d3cf 100644 --- a/pkgs/by-name/ka/kazumi/pubspec.lock.json +++ b/pkgs/by-name/ka/kazumi/pubspec.lock.json @@ -886,7 +886,7 @@ "description": { "path": "media_kit", "ref": "main", - "resolved-ref": "eefa578ea41f594b8392653edff6fe8da05cc95b", + "resolved-ref": "ba7c156ad59e55d69f9c8a5c74300f1bb7034c60", "url": "https://github.com/Predidit/media-kit.git" }, "source": "git", @@ -897,7 +897,7 @@ "description": { "path": "libs/android/media_kit_libs_android_video", "ref": "main", - "resolved-ref": "eefa578ea41f594b8392653edff6fe8da05cc95b", + "resolved-ref": "ba7c156ad59e55d69f9c8a5c74300f1bb7034c60", "url": "https://github.com/Predidit/media-kit.git" }, "source": "git", @@ -908,7 +908,7 @@ "description": { "path": "libs/ios/media_kit_libs_ios_video", "ref": "main", - "resolved-ref": "eefa578ea41f594b8392653edff6fe8da05cc95b", + "resolved-ref": "ba7c156ad59e55d69f9c8a5c74300f1bb7034c60", "url": "https://github.com/Predidit/media-kit.git" }, "source": "git", @@ -919,7 +919,7 @@ "description": { "path": "libs/linux/media_kit_libs_linux", "ref": "main", - "resolved-ref": "eefa578ea41f594b8392653edff6fe8da05cc95b", + "resolved-ref": "ba7c156ad59e55d69f9c8a5c74300f1bb7034c60", "url": "https://github.com/Predidit/media-kit.git" }, "source": "git", @@ -930,7 +930,7 @@ "description": { "path": "libs/macos/media_kit_libs_macos_video", "ref": "main", - "resolved-ref": "eefa578ea41f594b8392653edff6fe8da05cc95b", + "resolved-ref": "ba7c156ad59e55d69f9c8a5c74300f1bb7034c60", "url": "https://github.com/Predidit/media-kit.git" }, "source": "git", @@ -941,7 +941,7 @@ "description": { "path": "libs/universal/media_kit_libs_video", "ref": "main", - "resolved-ref": "eefa578ea41f594b8392653edff6fe8da05cc95b", + "resolved-ref": "ba7c156ad59e55d69f9c8a5c74300f1bb7034c60", "url": "https://github.com/Predidit/media-kit.git" }, "source": "git", @@ -952,7 +952,7 @@ "description": { "path": "libs/windows/media_kit_libs_windows_video", "ref": "main", - "resolved-ref": "eefa578ea41f594b8392653edff6fe8da05cc95b", + "resolved-ref": "ba7c156ad59e55d69f9c8a5c74300f1bb7034c60", "url": "https://github.com/Predidit/media-kit.git" }, "source": "git", @@ -963,7 +963,7 @@ "description": { "path": "media_kit_video", "ref": "main", - "resolved-ref": "eefa578ea41f594b8392653edff6fe8da05cc95b", + "resolved-ref": "ba7c156ad59e55d69f9c8a5c74300f1bb7034c60", "url": "https://github.com/Predidit/media-kit.git" }, "source": "git", @@ -1083,21 +1083,21 @@ "dependency": "transitive", "description": { "name": "package_info_plus", - "sha256": "da8d9ac8c4b1df253d1a328b7bf01ae77ef132833479ab40763334db13b91cce", + "sha256": "70c421fe9d9cc1a9a7f3b05ae56befd469fe4f8daa3b484823141a55442d858d", "url": "https://pub.dev" }, "source": "hosted", - "version": "8.1.1" + "version": "8.1.2" }, "package_info_plus_platform_interface": { "dependency": "transitive", "description": { "name": "package_info_plus_platform_interface", - "sha256": "ac1f4a4847f1ade8e6a87d1f39f5d7c67490738642e2542f559ec38c37489a66", + "sha256": "a5ef9986efc7bf772f2696183a3992615baa76c1ffb1189318dd8803778fb05b", "url": "https://pub.dev" }, "source": "hosted", - "version": "3.0.1" + "version": "3.0.2" }, "path": { "dependency": "transitive", @@ -1849,21 +1849,21 @@ "dependency": "transitive", "description": { "name": "wakelock_plus", - "sha256": "bf4ee6f17a2fa373ed3753ad0e602b7603f8c75af006d5b9bdade263928c0484", + "sha256": "36c88af0b930121941345306d259ec4cc4ecca3b151c02e3a9e71aede83c615e", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.2.8" + "version": "1.2.10" }, "wakelock_plus_platform_interface": { "dependency": "transitive", "description": { "name": "wakelock_plus_platform_interface", - "sha256": "422d1cdbb448079a8a62a5a770b69baa489f8f7ca21aef47800c726d404f9d16", + "sha256": "70e780bc99796e1db82fe764b1e7dcb89a86f1e5b3afb1db354de50f2e41eb7a", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.2.1" + "version": "1.2.2" }, "watcher": { "dependency": "transitive", From f12bc63cd6b9ad94b25a2074a5d665930b97b0d3 Mon Sep 17 00:00:00 2001 From: Niklas Korz Date: Fri, 27 Dec 2024 15:09:38 +0100 Subject: [PATCH 170/429] mobilizon: 5.1.0 -> 5.1.1 --- pkgs/servers/mobilizon/common.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/mobilizon/common.nix b/pkgs/servers/mobilizon/common.nix index d77b7758a2cc..f6fa1a72cb76 100644 --- a/pkgs/servers/mobilizon/common.nix +++ b/pkgs/servers/mobilizon/common.nix @@ -1,13 +1,13 @@ { fetchFromGitLab }: rec { pname = "mobilizon"; - version = "5.1.0"; + version = "5.1.1"; src = fetchFromGitLab { domain = "framagit.org"; owner = "framasoft"; repo = pname; rev = version; - sha256 = "sha256-2L1k8oaO9EDWlYO+OIlkbEcqPYN1fac0MpnpNHkoeis="; + sha256 = "sha256-zH/F+8rqzlMh0itVBOgDDzAx6n1nJH81lMzaBfjzhXU="; }; } From dae5df7bdcaed5aa8f1a96f9d5adff029cdb4be7 Mon Sep 17 00:00:00 2001 From: wxt <3264117476@qq.com> Date: Sat, 28 Dec 2024 16:25:53 +0800 Subject: [PATCH 171/429] clash-verge-rev: fix wrong patch for lib/ --- pkgs/by-name/cl/clash-verge-rev/package.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/cl/clash-verge-rev/package.nix b/pkgs/by-name/cl/clash-verge-rev/package.nix index bfa128cf7728..1990b67ac865 100644 --- a/pkgs/by-name/cl/clash-verge-rev/package.nix +++ b/pkgs/by-name/cl/clash-verge-rev/package.nix @@ -108,16 +108,16 @@ stdenv.mkDerivation { installPhase = '' runHook preInstall - mkdir -p $out/{bin,share,lib/clash-verge/resources} + mkdir -p $out/{bin,share,lib/Clash\ Verge/resources} cp -r ${unwrapped}/share/* $out/share cp -r ${unwrapped}/bin/clash-verge $out/bin/clash-verge # This can't be symbol linked. It will find mihomo in its runtime path ln -s ${service}/bin/clash-verge-service $out/bin/clash-verge-service ln -s ${mihomo}/bin/mihomo $out/bin/verge-mihomo # people who want to use alpha build show override mihomo themselves. The alpha core entry was removed in clash-verge. - ln -s ${v2ray-geoip}/share/v2ray/geoip.dat $out/lib/clash-verge/resources/geoip.dat - ln -s ${v2ray-domain-list-community}/share/v2ray/geosite.dat $out/lib/clash-verge/resources/geosite.dat - ln -s ${dbip-country-lite.mmdb} $out/lib/clash-verge/resources/Country.mmdb + ln -s ${v2ray-geoip}/share/v2ray/geoip.dat $out/lib/Clash\ Verge/resources/geoip.dat + ln -s ${v2ray-domain-list-community}/share/v2ray/geosite.dat $out/lib/Clash\ Verge/resources/geosite.dat + ln -s ${dbip-country-lite.mmdb} $out/lib/Clash\ Verge/resources/Country.mmdb runHook postInstall ''; } From 061e93f3574377ccc7ad0d6289486c6bd9ff9264 Mon Sep 17 00:00:00 2001 From: wxt <3264117476@qq.com> Date: Sat, 28 Dec 2024 16:26:10 +0800 Subject: [PATCH 172/429] clash-verge-rev: add missing patch for kde --- pkgs/by-name/cl/clash-verge-rev/package.nix | 4 ++++ pkgs/by-name/cl/clash-verge-rev/unwrapped.nix | 8 +++++++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/cl/clash-verge-rev/package.nix b/pkgs/by-name/cl/clash-verge-rev/package.nix index 1990b67ac865..c90218f2f36c 100644 --- a/pkgs/by-name/cl/clash-verge-rev/package.nix +++ b/pkgs/by-name/cl/clash-verge-rev/package.nix @@ -70,6 +70,10 @@ let meta = { description = "Clash GUI based on tauri"; homepage = "https://github.com/clash-verge-rev/clash-verge-rev"; + longDescription = '' + Clash GUI based on tauri + Setting NixOS option `programs.clash-verge.enable = true` is recommended. + ''; license = lib.licenses.gpl3Only; mainProgram = "clash-verge"; maintainers = with lib.maintainers; [ diff --git a/pkgs/by-name/cl/clash-verge-rev/unwrapped.nix b/pkgs/by-name/cl/clash-verge-rev/unwrapped.nix index 644a5f2871a9..181ddafafd5c 100644 --- a/pkgs/by-name/cl/clash-verge-rev/unwrapped.nix +++ b/pkgs/by-name/cl/clash-verge-rev/unwrapped.nix @@ -10,6 +10,8 @@ libsoup, rustPlatform, makeDesktopItem, + libsForQt5, + kdePackages, meta, webkitgtk_4_1, openssl, @@ -32,7 +34,11 @@ rustPlatform.buildRustPackage { --replace-fail "libayatana-appindicator3.so.1" "${libayatana-appindicator}/lib/libayatana-appindicator3.so.1" substituteInPlace $cargoDepsCopy/sysproxy-*/src/linux.rs \ - --replace-fail '"gsettings"' '"${glib.bin}/bin/gsettings"' + --replace-fail '"gsettings"' '"${glib.bin}/bin/gsettings"' \ + --replace-fail '"kreadconfig5"' '"${libsForQt5.kconfig}/bin/kreadconfig5"' \ + --replace-fail '"kreadconfig6"' '"${kdePackages.kconfig}/bin/kreadconfig6"' \ + --replace-fail '"kwriteconfig5"' '"${libsForQt5.kconfig}/bin/kwriteconfig5"' \ + --replace-fail '"kwriteconfig6"' '"${kdePackages.kconfig}/bin/kwriteconfig6"' substituteInPlace ./tauri.conf.json \ --replace-fail '"frontendDist": "../dist",' '"frontendDist": "${webui}",' \ From 25a67f8af198d1f06c090810bfb62e5d27286b55 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 28 Dec 2024 09:15:03 +0000 Subject: [PATCH 173/429] nagios: 4.5.8 -> 4.5.9 --- pkgs/by-name/na/nagios/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/na/nagios/package.nix b/pkgs/by-name/na/nagios/package.nix index a3afea87550f..1863ec630458 100644 --- a/pkgs/by-name/na/nagios/package.nix +++ b/pkgs/by-name/na/nagios/package.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "nagios"; - version = "4.5.8"; + version = "4.5.9"; src = fetchFromGitHub { owner = "NagiosEnterprises"; repo = "nagioscore"; rev = "refs/tags/nagios-${finalAttrs.version}"; - hash = "sha256-DOtZMq4KFBWYbaBhlSM8PgjTNHJu5o6dCd1dE2qt7lA="; + hash = "sha256-aOHdMZJCrGeJ3XA3+ed3JUb7X1FdfdGiT2ytzBDAT4c="; }; patches = [ ./nagios.patch ]; From fd78de769a608aaadea5fce8f02aef8901457c3b Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Sat, 28 Dec 2024 03:29:25 +0000 Subject: [PATCH 174/429] xfce.catfish: 4.18.0 -> 4.20.0 https://gitlab.xfce.org/apps/catfish/-/compare/catfish-4.18.0...catfish-4.20.0 * Ported to meson. --- .../xfce/applications/catfish/default.nix | 80 ++++++++----------- 1 file changed, 34 insertions(+), 46 deletions(-) diff --git a/pkgs/desktops/xfce/applications/catfish/default.nix b/pkgs/desktops/xfce/applications/catfish/default.nix index 5eeec6ccfa1e..4c3bd14bc2a9 100644 --- a/pkgs/desktops/xfce/applications/catfish/default.nix +++ b/pkgs/desktops/xfce/applications/catfish/default.nix @@ -1,77 +1,65 @@ { + stdenv, lib, fetchFromGitLab, - gitUpdater, - file, - which, - intltool, + desktop-file-utils, gobject-introspection, - findutils, - xdg-utils, - dconf, - gtk3, - python3Packages, - xfconf, + meson, + ninja, + pkg-config, wrapGAppsHook3, + glib, + gtk3, + python3, + xfconf, + shared-mime-info, + xdg-utils, + gitUpdater, }: -python3Packages.buildPythonApplication rec { +stdenv.mkDerivation (finalAttrs: { pname = "catfish"; - version = "4.18.0"; + version = "4.20.0"; src = fetchFromGitLab { domain = "gitlab.xfce.org"; owner = "apps"; - repo = pname; - rev = "${pname}-${version}"; - sha256 = "sha256-hfbIgSFn48++eGrJXzhXRxhWkrjgTYsr7BX/n0EXhGo="; + repo = "catfish"; + rev = "catfish-${finalAttrs.version}"; + hash = "sha256-7ERE6R714OuqTjeNZw3K6HvQTA8OIglG6+8Kiawwzu8="; }; nativeBuildInputs = [ - python3Packages.distutils-extra - file - which - intltool - gobject-introspection # for setup hook populating GI_TYPELIB_PATH + desktop-file-utils + gobject-introspection + meson + ninja + pkg-config wrapGAppsHook3 ]; buildInputs = [ + glib gtk3 - dconf - python3Packages.pyxdg - python3Packages.ptyprocess - python3Packages.pycairo - ]; - - propagatedBuildInputs = [ - python3Packages.dbus-python - python3Packages.pygobject3 - python3Packages.pexpect - xdg-utils - findutils + (python3.withPackages (p: [ + p.dbus-python + p.pygobject3 + p.pexpect + ])) xfconf ]; - # Explicitly set the prefix dir in "setup.py" because setuptools is - # not using "$out" as the prefix when installing catfish data. In - # particular the variable "__catfish_data_directory__" in - # "catfishconfig.py" is being set to a subdirectory in the python - # path in the store. postPatch = '' - sed -i "/^ if self.root/i\\ self.prefix = \"$out\"" setup.py + substituteInPlace catfish/CatfishWindow.py \ + --replace-fail "/usr/share/mime" "${shared-mime-info}/share/mime" ''; - # Disable check because there is no test in the source distribution - doCheck = false; - - dontWrapGApps = true; - preFixup = '' - makeWrapperArgs+=("''${gappsWrapperArgs[@]}") + # For xdg-mime and xdg-open. + gappsWrapperArgs+=(--prefix PATH : "${lib.makeBinPath [ xdg-utils ]}") ''; - passthru.updateScript = gitUpdater { rev-prefix = "${pname}-"; }; + passthru.updateScript = gitUpdater { rev-prefix = "catfish-"; }; meta = with lib; { homepage = "https://docs.xfce.org/apps/catfish/start"; @@ -87,4 +75,4 @@ python3Packages.buildPythonApplication rec { platforms = platforms.linux; maintainers = with maintainers; [ ] ++ teams.xfce.members; }; -} +}) From 117f967463a99ab6b854f07c575f4f84a5940794 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Sat, 28 Dec 2024 03:29:37 +0000 Subject: [PATCH 175/429] xfce.gigolo: 0.5.3 -> 0.5.4 https://gitlab.xfce.org/apps/gigolo/-/compare/gigolo-0.5.3...gigolo-0.5.4 --- pkgs/desktops/xfce/applications/gigolo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/xfce/applications/gigolo/default.nix b/pkgs/desktops/xfce/applications/gigolo/default.nix index 4a2edb70f230..c9207e85ccd5 100644 --- a/pkgs/desktops/xfce/applications/gigolo/default.nix +++ b/pkgs/desktops/xfce/applications/gigolo/default.nix @@ -8,10 +8,10 @@ mkXfceDerivation { category = "apps"; pname = "gigolo"; - version = "0.5.3"; + version = "0.5.4"; odd-unstable = false; - sha256 = "sha256-dxaFuKbSqhj/l5JV31cI+XzgdghfbcVwVtwmRiZeff8="; + sha256 = "sha256-gRv1ZQLgwwzFERnco2Dm2PkT/BNDIZU6fX+HdhiRCJk="; buildInputs = [ gtk3 From cad618f82ab365c40288a32a2b0745f9fbb96a6f Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Sat, 28 Dec 2024 03:29:49 +0000 Subject: [PATCH 176/429] xfce.parole: 4.18.1 -> 4.18.2 https://gitlab.xfce.org/apps/parole/-/compare/parole-4.18.1...parole-4.18.2 --- pkgs/desktops/xfce/applications/parole/default.nix | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/pkgs/desktops/xfce/applications/parole/default.nix b/pkgs/desktops/xfce/applications/parole/default.nix index 4d2f5bfe80bf..c6ec0f2be8e3 100644 --- a/pkgs/desktops/xfce/applications/parole/default.nix +++ b/pkgs/desktops/xfce/applications/parole/default.nix @@ -18,14 +18,9 @@ mkXfceDerivation { category = "apps"; pname = "parole"; - version = "4.18.1"; + version = "4.18.2"; - sha256 = "sha256-g+Wy90tHpCeylbU7aUa8578ehmuyWI5WlCK7YdJKlNQ="; - - postPatch = '' - substituteInPlace src/plugins/mpris2/Makefile.am \ - --replace GST_BASE_CFLAGS GST_VIDEO_CFLAGS - ''; + sha256 = "sha256-C4dGiMYn51YuASsQeQs3Cbc+KkPqcOrsCMS+dYfP+Ps="; buildInputs = with gst_all_1; [ dbus From 166b204de05501727137b8894962d1df19ad3876 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Sat, 28 Dec 2024 03:29:53 +0000 Subject: [PATCH 177/429] xfce.ristretto: 0.13.2 -> 0.13.3 https://gitlab.xfce.org/apps/ristretto/-/compare/ristretto-0.13.2...ristretto-0.13.3 --- pkgs/desktops/xfce/applications/ristretto/default.nix | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/pkgs/desktops/xfce/applications/ristretto/default.nix b/pkgs/desktops/xfce/applications/ristretto/default.nix index 389fe02773be..bc13fa546489 100644 --- a/pkgs/desktops/xfce/applications/ristretto/default.nix +++ b/pkgs/desktops/xfce/applications/ristretto/default.nix @@ -16,10 +16,10 @@ mkXfceDerivation { category = "apps"; pname = "ristretto"; - version = "0.13.2"; + version = "0.13.3"; odd-unstable = false; - sha256 = "sha256-FKgNKQ2l4FGvEvmppf+RTxMXU6TfsZVFBVii4zr4ASc="; + sha256 = "sha256-cJMHRN4Wl6Fm0yoVqe0h30ZUlE1+Hw1uEDBHfHXBbC0="; buildInputs = [ glib @@ -30,8 +30,6 @@ mkXfceDerivation { xfconf ]; - env.NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0"; - postInstall = '' # Pull in JXL and WebP support for ristretto. # In postInstall to run before gappsWrapperArgsHook. From 3b5405bc79a8e0a3e397b9be299c1733119a1dce Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Sat, 28 Dec 2024 03:30:43 +0000 Subject: [PATCH 178/429] xfce.xfce4-panel-profiles: 1.0.14 -> 1.0.15 https://gitlab.xfce.org/apps/xfce4-panel-profiles/-/compare/xfce4-panel-profiles-1.0.14...xfce4-panel-profiles-1.0.15 --- .../xfce/applications/xfce4-panel-profiles/default.nix | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/pkgs/desktops/xfce/applications/xfce4-panel-profiles/default.nix b/pkgs/desktops/xfce/applications/xfce4-panel-profiles/default.nix index b11057c5b566..32203b7a5d28 100644 --- a/pkgs/desktops/xfce/applications/xfce4-panel-profiles/default.nix +++ b/pkgs/desktops/xfce/applications/xfce4-panel-profiles/default.nix @@ -4,7 +4,6 @@ fetchFromGitLab, gettext, gobject-introspection, - intltool, wrapGAppsHook3, glib, gtk3, @@ -21,20 +20,19 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "xfce4-panel-profiles"; - version = "1.0.14"; + version = "1.0.15"; src = fetchFromGitLab { domain = "gitlab.xfce.org"; owner = "apps"; repo = "xfce4-panel-profiles"; rev = "xfce4-panel-profiles-${finalAttrs.version}"; - sha256 = "sha256-mGA70t2U4mqEbcrj/DDsPl++EKWyZ8YXzKzzVOrH5h8="; + sha256 = "sha256-UxXxj0lxJhaMv5cQoyz+glJiLwvIFfpPu27TCNDhoL0="; }; nativeBuildInputs = [ gettext gobject-introspection - intltool wrapGAppsHook3 ]; From c475fbb48fda8d8acc5296e6a39f696d0ab03355 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Sat, 28 Dec 2024 03:30:51 +0000 Subject: [PATCH 179/429] xfce.xfce4-taskmanager: 1.5.7 -> 1.5.8 https://gitlab.xfce.org/apps/xfce4-taskmanager/-/compare/xfce4-taskmanager-1.5.7...xfce4-taskmanager-1.5.8 --- pkgs/desktops/xfce/applications/xfce4-taskmanager/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/xfce/applications/xfce4-taskmanager/default.nix b/pkgs/desktops/xfce/applications/xfce4-taskmanager/default.nix index f4f65792ea93..80637f141d62 100644 --- a/pkgs/desktops/xfce/applications/xfce4-taskmanager/default.nix +++ b/pkgs/desktops/xfce/applications/xfce4-taskmanager/default.nix @@ -14,10 +14,10 @@ mkXfceDerivation { category = "apps"; pname = "xfce4-taskmanager"; - version = "1.5.7"; + version = "1.5.8"; odd-unstable = false; - sha256 = "sha256-znadP7rrP/IxH22U1D9p6IHZ1J1JfXoCVk8iKUgrkJw="; + sha256 = "sha256-A2L41YdIpFnbAjQOp+/sJu1oUX9V7jxLsWY7b21frjY="; nativeBuildInputs = [ exo From 3e2f1e8a1f4c15553a117951c200933e97237dce Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Sat, 28 Dec 2024 03:31:15 +0000 Subject: [PATCH 180/429] xfce.xfce4-terminal: 1.1.3 -> 1.1.4 https://gitlab.xfce.org/apps/xfce4-terminal/-/compare/xfce4-terminal-1.1.3...xfce4-terminal-1.1.4 --- pkgs/desktops/xfce/applications/xfce4-terminal/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/xfce/applications/xfce4-terminal/default.nix b/pkgs/desktops/xfce/applications/xfce4-terminal/default.nix index 3cab5bcf8ddc..0d6277a0d8e0 100644 --- a/pkgs/desktops/xfce/applications/xfce4-terminal/default.nix +++ b/pkgs/desktops/xfce/applications/xfce4-terminal/default.nix @@ -18,10 +18,10 @@ mkXfceDerivation { category = "apps"; pname = "xfce4-terminal"; - version = "1.1.3"; + version = "1.1.4"; odd-unstable = false; - sha256 = "sha256-CUIQf22Lmb6MNPd2wk8LlHFNUhdIoC1gzVV6RDP2PfY="; + sha256 = "sha256-WrmffY8kC9tBorvtEb8q6DmHKX5d7HnvbxtBbpy4LJs="; nativeBuildInputs = [ libxslt From 9dc6db70f879d2ee152e77d9a18f2c338b3ee5d4 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Sat, 28 Dec 2024 03:31:19 +0000 Subject: [PATCH 181/429] xfce.xfce4-volumed-pulse: 0.2.4 -> 0.2.5 https://gitlab.xfce.org/apps/xfce4-volumed-pulse/-/compare/xfce4-volumed-pulse-0.2.4...xfce4-volumed-pulse-0.2.5 --- .../xfce/applications/xfce4-volumed-pulse/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/xfce/applications/xfce4-volumed-pulse/default.nix b/pkgs/desktops/xfce/applications/xfce4-volumed-pulse/default.nix index 3195b0b33c76..c53994322916 100644 --- a/pkgs/desktops/xfce/applications/xfce4-volumed-pulse/default.nix +++ b/pkgs/desktops/xfce/applications/xfce4-volumed-pulse/default.nix @@ -11,9 +11,9 @@ mkXfceDerivation { category = "apps"; pname = "xfce4-volumed-pulse"; - version = "0.2.4"; + version = "0.2.5"; - sha256 = "sha256-NDIJRjKV5aoM2sLhZ6WmoynOc4yz55KpuiTJDMLMA5Y="; + sha256 = "sha256-A7PM4zHL4hkhsZjYEPuEiujP1ofP7V/QVqDNgGoGIm8="; buildInputs = [ gtk3 From 78e9387d2420e7354a3ba84002ebdb3b73110869 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Sat, 28 Dec 2024 11:36:38 +0800 Subject: [PATCH 182/429] xfce.xfmpc: 0.3.1-2024-05-29 -> 0.3.2 https://gitlab.xfce.org/apps/xfmpc/-/compare/cf40dffec6e9b80abb1f1aa6d7dceef4790173dc...xfmpc-0.3.2 --- pkgs/desktops/xfce/applications/xfmpc/default.nix | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/pkgs/desktops/xfce/applications/xfmpc/default.nix b/pkgs/desktops/xfce/applications/xfmpc/default.nix index 85088a61937e..03f7acb3e663 100644 --- a/pkgs/desktops/xfce/applications/xfmpc/default.nix +++ b/pkgs/desktops/xfce/applications/xfmpc/default.nix @@ -12,10 +12,8 @@ mkXfceDerivation rec { category = "apps"; pname = "xfmpc"; - # Last release is too old - version = "0.3.1-2024-05-29"; - rev = "cf40dffec6e9b80abb1f1aa6d7dceef4790173dc"; - sha256 = "sha256-moCWSLGBJuWM4/lRJi6D3w38iJeCntLo3Vl/eVfu7lw="; + version = "0.3.2"; + sha256 = "sha256-V5YHvhcWv6IUPe8W1VtuPagj3uU3s+ikgu3ZnRF48O4="; nativeBuildInputs = [ vala @@ -33,7 +31,7 @@ mkXfceDerivation rec { meta = with lib; { description = "MPD client written in GTK"; homepage = "https://docs.xfce.org/apps/xfmpc/start"; - changelog = "https://gitlab.xfce.org/apps/xfmpc/-/blob/${rev}/NEWS"; + changelog = "https://gitlab.xfce.org/apps/xfmpc/-/blob/xfmpc-${version}/NEWS"; maintainers = with maintainers; [ doronbehar ] ++ teams.xfce.members; mainProgram = "xfmpc"; }; From e97955fce64f04ed2db075399ba1c942c1112deb Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Sat, 28 Dec 2024 14:34:11 +0100 Subject: [PATCH 183/429] threema-desktop: 2.5.3 -> 2.5.7 This fixes the build otherwise broken with nodejs 22 in the old version. Alternative to #368813 --- pkgs/by-name/th/threema-desktop/package.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/by-name/th/threema-desktop/package.nix b/pkgs/by-name/th/threema-desktop/package.nix index 8125a18a2ae7..1ed7fe3c9350 100644 --- a/pkgs/by-name/th/threema-desktop/package.nix +++ b/pkgs/by-name/th/threema-desktop/package.nix @@ -10,26 +10,26 @@ }: let - version = "1.2.41"; + version = "1.2.46"; electronSrc = fetchFromGitHub { owner = "threema-ch"; repo = "threema-web-electron"; rev = "refs/tags/${version}"; - hash = "sha256-gV64rNBwQxPpREi0NFzfCA7lSO65/h0CVRw2EcbFedM="; + hash = "sha256-Qv40l6TyYZL9WcRQeIYUgMFsJrr0XYC2nmtYBgQKXvY="; }; threema-web = buildNpmPackage rec { pname = "threema-web"; - version = "2.5.3"; + version = "2.5.7"; src = fetchFromGitHub { owner = "threema-ch"; repo = "threema-web"; rev = "refs/tags/v${version}"; - hash = "sha256-RIYyDoEck+a0kPUzTpdNLdyd4+ZYGjjkAlkCp9/S7FY="; + hash = "sha256-WuPOOchFZtnLVoB+i4LKFkeSujYXpQN8RLrt9xG9/W0="; }; - npmDepsHash = "sha256-OqiPpjIdLwBfxEmbI+YFmYGt3beMqXyGZc9FCwbng4U="; + npmDepsHash = "sha256-eJIVX2W0Fgk/OmkaN2cR+qFoHTOmu4RmluR3BEuPOAU="; npmBuildScript = "dist"; nativeBuildInputs = [ @@ -54,7 +54,7 @@ let inherit version; src = electronSrc; sourceRoot = "${src.name}/app"; - npmDepsHash = "sha256-AaUxnvrVCgKWCtMzeXexVBxs/NuVwWH67x4eBGAcsxk="; + npmDepsHash = "sha256-CRYcmly8S+waeCf2fRWM2o3IuBVdpk2gZ/djHhxLLTQ="; env.ELECTRON_SKIP_BINARY_DOWNLOAD = "1"; dontNpmBuild = true; prePatch = '' @@ -73,7 +73,7 @@ buildNpmPackage rec { inherit version; src = electronSrc; - npmDepsHash = "sha256-f/Oy9cHBc9k54MDSeilPcTJe0txOS2sqNt2UCUf5+M8="; + npmDepsHash = "sha256-OdxDAy9ybBUEFuQQtihEvUXCVtVtveksLlOBD8F1RP0="; env.ELECTRON_SKIP_BINARY_DOWNLOAD = "1"; From f17d2ac74979f146fcaa101ccdefe332c56ab47d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 28 Dec 2024 15:39:53 +0000 Subject: [PATCH 184/429] lefthook: 1.9.2 -> 1.10.1 --- pkgs/by-name/le/lefthook/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/le/lefthook/package.nix b/pkgs/by-name/le/lefthook/package.nix index e302feaefc9f..2207b1f83431 100644 --- a/pkgs/by-name/le/lefthook/package.nix +++ b/pkgs/by-name/le/lefthook/package.nix @@ -7,7 +7,7 @@ let pname = "lefthook"; - version = "1.9.2"; + version = "1.10.1"; in buildGoModule { inherit pname version; @@ -16,10 +16,10 @@ buildGoModule { owner = "evilmartians"; repo = "lefthook"; rev = "v${version}"; - hash = "sha256-Q1MGE6GQRz+X2LAd4+CN16peI7dR27vbbrBW3uAIIu8="; + hash = "sha256-M+JbbrHmN+ayLKXostvsVdSueXG7CHJXPRyOjWoabpI="; }; - vendorHash = "sha256-zzIdqEmKlkauJSAtow/+NWK+Cxy3WQdgr/IGkiArbis="; + vendorHash = "sha256-phXZUKmadtWmevSXGOxu3NRIdAYCALiD3yepvMTLmT4="; nativeBuildInputs = [ installShellFiles ]; From d6251d4afcc1efc29fad3e5967afaa138ee8427c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 28 Dec 2024 16:03:33 +0000 Subject: [PATCH 185/429] uxn: 1.0-unstable-2024-11-30 -> 1.0-unstable-2024-12-25 --- pkgs/by-name/ux/uxn/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ux/uxn/package.nix b/pkgs/by-name/ux/uxn/package.nix index 2fc2a961b7a2..d4bab7374854 100644 --- a/pkgs/by-name/ux/uxn/package.nix +++ b/pkgs/by-name/ux/uxn/package.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "uxn"; - version = "1.0-unstable-2024-11-30"; + version = "1.0-unstable-2024-12-25"; src = fetchFromSourcehut { owner = "~rabbits"; repo = "uxn"; - rev = "ac3f9ccb20dcbd63180d121d0df43efa01a91a8f"; - hash = "sha256-YHRdELTVf6BNa7HFu1buAG9HKRdpx++XjU60P2huY/Q="; + rev = "c93972cae22be2300d1cade49142546cf162da50"; + hash = "sha256-SXzuNfiCQaQxC2AOwm2+SYMb4Z3vQE+g1yolRoPaCQc="; }; outputs = [ From c225f5e642c9590616d32c42e6642ee51be26463 Mon Sep 17 00:00:00 2001 From: Izorkin Date: Sat, 28 Dec 2024 20:00:21 +0300 Subject: [PATCH 186/429] angie: 1.8.0 -> 1.8.1 --- pkgs/servers/http/angie/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/http/angie/default.nix b/pkgs/servers/http/angie/default.nix index 5da1105e90db..ed23cecaf332 100644 --- a/pkgs/servers/http/angie/default.nix +++ b/pkgs/servers/http/angie/default.nix @@ -9,12 +9,12 @@ }@args: callPackage ../nginx/generic.nix args rec { - version = "1.8.0"; + version = "1.8.1"; pname = if withQuic then "angieQuic" else "angie"; src = fetchurl { url = "https://download.angie.software/files/angie-${version}.tar.gz"; - hash = "sha256-UbAylZB0ukki5AZ7XUgSLIQHekT3h8IqLyy/c/mBGwE="; + hash = "sha256-2zC2kEXPmkDxRJEYFEFNnhtNQ3D2aT0Aj0AX3LQ3C0w="; }; configureFlags = From adf29eeeb6dcaf35202850edda9128eae0563287 Mon Sep 17 00:00:00 2001 From: Jared Baur Date: Sat, 28 Dec 2024 10:54:38 -0700 Subject: [PATCH 187/429] tayga: fix building with gcc14 Sources for tayga haven't been updated since 2011, therefore it's probably more reasonable to disable these errors during compilation rather than patching. --- pkgs/by-name/ta/tayga/package.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/by-name/ta/tayga/package.nix b/pkgs/by-name/ta/tayga/package.nix index f53491664732..4749fcee5042 100644 --- a/pkgs/by-name/ta/tayga/package.nix +++ b/pkgs/by-name/ta/tayga/package.nix @@ -14,6 +14,11 @@ stdenv.mkDerivation rec { hash = "sha256-Kx95J6nS3P+Qla/zwnGSSwUsz9L6ypWIsndDGkTwAJw="; }; + env.NIX_CFLAGS_COMPILE = toString [ + "-Wno-address-of-packed-member" + "-Wno-implicit-function-declaration" + ]; + passthru.tests.tayga = nixosTests.tayga; meta = with lib; { From 5f3eb7e6d8dcd75b9731d91a7db744c851c37fa5 Mon Sep 17 00:00:00 2001 From: Luflosi Date: Sun, 29 Dec 2024 00:51:12 +0100 Subject: [PATCH 188/429] megapixels: 1.8.2 -> 1.8.3 https://gitlab.com/megapixels-org/Megapixels/-/tags/1.8.3 --- pkgs/by-name/me/megapixels/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/me/megapixels/package.nix b/pkgs/by-name/me/megapixels/package.nix index 1bb0de25e5f5..e64b018136c2 100644 --- a/pkgs/by-name/me/megapixels/package.nix +++ b/pkgs/by-name/me/megapixels/package.nix @@ -38,13 +38,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "megapixels"; - version = "1.8.2"; + version = "1.8.3"; src = fetchFromGitLab { owner = "megapixels-org"; repo = "Megapixels"; rev = finalAttrs.version; - hash = "sha256-odsOYrk//ZhodsumLpJjhPDcwF1gkE/no166u+IDxSY="; + hash = "sha256-ZXr0gmO72zKHwORn4p8zKuGcdICvb5+L/Q9d/ty8zwA="; }; nativeBuildInputs = [ From a9803a28afd318ffe36b947a3a3761da072f87c5 Mon Sep 17 00:00:00 2001 From: Ben Darwin Date: Sat, 28 Dec 2024 20:52:30 -0500 Subject: [PATCH 189/429] python312Packages.transforms3d: 0.4.1 -> 0.4.2 Unbreaks the package due to added numpy 2.x support. --- .../python-modules/transforms3d/default.nix | 21 +++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/transforms3d/default.nix b/pkgs/development/python-modules/transforms3d/default.nix index 154badcbaa3a..4550649e6392 100644 --- a/pkgs/development/python-modules/transforms3d/default.nix +++ b/pkgs/development/python-modules/transforms3d/default.nix @@ -3,6 +3,8 @@ buildPythonPackage, fetchFromGitHub, pythonOlder, + setuptools, + versioneer, pytestCheckHook, numpy, scipy, @@ -11,32 +13,39 @@ buildPythonPackage rec { pname = "transforms3d"; - version = "0.4.1"; - format = "setuptools"; + version = "0.4.2"; + pyproject = true; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "matthew-brett"; repo = pname; - rev = "refs/tags/${version}"; - hash = "sha256-GgnjvwAfyxnDfBGvgMFIPPbR88BWFiNGrScVORygq94="; + tag = version; + hash = "sha256-9wICu7zNYF54e6xcDpZxqctB4GVu5Knf79Z36016Rpw="; }; - propagatedBuildInputs = [ + build-system = [ + setuptools + versioneer + ]; + + dependencies = [ numpy - sympy ]; nativeCheckInputs = [ pytestCheckHook scipy + sympy ]; + pythonImportsCheck = [ "transforms3d" ]; meta = with lib; { homepage = "https://matthew-brett.github.io/transforms3d"; description = "Convert between various geometric transformations"; + changelog = "https://github.com/matthew-brett/transforms3d/blob/main/Changelog"; license = licenses.bsd2; maintainers = with maintainers; [ bcdarwin ]; }; From 198b211e5b1f139cb63cfbd0143840fea67d9215 Mon Sep 17 00:00:00 2001 From: Gliczy <129636582+Gliczy@users.noreply.github.com> Date: Sun, 29 Dec 2024 03:41:58 +0100 Subject: [PATCH 190/429] alpaca: 2.9.0 -> 3.1.0 --- pkgs/by-name/al/alpaca/package.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/al/alpaca/package.nix b/pkgs/by-name/al/alpaca/package.nix index 7b8d12bbcca2..8071c0f789d9 100644 --- a/pkgs/by-name/al/alpaca/package.nix +++ b/pkgs/by-name/al/alpaca/package.nix @@ -18,14 +18,14 @@ python3Packages.buildPythonApplication rec { pname = "alpaca"; - version = "2.9.0"; + version = "3.1.0"; pyproject = false; # Built with meson src = fetchFromGitHub { owner = "Jeffser"; repo = "Alpaca"; - rev = "refs/tags/${version}"; - hash = "sha256-ionioPA69haDIyXjqU84nuTNtI32jOnhd6oCTRI6vcA="; + tag = version; + hash = "sha256-KPab5TU+Ra1o0FWpD5pkhtP7ylno903GQTqqWlir26s="; }; nativeBuildInputs = [ @@ -49,10 +49,11 @@ python3Packages.buildPythonApplication rec { requests pillow pypdf - pytube html2text youtube-transcript-api pydbus + odfpy + pyicu ]; dontWrapGApps = true; From 56bcf2418dcdd26ae451ba254debe2eeffb450c1 Mon Sep 17 00:00:00 2001 From: Gliczy <129636582+Gliczy@users.noreply.github.com> Date: Sun, 29 Dec 2024 03:42:26 +0100 Subject: [PATCH 191/429] alpaca: add myself as maintainer --- pkgs/by-name/al/alpaca/package.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/al/alpaca/package.nix b/pkgs/by-name/al/alpaca/package.nix index 8071c0f789d9..eb2462d6c9b1 100644 --- a/pkgs/by-name/al/alpaca/package.nix +++ b/pkgs/by-name/al/alpaca/package.nix @@ -85,7 +85,10 @@ python3Packages.buildPythonApplication rec { homepage = "https://jeffser.com/alpaca"; license = lib.licenses.gpl3Plus; mainProgram = "alpaca"; - maintainers = with lib.maintainers; [ aleksana ]; + maintainers = with lib.maintainers; [ + aleksana + Gliczy + ]; platforms = lib.platforms.linux; }; } From 0c7cb01f2b21498a7b16110bdb6640ea0ebc6a75 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 29 Dec 2024 06:55:06 +0000 Subject: [PATCH 192/429] lms: 3.61.0 -> 3.62.1 --- pkgs/by-name/lm/lms/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/lm/lms/package.nix b/pkgs/by-name/lm/lms/package.nix index e15ae8944531..91a16490a424 100644 --- a/pkgs/by-name/lm/lms/package.nix +++ b/pkgs/by-name/lm/lms/package.nix @@ -22,13 +22,13 @@ stdenv.mkDerivation rec { pname = "lms"; - version = "3.61.0"; + version = "3.62.1"; src = fetchFromGitHub { owner = "epoupon"; repo = "lms"; rev = "v${version}"; - hash = "sha256-q2LnJhIQYdjvVk+fQQ2tjoEw046DUR1o+RUG2bp/w3M="; + hash = "sha256-LzDEK17Gh/r3tXGRItQfOeTCD9yGcRzIYMBX77MuwAU="; }; strictDeps = true; From 67c5a83f65f7c2bb2dc6b118242cee5506a6e6ed Mon Sep 17 00:00:00 2001 From: Florian Brandes Date: Sun, 29 Dec 2024 09:13:43 +0100 Subject: [PATCH 193/429] python312Packages.openusd: fix build on darwin Due to an update to Clang 19 the compiler got stricter and will fail with ``` error: no member named '_Set' in 'SdfChildrenProxy<_View>' ``` Upstream has merged an fix, which this commit will pull Signed-off-by: Florian Brandes --- pkgs/development/python-modules/openusd/default.nix | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/pkgs/development/python-modules/openusd/default.nix b/pkgs/development/python-modules/openusd/default.nix index c9e0213dce4e..959014e2513b 100644 --- a/pkgs/development/python-modules/openusd/default.nix +++ b/pkgs/development/python-modules/openusd/default.nix @@ -74,6 +74,19 @@ buildPythonPackage rec { url = "https://github.com/PixarAnimationStudios/OpenUSD/commit/c8fec1342e05dca98a1afd4ea93c7a5f0b41e25b.patch?full_index=1"; hash = "sha256-pK1TUwmVv9zsZkOypq25pl+FJDxJJvozUtVP9ystGtI="; }) + # https://github.com/PixarAnimationStudios/OpenUSD/issues/3442 + # https://github.com/PixarAnimationStudios/OpenUSD/pull/3434 commit 1 + (fetchpatch { + name = "explicitly-adding-template-keyword.patch"; + url = "https://github.com/PixarAnimationStudios/OpenUSD/commit/274cf7c6fe1c121d095acd38dd1a33214e0c8448.patch?full_index=1"; + hash = "sha256-nlw7o2jVWV9f1Lzl32UXcRVXcWnfyMNv9Mp4SVgFvyw="; + }) + # https://github.com/PixarAnimationStudios/OpenUSD/pull/3434 commit 2 + (fetchpatch { + name = "fix-removes-unused-path.patch"; + url = "https://github.com/PixarAnimationStudios/OpenUSD/commit/5a6437e44269534bfde0c35cc2c7bdef087b70e8.patch?full_index=1"; + hash = "sha256-X2v14U0pJjd4IMD8viXK2/onVFqUabJTXwDGRFKDZ+g="; + }) ]; env.OSL_LOCATION = "${osl}"; From 2d60a8c9f3be494e7af61727ecb8ec03984629d5 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 29 Dec 2024 08:26:41 +0000 Subject: [PATCH 194/429] checkstyle: 10.20.2 -> 10.21.1 --- pkgs/by-name/ch/checkstyle/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ch/checkstyle/package.nix b/pkgs/by-name/ch/checkstyle/package.nix index 625d4a2c0701..c872896c4105 100644 --- a/pkgs/by-name/ch/checkstyle/package.nix +++ b/pkgs/by-name/ch/checkstyle/package.nix @@ -1,12 +1,12 @@ { lib, stdenvNoCC, fetchurl, makeBinaryWrapper, jre }: stdenvNoCC.mkDerivation rec { - version = "10.20.2"; + version = "10.21.1"; pname = "checkstyle"; src = fetchurl { url = "https://github.com/checkstyle/checkstyle/releases/download/checkstyle-${version}/checkstyle-${version}-all.jar"; - sha256 = "sha256-PBm1fBCo4S8pQId19p3gIr7zEXJ5V1tYr0qHdOk0yL4="; + sha256 = "sha256-u8248qMMHRBxWk7VpFripdLQSbcAL3ApLtCQa6TyMJ4="; }; nativeBuildInputs = [ makeBinaryWrapper ]; From 52cbf930f6a20c13685c9c69bb7a01552d8e2722 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 29 Dec 2024 08:56:48 +0000 Subject: [PATCH 195/429] chezmoi: 2.55.0 -> 2.56.0 --- pkgs/by-name/ch/chezmoi/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ch/chezmoi/package.nix b/pkgs/by-name/ch/chezmoi/package.nix index 590b8f7dd1e0..fd6b7c8211e2 100644 --- a/pkgs/by-name/ch/chezmoi/package.nix +++ b/pkgs/by-name/ch/chezmoi/package.nix @@ -8,16 +8,16 @@ let argset = { pname = "chezmoi"; - version = "2.55.0"; + version = "2.56.0"; src = fetchFromGitHub { owner = "twpayne"; repo = "chezmoi"; rev = "v${argset.version}"; - hash = "sha256-S9g0v/p3Hv6yMKz3OPtaZrtkyvIXbtFW4GlGxeGqx+M="; + hash = "sha256-PjbfGWERJmV/vHF9BitsA8Cn9oTcCwJOnUgvTV6v7mg="; }; - vendorHash = "sha256-hmNb712gnQsJSjfhVKlNTkFx/Nmx0rkJMFRdcwJj3ZA="; + vendorHash = "sha256-ACGXJqpELysLRFoWHtCMrAFjdmuYoP+ZpCQZYOd/GoE="; nativeBuildInputs = [ installShellFiles From f6edfae3d7fc86b75f712a48aec7c24ac2e37771 Mon Sep 17 00:00:00 2001 From: Francesco Gazzetta Date: Sun, 29 Dec 2024 11:55:20 +0100 Subject: [PATCH 196/429] faircamp: 0.21.0 -> 1.0.0 Diff: https://codeberg.org/simonrepp/faircamp/compare/0.21.0...1.0.0 --- pkgs/by-name/fa/faircamp/Cargo.lock | 420 +++++++++++++-------------- pkgs/by-name/fa/faircamp/package.nix | 6 +- 2 files changed, 204 insertions(+), 222 deletions(-) diff --git a/pkgs/by-name/fa/faircamp/Cargo.lock b/pkgs/by-name/fa/faircamp/Cargo.lock index da90a4b5fd70..be03b759e5b0 100644 --- a/pkgs/by-name/fa/faircamp/Cargo.lock +++ b/pkgs/by-name/fa/faircamp/Cargo.lock @@ -88,7 +88,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e01ed3140b2f8d422c68afa1ed2e85d996ea619c988ac834d255db32138655cb" dependencies = [ "quote", - "syn 2.0.87", + "syn 2.0.90", ] [[package]] @@ -205,7 +205,7 @@ dependencies = [ "actix-router", "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.90", ] [[package]] @@ -217,12 +217,6 @@ 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" @@ -358,15 +352,15 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.89" +version = "1.0.94" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86fdf8605db99b54d3cd748a44c6d04df638eb5dafb219b135d0149bd0db01f6" +checksum = "c1fd03a028ef38ba2276dce7e33fcd6369c158a1bca17946c4b1b701891c1ff7" [[package]] name = "arbitrary" -version = "1.3.2" +version = "1.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d5a26814d8dcb93b0e5a0ff3c6d80a8843bafb21b39e8e18a6f05471870e110" +checksum = "dde20b3d026af13f561bdd0f15edf01fc734f0dafcedbaf42bba506a9517f223" dependencies = [ "derive_arbitrary", ] @@ -385,7 +379,7 @@ checksum = "0ae92a5119aa49cdbcf6b9f893fe4e1d98b04ccbf82ee0584ad948a44a734dea" dependencies = [ "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.90", ] [[package]] @@ -394,6 +388,15 @@ version = "0.7.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7c02d123df017efcdfbd739ef81735b36c5ba83ec3c59c80a9d7ecc718f92e50" +[[package]] +name = "atomic-polyfill" +version = "1.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8cf2bce30dfe09ef0bfaef228b9d414faaf7e563035494d7fe092dba54b300f4" +dependencies = [ + "critical-section", +] + [[package]] name = "audiopus_sys" version = "0.2.2" @@ -449,7 +452,7 @@ dependencies = [ "addr2line", "cfg-if", "libc", - "miniz_oxide 0.8.0", + "miniz_oxide", "object", "rustc-demangle", "windows-targets 0.52.6", @@ -499,9 +502,9 @@ dependencies = [ [[package]] name = "bitstream-io" -version = "2.5.3" +version = "2.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b81e1519b0d82120d2fd469d5bfb2919a9361c48b02d82d04befc1cdd2002452" +checksum = "6099cdc01846bc367c4e7dd630dc5966dccf36b652fae7a74e17b640411a91b2" [[package]] name = "block-buffer" @@ -544,9 +547,9 @@ dependencies = [ [[package]] name = "built" -version = "0.7.4" +version = "0.7.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "236e6289eda5a812bc6b53c3b024039382a2895fbbeef2d748b2931546d392c4" +checksum = "c360505aed52b7ec96a3636c3f039d99103c37d1d9b4f7a8c743d3ea9ffcd03b" [[package]] name = "bumpalo" @@ -556,9 +559,9 @@ checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c" [[package]] name = "bytemuck" -version = "1.18.0" +version = "1.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94bbb0ad554ad961ddc5da507a12a29b14e4ae5bda06b19f575a3e6079d2e2ae" +checksum = "8b37c88a63ffd85d15b406896cc343916d7cf57838a847b3a6f2ca5d39a5695a" [[package]] name = "byteorder" @@ -574,15 +577,15 @@ checksum = "8f1fe948ff07f4bd06c30984e69f5b4899c516a3ef74f34df92a2df2ab535495" [[package]] name = "bytes" -version = "1.7.2" +version = "1.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "428d9aa8fbc0670b7b8d6030a7fadd0f86151cae55e4dbbece15f3780a3dfaf3" +checksum = "325918d6fe32f23b19878fe4b34794ae41fc19ddbe53b10571a4874d44ffd39b" [[package]] name = "bytestring" -version = "1.3.1" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "74d80203ea6b29df88012294f62733de21cfeab47f17b41af3a38bc30a03ee72" +checksum = "e465647ae23b2823b0753f50decb2d5a86d2bb2cac04788fafd1f80e45378e5f" dependencies = [ "bytes", ] @@ -610,9 +613,9 @@ dependencies = [ [[package]] name = "cc" -version = "1.1.28" +version = "1.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2e80e3b6a3ab07840e1cae9b0666a63970dc28e8ed5ffbcdacbfc760c281bfc1" +checksum = "27f657647bcff5394bf56c7317665bbf790a137a50eaaa5c6bfbb9e27a518f2d" dependencies = [ "jobserver", "libc", @@ -643,9 +646,9 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] name = "chrono" -version = "0.4.38" +version = "0.4.39" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a21f936df1771bf62b77f047b726c4625ff2e8aa607c01ec06e5a05bd8463401" +checksum = "7e36cc9d416881d2e24f9a963be5fb1cd90966419ac844274161d10488b3e825" dependencies = [ "android-tzdata", "iana-time-zone", @@ -668,9 +671,9 @@ dependencies = [ [[package]] name = "clap" -version = "4.5.21" +version = "4.5.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb3b4b9e5a7c7514dfa52869339ee98b3156b0bfb4e8a77c4ff4babb64b1604f" +checksum = "3135e7ec2ef7b10c6ed8950f0f792ed96ee093fa088608f1c76e569722700c84" dependencies = [ "clap_builder", "clap_derive", @@ -678,9 +681,9 @@ dependencies = [ [[package]] name = "clap_builder" -version = "4.5.21" +version = "4.5.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b17a95aa67cc7b5ebd32aa5370189aa0d79069ef1c64ce893bd30fb24bff20ec" +checksum = "30582fc632330df2bd26877bde0c1f4470d57c582bbc070376afcd04d8cb4838" dependencies = [ "anstream", "anstyle", @@ -697,14 +700,14 @@ dependencies = [ "heck", "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.90", ] [[package]] name = "clap_lex" -version = "0.7.2" +version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1462739cb27611015575c0c11df5df7601141071f07518d56fcc1be504cbec97" +checksum = "f46ad14479a25103f283c0f10005961cf086d8dc42205bb44c46ac563475dca6" [[package]] name = "claxon" @@ -745,9 +748,9 @@ dependencies = [ [[package]] name = "constant_time_eq" -version = "0.3.0" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f7144d30dcf0fafbce74250a3963025d8d52177934239851c917d29f1df280c2" +checksum = "7c74b8349d32d297c9134b8c88677813a227df8f779daa29bfc29c183fe3dca6" [[package]] name = "convert_case" @@ -784,9 +787,9 @@ checksum = "773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b" [[package]] name = "cpufeatures" -version = "0.2.14" +version = "0.2.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "608697df725056feaccfa42cffdaeeec3fccc4ffc38358ecd19b243e716a78e0" +checksum = "16b80225097f2e5ae4e7179dd2266824648f3e2f49d9134d584b76389d31c4c3" dependencies = [ "libc", ] @@ -815,6 +818,12 @@ dependencies = [ "cfg-if", ] +[[package]] +name = "critical-section" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "790eea4361631c5e7d22598ecd5723ff611904e3344ce8720784c93e3d83d40b" + [[package]] name = "crossbeam-deque" version = "0.8.5" @@ -873,13 +882,13 @@ dependencies = [ [[package]] name = "derive_arbitrary" -version = "1.3.2" +version = "1.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67e77553c4162a157adbf834ebae5b415acbecbeafc7a74b0e886657506a7611" +checksum = "30542c1ad912e0e3d22a1935c290e12e8a29d704a420177a31faad4a601a0800" dependencies = [ "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.90", ] [[package]] @@ -892,7 +901,7 @@ dependencies = [ "proc-macro2", "quote", "rustc_version", - "syn 2.0.87", + "syn 2.0.90", ] [[package]] @@ -920,7 +929,7 @@ checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0" dependencies = [ "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.90", ] [[package]] @@ -931,17 +940,17 @@ checksum = "60b1af1c220855b6ceac025d3f6ecdd2b7c4894bfe9cd9bda4fbb4bc7c0d4cf0" [[package]] name = "encoding_rs" -version = "0.8.34" +version = "0.8.35" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b45de904aa0b010bce2ab45264d0631681847fa7b6f2eaa7dab7619943bc4f59" +checksum = "75030f3c4f45dafd7586dd6780965a8c7e8e285a5ecb86713e63a79c5b2766f3" dependencies = [ "cfg-if", ] [[package]] name = "enolib" -version = "0.4.2" -source = "git+https://codeberg.org/simonrepp/enolib-rs?tag=0.4.2#b97102e1890d91f184469f9c778d07df7d117adc" +version = "0.5.0" +source = "git+https://codeberg.org/simonrepp/enolib-rs?tag=0.5.0#011a93092e5127c9354d643e9ac51ff592cf59f2" [[package]] name = "equivalent" @@ -951,15 +960,14 @@ checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" [[package]] name = "exr" -version = "1.72.0" +version = "1.73.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "887d93f60543e9a9362ef8a21beedd0a833c5d9610e18c67abe15a5963dcb1a4" +checksum = "f83197f59927b46c04a183a619b7c29df34e63e63c7869320862268c0ef687e0" dependencies = [ "bit_field", - "flume", "half", "lebe", - "miniz_oxide 0.7.4", + "miniz_oxide", "rayon-core", "smallvec", "zune-inflate", @@ -967,7 +975,7 @@ dependencies = [ [[package]] name = "faircamp" -version = "0.21.0" +version = "1.0.0" dependencies = [ "actix-files", "actix-web", @@ -1018,18 +1026,18 @@ dependencies = [ [[package]] name = "fdeflate" -version = "0.3.5" +version = "0.3.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d8090f921a24b04994d9929e204f50b498a33ea6ba559ffaa05e04f7ee7fb5ab" +checksum = "1e6853b52649d4ac5c0bd02320cddc5ba956bdb407c4b75a2c6b75bf51500f8c" dependencies = [ "simd-adler32", ] [[package]] name = "fixed" -version = "1.28.0" +version = "1.27.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85c6e0b89bf864acd20590dbdbad56f69aeb898abfc9443008fd7bd48b2cc85a" +checksum = "2fc715d38bea7b5bf487fcd79bcf8c209f0b58014f3018a7a19c2b855f472048" dependencies = [ "az", "bytemuck", @@ -1039,21 +1047,12 @@ dependencies = [ [[package]] name = "flate2" -version = "1.0.34" +version = "1.0.35" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1b589b4dc103969ad3cf85c950899926ec64300a1a46d76c03a6072957036f0" +checksum = "c936bfdafb507ebbf50b8074c54fa31c5be9a1e7e5f467dd659697041407d07c" dependencies = [ "crc32fast", - "miniz_oxide 0.8.0", -] - -[[package]] -name = "flume" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "55ac459de2512911e4b674ce33cf20befaba382d05b62b008afc1c8b57cbf181" -dependencies = [ - "spin", + "miniz_oxide", ] [[package]] @@ -1169,9 +1168,9 @@ dependencies = [ [[package]] name = "hash32" -version = "0.3.1" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "47d60b12902ba28e2730cd37e95b8c9223af2808df9e902d4df49588d1470606" +checksum = "b0c35f58762feb77d74ebe43bdbc3210f09be9fe6742234d573bacc26ed92b67" dependencies = [ "byteorder", ] @@ -1187,17 +1186,20 @@ dependencies = [ [[package]] name = "hashbrown" -version = "0.15.0" +version = "0.15.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e087f84d4f86bf4b218b927129862374b72199ae7d8657835f1e89000eea4fb" +checksum = "bf151400ff0baff5465007dd2f3e717f3fe502074ca563069ce3a6629d07b289" [[package]] name = "heapless" -version = "0.8.0" +version = "0.7.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0bfb9eb618601c89945a70e254898da93b13be0388091d42117462b265bb3fad" +checksum = "cdc6457c0eb62c71aac4bc17216026d8410337c4126773b9c5daba343f17964f" dependencies = [ + "atomic-polyfill", "hash32", + "rustc_version", + "spin", "stable_deref_trait", ] @@ -1207,12 +1209,6 @@ 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 = "hex" version = "0.4.3" @@ -1410,14 +1406,14 @@ checksum = "1ec89e9337638ecdc08744df490b221a7399bf8d164eb52a665454e60e075ad6" dependencies = [ "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.90", ] [[package]] name = "id3" -version = "1.14.0" +version = "1.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "55f4e785f2c700217ee82a1c727c720449421742abd5fcb2f1df04e1244760e9" +checksum = "9d1df50e6c625115513974d5efc34c4bc55524145e14cb2297e909ab5ece0d49" dependencies = [ "bitflags 2.6.0", "byteorder", @@ -1480,24 +1476,24 @@ dependencies = [ [[package]] name = "imgref" -version = "1.10.1" +version = "1.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44feda355f4159a7c757171a77de25daf6411e217b4cabd03bd6650690468126" +checksum = "d0263a3d970d5c054ed9312c0057b4f3bde9c0b33836d3637361d4a9e6e7a408" [[package]] name = "impl-more" -version = "0.1.6" +version = "0.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "206ca75c9c03ba3d4ace2460e57b189f39f43de612c2f85836e65c929701bb2d" +checksum = "aae21c3177a27788957044151cc2800043d127acaa460a47ebb9b84dfa2c6aa0" [[package]] name = "indexmap" -version = "2.6.0" +version = "2.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "707907fe3c25f5424cce2cb7e1cbcafee6bdbe735ca90ef77c29e84591e5b9da" +checksum = "62f822373a4fe84d4bb149bf54e584a7f4abec90e072ed49cda0edea5b95471f" dependencies = [ "equivalent", - "hashbrown 0.15.0", + "hashbrown 0.15.2", ] [[package]] @@ -1523,7 +1519,7 @@ checksum = "c34819042dc3d3971c46c2190835914dfbe0c3c13f61449b2997f4e9722dfa60" dependencies = [ "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.90", ] [[package]] @@ -1543,9 +1539,9 @@ dependencies = [ [[package]] name = "iso_currency" -version = "0.5.0" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f402cc74ed2fec6f6fed285d45645a8c7c82e1d1fa694898864ef7c0cb047785" +checksum = "21cb463eec852038d9685e2095fb8fae12661c5ab8f13462c2530233ec31ef78" dependencies = [ "iso_country", "proc-macro2", @@ -1563,9 +1559,9 @@ dependencies = [ [[package]] name = "itoa" -version = "1.0.11" +version = "1.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b" +checksum = "d75a2a4b1b190afb6f5425f10f6a8f959d2ea0b9c2b1d79553551850539e4674" [[package]] name = "jni" @@ -1578,7 +1574,7 @@ dependencies = [ "combine", "jni-sys", "log", - "thiserror 1.0.64", + "thiserror 1.0.69", "walkdir", "windows-sys 0.45.0", ] @@ -1606,10 +1602,11 @@ checksum = "f5d4a7da358eff58addd2877a45865158f0d78c911d43a5784ceb7bbf52833b0" [[package]] name = "js-sys" -version = "0.3.70" +version = "0.3.76" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1868808506b929d7b0cfa8f75951347aa71bb21144b7791bae35d9bccfcfe37a" +checksum = "6717b6b5b077764fb5966237269cb3c64edddde4b14ce42647430a78ced9e7b7" dependencies = [ + "once_cell", "wasm-bindgen", ] @@ -1644,19 +1641,18 @@ dependencies = [ [[package]] name = "libc" -version = "0.2.159" +version = "0.2.167" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "561d97a539a36e26a9a5fad1ea11a3039a67714694aaa379433e580854bc3dc5" +checksum = "09d6582e104315a817dff97f75133544b2e094ee22447d2acf4a74e189ba06fc" [[package]] name = "libfuzzer-sys" -version = "0.4.7" +version = "0.4.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a96cfd5557eb82f2b83fed4955246c988d331975a002961b07c81584d107e7f7" +checksum = "9b9569d2f74e257076d8c6bfa73fb505b46b851e51ddaecc825944aa3bed17fa" dependencies = [ "arbitrary", "cc", - "once_cell", ] [[package]] @@ -1671,9 +1667,9 @@ dependencies = [ [[package]] name = "litemap" -version = "0.7.3" +version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "643cb0b8d4fcc284004d5fd0d67ccf61dfffadb7f75e1e71bc420f4688a3a704" +checksum = "4ee93343901ab17bd981295f2cf0026d4ad018c7c31ba84549a4ddbb47a45104" [[package]] name = "local-channel" @@ -1781,15 +1777,6 @@ version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" -[[package]] -name = "miniz_oxide" -version = "0.7.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b8a240ddb74feaf34a79a7add65a741f3167852fba007066dcac1ca548d89c08" -dependencies = [ - "adler", -] - [[package]] name = "miniz_oxide" version = "0.8.0" @@ -1802,11 +1789,10 @@ dependencies = [ [[package]] name = "mio" -version = "1.0.2" +version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "80e04d1dcff3aae0704555fe5fee3bcfaf3d1fdf8a7e521d5b9d2b42acb52cec" +checksum = "2886843bf800fba2e3377cff24abf6379b4c4d5c6681eaf9ea5b0d15090450bd" dependencies = [ - "hermit-abi", "libc", "log", "wasi", @@ -1911,7 +1897,7 @@ checksum = "ed3955f1a9c7c0c15e092f9c887db08b1fc683305fdf6eb6684f22555355e202" dependencies = [ "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.90", ] [[package]] @@ -2028,15 +2014,15 @@ checksum = "afbb993947f111397c2bc536944f8dac7f54a4e73383d478efe1990b56404b60" [[package]] name = "pacmog" -version = "0.5.0" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9aec65fa4371bb2526d0ecd63fc90294f7d0dc370a8645adeb32042af57e641" +checksum = "1f24fb9dc847fa21adf6fe1cbf98239cd27ba02b80c1503a89672b3808b82f5a" dependencies = [ + "anyhow", "arbitrary-int", "fixed", "heapless", "nom", - "thiserror 2.0.3", ] [[package]] @@ -2086,9 +2072,9 @@ checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" [[package]] name = "pin-project-lite" -version = "0.2.14" +version = "0.2.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bda66fc9667c18cb2758a2ac84d1167245054bcf85d5d1aaa6923f45801bdd02" +checksum = "915a1e146535de9163f3987b8944ed8cf49a18bb0056bcebcdcece385cece4ff" [[package]] name = "pin-utils" @@ -2104,15 +2090,15 @@ checksum = "953ec861398dccce10c670dfeaf3ec4911ca479e9c02154b3a215178c5f566f2" [[package]] name = "png" -version = "0.17.14" +version = "0.17.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "52f9d46a34a05a6a57566bc2bfae066ef07585a6e3fa30fbbdff5936380623f0" +checksum = "b67582bd5b65bdff614270e2ea89a1cf15bef71245cc1e5f7ea126977144211d" dependencies = [ "bitflags 1.3.2", "crc32fast", "fdeflate", "flate2", - "miniz_oxide 0.8.0", + "miniz_oxide", ] [[package]] @@ -2132,30 +2118,30 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.86" +version = "1.0.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77" +checksum = "37d3544b3f2748c54e147655edb5025752e2303145b5aefb3c3ea2c78b973bb0" dependencies = [ "unicode-ident", ] [[package]] name = "profiling" -version = "1.0.15" +version = "1.0.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43d84d1d7a6ac92673717f9f6d1518374ef257669c24ebc5ac25d5033828be58" +checksum = "afbdc74edc00b6f6a218ca6a5364d6226a259d4b8ea1af4a0ea063f27e179f4d" dependencies = [ "profiling-procmacros", ] [[package]] name = "profiling-procmacros" -version = "1.0.15" +version = "1.0.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8021cf59c8ec9c432cfc2526ac6b8aa508ecaf29cd415f271b8406c1b851c3fd" +checksum = "a65f2e60fbf1063868558d69c6beacf412dc755f9fc020f514b7955fc914fe30" dependencies = [ "quote", - "syn 2.0.87", + "syn 2.0.90", ] [[package]] @@ -2260,7 +2246,7 @@ dependencies = [ "rand_chacha", "simd_helpers", "system-deps", - "thiserror 1.0.64", + "thiserror 1.0.69", "v_frame", "wasm-bindgen", ] @@ -2311,9 +2297,9 @@ dependencies = [ [[package]] name = "regex" -version = "1.11.0" +version = "1.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38200e5ee88914975b69f657f0801b6f6dccafd44fd9326302a4aaeecfacb1d8" +checksum = "b544ef1b4eac5dc2db33ea63606ae9ffcfac26c1416a2806ae0bf5f56b201191" dependencies = [ "aho-corasick", "memchr", @@ -2323,9 +2309,9 @@ dependencies = [ [[package]] name = "regex-automata" -version = "0.4.8" +version = "0.4.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "368758f23274712b504848e9d5a6f010445cc8b87a7cdb4d7cbee666c1288da3" +checksum = "809e8dc61f6de73b46c85f4c96486310fe304c434cfa43669d7b40f711150908" dependencies = [ "aho-corasick", "memchr", @@ -2419,29 +2405,29 @@ checksum = "61697e0a1c7e512e84a621326239844a24d8207b4669b41bc18b32ea5cbf988b" [[package]] name = "serde" -version = "1.0.215" +version = "1.0.216" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6513c1ad0b11a9376da888e3e0baa0077f1aed55c17f50e7b2397136129fb88f" +checksum = "0b9781016e935a97e8beecf0c933758c97a5520d32930e460142b4cd80c6338e" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.215" +version = "1.0.216" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad1e866f866923f252f05c889987993144fb74e722403468a4ebd70c3cd756c0" +checksum = "46f859dbbf73865c6627ed570e78961cd3ac92407a2d117204c49232485da55e" dependencies = [ "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.90", ] [[package]] name = "serde_json" -version = "1.0.128" +version = "1.0.133" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ff5456707a1de34e7e37f2a6fd3d3f808c318259cbd01ab6377795054b483d8" +checksum = "c7fceb2473b9166b2294ef05efcb65a3db80803f0b03ef86a5fc88a2b85ee377" dependencies = [ "itoa", "memchr", @@ -2538,9 +2524,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67" [[package]] name = "socket2" -version = "0.5.7" +version = "0.5.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce305eb0b4296696835b71df73eb912e0f1ffd2556a501fcede6e0c50349191c" +checksum = "c970269d99b64e60ec3bd6ad27270092a5394c4e309314b18ae3fe575695fbe8" dependencies = [ "libc", "windows-sys 0.52.0", @@ -2592,9 +2578,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.87" +version = "2.0.90" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "25aa4ce346d03a6dcd68dd8b4010bcb74e54e62c90c573f394c46eae99aba32d" +checksum = "919d3b74a5dd0ccd15aeb8f93e7006bd9e14c295087c9896a110f490752bcf31" dependencies = [ "proc-macro2", "quote", @@ -2609,7 +2595,7 @@ checksum = "c8af7666ab7b6390ab78131fb5b0fce11d6b7a6951602017c35fa82800708971" dependencies = [ "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.90", ] [[package]] @@ -2633,42 +2619,42 @@ checksum = "61c41af27dd6d1e27b1b16b489db798443478cef1f06a660c96db617ba5de3b1" [[package]] name = "thiserror" -version = "1.0.64" +version = "1.0.69" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d50af8abc119fb8bb6dbabcfa89656f46f84aa0ac7688088608076ad2b459a84" +checksum = "b6aaf5339b578ea85b50e080feb250a3e8ae8cfcdff9a461c9ec2904bc923f52" dependencies = [ - "thiserror-impl 1.0.64", + "thiserror-impl 1.0.69", ] [[package]] name = "thiserror" -version = "2.0.3" +version = "2.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c006c85c7651b3cf2ada4584faa36773bd07bac24acfb39f3c431b36d7e667aa" +checksum = "2f49a1853cf82743e3b7950f77e0f4d622ca36cf4317cba00c767838bac8d490" dependencies = [ - "thiserror-impl 2.0.3", + "thiserror-impl 2.0.4", ] [[package]] name = "thiserror-impl" -version = "1.0.64" +version = "1.0.69" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08904e7672f5eb876eaaf87e0ce17857500934f4981c4a0ab2b4aa98baac7fc3" +checksum = "4fee6c4efc90059e10f81e6d42c60a18f76588c3d74cb83a0b242a2b6c7504c1" dependencies = [ "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.90", ] [[package]] name = "thiserror-impl" -version = "2.0.3" +version = "2.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f077553d607adc1caf65430528a576c757a71ed73944b66ebb58ef2bbd243568" +checksum = "8381894bb3efe0c4acac3ded651301ceee58a15d47c2e34885ed1908ad667061" dependencies = [ "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.90", ] [[package]] @@ -2684,9 +2670,9 @@ dependencies = [ [[package]] name = "time" -version = "0.3.36" +version = "0.3.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885" +checksum = "35e7868883861bd0e56d9ac6efcaaca0d6d5d82a2a7ec8209ff492c07cf37b21" dependencies = [ "deranged", "itoa", @@ -2705,9 +2691,9 @@ checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3" [[package]] name = "time-macros" -version = "0.2.18" +version = "0.2.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f252a68540fde3a3877aeea552b832b40ab9a69e318efd078774a01ddee1ccf" +checksum = "2834e6017e3e5e4b9834939793b282bc03b37a3336245fa820e35e233e2a85de" dependencies = [ "num-conv", "time-core", @@ -2740,9 +2726,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.41.1" +version = "1.42.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22cfb5bee7a6a52939ca9224d6ac897bb669134078daa8735560897f69de4d33" +checksum = "5cec9b21b0450273377fc97bd4c33a8acffc8c996c987a7c5b319a0083707551" dependencies = [ "backtrace", "bytes", @@ -2764,14 +2750,14 @@ checksum = "693d596312e88961bc67d7f1f97af8a70227d9f90c31bba5806eec004978d752" dependencies = [ "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.90", ] [[package]] name = "tokio-util" -version = "0.7.12" +version = "0.7.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61e7c3654c13bcd040d4a03abee2c75b1d14a37b423cf5a813ceae1cc903ec6a" +checksum = "d7fcaa8d55a2bdd6b83ace262b016eca0d79ee02818c5c1bcdf0305114081078" dependencies = [ "bytes", "futures-core", @@ -2816,9 +2802,9 @@ dependencies = [ [[package]] name = "tracing" -version = "0.1.40" +version = "0.1.41" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef" +checksum = "784e0ac535deb450455cbfa28a6f0df145ea1bb7ae51b821cf5e7927fdcfbdd0" dependencies = [ "log", "pin-project-lite", @@ -2827,16 +2813,16 @@ dependencies = [ [[package]] name = "tracing-core" -version = "0.1.32" +version = "0.1.33" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c06d3da6113f116aaee68e4d601191614c9053067f9ab7f6edbcb161237daa54" +checksum = "e672c95779cf947c5311f83787af4fa8fffd12fb27e4993211a84bdfd9610f9c" dependencies = [ "once_cell", ] [[package]] name = "translations" -version = "0.0.0" +version = "1.0.0" dependencies = [ "base64", "indoc", @@ -2850,24 +2836,21 @@ checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825" [[package]] name = "unicase" -version = "2.7.0" +version = "2.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f7d2d4dafb69621809a81864c9c1b864479e1235c0dd4e199924b9742439ed89" -dependencies = [ - "version_check", -] +checksum = "7e51b68083f157f853b6379db119d1c1be0e6e4dec98101079dec41f6f5cf6df" [[package]] name = "unicode-ident" -version = "1.0.13" +version = "1.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe" +checksum = "adb9e6ca4f869e1180728b7950e35922a7fc6397f7b641499e8f3ef06e50dc83" [[package]] name = "url" -version = "2.5.3" +version = "2.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8d157f1b96d14500ffdc1f10ba712e780825526c03d9a49b4d0324b0d9113ada" +checksum = "32f8b686cadd1473f4bd0117a5d28d36b1ade384ea9b5069a1c40aefed7fda60" dependencies = [ "form_urlencoded", "idna", @@ -2945,9 +2928,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] name = "wasm-bindgen" -version = "0.2.93" +version = "0.2.99" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a82edfc16a6c469f5f44dc7b571814045d60404b55a0ee849f9bcfa2e63dd9b5" +checksum = "a474f6281d1d70c17ae7aa6a613c87fce69a127e2624002df63dcb39d6cf6396" dependencies = [ "cfg-if", "once_cell", @@ -2956,24 +2939,23 @@ dependencies = [ [[package]] name = "wasm-bindgen-backend" -version = "0.2.93" +version = "0.2.99" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9de396da306523044d3302746f1208fa71d7532227f15e347e2d93e4145dd77b" +checksum = "5f89bb38646b4f81674e8f5c3fb81b562be1fd936d84320f3264486418519c79" dependencies = [ "bumpalo", "log", - "once_cell", "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.90", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-macro" -version = "0.2.93" +version = "0.2.99" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "585c4c91a46b072c92e908d99cb1dcdf95c5218eeb6f3bf1efa991ee7a68cccf" +checksum = "2cc6181fd9a7492eef6fef1f33961e3695e4579b9872a6f7c83aee556666d4fe" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -2981,28 +2963,28 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.93" +version = "0.2.99" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "afc340c74d9005395cf9dd098506f7f44e38f2b4a21c6aaacf9a105ea5e1e836" +checksum = "30d7a95b763d3c45903ed6c81f156801839e5ee968bb07e534c44df0fcd330c2" dependencies = [ "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.90", "wasm-bindgen-backend", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-shared" -version = "0.2.93" +version = "0.2.99" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c62a0a307cb4a311d3a07867860911ca130c3494e8c2719593806c08bc5d0484" +checksum = "943aab3fdaaa029a6e0271b35ea10b72b943135afe9bffca82384098ad0e06a6" [[package]] name = "web-sys" -version = "0.3.70" +version = "0.3.76" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26fdeaafd9bd129f65e7c031593c24d62186301e0c72c8978fa1678be7d532c0" +checksum = "04dd7223427d52553d3702c004d3b2fe07c148165faa56313cb00211e31c12bc" dependencies = [ "js-sys", "wasm-bindgen", @@ -3010,9 +2992,9 @@ dependencies = [ [[package]] name = "webbrowser" -version = "1.0.2" +version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2e5f07fb9bc8de2ddfe6b24a71a75430673fd679e568c48b52716cef1cfae923" +checksum = "ea9fe1ebb156110ff855242c1101df158b822487e4957b0556d9ffce9db0f535" dependencies = [ "block2", "core-foundation", @@ -3221,9 +3203,9 @@ checksum = "1e9df38ee2d2c3c5948ea468a8406ff0db0b29ae1ffde1bcf20ef305bcc95c51" [[package]] name = "yoke" -version = "0.7.4" +version = "0.7.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c5b1314b079b0930c31e3af543d8ee1757b1951ae1e1565ec704403a7240ca5" +checksum = "120e6aef9aa629e3d4f52dc8cc43a015c7724194c97dfaf45180d2daf2b77f40" dependencies = [ "serde", "stable_deref_trait", @@ -3233,13 +3215,13 @@ dependencies = [ [[package]] name = "yoke-derive" -version = "0.7.4" +version = "0.7.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "28cc31741b18cb6f1d5ff12f5b7523e3d6eb0852bbbad19d73905511d9849b95" +checksum = "2380878cad4ac9aac1e2435f3eb4020e8374b5f13c296cb75b4620ff8e229154" dependencies = [ "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.90", "synstructure", ] @@ -3261,27 +3243,27 @@ checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e" dependencies = [ "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.90", ] [[package]] name = "zerofrom" -version = "0.1.4" +version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91ec111ce797d0e0784a1116d0ddcdbea84322cd79e5d5ad173daeba4f93ab55" +checksum = "cff3ee08c995dee1859d998dea82f7374f2826091dd9cd47def953cae446cd2e" dependencies = [ "zerofrom-derive", ] [[package]] name = "zerofrom-derive" -version = "0.1.4" +version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ea7b4a3637ea8669cedf0f1fd5c286a17f3de97b8dd5a70a6c167a1730e63a5" +checksum = "595eed982f7d355beb85837f651fa22e90b3c044842dc7f2c2842c086f295808" dependencies = [ "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.90", "synstructure", ] @@ -3302,7 +3284,7 @@ checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69" dependencies = [ "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.90", ] [[package]] @@ -3324,14 +3306,14 @@ checksum = "6eafa6dfb17584ea3e2bd6e76e0cc15ad7af12b09abdd1ca55961bed9b1063c6" dependencies = [ "proc-macro2", "quote", - "syn 2.0.87", + "syn 2.0.90", ] [[package]] name = "zip" -version = "2.2.0" +version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc5e4288ea4057ae23afc69a4472434a87a2495cafce6632fd1c4ec9f5cf3494" +checksum = "99d52293fc86ea7cf13971b3bb81eb21683636e7ae24c729cdaf1b7c4157a352" dependencies = [ "aes", "arbitrary", @@ -3349,7 +3331,7 @@ dependencies = [ "pbkdf2", "rand", "sha1", - "thiserror 1.0.64", + "thiserror 2.0.4", "time", "zeroize", "zopfli", diff --git a/pkgs/by-name/fa/faircamp/package.nix b/pkgs/by-name/fa/faircamp/package.nix index 81684a7c5f9e..a079515ef11b 100644 --- a/pkgs/by-name/fa/faircamp/package.nix +++ b/pkgs/by-name/fa/faircamp/package.nix @@ -17,20 +17,20 @@ rustPlatform.buildRustPackage rec { pname = "faircamp"; - version = "0.21.0"; + version = "1.0.0"; src = fetchFromGitea { domain = "codeberg.org"; owner = "simonrepp"; repo = "faircamp"; rev = version; - hash = "sha256-1awOzIvWUaqsmtg0XP4BNCRZP+d26JTjn+3Lcvo/WcI="; + hash = "sha256-Pdt3HjjM4lR6CW3T10eMCvZWV29rbspGKHV7yEUA2U0="; }; cargoLock = { lockFile = ./Cargo.lock; outputHashes = { - "enolib-0.4.2" = "sha256-FJuWKcwjoi/wKfTzxghobNWblhnKRdUvHOejhpCF7kY="; + "enolib-0.5.0" = "sha256-NauWYmn1bUAJrIKJ2JN2XjcLsQehE3cjAxBOQ+Nme70="; }; }; From 992480bd6cb7014820dbd2780da357d97f265506 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 29 Dec 2024 11:18:26 +0000 Subject: [PATCH 197/429] allegro5: 5.2.10.0 -> 5.2.10.1 --- pkgs/development/libraries/allegro/5.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/allegro/5.nix b/pkgs/development/libraries/allegro/5.nix index a8f320029d62..c190aeaae5fc 100644 --- a/pkgs/development/libraries/allegro/5.nix +++ b/pkgs/development/libraries/allegro/5.nix @@ -39,13 +39,13 @@ stdenv.mkDerivation rec { pname = "allegro"; - version = "5.2.10.0"; + version = "5.2.10.1"; src = fetchFromGitHub { owner = "liballeg"; repo = "allegro5"; rev = version; - sha256 = "sha256-p01h1AX1vPlBm+ksnTMVQxEIz6q9s/f7R9twbR50YMs="; + sha256 = "sha256-agE3K+6VhhG/LO52fiesCsOq1fNYVRhdW7aKdPCbTOo="; }; nativeBuildInputs = [ From 141e773ab8e0ee707db1abdc5c26d91cd0dd35bc Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 29 Dec 2024 12:42:23 +0000 Subject: [PATCH 198/429] moon: 1.30.5 -> 1.30.6 --- pkgs/development/tools/build-managers/moon/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/build-managers/moon/default.nix b/pkgs/development/tools/build-managers/moon/default.nix index c1f066ea60e4..6476251a4ca1 100644 --- a/pkgs/development/tools/build-managers/moon/default.nix +++ b/pkgs/development/tools/build-managers/moon/default.nix @@ -10,16 +10,16 @@ rustPlatform.buildRustPackage rec { pname = "moon"; - version = "1.30.5"; + version = "1.30.6"; src = fetchFromGitHub { owner = "moonrepo"; repo = pname; rev = "v${version}"; - hash = "sha256-yH/NK5i0RL71TPgPkpLJuqx7YBdFVVGTEc5Hb1uBcak="; + hash = "sha256-rucRenc/mHFkl4pqXdf0b7enGqTRxuJkP+TjDzAX3ww="; }; - cargoHash = "sha256-wQ7JFccDCE7riMTsqlYI2CHMHEZVuRLgB5EwvNV4QsM="; + cargoHash = "sha256-zOGMci7G6TaZnmlc1FgrB571LDykY21h60HbE8/ffhE="; env = { RUSTFLAGS = "-C strip=symbols"; From 876c262b74e38b85d3609942221bb018bcec3935 Mon Sep 17 00:00:00 2001 From: Dimitar Nestorov <8790386+dimitarnestorov@users.noreply.github.com> Date: Sun, 29 Dec 2024 17:36:17 +0200 Subject: [PATCH 199/429] swiftlint: 0.57.0 -> 0.57.1 --- pkgs/by-name/sw/swiftlint/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/sw/swiftlint/package.nix b/pkgs/by-name/sw/swiftlint/package.nix index 7ea7c372a069..2bebed9b3f87 100644 --- a/pkgs/by-name/sw/swiftlint/package.nix +++ b/pkgs/by-name/sw/swiftlint/package.nix @@ -7,11 +7,11 @@ }: stdenvNoCC.mkDerivation rec { pname = "swiftlint"; - version = "0.57.0"; + version = "0.57.1"; src = fetchurl { url = "https://github.com/realm/SwiftLint/releases/download/${version}/portable_swiftlint.zip"; - hash = "sha256-m1+5hPze016ryyoQrs8CCbcLjWY3ONMn4Zgh6sReuBA="; + hash = "sha256-qi4Pj4JyVF5Vk+vt14cttREy/OxOrXbQAbvhevaceuU="; }; dontPatch = true; From 9fb5922b8f5d56ba4ee0baa7bf7ed61af37f6b29 Mon Sep 17 00:00:00 2001 From: Dimitar Nestorov <8790386+dimitarnestorov@users.noreply.github.com> Date: Sun, 29 Dec 2024 17:36:17 +0200 Subject: [PATCH 200/429] swiftlint: add `versionCheckHook` --- pkgs/by-name/sw/swiftlint/package.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/by-name/sw/swiftlint/package.nix b/pkgs/by-name/sw/swiftlint/package.nix index 2bebed9b3f87..6d755ac864a7 100644 --- a/pkgs/by-name/sw/swiftlint/package.nix +++ b/pkgs/by-name/sw/swiftlint/package.nix @@ -4,6 +4,7 @@ fetchurl, unzip, nix-update-script, + versionCheckHook, }: stdenvNoCC.mkDerivation rec { pname = "swiftlint"; @@ -28,6 +29,9 @@ stdenvNoCC.mkDerivation rec { runHook postInstall ''; + doInstallCheck = true; + nativeInstallCheckInputs = [ versionCheckHook ]; + passthru.updateScript = nix-update-script { }; meta = with lib; { From 4f96192d63be78a26a7e4728070078652a782825 Mon Sep 17 00:00:00 2001 From: Dimitar Nestorov <8790386+dimitarnestorov@users.noreply.github.com> Date: Sun, 29 Dec 2024 17:36:17 +0200 Subject: [PATCH 201/429] swiftlint: remove `with lib;` --- pkgs/by-name/sw/swiftlint/package.nix | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/sw/swiftlint/package.nix b/pkgs/by-name/sw/swiftlint/package.nix index 6d755ac864a7..cf2d6dcc76ef 100644 --- a/pkgs/by-name/sw/swiftlint/package.nix +++ b/pkgs/by-name/sw/swiftlint/package.nix @@ -34,13 +34,16 @@ stdenvNoCC.mkDerivation rec { passthru.updateScript = nix-update-script { }; - meta = with lib; { + meta = { description = "A tool to enforce Swift style and conventions"; homepage = "https://realm.github.io/SwiftLint/"; - license = licenses.mit; + license = lib.licenses.mit; mainProgram = "swiftlint"; - maintainers = with maintainers; [ matteopacini ]; - platforms = platforms.darwin; - sourceProvenance = with sourceTypes; [ binaryNativeCode ]; + maintainers = with lib.maintainers; [ + matteopacini + DimitarNestorov + ]; + platforms = lib.platforms.darwin; + sourceProvenance = [ lib.sourceTypes.binaryNativeCode ]; }; } From 910e728fb859f782c7d0a32d436861b0d3510228 Mon Sep 17 00:00:00 2001 From: yadokani389 Date: Mon, 30 Dec 2024 00:30:08 +0900 Subject: [PATCH 202/429] weylus: fix build on gcc14 --- pkgs/applications/graphics/weylus/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/applications/graphics/weylus/default.nix b/pkgs/applications/graphics/weylus/default.nix index 264f34a8fe42..3aa61ec06d30 100644 --- a/pkgs/applications/graphics/weylus/default.nix +++ b/pkgs/applications/graphics/weylus/default.nix @@ -104,6 +104,12 @@ rustPlatform.buildRustPackage rec { install -vDm755 weylus.desktop $out/share/applications/weylus.desktop ''; + env = { + NIX_CFLAGS_COMPILE = toString [ + "-Wno-incompatible-pointer-types" + ]; + }; + meta = with lib; { broken = stdenv.hostPlatform.isDarwin; description = "Use your tablet as graphic tablet/touch screen on your computer"; From 6c7ea8a9eef54cb8113d9c820d052c1af11246db Mon Sep 17 00:00:00 2001 From: TomaSajt <62384384+TomaSajt@users.noreply.github.com> Date: Sun, 29 Dec 2024 19:23:06 +0100 Subject: [PATCH 203/429] nanoboyadvance: fix build with gcc14 --- pkgs/by-name/na/nanoboyadvance/package.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pkgs/by-name/na/nanoboyadvance/package.nix b/pkgs/by-name/na/nanoboyadvance/package.nix index 576a517b8682..7edf601090d8 100644 --- a/pkgs/by-name/na/nanoboyadvance/package.nix +++ b/pkgs/by-name/na/nanoboyadvance/package.nix @@ -2,6 +2,7 @@ lib, stdenv, fetchFromGitHub, + fetchpatch, cmake, python3Packages, libsForQt5, @@ -30,6 +31,14 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-du3dPTg3OxNTWXDQo2m9W0rJxtrkn+lQSh/XGiu/eGg="; }; + patches = [ + (fetchpatch { + name = "add-missing-gcc14-include.patch"; + url = "https://github.com/nba-emu/NanoBoyAdvance/commit/f5551cc1aa6a12b3d65dd56d186c73a67f3d9dd6.patch"; + hash = "sha256-TCyN0qz7o7BDhVZtaTsWCZAcKThi5oVqUM0NGmj44FI="; + }) + ]; + nativeBuildInputs = [ cmake python3Packages.jinja2 From d579fa9b61ae4f9abade65409086d55f9fdc5889 Mon Sep 17 00:00:00 2001 From: TomaSajt <62384384+TomaSajt@users.noreply.github.com> Date: Sun, 29 Dec 2024 19:46:46 +0100 Subject: [PATCH 204/429] python312Packages.dash: 2.18.1 -> 2.18.2, relax deps to fix build --- pkgs/development/python-modules/dash/default.nix | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/dash/default.nix b/pkgs/development/python-modules/dash/default.nix index d514c8b454e7..2710e90cccd1 100644 --- a/pkgs/development/python-modules/dash/default.nix +++ b/pkgs/development/python-modules/dash/default.nix @@ -36,14 +36,14 @@ buildPythonPackage rec { pname = "dash"; - version = "2.18.1"; + version = "2.18.2"; pyproject = true; src = fetchFromGitHub { owner = "plotly"; repo = "dash"; rev = "refs/tags/v${version}"; - hash = "sha256-2LwM1lrJNdekoDN+wDHgaSlGOnpK618r65UHj7cP59E="; + hash = "sha256-qbvsYlf3byaT/4b+/BDvCgnaBKthL/J79y0CWh5Yid4="; }; nativeBuildInputs = [ @@ -53,7 +53,7 @@ buildPythonPackage rec { yarnOfflineCache = fetchYarnDeps { yarnLock = "${src}/@plotly/dash-jupyterlab/yarn.lock"; - hash = "sha256-L/or8jO6uEypI5krwy/ElIxa6jJrXGsCRZ9mh+0kcGA="; + hash = "sha256-Nvm9BS55q/HW9ArpHD01F5Rmx8PLS3yqaz1yDK8Sg68="; }; # as of writing this yarnConfigHook has no parameter that changes in which directory it will be run @@ -88,6 +88,11 @@ buildPythonPackage rec { nest-asyncio ]; + pythonRelaxDeps = [ + "werkzeug" + "flask" + ]; + optional-dependencies = { celery = [ celery From cc27227303863ecca0967b5ef39f7e93dbd8b4ab Mon Sep 17 00:00:00 2001 From: Jared Baur Date: Sat, 28 Dec 2024 10:55:33 -0700 Subject: [PATCH 205/429] tayga: use finalAttrs style --- pkgs/by-name/ta/tayga/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ta/tayga/package.nix b/pkgs/by-name/ta/tayga/package.nix index 4749fcee5042..bc6052464938 100644 --- a/pkgs/by-name/ta/tayga/package.nix +++ b/pkgs/by-name/ta/tayga/package.nix @@ -5,12 +5,12 @@ nixosTests, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { version = "0.9.2"; pname = "tayga"; src = fetchurl { - url = "http://www.litech.org/${pname}/${pname}-${version}.tar.bz2"; + url = "http://www.litech.org/tayga/tayga-${finalAttrs.version}.tar.bz2"; hash = "sha256-Kx95J6nS3P+Qla/zwnGSSwUsz9L6ypWIsndDGkTwAJw="; }; @@ -36,4 +36,4 @@ stdenv.mkDerivation rec { platforms = platforms.linux; mainProgram = "tayga"; }; -} +}) From 295c403f20a29d84c611538837185a5cefca172d Mon Sep 17 00:00:00 2001 From: Reno Dakota Date: Sun, 29 Dec 2024 16:27:59 -0800 Subject: [PATCH 206/429] subversionClient: remove vendored swig 3.0 files; fix build --- pkgs/applications/version-management/subversion/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/applications/version-management/subversion/default.nix b/pkgs/applications/version-management/subversion/default.nix index afef38d8b8c1..d981757990bf 100644 --- a/pkgs/applications/version-management/subversion/default.nix +++ b/pkgs/applications/version-management/subversion/default.nix @@ -94,6 +94,12 @@ let patches = [ ./apr-1.patch ] ++ extraPatches; + # remove vendored swig-3 files as these will shadow the swig provided + # ones and result in compile errors + postPatch = '' + rm subversion/bindings/swig/proxy/{perlrun.swg,pyrun.swg,python.swg,rubydef.swg,rubyhead.swg,rubytracking.swg,runtime.swg,swigrun.swg} + ''; + # We are hitting the following issue even with APR 1.6.x # -> https://issues.apache.org/jira/browse/SVN-4813 # "-P" CPPFLAG is needed to build Python bindings and subversionClient From 57008e12267612c26bce96a83646d7b7a154747e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 30 Dec 2024 06:14:33 +0000 Subject: [PATCH 207/429] nextdns: 1.43.5 -> 1.44.3 --- pkgs/by-name/ne/nextdns/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ne/nextdns/package.nix b/pkgs/by-name/ne/nextdns/package.nix index 0b901e2b4170..e37efbdf95e0 100644 --- a/pkgs/by-name/ne/nextdns/package.nix +++ b/pkgs/by-name/ne/nextdns/package.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "nextdns"; - version = "1.43.5"; + version = "1.44.3"; src = fetchFromGitHub { owner = "nextdns"; repo = "nextdns"; rev = "v${version}"; - sha256 = "sha256-XQ3dFv+JZ8x/SpaPhrauO8EfcpGrm9vbmQ7LLY1dQuE="; + sha256 = "sha256-fSYnR8yfgfOx8E9gGq82xAsvrMdujcwYq/qY/NF8LcM="; }; - vendorHash = "sha256-U5LJF1RX0ZS0PhjQTZKXrJo89WPfSZaVbgskWcYNlJY="; + vendorHash = "sha256-DKYWuCnpoJXJHBd6G9DFFzAPbekO+vaCPuBc4UTuxHg="; ldflags = [ "-s" From dd3a668da22e994158387dc5da54d0a3757ba931 Mon Sep 17 00:00:00 2001 From: Louis Thevenet Date: Mon, 30 Dec 2024 09:24:35 +0100 Subject: [PATCH 208/429] television: 0.7.1 -> 0.8.1 --- pkgs/by-name/te/television/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/te/television/package.nix b/pkgs/by-name/te/television/package.nix index 41a6044f39d0..f51564c41c38 100644 --- a/pkgs/by-name/te/television/package.nix +++ b/pkgs/by-name/te/television/package.nix @@ -8,16 +8,16 @@ }: rustPlatform.buildRustPackage rec { pname = "television"; - version = "0.7.1"; + version = "0.8.1"; src = fetchFromGitHub { owner = "alexpasmantier"; repo = "television"; rev = "refs/tags/" + version; - hash = "sha256-CvwJWut3N8TbeTVYnRg+6QHLXxwrDYWK1277uo2yxB8="; + hash = "sha256-+HLNZvCrpVe+lw7i5uAU6nyO/tTPth6In9qn03S/SX8="; }; - cargoHash = "sha256-NNJoWCl/hqAF1QWEFUTnsRnN9gSLs8kyYpUbvmbmWIo="; + cargoHash = "sha256-A+vXptX+2xEWmxJfO8nqmp0esWHZUx1HIvTLIna/x+U="; passthru = { tests.version = testers.testVersion { From a8f727fc31d78741086d195ae6ca4d65a792667d Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 30 Dec 2024 11:01:47 +0100 Subject: [PATCH 209/429] python312Packages.knx-frontend: 2024.11.16.205004 -> 2024.12.26.233449 Changelog: https://github.com/XKNX/knx-frontend/releases/tag/2024.12.26.233449 --- pkgs/development/python-modules/knx-frontend/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/knx-frontend/default.nix b/pkgs/development/python-modules/knx-frontend/default.nix index 243be4b8eb15..e6c86aa2048c 100644 --- a/pkgs/development/python-modules/knx-frontend/default.nix +++ b/pkgs/development/python-modules/knx-frontend/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "knx-frontend"; - version = "2024.11.16.205004"; + version = "2024.12.26.233449"; pyproject = true; # TODO: source build, uses yarn.lock src = fetchPypi { pname = "knx_frontend"; inherit version; - hash = "sha256-CsKtCTLsBpW3IMTdT8YBsnWLBt/huZGejyyBmusT6zc="; + hash = "sha256-PlV1CFUtKdUMXnnyeil6c+N7VBmsjmOSs8uYziGrZ9s="; }; build-system = [ setuptools ]; From 6b9dfa5c565680a09bce67972c9d654610d07666 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 30 Dec 2024 11:04:10 +0100 Subject: [PATCH 210/429] python312Packages.pynecil: 2.0.2 -> 3.0.1 Diff: https://github.com/tr4nt0r/pynecil/compare/refs/tags/v2.0.2...v3.0.1 Changelog: https://github.com/tr4nt0r/pynecil/releases/tag/v3.0.1 --- pkgs/development/python-modules/pynecil/default.nix | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/pynecil/default.nix b/pkgs/development/python-modules/pynecil/default.nix index d5e182f4b541..3e4ba20a1634 100644 --- a/pkgs/development/python-modules/pynecil/default.nix +++ b/pkgs/development/python-modules/pynecil/default.nix @@ -1,4 +1,5 @@ { + aiohttp, bleak, buildPythonPackage, fetchFromGitHub, @@ -12,22 +13,27 @@ buildPythonPackage rec { pname = "pynecil"; - version = "2.0.2"; + version = "3.0.1"; pyproject = true; src = fetchFromGitHub { owner = "tr4nt0r"; repo = "pynecil"; rev = "refs/tags/v${version}"; - hash = "sha256-JvLHzWFhvttix1BzFM6enrboGLQhgXK82ld55I/iA/s="; + hash = "sha256-Z4QuX562LKDtNbl1rWcnJbB3Qw0ZaQcJskPPy7DWvQs="; }; + pythonRelaxDeps = [ "aiohttp" ]; + build-system = [ hatch-regex-commit hatchling ]; - dependencies = [ bleak ]; + dependencies = [ + aiohttp + bleak + ]; pythonImportsCheck = [ "pynecil" ]; From b9b070ae8225cdcf148f9fb9b9c7a102dc1c6aaa Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Sun, 29 Dec 2024 21:50:35 +0100 Subject: [PATCH 211/429] nixos/services.manticore: remove `with lib;` --- nixos/modules/services/search/manticore.nix | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/nixos/modules/services/search/manticore.nix b/nixos/modules/services/search/manticore.nix index 76cb16bee0d1..e69c6d8c59f2 100644 --- a/nixos/modules/services/search/manticore.nix +++ b/nixos/modules/services/search/manticore.nix @@ -4,9 +4,6 @@ pkgs, ... }: - -with lib; - let cfg = config.services.manticore; @@ -14,7 +11,7 @@ let toSphinx = { - mkKeyValue ? generators.mkKeyValueDefault { } "=", + mkKeyValue ? lib.generators.mkKeyValueDefault { } "=", listsAsDuplicateKeys ? true, }: attrsOfAttrs: @@ -22,7 +19,7 @@ let # map function to string for each key val mapAttrsToStringsSep = sep: mapFn: attrs: - concatStringsSep sep (mapAttrsToList mapFn attrs); + lib.concatStringsSep sep (lib.mapAttrsToList mapFn attrs); mkSection = sectName: sectValues: '' @@ -46,9 +43,9 @@ in options = { services.manticore = { - enable = mkEnableOption "Manticoresearch"; + enable = lib.mkEnableOption "Manticoresearch"; - settings = mkOption { + settings = lib.mkOption { default = { searchd = { listen = [ @@ -67,10 +64,10 @@ in for more information. ''; - type = types.submodule { + type = lib.types.submodule { freeformType = format.type; }; - example = literalExpression '' + example = lib.literalExpression '' { searchd = { listen = [ @@ -90,7 +87,7 @@ in }; }; - config = mkIf cfg.enable { + config = lib.mkIf cfg.enable { systemd = { packages = [ pkgs.manticoresearch ]; From 90934eae5038a7e6ae801ec9207b15a35ba583af Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Sun, 29 Dec 2024 21:50:35 +0100 Subject: [PATCH 212/429] nixos/services.meilisearch: remove `with lib;` --- nixos/modules/services/search/meilisearch.nix | 47 +++++++++---------- 1 file changed, 22 insertions(+), 25 deletions(-) diff --git a/nixos/modules/services/search/meilisearch.nix b/nixos/modules/services/search/meilisearch.nix index ed51e67a0da8..1a1465b8e222 100644 --- a/nixos/modules/services/search/meilisearch.nix +++ b/nixos/modules/services/search/meilisearch.nix @@ -4,16 +4,13 @@ pkgs, ... }: - -with lib; - let cfg = config.services.meilisearch; in { - meta.maintainers = with maintainers; [ + meta.maintainers = with lib.maintainers; [ Br1ght0ne happysalada ]; @@ -22,37 +19,37 @@ in ###### interface options.services.meilisearch = { - enable = mkEnableOption "MeiliSearch - a RESTful search API"; + enable = lib.mkEnableOption "MeiliSearch - a RESTful search API"; - package = mkPackageOption pkgs "meilisearch" { + package = lib.mkPackageOption pkgs "meilisearch" { extraDescription = '' Use this if you require specific features to be enabled. The default package has no features. ''; }; - listenAddress = mkOption { + listenAddress = lib.mkOption { description = "MeiliSearch listen address."; default = "127.0.0.1"; - type = types.str; + type = lib.types.str; }; - listenPort = mkOption { + listenPort = lib.mkOption { description = "MeiliSearch port to listen on."; default = 7700; - type = types.port; + type = lib.types.port; }; - environment = mkOption { + environment = lib.mkOption { description = "Defines the running environment of MeiliSearch."; default = "development"; - type = types.enum [ + type = lib.types.enum [ "development" "production" ]; }; # TODO change this to LoadCredentials once possible - masterKeyEnvironmentFile = mkOption { + masterKeyEnvironmentFile = lib.mkOption { description = '' Path to file which contains the master key. By doing so, all routes will be protected and will require a key to be accessed. @@ -61,10 +58,10 @@ in MEILI_MASTER_KEY=my_secret_key ''; default = null; - type = with types; nullOr path; + type = with lib.types; nullOr path; }; - noAnalytics = mkOption { + noAnalytics = lib.mkOption { description = '' Deactivates analytics. Analytics allow MeiliSearch to know how many users are using MeiliSearch, @@ -72,10 +69,10 @@ in This process is entirely anonymous. ''; default = true; - type = types.bool; + type = lib.types.bool; }; - logLevel = mkOption { + logLevel = lib.mkOption { description = '' Defines how much detail should be present in MeiliSearch's logs. MeiliSearch currently supports four log levels, listed in order of increasing verbosity: @@ -86,10 +83,10 @@ in Useful when diagnosing issues and debugging ''; default = "INFO"; - type = types.str; + type = lib.types.str; }; - maxIndexSize = mkOption { + maxIndexSize = lib.mkOption { description = '' Sets the maximum size of the index. Value must be given in bytes or explicitly stating a base unit. @@ -97,10 +94,10 @@ in Default is 100 GiB ''; default = "107374182400"; - type = types.str; + type = lib.types.str; }; - payloadSizeLimit = mkOption { + payloadSizeLimit = lib.mkOption { description = '' Sets the maximum size of accepted JSON payloads. Value must be given in bytes or explicitly stating a base unit. @@ -108,14 +105,14 @@ in Default is ~ 100 MB ''; default = "104857600"; - type = types.str; + type = lib.types.str; }; }; ###### implementation - config = mkIf cfg.enable { + config = lib.mkIf cfg.enable { # used to restore dumps environment.systemPackages = [ cfg.package ]; @@ -127,7 +124,7 @@ in environment = { MEILI_DB_PATH = "/var/lib/meilisearch"; MEILI_HTTP_ADDR = "${cfg.listenAddress}:${toString cfg.listenPort}"; - MEILI_NO_ANALYTICS = boolToString cfg.noAnalytics; + MEILI_NO_ANALYTICS = lib.boolToString cfg.noAnalytics; MEILI_ENV = cfg.environment; MEILI_DUMP_DIR = "/var/lib/meilisearch/dumps"; MEILI_LOG_LEVEL = cfg.logLevel; @@ -137,7 +134,7 @@ in ExecStart = "${cfg.package}/bin/meilisearch"; DynamicUser = true; StateDirectory = "meilisearch"; - EnvironmentFile = mkIf (cfg.masterKeyEnvironmentFile != null) cfg.masterKeyEnvironmentFile; + EnvironmentFile = lib.mkIf (cfg.masterKeyEnvironmentFile != null) cfg.masterKeyEnvironmentFile; }; }; }; From 418f49af7458fb8063a8ce004beaf9a032b14164 Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Sun, 29 Dec 2024 21:50:35 +0100 Subject: [PATCH 213/429] nixos/services.opensearch: remove `with lib;` --- nixos/modules/services/search/opensearch.nix | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/nixos/modules/services/search/opensearch.nix b/nixos/modules/services/search/opensearch.nix index 59e04114eb69..6630dd017db6 100644 --- a/nixos/modules/services/search/opensearch.nix +++ b/nixos/modules/services/search/opensearch.nix @@ -4,9 +4,6 @@ pkgs, ... }: - -with lib; - let cfg = config.services.opensearch; @@ -28,7 +25,7 @@ in { options.services.opensearch = { - enable = mkEnableOption "OpenSearch"; + enable = lib.mkEnableOption "OpenSearch"; package = lib.mkPackageOption pkgs "OpenSearch" { default = [ "opensearch" ]; @@ -113,13 +110,13 @@ in rootLogger.level = info rootLogger.appenderRef.console.ref = console ''; - type = types.str; + type = lib.types.str; }; dataDir = lib.mkOption { type = lib.types.path; default = "/var/lib/opensearch"; - apply = converge (removeSuffix "/"); + apply = lib.converge (lib.removeSuffix "/"); description = '' Data directory for OpenSearch. If you change this, you need to manually create the directory. You also need to create the @@ -173,7 +170,7 @@ in }; }; - config = mkIf cfg.enable { + config = lib.mkIf cfg.enable { systemd.services.opensearch = { description = "OpenSearch Daemon"; wantedBy = [ "multi-user.target" ]; @@ -194,7 +191,7 @@ in set -o errexit -o pipefail -o nounset -o errtrace shopt -s inherit_errexit '' - + (optionalString (!config.boot.isContainer) '' + + (lib.optionalString (!config.boot.isContainer) '' # Only set vm.max_map_count if lower than ES required minimum # This avoids conflict if configured via boot.kernel.sysctl if [ $(${pkgs.procps}/bin/sysctl -n vm.max_map_count) -lt 262144 ]; then @@ -268,7 +265,7 @@ in TimeoutStartSec = "infinity"; DynamicUser = usingDefaultUserAndGroup && usingDefaultDataDir; } - // (optionalAttrs (usingDefaultDataDir) { + // (lib.optionalAttrs (usingDefaultDataDir) { StateDirectory = "opensearch"; StateDirectoryMode = "0700"; }); From 0c00abec83397b854556ba8193875344b6472e6a Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Sun, 29 Dec 2024 21:50:35 +0100 Subject: [PATCH 214/429] nixos/services.qdrant: remove `with lib;` --- nixos/modules/services/search/qdrant.nix | 70 ++++++++++++------------ 1 file changed, 34 insertions(+), 36 deletions(-) diff --git a/nixos/modules/services/search/qdrant.nix b/nixos/modules/services/search/qdrant.nix index 3b2ce4f6fd5c..665dad648a69 100644 --- a/nixos/modules/services/search/qdrant.nix +++ b/nixos/modules/services/search/qdrant.nix @@ -4,8 +4,6 @@ pkgs, ... }: - -with lib; let cfg = config.services.qdrant; @@ -17,9 +15,9 @@ in options = { services.qdrant = { - enable = mkEnableOption "Vector Search Engine for the next generation of AI applications"; + enable = lib.mkEnableOption "Vector Search Engine for the next generation of AI applications"; - settings = mkOption { + settings = lib.mkOption { description = '' Configuration for Qdrant Refer to for details on supported values. @@ -43,7 +41,7 @@ in telemetry_disabled = true; }; - defaultText = literalExpression '' + defaultText = lib.literalExpression '' { storage = { storage_path = "/var/lib/qdrant/storage"; @@ -64,41 +62,41 @@ in }; }; - config = mkIf cfg.enable { + config = lib.mkIf cfg.enable { services.qdrant.settings = { - service.static_content_dir = mkDefault pkgs.qdrant-web-ui; - storage.storage_path = mkDefault "/var/lib/qdrant/storage"; - storage.snapshots_path = mkDefault "/var/lib/qdrant/snapshots"; + service.static_content_dir = lib.mkDefault pkgs.qdrant-web-ui; + storage.storage_path = lib.mkDefault "/var/lib/qdrant/storage"; + storage.snapshots_path = lib.mkDefault "/var/lib/qdrant/snapshots"; # The following default values are the same as in the default config, # they are just written here for convenience. - storage.on_disk_payload = mkDefault true; - storage.wal.wal_capacity_mb = mkDefault 32; - storage.wal.wal_segments_ahead = mkDefault 0; - storage.performance.max_search_threads = mkDefault 0; - storage.performance.max_optimization_threads = mkDefault 1; - storage.optimizers.deleted_threshold = mkDefault 0.2; - storage.optimizers.vacuum_min_vector_number = mkDefault 1000; - storage.optimizers.default_segment_number = mkDefault 0; - storage.optimizers.max_segment_size_kb = mkDefault null; - storage.optimizers.memmap_threshold_kb = mkDefault null; - storage.optimizers.indexing_threshold_kb = mkDefault 20000; - storage.optimizers.flush_interval_sec = mkDefault 5; - storage.optimizers.max_optimization_threads = mkDefault 1; - storage.hnsw_index.m = mkDefault 16; - storage.hnsw_index.ef_construct = mkDefault 100; - storage.hnsw_index.full_scan_threshold_kb = mkDefault 10000; - storage.hnsw_index.max_indexing_threads = mkDefault 0; - storage.hnsw_index.on_disk = mkDefault false; - storage.hnsw_index.payload_m = mkDefault null; - service.max_request_size_mb = mkDefault 32; - service.max_workers = mkDefault 0; - service.http_port = mkDefault 6333; - service.grpc_port = mkDefault 6334; - service.enable_cors = mkDefault true; - cluster.enabled = mkDefault false; + storage.on_disk_payload = lib.mkDefault true; + storage.wal.wal_capacity_mb = lib.mkDefault 32; + storage.wal.wal_segments_ahead = lib.mkDefault 0; + storage.performance.max_search_threads = lib.mkDefault 0; + storage.performance.max_optimization_threads = lib.mkDefault 1; + storage.optimizers.deleted_threshold = lib.mkDefault 0.2; + storage.optimizers.vacuum_min_vector_number = lib.mkDefault 1000; + storage.optimizers.default_segment_number = lib.mkDefault 0; + storage.optimizers.max_segment_size_kb = lib.mkDefault null; + storage.optimizers.memmap_threshold_kb = lib.mkDefault null; + storage.optimizers.indexing_threshold_kb = lib.mkDefault 20000; + storage.optimizers.flush_interval_sec = lib.mkDefault 5; + storage.optimizers.max_optimization_threads = lib.mkDefault 1; + storage.hnsw_index.m = lib.mkDefault 16; + storage.hnsw_index.ef_construct = lib.mkDefault 100; + storage.hnsw_index.full_scan_threshold_kb = lib.mkDefault 10000; + storage.hnsw_index.max_indexing_threads = lib.mkDefault 0; + storage.hnsw_index.on_disk = lib.mkDefault false; + storage.hnsw_index.payload_m = lib.mkDefault null; + service.max_request_size_mb = lib.mkDefault 32; + service.max_workers = lib.mkDefault 0; + service.http_port = lib.mkDefault 6333; + service.grpc_port = lib.mkDefault 6334; + service.enable_cors = lib.mkDefault true; + cluster.enabled = lib.mkDefault false; # the following have been altered for security - service.host = mkDefault "127.0.0.1"; - telemetry_disabled = mkDefault true; + service.host = lib.mkDefault "127.0.0.1"; + telemetry_disabled = lib.mkDefault true; }; systemd.services.qdrant = { From ed344f1d2a05bc9dde22fa87abeffedd36a63527 Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Sun, 29 Dec 2024 21:50:36 +0100 Subject: [PATCH 215/429] nixos/services.quickwit: remove `with lib;` --- nixos/modules/services/search/quickwit.nix | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/nixos/modules/services/search/quickwit.nix b/nixos/modules/services/search/quickwit.nix index c55b32154b53..c8b1c1c516e9 100644 --- a/nixos/modules/services/search/quickwit.nix +++ b/nixos/modules/services/search/quickwit.nix @@ -4,9 +4,6 @@ pkgs, ... }: - -with lib; - let cfg = config.services.quickwit; @@ -19,7 +16,7 @@ in { options.services.quickwit = { - enable = mkEnableOption "Quickwit"; + enable = lib.mkEnableOption "Quickwit"; package = lib.mkPackageOption pkgs "Quickwit" { default = [ "quickwit" ]; @@ -83,7 +80,7 @@ in dataDir = lib.mkOption { type = lib.types.path; default = "/var/lib/quickwit"; - apply = converge (removeSuffix "/"); + apply = lib.converge (lib.removeSuffix "/"); description = '' Data directory for Quickwit. If you change this, you need to manually create the directory. You also need to create the @@ -130,7 +127,7 @@ in }; }; - config = mkIf cfg.enable { + config = lib.mkIf cfg.enable { systemd.services.quickwit = { description = "Quickwit"; wantedBy = [ "multi-user.target" ]; @@ -143,7 +140,7 @@ in { ExecStart = '' ${cfg.package}/bin/quickwit run --config ${quickwitYml} \ - ${escapeShellArgs cfg.extraFlags} + ${lib.escapeShellArgs cfg.extraFlags} ''; User = cfg.user; Group = cfg.group; @@ -186,7 +183,7 @@ in "@chown" ]; } - // (optionalAttrs (usingDefaultDataDir) { + // (lib.optionalAttrs (usingDefaultDataDir) { StateDirectory = "quickwit"; StateDirectoryMode = "0700"; }); From e89c367895ae22e06e1c4a85638b5577a84c7b71 Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Sun, 29 Dec 2024 21:50:36 +0100 Subject: [PATCH 216/429] nixos/services.certmgr: remove `with lib;` --- nixos/modules/services/security/certmgr.nix | 71 ++++++++++----------- 1 file changed, 34 insertions(+), 37 deletions(-) diff --git a/nixos/modules/services/security/certmgr.nix b/nixos/modules/services/security/certmgr.nix index f3164072b6b5..4a156539b438 100644 --- a/nixos/modules/services/security/certmgr.nix +++ b/nixos/modules/services/security/certmgr.nix @@ -4,15 +4,12 @@ pkgs, ... }: - -with lib; - let cfg = config.services.certmgr; - specs = mapAttrsToList (n: v: rec { + specs = lib.mapAttrsToList (n: v: rec { name = n + ".json"; - path = if isAttrs v then pkgs.writeText name (builtins.toJSON v) else v; + path = if lib.isAttrs v then pkgs.writeText name (builtins.toJSON v) else v; }) cfg.specs; allSpecs = pkgs.linkFarm "certmgr.d" specs; @@ -29,59 +26,59 @@ let ); specPaths = map dirOf ( - concatMap ( + lib.concatMap ( spec: - if isAttrs spec then - collect isString (filterAttrsRecursive (n: v: isAttrs v || n == "path") spec) + if lib.isAttrs spec then + lib.collect lib.isString (lib.filterAttrsRecursive (n: v: lib.isAttrs v || n == "path") spec) else [ spec ] - ) (attrValues cfg.specs) + ) (lib.attrValues cfg.specs) ); preStart = '' - ${concatStringsSep " \\\n" ([ "mkdir -p" ] ++ map escapeShellArg specPaths)} + ${lib.concatStringsSep " \\\n" ([ "mkdir -p" ] ++ map lib.escapeShellArg specPaths)} ${cfg.package}/bin/certmgr -f ${certmgrYaml} check ''; in { options.services.certmgr = { - enable = mkEnableOption "certmgr"; + enable = lib.mkEnableOption "certmgr"; - package = mkPackageOption pkgs "certmgr" { }; + package = lib.mkPackageOption pkgs "certmgr" { }; - defaultRemote = mkOption { - type = types.str; + defaultRemote = lib.mkOption { + type = lib.types.str; default = "127.0.0.1:8888"; description = "The default CA host:port to use."; }; - validMin = mkOption { + validMin = lib.mkOption { default = "72h"; - type = types.str; + type = lib.types.str; description = "The interval before a certificate expires to start attempting to renew it."; }; - renewInterval = mkOption { + renewInterval = lib.mkOption { default = "30m"; - type = types.str; + type = lib.types.str; description = "How often to check certificate expirations and how often to update the cert_next_expires metric."; }; - metricsAddress = mkOption { + metricsAddress = lib.mkOption { default = "127.0.0.1"; - type = types.str; + type = lib.types.str; description = "The address for the Prometheus HTTP endpoint."; }; - metricsPort = mkOption { + metricsPort = lib.mkOption { default = 9488; - type = types.ints.u16; + type = lib.types.ints.u16; description = "The port for the Prometheus HTTP endpoint."; }; - specs = mkOption { + specs = lib.mkOption { default = { }; - example = literalExpression '' + example = lib.literalExpression '' { exampleCert = let @@ -119,17 +116,17 @@ in } ''; type = - with types; + with lib.types; attrsOf ( either path (submodule { options = { - service = mkOption { + service = lib.mkOption { type = nullOr str; default = null; description = "The service on which to perform \ after fetching."; }; - action = mkOption { + action = lib.mkOption { type = addCheck str ( x: cfg.svcManager == "command" @@ -144,22 +141,22 @@ in }; # These ought all to be specified according to certmgr spec def. - authority = mkOption { + authority = lib.mkOption { type = attrs; description = "certmgr spec authority object."; }; - certificate = mkOption { + certificate = lib.mkOption { type = nullOr attrs; description = "certmgr spec certificate object."; }; - private_key = mkOption { + private_key = lib.mkOption { type = nullOr attrs; description = "certmgr spec private_key object."; }; - request = mkOption { + request = lib.mkOption { type = nullOr attrs; description = "certmgr spec request object."; }; @@ -173,9 +170,9 @@ in ''; }; - svcManager = mkOption { + svcManager = lib.mkOption { default = "systemd"; - type = types.enum [ + type = lib.types.enum [ "circus" "command" "dummy" @@ -193,7 +190,7 @@ in }; - config = mkIf cfg.enable { + config = lib.mkIf cfg.enable { assertions = [ { assertion = cfg.specs != { }; @@ -201,10 +198,10 @@ in } { assertion = - !any (hasAttrByPath [ + !lib.any (lib.hasAttrByPath [ "authority" "auth_key" - ]) (attrValues cfg.specs); + ]) (lib.attrValues cfg.specs); message = '' Inline services.certmgr.specs are added to the Nix store rendering them world readable. Specify paths as specs, if you want to use include auth_key - or use the auth_key_file option." @@ -214,7 +211,7 @@ in systemd.services.certmgr = { description = "certmgr"; - path = mkIf (cfg.svcManager == "command") [ pkgs.bash ]; + path = lib.mkIf (cfg.svcManager == "command") [ pkgs.bash ]; wants = [ "network-online.target" ]; after = [ "network-online.target" ]; wantedBy = [ "multi-user.target" ]; From 03977fb5852dbce03a39207000c6b719040f6562 Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Sun, 29 Dec 2024 21:50:36 +0100 Subject: [PATCH 217/429] nixos/services.cfssl: remove `with lib;` --- nixos/modules/services/security/cfssl.nix | 105 +++++++++++----------- 1 file changed, 51 insertions(+), 54 deletions(-) diff --git a/nixos/modules/services/security/cfssl.nix b/nixos/modules/services/security/cfssl.nix index 9e22121f97f6..574649de75a9 100644 --- a/nixos/modules/services/security/cfssl.nix +++ b/nixos/modules/services/security/cfssl.nix @@ -5,19 +5,16 @@ pkgs, ... }: - -with lib; - let cfg = config.services.cfssl; in { options.services.cfssl = { - enable = mkEnableOption "the CFSSL CA api-server"; + enable = lib.mkEnableOption "the CFSSL CA api-server"; - dataDir = mkOption { + dataDir = lib.mkOption { default = "/var/lib/cfssl"; - type = types.path; + type = lib.types.path; description = '' The work directory for CFSSL. @@ -30,51 +27,51 @@ in ''; }; - address = mkOption { + address = lib.mkOption { default = "127.0.0.1"; - type = types.str; + type = lib.types.str; description = "Address to bind."; }; - port = mkOption { + port = lib.mkOption { default = 8888; - type = types.port; + type = lib.types.port; description = "Port to bind."; }; - ca = mkOption { - defaultText = literalExpression ''"''${cfg.dataDir}/ca.pem"''; - type = types.str; + ca = lib.mkOption { + defaultText = lib.literalExpression ''"''${cfg.dataDir}/ca.pem"''; + type = lib.types.str; description = "CA used to sign the new certificate -- accepts '[file:]fname' or 'env:varname'."; }; - caKey = mkOption { - defaultText = literalExpression ''"file:''${cfg.dataDir}/ca-key.pem"''; - type = types.str; + caKey = lib.mkOption { + defaultText = lib.literalExpression ''"file:''${cfg.dataDir}/ca-key.pem"''; + type = lib.types.str; description = "CA private key -- accepts '[file:]fname' or 'env:varname'."; }; - caBundle = mkOption { + caBundle = lib.mkOption { default = null; - type = types.nullOr types.path; + type = lib.types.nullOr lib.types.path; description = "Path to root certificate store."; }; - intBundle = mkOption { + intBundle = lib.mkOption { default = null; - type = types.nullOr types.path; + type = lib.types.nullOr lib.types.path; description = "Path to intermediate certificate store."; }; - intDir = mkOption { + intDir = lib.mkOption { default = null; - type = types.nullOr types.path; + type = lib.types.nullOr lib.types.path; description = "Intermediates directory."; }; - metadata = mkOption { + metadata = lib.mkOption { default = null; - type = types.nullOr types.path; + type = lib.types.nullOr lib.types.path; description = '' Metadata file for root certificate presence. The content of the file is a json dictionary (k,v): each key k is @@ -83,81 +80,81 @@ in ''; }; - remote = mkOption { + remote = lib.mkOption { default = null; - type = types.nullOr types.str; + type = lib.types.nullOr lib.types.str; description = "Remote CFSSL server."; }; - configFile = mkOption { + configFile = lib.mkOption { default = null; - type = types.nullOr types.str; + type = lib.types.nullOr lib.types.str; description = "Path to configuration file. Do not put this in nix-store as it might contain secrets."; }; - responder = mkOption { + responder = lib.mkOption { default = null; - type = types.nullOr types.path; + type = lib.types.nullOr lib.types.path; description = "Certificate for OCSP responder."; }; - responderKey = mkOption { + responderKey = lib.mkOption { default = null; - type = types.nullOr types.str; + type = lib.types.nullOr lib.types.str; description = "Private key for OCSP responder certificate. Do not put this in nix-store."; }; - tlsKey = mkOption { + tlsKey = lib.mkOption { default = null; - type = types.nullOr types.str; + type = lib.types.nullOr lib.types.str; description = "Other endpoint's CA private key. Do not put this in nix-store."; }; - tlsCert = mkOption { + tlsCert = lib.mkOption { default = null; - type = types.nullOr types.path; + type = lib.types.nullOr lib.types.path; description = "Other endpoint's CA to set up TLS protocol."; }; - mutualTlsCa = mkOption { + mutualTlsCa = lib.mkOption { default = null; - type = types.nullOr types.path; + type = lib.types.nullOr lib.types.path; description = "Mutual TLS - require clients be signed by this CA."; }; - mutualTlsCn = mkOption { + mutualTlsCn = lib.mkOption { default = null; - type = types.nullOr types.str; + type = lib.types.nullOr lib.types.str; description = "Mutual TLS - regex for whitelist of allowed client CNs."; }; - tlsRemoteCa = mkOption { + tlsRemoteCa = lib.mkOption { default = null; - type = types.nullOr types.path; + type = lib.types.nullOr lib.types.path; description = "CAs to trust for remote TLS requests."; }; - mutualTlsClientCert = mkOption { + mutualTlsClientCert = lib.mkOption { default = null; - type = types.nullOr types.path; + type = lib.types.nullOr lib.types.path; description = "Mutual TLS - client certificate to call remote instance requiring client certs."; }; - mutualTlsClientKey = mkOption { + mutualTlsClientKey = lib.mkOption { default = null; - type = types.nullOr types.path; + type = lib.types.nullOr lib.types.path; description = "Mutual TLS - client key to call remote instance requiring client certs. Do not put this in nix-store."; }; - dbConfig = mkOption { + dbConfig = lib.mkOption { default = null; - type = types.nullOr types.path; + type = lib.types.nullOr lib.types.path; description = "Certificate db configuration file. Path must be writeable."; }; - logLevel = mkOption { + logLevel = lib.mkOption { default = 1; - type = types.enum [ + type = lib.types.enum [ 0 1 2 @@ -169,7 +166,7 @@ in }; }; - config = mkIf cfg.enable { + config = lib.mkIf cfg.enable { users.groups.cfssl = { gid = config.ids.gids.cfssl; }; @@ -223,7 +220,7 @@ in (opt "loglevel" (toString logLevel)) ]; } - (mkIf (cfg.dataDir == options.services.cfssl.dataDir.default) { + (lib.mkIf (cfg.dataDir == options.services.cfssl.dataDir.default) { StateDirectory = baseNameOf cfg.dataDir; StateDirectoryMode = 700; }) @@ -231,8 +228,8 @@ in }; services.cfssl = { - ca = mkDefault "${cfg.dataDir}/ca.pem"; - caKey = mkDefault "${cfg.dataDir}/ca-key.pem"; + ca = lib.mkDefault "${cfg.dataDir}/ca.pem"; + caKey = lib.mkDefault "${cfg.dataDir}/ca-key.pem"; }; }; } From 8dbe32532163414bb085e1b188753b74d6cc656b Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Sun, 29 Dec 2024 21:50:36 +0100 Subject: [PATCH 218/429] nixos/services.clamav: remove `with lib;` --- nixos/modules/services/security/clamav.nix | 91 +++++++++++----------- 1 file changed, 45 insertions(+), 46 deletions(-) diff --git a/nixos/modules/services/security/clamav.nix b/nixos/modules/services/security/clamav.nix index 2b0929599723..d4d2fe4689dc 100644 --- a/nixos/modules/services/security/clamav.nix +++ b/nixos/modules/services/security/clamav.nix @@ -1,13 +1,12 @@ { config, lib, pkgs, ... }: -with lib; let clamavUser = "clamav"; stateDir = "/var/lib/clamav"; clamavGroup = clamavUser; cfg = config.services.clamav; - toKeyValue = generators.toKeyValue { - mkKeyValue = generators.mkKeyValueDefault { } " "; + toKeyValue = lib.generators.toKeyValue { + mkKeyValue = lib.generators.mkKeyValueDefault { } " "; listsAsDuplicateKeys = true; }; @@ -19,19 +18,19 @@ let in { imports = [ - (mkRemovedOptionModule [ "services" "clamav" "updater" "config" ] "Use services.clamav.updater.settings instead.") - (mkRemovedOptionModule [ "services" "clamav" "updater" "extraConfig" ] "Use services.clamav.updater.settings instead.") - (mkRemovedOptionModule [ "services" "clamav" "daemon" "extraConfig" ] "Use services.clamav.daemon.settings instead.") + (lib.mkRemovedOptionModule [ "services" "clamav" "updater" "config" ] "Use services.clamav.updater.settings instead.") + (lib.mkRemovedOptionModule [ "services" "clamav" "updater" "extraConfig" ] "Use services.clamav.updater.settings instead.") + (lib.mkRemovedOptionModule [ "services" "clamav" "daemon" "extraConfig" ] "Use services.clamav.daemon.settings instead.") ]; options = { services.clamav = { - package = mkPackageOption pkgs "clamav" { }; + package = lib.mkPackageOption pkgs "clamav" { }; daemon = { - enable = mkEnableOption "ClamAV clamd daemon"; + enable = lib.mkEnableOption "ClamAV clamd daemon"; - settings = mkOption { - type = with types; attrsOf (oneOf [ bool int str (listOf str) ]); + settings = lib.mkOption { + type = with lib.types; attrsOf (oneOf [ bool int str (listOf str) ]); default = { }; description = '' ClamAV configuration. Refer to , @@ -40,18 +39,18 @@ in }; }; updater = { - enable = mkEnableOption "ClamAV freshclam updater"; + enable = lib.mkEnableOption "ClamAV freshclam updater"; - frequency = mkOption { - type = types.int; + frequency = lib.mkOption { + type = lib.types.int; default = 12; description = '' Number of database checks per day. ''; }; - interval = mkOption { - type = types.str; + interval = lib.mkOption { + type = lib.types.str; default = "hourly"; description = '' How often freshclam is invoked. See systemd.time(7) for more @@ -59,8 +58,8 @@ in ''; }; - settings = mkOption { - type = with types; attrsOf (oneOf [ bool int str (listOf str) ]); + settings = lib.mkOption { + type = with lib.types; attrsOf (oneOf [ bool int str (listOf str) ]); default = { }; description = '' freshclam configuration. Refer to , @@ -69,10 +68,10 @@ in }; }; fangfrisch = { - enable = mkEnableOption "ClamAV fangfrisch updater"; + enable = lib.mkEnableOption "ClamAV fangfrisch updater"; - interval = mkOption { - type = types.str; + interval = lib.mkOption { + type = lib.types.str; default = "hourly"; description = '' How often freshclam is invoked. See systemd.time(7) for more @@ -80,9 +79,9 @@ in ''; }; - settings = mkOption { + settings = lib.mkOption { type = lib.types.submodule { - freeformType = with types; attrsOf (attrsOf (oneOf [ str int bool ])); + freeformType = with lib.types; attrsOf (attrsOf (oneOf [ str int bool ])); }; default = { }; example = { @@ -100,10 +99,10 @@ in }; scanner = { - enable = mkEnableOption "ClamAV scanner"; + enable = lib.mkEnableOption "ClamAV scanner"; - interval = mkOption { - type = types.str; + interval = lib.mkOption { + type = lib.types.str; default = "*-*-* 04:00:00"; description = '' How often clamdscan is invoked. See systemd.time(7) for more @@ -112,8 +111,8 @@ in ''; }; - scanDirectories = mkOption { - type = with types; listOf str; + scanDirectories = lib.mkOption { + type = with lib.types; listOf str; default = [ "/home" "/var/lib" "/tmp" "/etc" "/var/tmp" ]; description = '' List of directories to scan. @@ -124,7 +123,7 @@ in }; }; - config = mkIf (cfg.updater.enable || cfg.daemon.enable) { + config = lib.mkIf (cfg.updater.enable || cfg.daemon.enable) { environment.systemPackages = [ cfg.package ]; users.users.${clamavUser} = { @@ -153,12 +152,12 @@ in }; services.clamav.fangfrisch.settings = { - DEFAULT.db_url = mkDefault "sqlite:////var/lib/clamav/fangfrisch_db.sqlite"; - DEFAULT.local_directory = mkDefault stateDir; - DEFAULT.log_level = mkDefault "INFO"; - urlhaus.enabled = mkDefault "yes"; - urlhaus.max_size = mkDefault "2MB"; - sanesecurity.enabled = mkDefault "yes"; + DEFAULT.db_url = lib.mkDefault "sqlite:////var/lib/clamav/fangfrisch_db.sqlite"; + DEFAULT.local_directory = lib.mkDefault stateDir; + DEFAULT.log_level = lib.mkDefault "INFO"; + urlhaus.enabled = lib.mkDefault "yes"; + urlhaus.max_size = lib.mkDefault "2MB"; + sanesecurity.enabled = lib.mkDefault "yes"; }; environment.etc."clamav/freshclam.conf".source = freshclamConfigFile; @@ -168,10 +167,10 @@ in description = "ClamAV Antivirus Slice"; }; - systemd.services.clamav-daemon = mkIf cfg.daemon.enable { + systemd.services.clamav-daemon = lib.mkIf cfg.daemon.enable { description = "ClamAV daemon (clamd)"; - after = optionals cfg.updater.enable [ "clamav-freshclam.service" ]; - wants = optionals cfg.updater.enable [ "clamav-freshclam.service" ]; + after = lib.optionals cfg.updater.enable [ "clamav-freshclam.service" ]; + wants = lib.optionals cfg.updater.enable [ "clamav-freshclam.service" ]; wantedBy = [ "multi-user.target" ]; restartTriggers = [ clamdConfigFile ]; @@ -189,7 +188,7 @@ in }; }; - systemd.timers.clamav-freshclam = mkIf cfg.updater.enable { + systemd.timers.clamav-freshclam = lib.mkIf cfg.updater.enable { description = "Timer for ClamAV virus database updater (freshclam)"; wantedBy = [ "timers.target" ]; timerConfig = { @@ -198,7 +197,7 @@ in }; }; - systemd.services.clamav-freshclam = mkIf cfg.updater.enable { + systemd.services.clamav-freshclam = lib.mkIf cfg.updater.enable { description = "ClamAV virus database updater (freshclam)"; restartTriggers = [ freshclamConfigFile ]; requires = [ "network-online.target" ]; @@ -217,7 +216,7 @@ in }; }; - systemd.services.clamav-fangfrisch-init = mkIf cfg.fangfrisch.enable { + systemd.services.clamav-fangfrisch-init = lib.mkIf cfg.fangfrisch.enable { wantedBy = [ "multi-user.target" ]; # if the sqlite file can be found assume the database has already been initialised script = '' @@ -239,7 +238,7 @@ in }; }; - systemd.timers.clamav-fangfrisch = mkIf cfg.fangfrisch.enable { + systemd.timers.clamav-fangfrisch = lib.mkIf cfg.fangfrisch.enable { description = "Timer for ClamAV virus database updater (fangfrisch)"; wantedBy = [ "timers.target" ]; timerConfig = { @@ -248,7 +247,7 @@ in }; }; - systemd.services.clamav-fangfrisch = mkIf cfg.fangfrisch.enable { + systemd.services.clamav-fangfrisch = lib.mkIf cfg.fangfrisch.enable { description = "ClamAV virus database updater (fangfrisch)"; restartTriggers = [ fangfrischConfigFile ]; requires = [ "network-online.target" ]; @@ -266,7 +265,7 @@ in }; }; - systemd.timers.clamdscan = mkIf cfg.scanner.enable { + systemd.timers.clamdscan = lib.mkIf cfg.scanner.enable { description = "Timer for ClamAV virus scanner"; wantedBy = [ "timers.target" ]; timerConfig = { @@ -275,10 +274,10 @@ in }; }; - systemd.services.clamdscan = mkIf cfg.scanner.enable { + systemd.services.clamdscan = lib.mkIf cfg.scanner.enable { description = "ClamAV virus scanner"; - after = optionals cfg.updater.enable [ "clamav-freshclam.service" ]; - wants = optionals cfg.updater.enable [ "clamav-freshclam.service" ]; + after = lib.optionals cfg.updater.enable [ "clamav-freshclam.service" ]; + wants = lib.optionals cfg.updater.enable [ "clamav-freshclam.service" ]; serviceConfig = { Type = "oneshot"; From cd46072e35386adaa180ee8af8447e17645c2753 Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Sun, 29 Dec 2024 21:50:36 +0100 Subject: [PATCH 219/429] nixos/services.endlessh-go: remove `with lib;` --- .../modules/services/security/endlessh-go.nix | 39 +++++++++---------- 1 file changed, 18 insertions(+), 21 deletions(-) diff --git a/nixos/modules/services/security/endlessh-go.nix b/nixos/modules/services/security/endlessh-go.nix index 8a22c01390a6..a44652e8afd8 100644 --- a/nixos/modules/services/security/endlessh-go.nix +++ b/nixos/modules/services/security/endlessh-go.nix @@ -4,20 +4,17 @@ pkgs, ... }: - -with lib; - let cfg = config.services.endlessh-go; in { options.services.endlessh-go = { - enable = mkEnableOption "endlessh-go service"; + enable = lib.mkEnableOption "endlessh-go service"; - package = mkPackageOption pkgs "endlessh-go" { }; + package = lib.mkPackageOption pkgs "endlessh-go" { }; - listenAddress = mkOption { - type = types.str; + listenAddress = lib.mkOption { + type = lib.types.str; default = "0.0.0.0"; example = "[::]"; description = '' @@ -25,8 +22,8 @@ in ''; }; - port = mkOption { - type = types.port; + port = lib.mkOption { + type = lib.types.port; default = 2222; example = 22; description = '' @@ -38,10 +35,10 @@ in }; prometheus = { - enable = mkEnableOption "Prometheus integration"; + enable = lib.mkEnableOption "Prometheus integration"; - listenAddress = mkOption { - type = types.str; + listenAddress = lib.mkOption { + type = lib.types.str; default = "0.0.0.0"; example = "[::]"; description = '' @@ -50,8 +47,8 @@ in ''; }; - port = mkOption { - type = types.port; + port = lib.mkOption { + type = lib.types.port; default = 2112; example = 9119; description = '' @@ -61,8 +58,8 @@ in }; }; - extraOptions = mkOption { - type = with types; listOf str; + extraOptions = lib.mkOption { + type = with lib.types; listOf str; default = [ ]; example = [ "-conn_type=tcp4" @@ -73,8 +70,8 @@ in ''; }; - openFirewall = mkOption { - type = types.bool; + openFirewall = lib.mkOption { + type = lib.types.bool; default = false; description = '' Whether to open a firewall port for the SSH listener. @@ -82,7 +79,7 @@ in }; }; - config = mkIf cfg.enable { + config = lib.mkIf cfg.enable { systemd.services.endlessh-go = { description = "SSH tarpit"; requires = [ "network.target" ]; @@ -90,7 +87,7 @@ in serviceConfig = let needsPrivileges = cfg.port < 1024 || cfg.prometheus.port < 1024; - capabilities = [ "" ] ++ optionals needsPrivileges [ "CAP_NET_BIND_SERVICE" ]; + capabilities = [ "" ] ++ lib.optionals needsPrivileges [ "CAP_NET_BIND_SERVICE" ]; rootDirectory = "/run/endlessh-go"; in { @@ -155,5 +152,5 @@ in networking.firewall.allowedTCPPorts = with cfg; optionals openFirewall [ port ]; }; - meta.maintainers = with maintainers; [ azahi ]; + meta.maintainers = with lib.maintainers; [ azahi ]; } From 57fa81efce06f607aaa0c234714b9ba080eaf49e Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Sun, 29 Dec 2024 21:50:36 +0100 Subject: [PATCH 220/429] nixos/services.endlessh: remove `with lib;` --- nixos/modules/services/security/endlessh.nix | 23 +++++++++----------- 1 file changed, 10 insertions(+), 13 deletions(-) diff --git a/nixos/modules/services/security/endlessh.nix b/nixos/modules/services/security/endlessh.nix index 479e27d18ccd..cac6de5c3cf3 100644 --- a/nixos/modules/services/security/endlessh.nix +++ b/nixos/modules/services/security/endlessh.nix @@ -4,18 +4,15 @@ pkgs, ... }: - -with lib; - let cfg = config.services.endlessh; in { options.services.endlessh = { - enable = mkEnableOption "endlessh service"; + enable = lib.mkEnableOption "endlessh service"; - port = mkOption { - type = types.port; + port = lib.mkOption { + type = lib.types.port; default = 2222; example = 22; description = '' @@ -26,8 +23,8 @@ in ''; }; - extraOptions = mkOption { - type = with types; listOf str; + extraOptions = lib.mkOption { + type = with lib.types; listOf str; default = [ ]; example = [ "-6" @@ -39,8 +36,8 @@ in ''; }; - openFirewall = mkOption { - type = types.bool; + openFirewall = lib.mkOption { + type = lib.types.bool; default = false; description = '' Whether to open a firewall port for the SSH listener. @@ -48,7 +45,7 @@ in }; }; - config = mkIf cfg.enable { + config = lib.mkIf cfg.enable { systemd.services.endlessh = { description = "SSH tarpit"; requires = [ "network.target" ]; @@ -56,7 +53,7 @@ in serviceConfig = let needsPrivileges = cfg.port < 1024; - capabilities = [ "" ] ++ optionals needsPrivileges [ "CAP_NET_BIND_SERVICE" ]; + capabilities = [ "" ] ++ lib.optionals needsPrivileges [ "CAP_NET_BIND_SERVICE" ]; rootDirectory = "/run/endlessh"; in { @@ -115,5 +112,5 @@ in networking.firewall.allowedTCPPorts = with cfg; optionals openFirewall [ port ]; }; - meta.maintainers = with maintainers; [ azahi ]; + meta.maintainers = with lib.maintainers; [ azahi ]; } From f22a652424ab579c3e90fb7c948dcb4c44a69d72 Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Sun, 29 Dec 2024 21:50:36 +0100 Subject: [PATCH 221/429] nixos/services.fail2ban: remove `with lib;` --- nixos/modules/services/security/fail2ban.nix | 151 +++++++++---------- 1 file changed, 74 insertions(+), 77 deletions(-) diff --git a/nixos/modules/services/security/fail2ban.nix b/nixos/modules/services/security/fail2ban.nix index d006f08f121a..83a65111756b 100644 --- a/nixos/modules/services/security/fail2ban.nix +++ b/nixos/modules/services/security/fail2ban.nix @@ -4,47 +4,44 @@ pkgs, ... }: - -with lib; - let cfg = config.services.fail2ban; settingsFormat = pkgs.formats.keyValue { }; configFormat = pkgs.formats.ini { - mkKeyValue = generators.mkKeyValueDefault { } " = "; + mkKeyValue = lib.generators.mkKeyValueDefault { } " = "; }; mkJailConfig = name: attrs: - optionalAttrs (name != "DEFAULT") { inherit (attrs) enabled; } - // optionalAttrs (attrs.filter != null) { - filter = if (builtins.isString filter) then filter else name; + lib.optionalAttrs (name != "DEFAULT") { inherit (attrs) enabled; } + // lib.optionalAttrs (attrs.filter != null) { + filter = if (builtins.isString lib.filter) then lib.filter else name; } // attrs.settings; mkFilter = name: attrs: - nameValuePair "fail2ban/filter.d/${name}.conf" { + lib.nameValuePair "fail2ban/filter.d/${name}.conf" { source = configFormat.generate "filter.d/${name}.conf" attrs.filter; }; fail2banConf = configFormat.generate "fail2ban.local" cfg.daemonSettings; - strJails = filterAttrs (_: builtins.isString) cfg.jails; - attrsJails = filterAttrs (_: builtins.isAttrs) cfg.jails; + strJails = lib.filterAttrs (_: builtins.isString) cfg.jails; + attrsJails = lib.filterAttrs (_: builtins.isAttrs) cfg.jails; jailConf = let configFile = configFormat.generate "jail.local" ( - { INCLUDES.before = "paths-nixos.conf"; } // (mapAttrs mkJailConfig attrsJails) + { INCLUDES.before = "paths-nixos.conf"; } // (lib.mapAttrs mkJailConfig attrsJails) ); - extraConfig = concatStringsSep "\n" ( - attrValues ( - mapAttrs ( + extraConfig = lib.concatStringsSep "\n" ( + lib.attrValues ( + lib.mapAttrs ( name: def: - optionalString (def != "") '' + lib.optionalString (def != "") '' [${name}] ${def} '' @@ -74,12 +71,12 @@ in { imports = [ - (mkRemovedOptionModule [ + (lib.mkRemovedOptionModule [ "services" "fail2ban" "daemonConfig" ] "The daemon is now configured through the attribute set `services.fail2ban.daemonSettings`.") - (mkRemovedOptionModule [ "services" "fail2ban" "extraSettings" ] + (lib.mkRemovedOptionModule [ "services" "fail2ban" "extraSettings" ] "The extra default configuration can now be set using `services.fail2ban.jails.DEFAULT.settings`." ) ]; @@ -88,9 +85,9 @@ in options = { services.fail2ban = { - enable = mkOption { + enable = lib.mkOption { default = false; - type = types.bool; + type = lib.types.bool; description = '' Whether to enable the fail2ban service. @@ -99,20 +96,20 @@ in ''; }; - package = mkPackageOption pkgs "fail2ban" { + package = lib.mkPackageOption pkgs "fail2ban" { example = "fail2ban_0_11"; }; - packageFirewall = mkOption { + packageFirewall = lib.mkOption { default = config.networking.firewall.package; - defaultText = literalExpression "config.networking.firewall.package"; - type = types.package; + defaultText = lib.literalExpression "config.networking.firewall.package"; + type = lib.types.package; description = "The firewall package used by fail2ban service. Defaults to the package for your firewall (iptables or nftables)."; }; - extraPackages = mkOption { + extraPackages = lib.mkOption { default = [ ]; - type = types.listOf types.package; + type = lib.types.listOf lib.types.package; example = lib.literalExpression "[ pkgs.ipset ]"; description = '' Extra packages to be made available to the fail2ban service. The example contains @@ -120,23 +117,23 @@ in ''; }; - bantime = mkOption { + bantime = lib.mkOption { default = "10m"; - type = types.str; + type = lib.types.str; example = "1h"; description = "Number of seconds that a host is banned."; }; - maxretry = mkOption { + maxretry = lib.mkOption { default = 3; - type = types.ints.unsigned; + type = lib.types.ints.unsigned; description = "Number of failures before a host gets banned."; }; - banaction = mkOption { + banaction = lib.mkOption { default = if config.networking.nftables.enable then "nftables-multiport" else "iptables-multiport"; - defaultText = literalExpression ''if config.networking.nftables.enable then "nftables-multiport" else "iptables-multiport"''; - type = types.str; + defaultText = lib.literalExpression ''if config.networking.nftables.enable then "nftables-multiport" else "iptables-multiport"''; + type = lib.types.str; description = '' Default banning action (e.g. iptables, iptables-new, iptables-multiport, iptables-ipset-proto6-allports, shorewall, etc). It is used to @@ -145,10 +142,10 @@ in ''; }; - banaction-allports = mkOption { + banaction-allports = lib.mkOption { default = if config.networking.nftables.enable then "nftables-allports" else "iptables-allports"; - defaultText = literalExpression ''if config.networking.nftables.enable then "nftables-allports" else "iptables-allports"''; - type = types.str; + defaultText = lib.literalExpression ''if config.networking.nftables.enable then "nftables-allports" else "iptables-allports"''; + type = lib.types.str; description = '' Default banning action (e.g. iptables, iptables-new, iptables-multiport, shorewall, etc) for "allports" jails. It is used to define action_* variables. Can be overridden @@ -156,18 +153,18 @@ in ''; }; - bantime-increment.enable = mkOption { + bantime-increment.enable = lib.mkOption { default = false; - type = types.bool; + type = lib.types.bool; description = '' "bantime.increment" allows to use database for searching of previously banned ip's to increase a default ban time using special formula, default it is banTime * 1, 2, 4, 8, 16, 32 ... ''; }; - bantime-increment.rndtime = mkOption { + bantime-increment.rndtime = lib.mkOption { default = null; - type = types.nullOr types.str; + type = lib.types.nullOr lib.types.str; example = "8m"; description = '' "bantime.rndtime" is the max number of seconds using for mixing with random time @@ -175,18 +172,18 @@ in ''; }; - bantime-increment.maxtime = mkOption { + bantime-increment.maxtime = lib.mkOption { default = null; - type = types.nullOr types.str; + type = lib.types.nullOr lib.types.str; example = "48h"; description = '' "bantime.maxtime" is the max number of seconds using the ban time can reach (don't grows further) ''; }; - bantime-increment.factor = mkOption { + bantime-increment.factor = lib.mkOption { default = null; - type = types.nullOr types.str; + type = lib.types.nullOr lib.types.str; example = "4"; description = '' "bantime.factor" is a coefficient to calculate exponent growing of the formula or common multiplier, @@ -194,9 +191,9 @@ in ''; }; - bantime-increment.formula = mkOption { + bantime-increment.formula = lib.mkOption { default = null; - type = types.nullOr types.str; + type = lib.types.nullOr lib.types.str; example = "ban.Time * math.exp(float(ban.Count+1)*banFactor)/math.exp(1*banFactor)"; description = '' "bantime.formula" used by default to calculate next value of ban time, default value below, @@ -204,9 +201,9 @@ in ''; }; - bantime-increment.multipliers = mkOption { + bantime-increment.multipliers = lib.mkOption { default = null; - type = types.nullOr types.str; + type = lib.types.nullOr lib.types.str; example = "1 2 4 8 16 32 64"; description = '' "bantime.multipliers" used to calculate next value of ban time instead of formula, corresponding @@ -216,9 +213,9 @@ in ''; }; - bantime-increment.overalljails = mkOption { + bantime-increment.overalljails = lib.mkOption { default = null; - type = types.nullOr types.bool; + type = lib.types.nullOr lib.types.bool; example = true; description = '' "bantime.overalljails" (if true) specifies the search of IP in the database will be executed @@ -226,9 +223,9 @@ in ''; }; - ignoreIP = mkOption { + ignoreIP = lib.mkOption { default = [ ]; - type = types.listOf types.str; + type = lib.types.listOf lib.types.str; example = [ "192.168.0.0/16" "2001:DB8::42" @@ -239,10 +236,10 @@ in ''; }; - daemonSettings = mkOption { + daemonSettings = lib.mkOption { inherit (configFormat) type; - defaultText = literalExpression '' + defaultText = lib.literalExpression '' { Definition = { logtarget = "SYSLOG"; @@ -258,9 +255,9 @@ in ''; }; - jails = mkOption { + jails = lib.mkOption { default = { }; - example = literalExpression '' + example = lib.literalExpression '' { apache-nohome-iptables = { settings = { @@ -287,26 +284,26 @@ in }; ''; type = - with types; + with lib.types; attrsOf ( either lines ( submodule ( { name, ... }: { options = { - enabled = mkEnableOption "this jail" // { + enabled = lib.mkEnableOption "this jail" // { default = true; readOnly = name == "DEFAULT"; }; - filter = mkOption { + filter = lib.mkOption { type = nullOr (either str configFormat.type); default = null; description = "Content of the filter used for this jail."; }; - settings = mkOption { + settings = lib.mkOption { inherit (settingsFormat) type; default = { }; @@ -344,7 +341,7 @@ in ###### implementation - config = mkIf cfg.enable { + config = lib.mkIf cfg.enable { assertions = [ { assertion = cfg.bantime-increment.formula == null || cfg.bantime-increment.multipliers == null; @@ -354,7 +351,7 @@ in } ]; - warnings = mkIf (!config.networking.firewall.enable && !config.networking.nftables.enable) [ + warnings = lib.mkIf (!config.networking.firewall.enable && !config.networking.nftables.enable) [ "fail2ban can not be used without a firewall" ]; @@ -371,14 +368,14 @@ in "fail2ban/action.d".source = "${cfg.package}/etc/fail2ban/action.d/*.conf"; "fail2ban/filter.d".source = "${cfg.package}/etc/fail2ban/filter.d/*.conf"; } - // (mapAttrs' mkFilter ( - filterAttrs (_: v: v.filter != null && !builtins.isString v.filter) attrsJails + // (lib.mapAttrs' mkFilter ( + lib.filterAttrs (_: v: v.filter != null && !builtins.isString v.filter) attrsJails )); systemd.packages = [ cfg.package ]; systemd.services.fail2ban = { wantedBy = [ "multi-user.target" ]; - partOf = optional config.networking.firewall.enable "firewall.service"; + partOf = lib.optional config.networking.firewall.enable "firewall.service"; restartTriggers = [ fail2banConf @@ -423,29 +420,29 @@ in # Defaults for the daemon settings services.fail2ban.daemonSettings.Definition = { - logtarget = mkDefault "SYSLOG"; - socket = mkDefault "/run/fail2ban/fail2ban.sock"; - pidfile = mkDefault "/run/fail2ban/fail2ban.pid"; - dbfile = mkDefault "/var/lib/fail2ban/fail2ban.sqlite3"; + logtarget = lib.mkDefault "SYSLOG"; + socket = lib.mkDefault "/run/fail2ban/fail2ban.sock"; + pidfile = lib.mkDefault "/run/fail2ban/fail2ban.pid"; + dbfile = lib.mkDefault "/var/lib/fail2ban/fail2ban.sqlite3"; }; # Add some reasonable default jails. The special "DEFAULT" jail # sets default values for all other jails. - services.fail2ban.jails = mkMerge [ + services.fail2ban.jails = lib.mkMerge [ { DEFAULT.settings = - (optionalAttrs cfg.bantime-increment.enable ( + (lib.optionalAttrs cfg.bantime-increment.enable ( { "bantime.increment" = cfg.bantime-increment.enable; } - // (mapAttrs' (name: nameValuePair "bantime.${name}") ( - filterAttrs (n: v: v != null && n != "enable") cfg.bantime-increment + // (lib.mapAttrs' (name: lib.nameValuePair "bantime.${name}") ( + lib.filterAttrs (n: v: v != null && n != "enable") cfg.bantime-increment )) )) // { # Miscellaneous options inherit (cfg) banaction maxretry bantime; - ignoreip = ''127.0.0.1/8 ${optionalString config.networking.enableIPv6 "::1"} ${concatStringsSep " " cfg.ignoreIP}''; + ignoreip = ''127.0.0.1/8 ${lib.optionalString config.networking.enableIPv6 "::1"} ${lib.concatStringsSep " " cfg.ignoreIP}''; backend = "systemd"; # Actions banaction_allports = cfg.banaction-allports; @@ -453,15 +450,15 @@ in } # Block SSH if there are too many failing connection attempts. - (mkIf config.services.openssh.enable { - sshd.settings.port = mkDefault ( - concatMapStringsSep "," builtins.toString config.services.openssh.ports + (lib.mkIf config.services.openssh.enable { + sshd.settings.port = lib.mkDefault ( + lib.concatMapStringsSep "," builtins.toString config.services.openssh.ports ); }) ]; # Benefits from verbose sshd logging to observe failed login attempts, # so we set that here unless the user overrode it. - services.openssh.settings.LogLevel = mkDefault "VERBOSE"; + services.openssh.settings.LogLevel = lib.mkDefault "VERBOSE"; }; } From 4d9366e1980b4c6e0ccbdca793b5ed08e481ad05 Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Sun, 29 Dec 2024 21:50:36 +0100 Subject: [PATCH 222/429] nixos/services.fprintd: remove `with lib;` --- nixos/modules/services/security/fprintd.nix | 23 +++++++++------------ 1 file changed, 10 insertions(+), 13 deletions(-) diff --git a/nixos/modules/services/security/fprintd.nix b/nixos/modules/services/security/fprintd.nix index 87c3f1f6f9e4..ea6d6189d248 100644 --- a/nixos/modules/services/security/fprintd.nix +++ b/nixos/modules/services/security/fprintd.nix @@ -1,7 +1,4 @@ { config, lib, pkgs, ... }: - -with lib; - let cfg = config.services.fprintd; @@ -18,12 +15,12 @@ in services.fprintd = { - enable = mkEnableOption "fprintd daemon and PAM module for fingerprint readers handling"; + enable = lib.mkEnableOption "fprintd daemon and PAM module for fingerprint readers handling"; - package = mkOption { - type = types.package; + package = lib.mkOption { + type = lib.types.package; default = fprintdPkg; - defaultText = literalExpression "if config.services.fprintd.tod.enable then pkgs.fprintd-tod else pkgs.fprintd"; + defaultText = lib.literalExpression "if config.services.fprintd.tod.enable then pkgs.fprintd-tod else pkgs.fprintd"; description = '' fprintd package to use. ''; @@ -31,11 +28,11 @@ in tod = { - enable = mkEnableOption "Touch OEM Drivers library support"; + enable = lib.mkEnableOption "Touch OEM Drivers library support"; - driver = mkOption { - type = types.package; - example = literalExpression "pkgs.libfprint-2-tod1-goodix"; + driver = lib.mkOption { + type = lib.types.package; + example = lib.literalExpression "pkgs.libfprint-2-tod1-goodix"; description = '' Touch OEM Drivers (TOD) package to use. ''; @@ -47,7 +44,7 @@ in ###### implementation - config = mkIf cfg.enable { + config = lib.mkIf cfg.enable { services.dbus.packages = [ cfg.package ]; @@ -55,7 +52,7 @@ in systemd.packages = [ cfg.package ]; - systemd.services.fprintd.environment = mkIf cfg.tod.enable { + systemd.services.fprintd.environment = lib.mkIf cfg.tod.enable { FP_TOD_DRIVERS_DIR = "${cfg.tod.driver}${cfg.tod.driver.driverPath}"; }; From 1c7eaa7b7ab0e3a5745910896a8db7106c272ac6 Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Sun, 29 Dec 2024 21:50:36 +0100 Subject: [PATCH 223/429] nixos/services.haka: remove `with lib;` --- nixos/modules/services/security/haka.nix | 50 +++++++++++------------- 1 file changed, 23 insertions(+), 27 deletions(-) diff --git a/nixos/modules/services/security/haka.nix b/nixos/modules/services/security/haka.nix index 05bb6025e5ec..a9ec240c50cf 100644 --- a/nixos/modules/services/security/haka.nix +++ b/nixos/modules/services/security/haka.nix @@ -1,14 +1,10 @@ # This module defines global configuration for Haka. - { config, lib, pkgs, ... }: - -with lib; - let cfg = config.services.haka; @@ -23,14 +19,14 @@ let else "${haka}/share/haka/sample/${cfg.configFile}" } - ${optionalString (builtins.lessThan 0 cfg.threads) "thread = ${cfg.threads}"} + ${lib.optionalString (builtins.lessThan 0 cfg.threads) "thread = ${cfg.threads}"} [packet] - ${optionalString cfg.pcap ''module = "packet/pcap"''} - ${optionalString cfg.nfqueue ''module = "packet/nqueue"''} - ${optionalString cfg.dump.enable ''dump = "yes"''} - ${optionalString cfg.dump.enable ''dump_input = "${cfg.dump.input}"''} - ${optionalString cfg.dump.enable ''dump_output = "${cfg.dump.output}"''} + ${lib.optionalString cfg.pcap ''module = "packet/pcap"''} + ${lib.optionalString cfg.nfqueue ''module = "packet/nqueue"''} + ${lib.optionalString cfg.dump.enable ''dump = "yes"''} + ${lib.optionalString cfg.dump.enable ''dump_input = "${cfg.dump.input}"''} + ${lib.optionalString cfg.dump.enable ''dump_output = "${cfg.dump.output}"''} interfaces = "${lib.strings.concatStringsSep "," cfg.interfaces}" @@ -62,14 +58,14 @@ in services.haka = { - enable = mkEnableOption "Haka"; + enable = lib.mkEnableOption "Haka"; - package = mkPackageOption pkgs "haka" { }; + package = lib.mkPackageOption pkgs "haka" { }; - configFile = mkOption { + configFile = lib.mkOption { default = "empty.lua"; example = "/srv/haka/myfilter.lua"; - type = types.str; + type = lib.types.str; description = '' Specify which configuration file Haka uses. It can be absolute path or a path relative to the sample directory of @@ -77,46 +73,46 @@ in ''; }; - interfaces = mkOption { + interfaces = lib.mkOption { default = [ "eth0" ]; example = [ "any" ]; - type = with types; listOf str; + type = with lib.types; listOf str; description = '' Specify which interface(s) Haka listens to. Use 'any' to listen to all interfaces. ''; }; - threads = mkOption { + threads = lib.mkOption { default = 0; example = 4; - type = types.int; + type = lib.types.int; description = '' The number of threads that will be used. All system threads are used by default. ''; }; - pcap = mkOption { + pcap = lib.mkOption { default = true; - type = types.bool; + type = lib.types.bool; description = "Whether to enable pcap"; }; - nfqueue = mkEnableOption "nfqueue"; + nfqueue = lib.mkEnableOption "nfqueue"; - dump.enable = mkEnableOption "dump"; - dump.input = mkOption { + dump.enable = lib.mkEnableOption "dump"; + dump.input = lib.mkOption { default = "/tmp/input.pcap"; example = "/path/to/file.pcap"; - type = types.path; + type = lib.types.path; description = "Path to file where incoming packets are dumped"; }; - dump.output = mkOption { + dump.output = lib.mkOption { default = "/tmp/output.pcap"; example = "/path/to/file.pcap"; - type = types.path; + type = lib.types.path; description = "Path to file where outgoing packets are dumped"; }; }; @@ -124,7 +120,7 @@ in ###### implementation - config = mkIf cfg.enable { + config = lib.mkIf cfg.enable { assertions = [ { From f155ae804a185c3c7b3ab4b0de2fe8af89e5327e Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Sun, 29 Dec 2024 21:50:37 +0100 Subject: [PATCH 224/429] nixos/services.haveged: remove `with lib;` --- nixos/modules/services/security/haveged.nix | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/nixos/modules/services/security/haveged.nix b/nixos/modules/services/security/haveged.nix index 778877825bb6..3e0a9f224cc8 100644 --- a/nixos/modules/services/security/haveged.nix +++ b/nixos/modules/services/security/haveged.nix @@ -4,9 +4,6 @@ pkgs, ... }: - -with lib; - let cfg = config.services.haveged; @@ -20,14 +17,14 @@ in services.haveged = { - enable = mkEnableOption '' + enable = lib.mkEnableOption '' haveged entropy daemon, which refills /dev/random when low. NOTE: does nothing on kernels newer than 5.6 ''; # source for the note https://github.com/jirka-h/haveged/issues/57 - refill_threshold = mkOption { - type = types.int; + refill_threshold = lib.mkOption { + type = lib.types.int; default = 1024; description = '' The number of bits of available entropy beneath which @@ -39,7 +36,7 @@ in }; - config = mkIf cfg.enable { + config = lib.mkIf cfg.enable { # https://github.com/jirka-h/haveged/blob/a4b69d65a8dfc5a9f52ff8505c7f58dcf8b9234f/contrib/Fedora/haveged.service systemd.services.haveged = { From 83ccb2a1bfdb998e93696889e19b127b5c7cdf62 Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Sun, 29 Dec 2024 21:50:37 +0100 Subject: [PATCH 225/429] nixos/services.hologram-agent: remove `with lib;` --- .../services/security/hologram-agent.nix | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/nixos/modules/services/security/hologram-agent.nix b/nixos/modules/services/security/hologram-agent.nix index e28efd1d12f6..21bedc4fabd2 100644 --- a/nixos/modules/services/security/hologram-agent.nix +++ b/nixos/modules/services/security/hologram-agent.nix @@ -4,9 +4,6 @@ lib, ... }: - -with lib; - let cfg = config.services.hologram-agent; @@ -19,20 +16,20 @@ in { options = { services.hologram-agent = { - enable = mkOption { - type = types.bool; + enable = lib.mkOption { + type = lib.types.bool; default = false; description = "Whether to enable the Hologram agent for AWS instance credentials"; }; - dialAddress = mkOption { - type = types.str; + dialAddress = lib.mkOption { + type = lib.types.str; default = "localhost:3100"; description = "Hologram server and port."; }; - httpPort = mkOption { - type = types.str; + httpPort = lib.mkOption { + type = lib.types.str; default = "80"; description = "Port for metadata service to listen on."; }; @@ -40,7 +37,7 @@ in }; }; - config = mkIf cfg.enable { + config = lib.mkIf cfg.enable { boot.kernelModules = [ "dummy" ]; networking.interfaces.dummy0.ipv4.addresses = [ From 3bb7989e0ddd78d28835d22a041ae8d65b02c7ff Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Sun, 29 Dec 2024 21:50:37 +0100 Subject: [PATCH 226/429] nixos/services.hologram-server: remove `with lib;` --- .../services/security/hologram-server.nix | 65 +++++++++---------- 1 file changed, 31 insertions(+), 34 deletions(-) diff --git a/nixos/modules/services/security/hologram-server.nix b/nixos/modules/services/security/hologram-server.nix index 58e2e58e9c0b..70f9b0e250db 100644 --- a/nixos/modules/services/security/hologram-server.nix +++ b/nixos/modules/services/security/hologram-server.nix @@ -4,9 +4,6 @@ lib, ... }: - -with lib; - let cfg = config.services.hologram-server; @@ -38,93 +35,93 @@ in { options = { services.hologram-server = { - enable = mkOption { - type = types.bool; + enable = lib.mkOption { + type = lib.types.bool; default = false; description = "Whether to enable the Hologram server for AWS instance credentials"; }; - listenAddress = mkOption { - type = types.str; + listenAddress = lib.mkOption { + type = lib.types.str; default = "0.0.0.0:3100"; description = "Address and port to listen on"; }; - ldapHost = mkOption { - type = types.str; + ldapHost = lib.mkOption { + type = lib.types.str; description = "Address of the LDAP server to use"; }; - ldapInsecure = mkOption { - type = types.bool; + ldapInsecure = lib.mkOption { + type = lib.types.bool; default = false; description = "Whether to connect to LDAP over SSL or not"; }; - ldapUserAttr = mkOption { - type = types.str; + ldapUserAttr = lib.mkOption { + type = lib.types.str; default = "cn"; description = "The LDAP attribute for usernames"; }; - ldapBaseDN = mkOption { - type = types.str; + ldapBaseDN = lib.mkOption { + type = lib.types.str; description = "The base DN for your Hologram users"; }; - ldapBindDN = mkOption { - type = types.str; + ldapBindDN = lib.mkOption { + type = lib.types.str; description = "DN of account to use to query the LDAP server"; }; - ldapBindPassword = mkOption { - type = types.str; + ldapBindPassword = lib.mkOption { + type = lib.types.str; description = "Password of account to use to query the LDAP server"; }; - enableLdapRoles = mkOption { - type = types.bool; + enableLdapRoles = lib.mkOption { + type = lib.types.bool; default = false; description = "Whether to assign user roles based on the user's LDAP group memberships"; }; - groupClassAttr = mkOption { - type = types.str; + groupClassAttr = lib.mkOption { + type = lib.types.str; default = "groupOfNames"; description = "The objectclass attribute to search for groups when enableLdapRoles is true"; }; - roleAttr = mkOption { - type = types.str; + roleAttr = lib.mkOption { + type = lib.types.str; default = "businessCategory"; description = "Which LDAP group attribute to search for authorized role ARNs"; }; - awsAccount = mkOption { - type = types.str; + awsAccount = lib.mkOption { + type = lib.types.str; description = "AWS account number"; }; - awsDefaultRole = mkOption { - type = types.str; + awsDefaultRole = lib.mkOption { + type = lib.types.str; description = "AWS default role"; }; - statsAddress = mkOption { - type = types.str; + statsAddress = lib.mkOption { + type = lib.types.str; default = ""; description = "Address of statsd server"; }; - cacheTimeoutSeconds = mkOption { - type = types.int; + cacheTimeoutSeconds = lib.mkOption { + type = lib.types.int; default = 3600; description = "How often (in seconds) to refresh the LDAP cache"; }; }; }; - config = mkIf cfg.enable { + config = lib.mkIf cfg.enable { systemd.services.hologram-server = { description = "Provide EC2 instance credentials to machines outside of EC2"; after = [ "network.target" ]; From bd92ad1747ccfb73ee38cfe349aa0a7b1db2585d Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Sun, 29 Dec 2024 21:50:37 +0100 Subject: [PATCH 227/429] nixos/services.infnoise: remove `with lib;` --- nixos/modules/services/security/infnoise.nix | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/nixos/modules/services/security/infnoise.nix b/nixos/modules/services/security/infnoise.nix index 36dce8bb3e03..0a71f16d9ffa 100644 --- a/nixos/modules/services/security/infnoise.nix +++ b/nixos/modules/services/security/infnoise.nix @@ -4,38 +4,35 @@ pkgs, ... }: - -with lib; - let cfg = config.services.infnoise; in { options = { services.infnoise = { - enable = mkEnableOption "the Infinite Noise TRNG driver"; + enable = lib.mkEnableOption "the Infinite Noise TRNG driver"; - fillDevRandom = mkOption { + fillDevRandom = lib.mkOption { description = '' Whether to run the infnoise driver as a daemon to refill /dev/random. If disabled, you can use the `infnoise` command-line tool to manually obtain randomness. ''; - type = types.bool; + type = lib.types.bool; default = true; }; }; }; - config = mkIf cfg.enable { + config = lib.mkIf cfg.enable { environment.systemPackages = [ pkgs.infnoise ]; services.udev.extraRules = '' SUBSYSTEM=="usb", ATTRS{idVendor}=="0403", ATTRS{idProduct}=="6015", SYMLINK+="infnoise", TAG+="systemd", GROUP="dialout", MODE="0664", ENV{SYSTEMD_WANTS}="infnoise.service" ''; - systemd.services.infnoise = mkIf cfg.fillDevRandom { + systemd.services.infnoise = lib.mkIf cfg.fillDevRandom { description = "Infinite Noise TRNG driver"; bindsTo = [ "dev-infnoise.device" ]; From bc6eb177b423b0cf8c52801328e71af0769e9330 Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Sun, 29 Dec 2024 21:50:37 +0100 Subject: [PATCH 228/429] nixos/services.munge: remove `with lib;` --- nixos/modules/services/security/munge.nix | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/nixos/modules/services/security/munge.nix b/nixos/modules/services/security/munge.nix index 16481f116532..00fb0a1e1ac3 100644 --- a/nixos/modules/services/security/munge.nix +++ b/nixos/modules/services/security/munge.nix @@ -4,9 +4,6 @@ pkgs, ... }: - -with lib; - let cfg = config.services.munge; @@ -20,11 +17,11 @@ in options = { services.munge = { - enable = mkEnableOption "munge service"; + enable = lib.mkEnableOption "munge service"; - password = mkOption { + password = lib.mkOption { default = "/etc/munge/munge.key"; - type = types.path; + type = lib.types.path; description = '' The path to a daemon's secret key. ''; @@ -36,7 +33,7 @@ in ###### implementation - config = mkIf cfg.enable { + config = lib.mkIf cfg.enable { environment.systemPackages = [ pkgs.munge ]; From fe23e335d553104211719cb40a65387b7fa65478 Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Sun, 29 Dec 2024 21:50:37 +0100 Subject: [PATCH 229/429] nixos/services.nginx.sso: remove `with lib;` --- nixos/modules/services/security/nginx-sso.nix | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/nixos/modules/services/security/nginx-sso.nix b/nixos/modules/services/security/nginx-sso.nix index 7afa0054c9d5..548a44e83ee2 100644 --- a/nixos/modules/services/security/nginx-sso.nix +++ b/nixos/modules/services/security/nginx-sso.nix @@ -1,21 +1,18 @@ { config, lib, pkgs, utils, ... }: - -with lib; - let cfg = config.services.nginx.sso; format = pkgs.formats.yaml { }; configPath = "/var/lib/nginx-sso/config.yaml"; in { options.services.nginx.sso = { - enable = mkEnableOption "nginx-sso service"; + enable = lib.mkEnableOption "nginx-sso service"; - package = mkPackageOption pkgs "nginx-sso" { }; + package = lib.mkPackageOption pkgs "nginx-sso" { }; - configuration = mkOption { + configuration = lib.mkOption { type = format.type; default = {}; - example = literalExpression '' + example = lib.literalExpression '' { listen = { addr = "127.0.0.1"; port = 8080; }; @@ -48,7 +45,7 @@ in { }; }; - config = mkIf cfg.enable { + config = lib.mkIf cfg.enable { systemd.services.nginx-sso = { description = "Nginx SSO Backend"; after = [ "network.target" ]; From a8d331716ca5f23a1955487309981877339bbb6a Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Sun, 29 Dec 2024 21:50:37 +0100 Subject: [PATCH 230/429] nixos/services.opensnitch: remove `with lib;` --- .../modules/services/security/opensnitch.nix | 77 +++++++++---------- 1 file changed, 37 insertions(+), 40 deletions(-) diff --git a/nixos/modules/services/security/opensnitch.nix b/nixos/modules/services/security/opensnitch.nix index 10b44052ac6e..897cf2587bac 100644 --- a/nixos/modules/services/security/opensnitch.nix +++ b/nixos/modules/services/security/opensnitch.nix @@ -4,14 +4,11 @@ pkgs, ... }: - -with lib; - let cfg = config.services.opensnitch; format = pkgs.formats.json { }; - predefinedRules = flip mapAttrs cfg.rules ( + predefinedRules = lib.flip lib.mapAttrs cfg.rules ( name: cfg: { file = pkgs.writeText "rule" (builtins.toJSON cfg); } @@ -21,11 +18,11 @@ in { options = { services.opensnitch = { - enable = mkEnableOption "Opensnitch application firewall"; + enable = lib.mkEnableOption "Opensnitch application firewall"; - rules = mkOption { + rules = lib.mkOption { default = { }; - example = literalExpression '' + example = lib.literalExpression '' { "tor" = { "name" = "tor"; @@ -50,28 +47,28 @@ in for available options. ''; - type = types.submodule { + type = lib.types.submodule { freeformType = format.type; }; }; - settings = mkOption { - type = types.submodule { + settings = lib.mkOption { + type = lib.types.submodule { freeformType = format.type; options = { Server = { - Address = mkOption { - type = types.str; + Address = lib.mkOption { + type = lib.types.str; description = '' Unix socket path (unix:///tmp/osui.sock, the "unix:///" part is mandatory) or TCP socket (192.168.1.100:50051). ''; }; - LogFile = mkOption { - type = types.path; + LogFile = lib.mkOption { + type = lib.types.path; description = '' File to write logs to (use /dev/stdout to write logs to standard output). @@ -80,8 +77,8 @@ in }; - DefaultAction = mkOption { - type = types.enum [ + DefaultAction = lib.mkOption { + type = lib.types.enum [ "allow" "deny" ]; @@ -91,15 +88,15 @@ in ''; }; - InterceptUnknown = mkOption { - type = types.bool; + InterceptUnknown = lib.mkOption { + type = lib.types.bool; description = '' Whether to intercept spare connections. ''; }; - ProcMonitorMethod = mkOption { - type = types.enum [ + ProcMonitorMethod = lib.mkOption { + type = lib.types.enum [ "ebpf" "proc" "ftrace" @@ -110,8 +107,8 @@ in ''; }; - LogLevel = mkOption { - type = types.enum [ + LogLevel = lib.mkOption { + type = lib.types.enum [ 0 1 2 @@ -124,8 +121,8 @@ in ''; }; - Firewall = mkOption { - type = types.enum [ + Firewall = lib.mkOption { + type = lib.types.enum [ "iptables" "nftables" ]; @@ -136,15 +133,15 @@ in Stats = { - MaxEvents = mkOption { - type = types.int; + MaxEvents = lib.mkOption { + type = lib.types.int; description = '' Max events to send to the GUI. ''; }; - MaxStats = mkOption { - type = types.int; + MaxStats = lib.mkOption { + type = lib.types.int; description = '' Max stats per item to keep in backlog. ''; @@ -152,14 +149,14 @@ in }; - Ebpf.ModulesPath = mkOption { - type = types.path; + Ebpf.ModulesPath = lib.mkOption { + type = lib.types.path; default = if cfg.settings.ProcMonitorMethod == "ebpf" then "${config.boot.kernelPackages.opensnitch-ebpf}/etc/opensnitchd" else null; - defaultText = literalExpression '' + defaultText = lib.literalExpression '' if cfg.settings.ProcMonitorMethod == "ebpf" then "\\$\\{config.boot.kernelPackages.opensnitch-ebpf\\}/etc/opensnitchd" else null; @@ -170,8 +167,8 @@ in ''; }; - Rules.Path = mkOption { - type = types.path; + Rules.Path = lib.mkOption { + type = lib.types.path; default = "/var/lib/opensnitch/rules"; description = '' Path to the directory where firewall rules can be found and will @@ -189,10 +186,10 @@ in }; }; - config = mkIf cfg.enable { + config = lib.mkIf cfg.enable { # pkg.opensnitch is referred to elsewhere in the module so we don't need to worry about it being garbage collected - services.opensnitch.settings = mapAttrs (_: v: mkDefault v) ( + services.opensnitch.settings = lib.mapAttrs (_: v: lib.mkDefault v) ( builtins.fromJSON ( builtins.unsafeDiscardStringContext ( builtins.readFile "${pkgs.opensnitch}/etc/opensnitchd/default-config.json" @@ -210,9 +207,9 @@ in "${pkgs.opensnitch}/bin/opensnitchd --config-file ${format.generate "default-config.json" cfg.settings}" ]; }; - preStart = mkIf (cfg.rules != { }) ( + preStart = lib.mkIf (cfg.rules != { }) ( let - rules = flip mapAttrsToList predefinedRules ( + rules = lib.flip lib.mapAttrsToList predefinedRules ( file: content: { inherit (content) file; local = "${cfg.settings.Rules.Path}/${file}.json"; @@ -225,11 +222,11 @@ in # declared in `cfg.rules` (i.e. all networks that were "removed" from # `cfg.rules`). find ${cfg.settings.Rules.Path} -type l -lname '${builtins.storeDir}/*' ${ - optionalString (rules != { }) '' - -not \( ${concatMapStringsSep " -o " ({ local, ... }: "-name '${baseNameOf local}*'") rules} \) \ + lib.optionalString (rules != { }) '' + -not \( ${lib.concatMapStringsSep " -o " ({ local, ... }: "-name '${baseNameOf local}*'") rules} \) \ '' } -delete - ${concatMapStrings ( + ${lib.concatMapStrings ( { file, local }: '' ln -sf '${file}' "${local}" From 9db6d6f09049463703dd6c1554d4985d10cb603c Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Sun, 29 Dec 2024 22:24:12 +0100 Subject: [PATCH 231/429] nixos/services.opensnitch: fmt --- nixos/modules/services/security/opensnitch.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/nixos/modules/services/security/opensnitch.nix b/nixos/modules/services/security/opensnitch.nix index 897cf2587bac..97700987025d 100644 --- a/nixos/modules/services/security/opensnitch.nix +++ b/nixos/modules/services/security/opensnitch.nix @@ -223,7 +223,9 @@ in # `cfg.rules`). find ${cfg.settings.Rules.Path} -type l -lname '${builtins.storeDir}/*' ${ lib.optionalString (rules != { }) '' - -not \( ${lib.concatMapStringsSep " -o " ({ local, ... }: "-name '${baseNameOf local}*'") rules} \) \ + -not \( ${ + lib.concatMapStringsSep " -o " ({ local, ... }: "-name '${baseNameOf local}*'") rules + } \) \ '' } -delete ${lib.concatMapStrings ( From 59dacf1e5302fe839a68e756efe3a6c0bd1dcc59 Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Sun, 29 Dec 2024 21:50:37 +0100 Subject: [PATCH 232/429] nixos/services.passSecretService: remove `with lib;` --- .../modules/services/security/pass-secret-service.nix | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/nixos/modules/services/security/pass-secret-service.nix b/nixos/modules/services/security/pass-secret-service.nix index 499a934d1366..e9d8432161fa 100644 --- a/nixos/modules/services/security/pass-secret-service.nix +++ b/nixos/modules/services/security/pass-secret-service.nix @@ -4,25 +4,22 @@ pkgs, ... }: - -with lib; - let cfg = config.services.passSecretService; in { options.services.passSecretService = { - enable = mkEnableOption "pass secret service"; + enable = lib.mkEnableOption "pass secret service"; - package = mkPackageOption pkgs "pass-secret-service" { + package = lib.mkPackageOption pkgs "pass-secret-service" { example = "pass-secret-service.override { python3 = pkgs.python310 }"; }; }; - config = mkIf cfg.enable { + config = lib.mkIf cfg.enable { systemd.packages = [ cfg.package ]; services.dbus.packages = [ cfg.package ]; }; - meta.maintainers = with maintainers; [ aidalgol ]; + meta.maintainers = with lib.maintainers; [ aidalgol ]; } From ace688110ef763e4b798a9d1c7c5f117bf2c098f Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Sun, 29 Dec 2024 21:50:38 +0100 Subject: [PATCH 233/429] nixos/services.physlock: remove `with lib;` --- nixos/modules/services/security/physlock.nix | 53 +++++++++----------- 1 file changed, 25 insertions(+), 28 deletions(-) diff --git a/nixos/modules/services/security/physlock.nix b/nixos/modules/services/security/physlock.nix index 0a6536f4dc6b..0c004c340df8 100644 --- a/nixos/modules/services/security/physlock.nix +++ b/nixos/modules/services/security/physlock.nix @@ -4,9 +4,6 @@ pkgs, ... }: - -with lib; - let cfg = config.services.physlock; in @@ -19,8 +16,8 @@ in services.physlock = { - enable = mkOption { - type = types.bool; + enable = lib.mkOption { + type = lib.types.bool; default = false; description = '' Whether to enable the {command}`physlock` screen locking mechanism. @@ -35,8 +32,8 @@ in ''; }; - allowAnyUser = mkOption { - type = types.bool; + allowAnyUser = lib.mkOption { + type = lib.types.bool; default = false; description = '' Whether to allow any user to lock the screen. This will install a @@ -46,24 +43,24 @@ in ''; }; - disableSysRq = mkOption { - type = types.bool; + disableSysRq = lib.mkOption { + type = lib.types.bool; default = true; description = '' Whether to disable SysRq when locked with physlock. ''; }; - lockMessage = mkOption { - type = types.str; + lockMessage = lib.mkOption { + type = lib.types.str; default = ""; description = '' Message to show on physlock login terminal. ''; }; - muteKernelMessages = mkOption { - type = types.bool; + muteKernelMessages = lib.mkOption { + type = lib.types.bool; default = false; description = '' Disable kernel messages on console while physlock is running. @@ -72,24 +69,24 @@ in lockOn = { - suspend = mkOption { - type = types.bool; + suspend = lib.mkOption { + type = lib.types.bool; default = true; description = '' Whether to lock screen with physlock just before suspend. ''; }; - hibernate = mkOption { - type = types.bool; + hibernate = lib.mkOption { + type = lib.types.bool; default = true; description = '' Whether to lock screen with physlock just before hibernate. ''; }; - extraTargets = mkOption { - type = types.listOf types.str; + extraTargets = lib.mkOption { + type = lib.types.listOf lib.types.str; default = [ ]; example = [ "display-manager.service" ]; description = '' @@ -110,7 +107,7 @@ in ###### implementation - config = mkIf cfg.enable (mkMerge [ + config = lib.mkIf cfg.enable (lib.mkMerge [ { # for physlock -l and physlock -L @@ -120,18 +117,18 @@ in enable = true; description = "Physlock"; wantedBy = - optional cfg.lockOn.suspend "suspend.target" - ++ optional cfg.lockOn.hibernate "hibernate.target" + lib.optional cfg.lockOn.suspend "suspend.target" + ++ lib.optional cfg.lockOn.hibernate "hibernate.target" ++ cfg.lockOn.extraTargets; before = - optional cfg.lockOn.suspend "systemd-suspend.service" - ++ optional cfg.lockOn.hibernate "systemd-hibernate.service" - ++ optional (cfg.lockOn.hibernate || cfg.lockOn.suspend) "systemd-suspend-then-hibernate.service" + lib.optional cfg.lockOn.suspend "systemd-suspend.service" + ++ lib.optional cfg.lockOn.hibernate "systemd-hibernate.service" + ++ lib.optional (cfg.lockOn.hibernate || cfg.lockOn.suspend) "systemd-suspend-then-hibernate.service" ++ cfg.lockOn.extraTargets; serviceConfig = { Type = "forking"; - ExecStart = "${pkgs.physlock}/bin/physlock -d${optionalString cfg.muteKernelMessages "m"}${optionalString cfg.disableSysRq "s"}${ - optionalString (cfg.lockMessage != "") " -p \"${cfg.lockMessage}\"" + ExecStart = "${pkgs.physlock}/bin/physlock -d${lib.optionalString cfg.muteKernelMessages "m"}${lib.optionalString cfg.disableSysRq "s"}${ + lib.optionalString (cfg.lockMessage != "") " -p \"${cfg.lockMessage}\"" }"; }; }; @@ -140,7 +137,7 @@ in } - (mkIf cfg.allowAnyUser { + (lib.mkIf cfg.allowAnyUser { security.wrappers.physlock = { setuid = true; From c75c02d0eca26efe9afc1dca08c56e632a1c6386 Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Sun, 29 Dec 2024 22:24:44 +0100 Subject: [PATCH 234/429] nixos/services.physlock: fmt --- nixos/modules/services/security/physlock.nix | 70 +++++++++++--------- 1 file changed, 37 insertions(+), 33 deletions(-) diff --git a/nixos/modules/services/security/physlock.nix b/nixos/modules/services/security/physlock.nix index 0c004c340df8..32167b624f7f 100644 --- a/nixos/modules/services/security/physlock.nix +++ b/nixos/modules/services/security/physlock.nix @@ -107,46 +107,50 @@ in ###### implementation - config = lib.mkIf cfg.enable (lib.mkMerge [ - { + config = lib.mkIf cfg.enable ( + lib.mkMerge [ + { - # for physlock -l and physlock -L - environment.systemPackages = [ pkgs.physlock ]; + # for physlock -l and physlock -L + environment.systemPackages = [ pkgs.physlock ]; - systemd.services.physlock = { - enable = true; - description = "Physlock"; - wantedBy = - lib.optional cfg.lockOn.suspend "suspend.target" - ++ lib.optional cfg.lockOn.hibernate "hibernate.target" - ++ cfg.lockOn.extraTargets; - before = - lib.optional cfg.lockOn.suspend "systemd-suspend.service" - ++ lib.optional cfg.lockOn.hibernate "systemd-hibernate.service" - ++ lib.optional (cfg.lockOn.hibernate || cfg.lockOn.suspend) "systemd-suspend-then-hibernate.service" - ++ cfg.lockOn.extraTargets; - serviceConfig = { - Type = "forking"; - ExecStart = "${pkgs.physlock}/bin/physlock -d${lib.optionalString cfg.muteKernelMessages "m"}${lib.optionalString cfg.disableSysRq "s"}${ - lib.optionalString (cfg.lockMessage != "") " -p \"${cfg.lockMessage}\"" - }"; + systemd.services.physlock = { + enable = true; + description = "Physlock"; + wantedBy = + lib.optional cfg.lockOn.suspend "suspend.target" + ++ lib.optional cfg.lockOn.hibernate "hibernate.target" + ++ cfg.lockOn.extraTargets; + before = + lib.optional cfg.lockOn.suspend "systemd-suspend.service" + ++ lib.optional cfg.lockOn.hibernate "systemd-hibernate.service" + ++ lib.optional ( + cfg.lockOn.hibernate || cfg.lockOn.suspend + ) "systemd-suspend-then-hibernate.service" + ++ cfg.lockOn.extraTargets; + serviceConfig = { + Type = "forking"; + ExecStart = "${pkgs.physlock}/bin/physlock -d${lib.optionalString cfg.muteKernelMessages "m"}${lib.optionalString cfg.disableSysRq "s"}${ + lib.optionalString (cfg.lockMessage != "") " -p \"${cfg.lockMessage}\"" + }"; + }; }; - }; - security.pam.services.physlock = { }; + security.pam.services.physlock = { }; - } + } - (lib.mkIf cfg.allowAnyUser { + (lib.mkIf cfg.allowAnyUser { - security.wrappers.physlock = { - setuid = true; - owner = "root"; - group = "root"; - source = "${pkgs.physlock}/bin/physlock"; - }; + security.wrappers.physlock = { + setuid = true; + owner = "root"; + group = "root"; + source = "${pkgs.physlock}/bin/physlock"; + }; - }) - ]); + }) + ] + ); } From f956ab771b6fd386c28c5195fa4b59790a217295 Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Sun, 29 Dec 2024 21:50:38 +0100 Subject: [PATCH 235/429] nixos/services.sks: remove `with lib;` --- nixos/modules/services/security/sks.nix | 33 +++++++++++-------------- 1 file changed, 15 insertions(+), 18 deletions(-) diff --git a/nixos/modules/services/security/sks.nix b/nixos/modules/services/security/sks.nix index 2c0067325936..db38ca425210 100644 --- a/nixos/modules/services/security/sks.nix +++ b/nixos/modules/services/security/sks.nix @@ -4,9 +4,6 @@ pkgs, ... }: - -with lib; - let cfg = config.services.sks; sksPkg = cfg.package; @@ -16,7 +13,7 @@ let in { - meta.maintainers = with maintainers; [ + meta.maintainers = with lib.maintainers; [ calbrecht jcumming ]; @@ -25,15 +22,15 @@ in services.sks = { - enable = mkEnableOption '' + enable = lib.mkEnableOption '' SKS (synchronizing key server for OpenPGP) and start the database server. You need to create "''${dataDir}/dump/*.gpg" for the initial import''; - package = mkPackageOption pkgs "sks" { }; + package = lib.mkPackageOption pkgs "sks" { }; - dataDir = mkOption { - type = types.path; + dataDir = lib.mkOption { + type = lib.types.path; default = "/var/db/sks"; example = "/var/lib/sks"; # TODO: The default might change to "/var/lib/sks" as this is more @@ -46,8 +43,8 @@ in ''; }; - extraDbConfig = mkOption { - type = types.str; + extraDbConfig = lib.mkOption { + type = lib.types.str; default = ""; description = '' Set contents of the files "KDB/DB_CONFIG" and "PTree/DB_CONFIG" within @@ -60,28 +57,28 @@ in ''; }; - hkpAddress = mkOption { + hkpAddress = lib.mkOption { default = [ "127.0.0.1" "::1" ]; - type = types.listOf types.str; + type = lib.types.listOf lib.types.str; description = '' Domain names, IPv4 and/or IPv6 addresses to listen on for HKP requests. ''; }; - hkpPort = mkOption { + hkpPort = lib.mkOption { default = 11371; - type = types.ints.u16; + type = lib.types.ints.u16; description = "HKP port to listen on."; }; - webroot = mkOption { - type = types.nullOr types.path; + webroot = lib.mkOption { + type = lib.types.nullOr lib.types.path; default = "${sksPkg.webSamples}/OpenPKG"; - defaultText = literalExpression ''"''${package.webSamples}/OpenPKG"''; + defaultText = lib.literalExpression ''"''${package.webSamples}/OpenPKG"''; description = '' Source directory (will be symlinked, if not null) for the files the built-in webserver should serve. SKS (''${pkgs.sks.webSamples}) @@ -96,7 +93,7 @@ in }; }; - config = mkIf cfg.enable { + config = lib.mkIf cfg.enable { users = { users.sks = { From 5d738347e5d76a2cc851839b54da4a74f4dad812 Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Sun, 29 Dec 2024 21:50:38 +0100 Subject: [PATCH 236/429] nixos/services.sshguard: remove `with lib;` --- nixos/modules/services/security/sshguard.nix | 53 +++++++++----------- 1 file changed, 25 insertions(+), 28 deletions(-) diff --git a/nixos/modules/services/security/sshguard.nix b/nixos/modules/services/security/sshguard.nix index ab768f787a66..49d27ad61eb6 100644 --- a/nixos/modules/services/security/sshguard.nix +++ b/nixos/modules/services/security/sshguard.nix @@ -4,9 +4,6 @@ pkgs, ... }: - -with lib; - let cfg = config.services.sshguard; @@ -19,7 +16,7 @@ let "-o cat" "-n1" ] - ++ (map (name: "-t ${escapeShellArg name}") cfg.services) + ++ (map (name: "-t ${lib.escapeShellArg name}") cfg.services) ); backend = if config.networking.nftables.enable then "sshg-fw-nft-sets" else "sshg-fw-ipset"; in @@ -36,40 +33,40 @@ in options = { services.sshguard = { - enable = mkOption { + enable = lib.mkOption { default = false; - type = types.bool; + type = lib.types.bool; description = "Whether to enable the sshguard service."; }; - attack_threshold = mkOption { + attack_threshold = lib.mkOption { default = 30; - type = types.int; + type = lib.types.int; description = '' Block attackers when their cumulative attack score exceeds threshold. Most attacks have a score of 10. ''; }; - blacklist_threshold = mkOption { + blacklist_threshold = lib.mkOption { default = null; example = 120; - type = types.nullOr types.int; + type = lib.types.nullOr lib.types.int; description = '' Blacklist an attacker when its score exceeds threshold. Blacklisted addresses are loaded from and added to blacklist-file. ''; }; - blacklist_file = mkOption { + blacklist_file = lib.mkOption { default = "/var/lib/sshguard/blacklist.db"; - type = types.path; + type = lib.types.path; description = '' Blacklist an attacker when its score exceeds threshold. Blacklisted addresses are loaded from and added to blacklist-file. ''; }; - blocktime = mkOption { + blocktime = lib.mkOption { default = 120; - type = types.int; + type = lib.types.int; description = '' Block attackers for initially blocktime seconds after exceeding threshold. Subsequent blocks increase by a factor of 1.5. @@ -77,33 +74,33 @@ in ''; }; - detection_time = mkOption { + detection_time = lib.mkOption { default = 1800; - type = types.int; + type = lib.types.int; description = '' Remember potential attackers for up to detection_time seconds before resetting their score. ''; }; - whitelist = mkOption { + whitelist = lib.mkOption { default = [ ]; example = [ "198.51.100.56" "198.51.100.2" ]; - type = types.listOf types.str; + type = lib.types.listOf lib.types.str; description = '' Whitelist a list of addresses, hostnames, or address blocks. ''; }; - services = mkOption { + services = lib.mkOption { default = [ "sshd" ]; example = [ "sshd" "exim" ]; - type = types.listOf types.str; + type = lib.types.listOf lib.types.str; description = '' Systemd services sshguard should receive logs of. ''; @@ -113,7 +110,7 @@ in ###### implementation - config = mkIf cfg.enable { + config = lib.mkIf cfg.enable { environment.etc."sshguard.conf".source = configFile; @@ -122,7 +119,7 @@ in wantedBy = [ "multi-user.target" ]; after = [ "network.target" ]; - partOf = optional config.networking.firewall.enable "firewall.service"; + partOf = lib.optional config.networking.firewall.enable "firewall.service"; restartTriggers = [ configFile ]; @@ -149,21 +146,21 @@ in # of the ipsets. So instead, we create both the ipsets and # firewall rules before sshguard starts. preStart = - optionalString config.networking.firewall.enable '' + lib.optionalString config.networking.firewall.enable '' ${pkgs.ipset}/bin/ipset -quiet create -exist sshguard4 hash:net family inet ${pkgs.iptables}/bin/iptables -I INPUT -m set --match-set sshguard4 src -j DROP '' - + optionalString (config.networking.firewall.enable && config.networking.enableIPv6) '' + + lib.optionalString (config.networking.firewall.enable && config.networking.enableIPv6) '' ${pkgs.ipset}/bin/ipset -quiet create -exist sshguard6 hash:net family inet6 ${pkgs.iptables}/bin/ip6tables -I INPUT -m set --match-set sshguard6 src -j DROP ''; postStop = - optionalString config.networking.firewall.enable '' + lib.optionalString config.networking.firewall.enable '' ${pkgs.iptables}/bin/iptables -D INPUT -m set --match-set sshguard4 src -j DROP ${pkgs.ipset}/bin/ipset -quiet destroy sshguard4 '' - + optionalString (config.networking.firewall.enable && config.networking.enableIPv6) '' + + lib.optionalString (config.networking.firewall.enable && config.networking.enableIPv6) '' ${pkgs.iptables}/bin/ip6tables -D INPUT -m set --match-set sshguard6 src -j DROP ${pkgs.ipset}/bin/ipset -quiet destroy sshguard6 ''; @@ -179,11 +176,11 @@ in "-a ${toString cfg.attack_threshold}" "-p ${toString cfg.blocktime}" "-s ${toString cfg.detection_time}" - (optionalString ( + (lib.optionalString ( cfg.blacklist_threshold != null ) "-b ${toString cfg.blacklist_threshold}:${cfg.blacklist_file}") ] - ++ (map (name: "-w ${escapeShellArg name}") cfg.whitelist) + ++ (map (name: "-w ${lib.escapeShellArg name}") cfg.whitelist) ); in "${pkgs.sshguard}/bin/sshguard ${args}"; From 5bbc04afb045e9e965b751ac3c9ae4edadf24cf8 Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Sun, 29 Dec 2024 21:50:38 +0100 Subject: [PATCH 237/429] nixos/services.sslmate-agent: remove `with lib;` --- nixos/modules/services/security/sslmate-agent.nix | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/nixos/modules/services/security/sslmate-agent.nix b/nixos/modules/services/security/sslmate-agent.nix index 081f4c077841..52e39c03b67f 100644 --- a/nixos/modules/services/security/sslmate-agent.nix +++ b/nixos/modules/services/security/sslmate-agent.nix @@ -4,9 +4,6 @@ pkgs, ... }: - -with lib; - let cfg = config.services.sslmate-agent; @@ -16,11 +13,11 @@ in options = { services.sslmate-agent = { - enable = mkEnableOption "sslmate-agent, a daemon for managing SSL/TLS certificates on a server"; + enable = lib.mkEnableOption "sslmate-agent, a daemon for managing SSL/TLS certificates on a server"; }; }; - config = mkIf cfg.enable { + config = lib.mkIf cfg.enable { environment.systemPackages = with pkgs; [ sslmate-agent ]; systemd = { From 4beedae4a124fc282808756add5292277b9c3c1d Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Sun, 29 Dec 2024 21:50:38 +0100 Subject: [PATCH 238/429] nixos/services.tang: remove `with lib;` --- nixos/modules/services/security/tang.nix | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/nixos/modules/services/security/tang.nix b/nixos/modules/services/security/tang.nix index 3d65a5cf6ead..6bf03d107def 100644 --- a/nixos/modules/services/security/tang.nix +++ b/nixos/modules/services/security/tang.nix @@ -4,23 +4,22 @@ pkgs, ... }: -with lib; let cfg = config.services.tang; in { options.services.tang = { - enable = mkEnableOption "tang"; + enable = lib.mkEnableOption "tang"; - package = mkOption { - type = types.package; + package = lib.mkOption { + type = lib.types.package; default = pkgs.tang; - defaultText = literalExpression "pkgs.tang"; + defaultText = lib.literalExpression "pkgs.tang"; description = "The tang package to use."; }; - listenStream = mkOption { - type = with types; listOf str; + listenStream = lib.mkOption { + type = with lib.types; listOf str; default = [ "7654" ]; example = [ "198.168.100.1:7654" @@ -33,9 +32,9 @@ in ''; }; - ipAddressAllow = mkOption { + ipAddressAllow = lib.mkOption { example = [ "192.168.1.0/24" ]; - type = types.listOf types.str; + type = lib.types.listOf lib.types.str; description = '' Whitelist a list of address prefixes. Preferably, internal addresses should be used. @@ -43,7 +42,7 @@ in }; }; - config = mkIf cfg.enable { + config = lib.mkIf cfg.enable { environment.systemPackages = [ cfg.package ]; systemd.services."tangd@" = { From a5b40fbc8b28da578a691a87325e2ac557da5a67 Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Sun, 29 Dec 2024 21:50:38 +0100 Subject: [PATCH 239/429] nixos/services.tor: remove `with lib;` --- nixos/modules/services/security/tor.nix | 277 ++++++++++++------------ 1 file changed, 137 insertions(+), 140 deletions(-) diff --git a/nixos/modules/services/security/tor.nix b/nixos/modules/services/security/tor.nix index 7c7d1a66c774..9db27b4d398c 100644 --- a/nixos/modules/services/security/tor.nix +++ b/nixos/modules/services/security/tor.nix @@ -5,10 +5,7 @@ pkgs, ... }: - with builtins; -with lib; - let cfg = config.services.tor; opt = options.services.tor; @@ -44,33 +41,33 @@ let ]); optionBool = optionName: - mkOption { - type = with types; nullOr bool; + lib.mkOption { + type = with lib.types; nullOr bool; default = null; description = (descriptionGeneric optionName); }; optionInt = optionName: - mkOption { - type = with types; nullOr int; + lib.mkOption { + type = with lib.types; nullOr int; default = null; description = (descriptionGeneric optionName); }; optionString = optionName: - mkOption { - type = with types; nullOr str; + lib.mkOption { + type = with lib.types; nullOr str; default = null; description = (descriptionGeneric optionName); }; optionStrings = optionName: - mkOption { - type = with types; listOf str; + lib.mkOption { + type = with lib.types; listOf str; default = [ ]; description = (descriptionGeneric optionName); }; - optionAddress = mkOption { + optionAddress = lib.mkOption { type = with types; nullOr str; default = null; example = "0.0.0.0"; @@ -78,14 +75,14 @@ let IPv4 or IPv6 (if between brackets) address. ''; }; - optionUnix = mkOption { + optionUnix = lib.mkOption { type = with types; nullOr path; default = null; description = '' Unix domain socket path to use. ''; }; - optionPort = mkOption { + optionPort = lib.mkOption { type = with types; nullOr (oneOf [ @@ -96,13 +93,13 @@ let }; optionPorts = optionName: - mkOption { - type = with types; listOf port; + lib.mkOption { + type = with lib.types; listOf port; default = [ ]; description = (descriptionGeneric optionName); }; optionIsolablePort = - with types; + with lib.types; oneOf [ port (enum [ "auto" ]) @@ -114,14 +111,14 @@ let addr = optionAddress; port = optionPort; flags = optionFlags; - SessionGroup = mkOption { + SessionGroup = lib.mkOption { type = nullOr int; default = null; }; } - // genAttrs isolateFlags ( + // lib.genAttrs isolateFlags ( name: - mkOption { + lib.mkOption { type = types.bool; default = false; } @@ -136,9 +133,9 @@ let ]; optionIsolablePorts = optionName: - mkOption { + lib.mkOption { default = [ ]; - type = with types; either optionIsolablePort (listOf optionIsolablePort); + type = with lib.types; either optionIsolablePort (listOf optionIsolablePort); description = (descriptionGeneric optionName); }; isolateFlags = [ @@ -171,7 +168,7 @@ let "WorldWritable" ] ++ isolateFlags; in - with types; + with lib.types; oneOf [ port (submodule ( @@ -183,19 +180,19 @@ let addr = optionAddress; port = optionPort; flags = optionFlags; - SessionGroup = mkOption { + SessionGroup = lib.mkOption { type = nullOr int; default = null; }; } - // genAttrs flags ( + // lib.genAttrs flags ( name: - mkOption { + lib.mkOption { type = types.bool; default = false; } ); - config = mkIf doConfig { + config = lib.mkIf doConfig { # Only add flags in SOCKSPort to avoid duplicates flags = filter (name: config.${name} == true) flags @@ -204,17 +201,17 @@ let } )) ]; - optionFlags = mkOption { + optionFlags = lib.mkOption { type = with types; listOf str; default = [ ]; }; optionORPort = optionName: - mkOption { + lib.mkOption { default = [ ]; example = 443; type = - with types; + with lib.types; oneOf [ port (enum [ "auto" ]) @@ -238,9 +235,9 @@ let port = optionPort; flags = optionFlags; } - // genAttrs flags ( + // lib.genAttrs flags ( name: - mkOption { + lib.mkOption { type = types.bool; default = false; } @@ -256,15 +253,15 @@ let }; optionBandwidth = optionName: - mkOption { - type = with types; nullOr (either int str); + lib.mkOption { + type = with lib.types; nullOr (either int str); default = null; description = (descriptionGeneric optionName); }; optionPath = optionName: - mkOption { - type = with types; nullOr path; + lib.mkOption { + type = with lib.types; nullOr path; default = null; description = (descriptionGeneric optionName); }; @@ -323,119 +320,119 @@ let in { imports = [ - (mkRenamedOptionModule + (lib.mkRenamedOptionModule [ "services" "tor" "client" "dns" "automapHostsSuffixes" ] [ "services" "tor" "settings" "AutomapHostsSuffixes" ] ) - (mkRemovedOptionModule [ + (lib.mkRemovedOptionModule [ "services" "tor" "client" "dns" "isolationOptions" ] "Use services.tor.settings.DNSPort instead.") - (mkRemovedOptionModule [ + (lib.mkRemovedOptionModule [ "services" "tor" "client" "dns" "listenAddress" ] "Use services.tor.settings.DNSPort instead.") - (mkRemovedOptionModule [ + (lib.mkRemovedOptionModule [ "services" "tor" "client" "privoxy" "enable" ] "Use services.privoxy.enable and services.privoxy.enableTor instead.") - (mkRemovedOptionModule [ + (lib.mkRemovedOptionModule [ "services" "tor" "client" "socksIsolationOptions" ] "Use services.tor.settings.SOCKSPort instead.") - (mkRemovedOptionModule [ + (lib.mkRemovedOptionModule [ "services" "tor" "client" "socksListenAddressFaster" ] "Use services.tor.settings.SOCKSPort instead.") - (mkRenamedOptionModule + (lib.mkRenamedOptionModule [ "services" "tor" "client" "socksPolicy" ] [ "services" "tor" "settings" "SocksPolicy" ] ) - (mkRemovedOptionModule [ + (lib.mkRemovedOptionModule [ "services" "tor" "client" "transparentProxy" "isolationOptions" ] "Use services.tor.settings.TransPort instead.") - (mkRemovedOptionModule [ + (lib.mkRemovedOptionModule [ "services" "tor" "client" "transparentProxy" "listenAddress" ] "Use services.tor.settings.TransPort instead.") - (mkRenamedOptionModule + (lib.mkRenamedOptionModule [ "services" "tor" "controlPort" ] [ "services" "tor" "settings" "ControlPort" ] ) - (mkRemovedOptionModule [ + (lib.mkRemovedOptionModule [ "services" "tor" "extraConfig" ] "Please use services.tor.settings instead.") - (mkRenamedOptionModule + (lib.mkRenamedOptionModule [ "services" "tor" "hiddenServices" ] [ "services" "tor" "relay" "onionServices" ] ) - (mkRenamedOptionModule + (lib.mkRenamedOptionModule [ "services" "tor" "relay" "accountingMax" ] [ "services" "tor" "settings" "AccountingMax" ] ) - (mkRenamedOptionModule + (lib.mkRenamedOptionModule [ "services" "tor" "relay" "accountingStart" ] [ "services" "tor" "settings" "AccountingStart" ] ) - (mkRenamedOptionModule + (lib.mkRenamedOptionModule [ "services" "tor" "relay" "address" ] [ "services" "tor" "settings" "Address" ] ) - (mkRenamedOptionModule + (lib.mkRenamedOptionModule [ "services" "tor" "relay" "bandwidthBurst" ] [ "services" "tor" "settings" "BandwidthBurst" ] ) - (mkRenamedOptionModule + (lib.mkRenamedOptionModule [ "services" "tor" "relay" "bandwidthRate" ] [ "services" "tor" "settings" "BandwidthRate" ] ) - (mkRenamedOptionModule + (lib.mkRenamedOptionModule [ "services" "tor" "relay" "bridgeTransports" ] [ "services" "tor" "settings" "ServerTransportPlugin" "transports" ] ) - (mkRenamedOptionModule + (lib.mkRenamedOptionModule [ "services" "tor" "relay" "contactInfo" ] [ "services" "tor" "settings" "ContactInfo" ] ) - (mkRenamedOptionModule + (lib.mkRenamedOptionModule [ "services" "tor" "relay" "exitPolicy" ] [ "services" "tor" "settings" "ExitPolicy" ] ) - (mkRemovedOptionModule [ + (lib.mkRemovedOptionModule [ "services" "tor" "relay" "isBridge" ] "Use services.tor.relay.role instead.") - (mkRemovedOptionModule [ "services" "tor" "relay" "isExit" ] "Use services.tor.relay.role instead.") - (mkRenamedOptionModule + (lib.mkRemovedOptionModule [ "services" "tor" "relay" "isExit" ] "Use services.tor.relay.role instead.") + (lib.mkRenamedOptionModule [ "services" "tor" "relay" "nickname" ] [ "services" "tor" "settings" "Nickname" ] ) - (mkRenamedOptionModule [ "services" "tor" "relay" "port" ] [ "services" "tor" "settings" "ORPort" ]) - (mkRenamedOptionModule + (lib.mkRenamedOptionModule [ "services" "tor" "relay" "port" ] [ "services" "tor" "settings" "ORPort" ]) + (lib.mkRenamedOptionModule [ "services" "tor" "relay" "portSpec" ] [ "services" "tor" "settings" "ORPort" ] ) @@ -443,17 +440,17 @@ in options = { services.tor = { - enable = mkEnableOption '' + enable = lib.mkEnableOption '' Tor daemon. By default, the daemon is run without relay, exit, bridge or client connectivity''; - openFirewall = mkEnableOption "opening of the relay port(s) in the firewall"; + openFirewall = lib.mkEnableOption "opening of the relay port(s) in the firewall"; - package = mkPackageOption pkgs "tor" { }; + package = lib.mkPackageOption pkgs "tor" { }; enableGeoIP = - mkEnableOption '' + lib.mkEnableOption '' use of GeoIP databases. Disabling this will disable by-country statistics for bridges and relays and some client and third-party software functionality'' @@ -461,19 +458,19 @@ in default = true; }; - controlSocket.enable = mkEnableOption '' + controlSocket.enable = lib.mkEnableOption '' control socket, created in `${runDir}/control`''; client = { - enable = mkEnableOption '' + enable = lib.mkEnableOption '' the routing of application connections. You might want to disable this if you plan running a dedicated Tor relay''; - transparentProxy.enable = mkEnableOption "transparent proxy"; - dns.enable = mkEnableOption "DNS resolver"; + transparentProxy.enable = lib.mkEnableOption "transparent proxy"; + dns.enable = lib.mkEnableOption "DNS resolver"; - socksListenAddress = mkOption { + socksListenAddress = lib.mkOption { type = optionSOCKSPort false; default = { addr = "127.0.0.1"; @@ -491,7 +488,7 @@ in ''; }; - onionServices = mkOption { + onionServices = lib.mkOption { description = (descriptionGeneric "HiddenServiceDir"); default = { }; example = { @@ -499,11 +496,11 @@ in clientAuthorizations = [ "/run/keys/tor/alice.prv.x25519" ]; }; }; - type = types.attrsOf ( - types.submodule ( + type = lib.types.attrsOf ( + lib.types.submodule ( { name, config, ... }: { - options.clientAuthorizations = mkOption { + options.clientAuthorizations = lib.mkOption { description = '' Clients' authorizations for a v3 onion service, as a list of files containing each one private key, in the format: @@ -512,7 +509,7 @@ in ``` ${descriptionGeneric "_client_authorization"} ''; - type = with types; listOf path; + type = with lib.types; listOf path; default = [ ]; example = [ "/run/keys/tor/alice.prv.x25519" ]; }; @@ -523,7 +520,7 @@ in }; relay = { - enable = mkEnableOption "tor relaying" // { + enable = lib.mkEnableOption "tor relaying" // { description = '' Whether to enable relaying of Tor traffic for others. @@ -538,8 +535,8 @@ in ''; }; - role = mkOption { - type = types.enum [ + role = lib.mkOption { + type = lib.types.enum [ "exit" "relay" "bridge" @@ -629,7 +626,7 @@ in ''; }; - onionServices = mkOption { + onionServices = lib.mkOption { description = (descriptionGeneric "HiddenServiceDir"); default = { }; example = { @@ -640,12 +637,12 @@ in ]; }; }; - type = types.attrsOf ( - types.submodule ( + type = lib.types.attrsOf ( + lib.types.submodule ( { name, config, ... }: { - options.path = mkOption { - type = types.path; + options.path = lib.mkOption { + type = lib.types.path; description = '' Path where to store the data files of the hidden service. If the {option}`secretKey` is null @@ -653,8 +650,8 @@ in otherwise to `${runDir}/onion/$onion`. ''; }; - options.secretKey = mkOption { - type = with types; nullOr path; + options.secretKey = lib.mkOption { + type = with lib.types; nullOr path; default = null; example = "/run/keys/tor/onion/expyuzz4wqqyqhjn/hs_ed25519_secret_key"; description = '' @@ -665,16 +662,16 @@ in from this file if they do not exist. ''; }; - options.authorizeClient = mkOption { + options.authorizeClient = lib.mkOption { description = (descriptionGeneric "HiddenServiceAuthorizeClient"); default = null; - type = types.nullOr ( - types.submodule ( + type = lib.types.nullOr ( + lib.types.submodule ( { ... }: { options = { - authType = mkOption { - type = types.enum [ + authType = lib.mkOption { + type = lib.types.enum [ "basic" "stealth" ]; @@ -684,8 +681,8 @@ in that also hides service activity from unauthorized clients. ''; }; - clientNames = mkOption { - type = with types; nonEmptyListOf (strMatching "[A-Za-z0-9+-_]+"); + clientNames = lib.mkOption { + type = with lib.types; nonEmptyListOf (strMatching "[A-Za-z0-9+-_]+"); description = '' Only clients that are listed here are authorized to access the hidden service. Generated authorization data can be found in {file}`${stateDir}/onion/$name/hostname`. @@ -698,7 +695,7 @@ in ) ); }; - options.authorizedClients = mkOption { + options.authorizedClients = lib.mkOption { description = '' Authorized clients for a v3 onion service, as a list of public key, in the format: @@ -707,14 +704,14 @@ in ``` ${descriptionGeneric "_client_authorization"} ''; - type = with types; listOf str; + type = with lib.types; listOf str; default = [ ]; example = [ "descriptor:x25519:XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX" ]; }; - options.map = mkOption { + options.map = lib.mkOption { description = (descriptionGeneric "HiddenServicePort"); type = - with types; + with lib.types; listOf (oneOf [ port (submodule ( @@ -722,7 +719,7 @@ in { options = { port = optionPort; - target = mkOption { + target = lib.mkOption { default = null; type = nullOr ( submodule ( @@ -752,25 +749,25 @@ in v ); }; - options.version = mkOption { + options.version = lib.mkOption { description = (descriptionGeneric "HiddenServiceVersion"); type = - with types; + with lib.types; nullOr (enum [ 2 3 ]); default = null; }; - options.settings = mkOption { + options.settings = lib.mkOption { description = '' Settings of the onion service. ${descriptionGeneric "_hidden_service_options"} ''; default = { }; - type = types.submodule { + type = lib.types.submodule { freeformType = - with types; + with lib.types; (attrsOf ( nullOr (oneOf [ str @@ -784,20 +781,20 @@ in }; options.HiddenServiceAllowUnknownPorts = optionBool "HiddenServiceAllowUnknownPorts"; options.HiddenServiceDirGroupReadable = optionBool "HiddenServiceDirGroupReadable"; - options.HiddenServiceExportCircuitID = mkOption { + options.HiddenServiceExportCircuitID = lib.mkOption { description = (descriptionGeneric "HiddenServiceExportCircuitID"); - type = with types; nullOr (enum [ "haproxy" ]); + type = with lib.types; nullOr (enum [ "haproxy" ]); default = null; }; - options.HiddenServiceMaxStreams = mkOption { + options.HiddenServiceMaxStreams = lib.mkOption { description = (descriptionGeneric "HiddenServiceMaxStreams"); - type = with types; nullOr (ints.between 0 65535); + type = with lib.types; nullOr (ints.between 0 65535); default = null; }; options.HiddenServiceMaxStreamsCloseCircuit = optionBool "HiddenServiceMaxStreamsCloseCircuit"; - options.HiddenServiceNumIntroductionPoints = mkOption { + options.HiddenServiceNumIntroductionPoints = lib.mkOption { description = (descriptionGeneric "HiddenServiceNumIntroductionPoints"); - type = with types; nullOr (ints.between 0 20); + type = with lib.types; nullOr (ints.between 0 20); default = null; }; options.HiddenServiceSingleHopMode = optionBool "HiddenServiceSingleHopMode"; @@ -822,15 +819,15 @@ in }; }; - settings = mkOption { + settings = lib.mkOption { description = '' See [torrc manual](https://2019.www.torproject.org/docs/tor-manual.html.en) for documentation. ''; default = { }; - type = types.submodule { + type = lib.types.submodule { freeformType = - with types; + with lib.types; (attrsOf ( nullOr (oneOf [ str @@ -872,10 +869,10 @@ in options.CellStatistics = optionBool "CellStatistics"; options.ClientAutoIPv6ORPort = optionBool "ClientAutoIPv6ORPort"; options.ClientDNSRejectInternalAddresses = optionBool "ClientDNSRejectInternalAddresses"; - options.ClientOnionAuthDir = mkOption { + options.ClientOnionAuthDir = lib.mkOption { description = (descriptionGeneric "ClientOnionAuthDir"); default = null; - type = with types; nullOr path; + type = with lib.types; nullOr path; }; options.ClientPreferIPv6DirPort = optionBool "ClientPreferIPv6DirPort"; # default is null and like "auto" options.ClientPreferIPv6ORPort = optionBool "ClientPreferIPv6ORPort"; # default is null and like "auto" @@ -885,12 +882,12 @@ in options.ConnDirectionStatistics = optionBool "ConnDirectionStatistics"; options.ConstrainedSockets = optionBool "ConstrainedSockets"; options.ContactInfo = optionString "ContactInfo"; - options.ControlPort = mkOption rec { + options.ControlPort = lib.mkOption rec { description = (descriptionGeneric "ControlPort"); default = [ ]; example = [ { port = 9051; } ]; type = - with types; + with lib.types; oneOf [ port (enum [ "auto" ]) @@ -914,9 +911,9 @@ in addr = optionAddress; port = optionPort; } - // genAttrs flags ( + // lib.genAttrs flags ( name: - mkOption { + lib.mkOption { type = types.bool; default = false; } @@ -946,9 +943,9 @@ in options.DormantOnFirstStartup = optionBool "DormantOnFirstStartup"; options.DormantTimeoutDisabledByIdleStreams = optionBool "DormantTimeoutDisabledByIdleStreams"; options.DirCache = optionBool "DirCache"; - options.DirPolicy = mkOption { + options.DirPolicy = lib.mkOption { description = (descriptionGeneric "DirPolicy"); - type = with types; listOf str; + type = with lib.types; listOf str; default = [ ]; example = [ "accept *:*" ]; }; @@ -973,11 +970,11 @@ in options.ExitPolicyRejectPrivate = optionBool "ExitPolicyRejectPrivate"; options.ExitPortStatistics = optionBool "ExitPortStatistics"; options.ExitRelay = optionBool "ExitRelay"; # default is null and like "auto" - options.ExtORPort = mkOption { + options.ExtORPort = lib.mkOption { description = (descriptionGeneric "ExtORPort"); default = null; type = - with types; + with lib.types; nullOr (oneOf [ port (enum [ "auto" ]) @@ -1009,20 +1006,20 @@ in options.GeoIPFile = optionPath "GeoIPFile"; options.GeoIPv6File = optionPath "GeoIPv6File"; options.GuardfractionFile = optionPath "GuardfractionFile"; - options.HidServAuth = mkOption { + options.HidServAuth = lib.mkOption { description = (descriptionGeneric "HidServAuth"); default = [ ]; type = - with types; + with lib.types; listOf (oneOf [ (submodule { options = { - onion = mkOption { + onion = lib.mkOption { type = strMatching "[a-z2-7]{16}\\.onion"; description = "Onion address."; example = "xxxxxxxxxxxxxxxx.onion"; }; - auth = mkOption { + auth = lib.mkOption { type = strMatching "[A-Za-z0-9+/]{22}"; description = "Authentication cookie."; }; @@ -1062,10 +1059,10 @@ in options.PidFile = optionPath "PidFile"; options.ProtocolWarnings = optionBool "ProtocolWarnings"; options.PublishHidServDescriptors = optionBool "PublishHidServDescriptors"; - options.PublishServerDescriptor = mkOption { + options.PublishServerDescriptor = lib.mkOption { description = (descriptionGeneric "PublishServerDescriptor"); type = - with types; + with lib.types; nullOr (enum [ false true @@ -1091,17 +1088,17 @@ in options.ServerDNSRandomizeCase = optionBool "ServerDNSRandomizeCase"; options.ServerDNSResolvConfFile = optionPath "ServerDNSResolvConfFile"; options.ServerDNSSearchDomains = optionBool "ServerDNSSearchDomains"; - options.ServerTransportPlugin = mkOption { + options.ServerTransportPlugin = lib.mkOption { description = (descriptionGeneric "ServerTransportPlugin"); default = null; type = - with types; + with lib.types; nullOr ( submodule ( { ... }: { options = { - transports = mkOption { + transports = lib.mkOption { description = "List of pluggable transports."; type = listOf str; example = [ @@ -1111,7 +1108,7 @@ in "scramblesuit" ]; }; - exec = mkOption { + exec = lib.mkOption { type = types.str; description = "Command of pluggable transport."; }; @@ -1120,31 +1117,31 @@ in ) ); }; - options.ShutdownWaitLength = mkOption { - type = types.int; + options.ShutdownWaitLength = lib.mkOption { + type = lib.types.int; default = 30; description = (descriptionGeneric "ShutdownWaitLength"); }; options.SocksPolicy = optionStrings "SocksPolicy" // { example = [ "accept *:*" ]; }; - options.SOCKSPort = mkOption { + options.SOCKSPort = lib.mkOption { description = (descriptionGeneric "SOCKSPort"); default = lib.optionals cfg.settings.HiddenServiceNonAnonymousMode [ { port = 0; } ]; - defaultText = literalExpression '' + defaultText = lib.literalExpression '' if config.${opt.settings}.HiddenServiceNonAnonymousMode == true then [ { port = 0; } ] else [ ] ''; example = [ { port = 9090; } ]; - type = types.listOf (optionSOCKSPort true); + type = lib.types.listOf (optionSOCKSPort true); }; options.TestingTorNetwork = optionBool "TestingTorNetwork"; options.TransPort = optionIsolablePorts "TransPort"; - options.TransProxyType = mkOption { + options.TransProxyType = lib.mkOption { description = (descriptionGeneric "TransProxyType"); type = - with types; + with lib.types; nullOr (enum [ "default" "TPROXY" @@ -1168,7 +1165,7 @@ in }; }; - config = mkIf cfg.enable { + config = lib.mkIf cfg.enable { # Not sure if `cfg.relay.role == "private-bridge"` helps as tor # sends a lot of stats warnings = @@ -1295,7 +1292,7 @@ in )) ]; - networking.firewall = mkIf cfg.openFirewall { + networking.firewall = lib.mkIf cfg.openFirewall { allowedTCPPorts = concatMap ( From d9297314fe789983077c22eedd425004d272d188 Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Sun, 29 Dec 2024 22:25:27 +0100 Subject: [PATCH 240/429] nixos/services.tor: fmt --- nixos/modules/services/security/tor.nix | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/nixos/modules/services/security/tor.nix b/nixos/modules/services/security/tor.nix index 9db27b4d398c..eb36e727fb0c 100644 --- a/nixos/modules/services/security/tor.nix +++ b/nixos/modules/services/security/tor.nix @@ -426,12 +426,20 @@ in "relay" "isBridge" ] "Use services.tor.relay.role instead.") - (lib.mkRemovedOptionModule [ "services" "tor" "relay" "isExit" ] "Use services.tor.relay.role instead.") + (lib.mkRemovedOptionModule [ + "services" + "tor" + "relay" + "isExit" + ] "Use services.tor.relay.role instead.") (lib.mkRenamedOptionModule [ "services" "tor" "relay" "nickname" ] [ "services" "tor" "settings" "Nickname" ] ) - (lib.mkRenamedOptionModule [ "services" "tor" "relay" "port" ] [ "services" "tor" "settings" "ORPort" ]) + (lib.mkRenamedOptionModule + [ "services" "tor" "relay" "port" ] + [ "services" "tor" "settings" "ORPort" ] + ) (lib.mkRenamedOptionModule [ "services" "tor" "relay" "portSpec" ] [ "services" "tor" "settings" "ORPort" ] From edf46e7668859cb071f4c9b12c4c6edc73118a0b Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Sun, 29 Dec 2024 21:50:38 +0100 Subject: [PATCH 241/429] nixos/services.tor.tsocks: remove `with lib;` --- nixos/modules/services/security/torify.nix | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/nixos/modules/services/security/torify.nix b/nixos/modules/services/security/torify.nix index aa60618b4299..dec02ee33ff5 100644 --- a/nixos/modules/services/security/torify.nix +++ b/nixos/modules/services/security/torify.nix @@ -4,7 +4,6 @@ pkgs, ... }: -with lib; let cfg = config.services.tor; @@ -29,8 +28,8 @@ in services.tor.tsocks = { - enable = mkOption { - type = types.bool; + enable = lib.mkOption { + type = lib.types.bool; default = false; description = '' Whether to build tsocks wrapper script to relay application traffic via Tor. @@ -45,8 +44,8 @@ in ''; }; - server = mkOption { - type = types.str; + server = lib.mkOption { + type = lib.types.str; default = "localhost:9050"; example = "192.168.0.20"; description = '' @@ -54,8 +53,8 @@ in ''; }; - config = mkOption { - type = types.lines; + config = lib.mkOption { + type = lib.types.lines; default = ""; description = '' Extra configuration. Contents will be added verbatim to TSocks @@ -69,13 +68,13 @@ in ###### implementation - config = mkIf cfg.tsocks.enable { + config = lib.mkIf cfg.tsocks.enable { environment.systemPackages = [ torify ]; # expose it to the users services.tor.tsocks.config = '' - server = ${toString (head (splitString ":" cfg.tsocks.server))} - server_port = ${toString (tail (splitString ":" cfg.tsocks.server))} + server = ${toString (lib.head (lib.splitString ":" cfg.tsocks.server))} + server_port = ${toString (lib.tail (lib.splitString ":" cfg.tsocks.server))} local = 127.0.0.0/255.128.0.0 local = 127.128.0.0/255.192.0.0 From ee9d6cd0d3a13427bc989ac8373e6f6ce48265d1 Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Sun, 29 Dec 2024 21:50:38 +0100 Subject: [PATCH 242/429] nixos/services.tor.torsocks: remove `with lib;` --- nixos/modules/services/security/torsocks.nix | 41 +++++++++----------- 1 file changed, 19 insertions(+), 22 deletions(-) diff --git a/nixos/modules/services/security/torsocks.nix b/nixos/modules/services/security/torsocks.nix index 32047f613d9f..e556ab44e1e2 100644 --- a/nixos/modules/services/security/torsocks.nix +++ b/nixos/modules/services/security/torsocks.nix @@ -1,14 +1,11 @@ { config, lib, pkgs, ... }: - -with lib; - let cfg = config.services.tor.torsocks; - optionalNullStr = b: v: optionalString (b != null) v; + optionalNullStr = b: v: lib.optionalString (b != null) v; configFile = server: '' - TorAddress ${toString (head (splitString ":" server))} - TorPort ${toString (tail (splitString ":" server))} + TorAddress ${toString (lib.head (lib.splitString ":" server))} + TorPort ${toString (lib.tail (lib.splitString ":" server))} OnionAddrRange ${cfg.onionAddrRange} @@ -34,18 +31,18 @@ in { options = { services.tor.torsocks = { - enable = mkOption { - type = types.bool; + enable = lib.mkOption { + type = lib.types.bool; default = config.services.tor.enable && config.services.tor.client.enable; - defaultText = literalExpression "config.services.tor.enable && config.services.tor.client.enable"; + defaultText = lib.literalExpression "config.services.tor.enable && config.services.tor.client.enable"; description = '' Whether to build `/etc/tor/torsocks.conf` containing the specified global torsocks configuration. ''; }; - server = mkOption { - type = types.str; + server = lib.mkOption { + type = lib.types.str; default = "127.0.0.1:9050"; example = "192.168.0.20:1234"; description = '' @@ -54,8 +51,8 @@ in ''; }; - fasterServer = mkOption { - type = types.str; + fasterServer = lib.mkOption { + type = lib.types.str; default = "127.0.0.1:9063"; example = "192.168.0.20:1234"; description = '' @@ -64,8 +61,8 @@ in ''; }; - onionAddrRange = mkOption { - type = types.str; + onionAddrRange = lib.mkOption { + type = lib.types.str; default = "127.42.42.0/24"; description = '' Tor hidden sites do not have real IP addresses. This @@ -77,8 +74,8 @@ in ''; }; - socks5Username = mkOption { - type = types.nullOr types.str; + socks5Username = lib.mkOption { + type = lib.types.nullOr lib.types.str; default = null; example = "bob"; description = '' @@ -87,8 +84,8 @@ in ''; }; - socks5Password = mkOption { - type = types.nullOr types.str; + socks5Password = lib.mkOption { + type = lib.types.nullOr lib.types.str; default = null; example = "sekret"; description = '' @@ -97,8 +94,8 @@ in ''; }; - allowInbound = mkOption { - type = types.bool; + allowInbound = lib.mkOption { + type = lib.types.bool; default = false; description = '' Set Torsocks to accept inbound connections. If set to @@ -110,7 +107,7 @@ in }; }; - config = mkIf cfg.enable { + config = lib.mkIf cfg.enable { environment.systemPackages = [ pkgs.torsocks (wrapTorsocks "torsocks-faster" cfg.fasterServer) ]; environment.etc."tor/torsocks.conf" = From 4bcc603cd873e55088afec33ddf9be1beeac1c86 Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Sun, 29 Dec 2024 21:50:38 +0100 Subject: [PATCH 243/429] nixos/services.usbguard: remove `with lib;` --- nixos/modules/services/security/usbguard.nix | 66 ++++++++++---------- 1 file changed, 32 insertions(+), 34 deletions(-) diff --git a/nixos/modules/services/security/usbguard.nix b/nixos/modules/services/security/usbguard.nix index d73d1c65747b..80780510e21c 100644 --- a/nixos/modules/services/security/usbguard.nix +++ b/nixos/modules/services/security/usbguard.nix @@ -4,14 +4,12 @@ pkgs, ... }: - -with lib; let cfg = config.services.usbguard; # valid policy options policy = ( - types.enum [ + lib.types.enum [ "allow" "block" "reject" @@ -30,13 +28,13 @@ let PresentDevicePolicy=${cfg.presentDevicePolicy} PresentControllerPolicy=${cfg.presentControllerPolicy} InsertedDevicePolicy=${cfg.insertedDevicePolicy} - RestoreControllerDeviceState=${boolToString cfg.restoreControllerDeviceState} + RestoreControllerDeviceState=${lib.boolToString cfg.restoreControllerDeviceState} # this does not seem useful for endusers to change DeviceManagerBackend=uevent - IPCAllowedUsers=${concatStringsSep " " cfg.IPCAllowedUsers} - IPCAllowedGroups=${concatStringsSep " " cfg.IPCAllowedGroups} + IPCAllowedUsers=${lib.concatStringsSep " " cfg.IPCAllowedUsers} + IPCAllowedGroups=${lib.concatStringsSep " " cfg.IPCAllowedGroups} IPCAccessControlFiles=/var/lib/usbguard/IPCAccessControl.d/ - DeviceRulesWithPort=${boolToString cfg.deviceRulesWithPort} + DeviceRulesWithPort=${lib.boolToString cfg.deviceRulesWithPort} # HACK: that way audit logs still land in the journal AuditFilePath=/dev/null ''; @@ -50,16 +48,16 @@ in options = { services.usbguard = { - enable = mkEnableOption "USBGuard daemon"; + enable = lib.mkEnableOption "USBGuard daemon"; - package = mkPackageOption pkgs "usbguard" { + package = lib.mkPackageOption pkgs "usbguard" { extraDescription = '' If you do not need the Qt GUI, use `pkgs.usbguard-nox` to save disk space. ''; }; - ruleFile = mkOption { - type = types.nullOr types.path; + ruleFile = lib.mkOption { + type = lib.types.nullOr lib.types.path; default = "/var/lib/usbguard/rules.conf"; example = "/run/secrets/usbguard-rules"; description = '' @@ -71,8 +69,8 @@ in ''; }; - rules = mkOption { - type = types.nullOr types.lines; + rules = lib.mkOption { + type = lib.types.nullOr lib.types.lines; default = null; example = '' allow with-interface equals { 08:*:* } @@ -92,8 +90,8 @@ in ''; }; - implicitPolicyTarget = mkOption { - type = types.enum [ + implicitPolicyTarget = lib.mkOption { + type = lib.types.enum [ "allow" "block" "reject" @@ -106,7 +104,7 @@ in ''; }; - presentDevicePolicy = mkOption { + presentDevicePolicy = lib.mkOption { type = policy; default = "apply-policy"; description = '' @@ -117,7 +115,7 @@ in ''; }; - presentControllerPolicy = mkOption { + presentControllerPolicy = lib.mkOption { type = policy; default = "keep"; description = '' @@ -126,8 +124,8 @@ in ''; }; - insertedDevicePolicy = mkOption { - type = types.enum [ + insertedDevicePolicy = lib.mkOption { + type = lib.types.enum [ "block" "reject" "apply-policy" @@ -139,8 +137,8 @@ in ''; }; - restoreControllerDeviceState = mkOption { - type = types.bool; + restoreControllerDeviceState = lib.mkOption { + type = lib.types.bool; default = false; description = '' The USBGuard daemon modifies some attributes of controller @@ -151,8 +149,8 @@ in ''; }; - IPCAllowedUsers = mkOption { - type = types.listOf types.str; + IPCAllowedUsers = lib.mkOption { + type = lib.types.listOf lib.types.str; default = [ "root" ]; example = [ "root" @@ -163,8 +161,8 @@ in ''; }; - IPCAllowedGroups = mkOption { - type = types.listOf types.str; + IPCAllowedGroups = lib.mkOption { + type = lib.types.listOf lib.types.str; default = [ ]; example = [ "wheel" ]; description = '' @@ -173,21 +171,21 @@ in ''; }; - deviceRulesWithPort = mkOption { - type = types.bool; + deviceRulesWithPort = lib.mkOption { + type = lib.types.bool; default = false; description = '' Generate device specific rules including the "via-port" attribute. ''; }; - dbus.enable = mkEnableOption "USBGuard dbus daemon"; + dbus.enable = lib.mkEnableOption "USBGuard dbus daemon"; }; }; ###### implementation - config = mkIf cfg.enable { + config = lib.mkIf cfg.enable { environment.systemPackages = [ cfg.package ]; @@ -239,7 +237,7 @@ in }; }; - usbguard-dbus = mkIf cfg.dbus.enable { + usbguard-dbus = lib.mkIf cfg.dbus.enable { description = "USBGuard D-Bus Service"; wantedBy = [ "multi-user.target" ]; @@ -261,7 +259,7 @@ in groupCheck = (lib.concatStrings (map (g: "subject.isInGroup(\"${g}\") || ") cfg.IPCAllowedGroups)) + "false"; in - optionalString cfg.dbus.enable '' + lib.optionalString cfg.dbus.enable '' polkit.addRule(function(action, subject) { if ((action.id == "org.usbguard.Policy1.listRules" || action.id == "org.usbguard.Policy1.appendRule" || @@ -278,15 +276,15 @@ in ''; }; imports = [ - (mkRemovedOptionModule [ "services" "usbguard" "IPCAccessControlFiles" ] + (lib.mkRemovedOptionModule [ "services" "usbguard" "IPCAccessControlFiles" ] "The usbguard module now hardcodes IPCAccessControlFiles to /var/lib/usbguard/IPCAccessControl.d." ) - (mkRemovedOptionModule [ + (lib.mkRemovedOptionModule [ "services" "usbguard" "auditFilePath" ] "Removed usbguard module audit log files. Audit logs can be found in the systemd journal.") - (mkRenamedOptionModule + (lib.mkRenamedOptionModule [ "services" "usbguard" "implictPolicyTarget" ] [ "services" "usbguard" "implicitPolicyTarget" ] ) From 10e015d823432e9f266cb2ffc8ba791ef49b38f6 Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Sun, 29 Dec 2024 21:50:39 +0100 Subject: [PATCH 244/429] nixos/services.vault-agent: remove `with lib;` --- .../modules/services/security/vault-agent.nix | 37 +++++++++---------- 1 file changed, 17 insertions(+), 20 deletions(-) diff --git a/nixos/modules/services/security/vault-agent.nix b/nixos/modules/services/security/vault-agent.nix index ca5576804a7b..37f52f9d5bf6 100644 --- a/nixos/modules/services/security/vault-agent.nix +++ b/nixos/modules/services/security/vault-agent.nix @@ -4,9 +4,6 @@ pkgs, ... }: - -with lib; - let format = pkgs.formats.json { }; commonOptions = @@ -14,26 +11,26 @@ let pkgName, flavour ? pkgName, }: - mkOption { + lib.mkOption { default = { }; description = '' Attribute set of ${flavour} instances. Creates independent `${flavour}-''${name}.service` systemd units for each instance defined here. ''; type = - with types; + with lib.types; attrsOf ( submodule ( { name, ... }: { options = { - enable = mkEnableOption "this ${flavour} instance" // { + enable = lib.mkEnableOption "this ${flavour} instance" // { default = true; }; - package = mkPackageOption pkgs pkgName { }; + package = lib.mkPackageOption pkgs pkgName { }; - user = mkOption { + user = lib.mkOption { type = types.str; default = "root"; description = '' @@ -41,7 +38,7 @@ let ''; }; - group = mkOption { + group = lib.mkOption { type = types.str; default = "root"; description = '' @@ -49,12 +46,12 @@ let ''; }; - settings = mkOption { + settings = lib.mkOption { type = types.submodule { freeformType = format.type; options = { - pid_file = mkOption { + pid_file = lib.mkOption { default = "/run/${flavour}/${name}.pid"; type = types.str; description = '' @@ -62,7 +59,7 @@ let ''; }; - template = mkOption { + template = lib.mkOption { default = null; type = with types; nullOr (listOf (attrsOf anything)); description = @@ -116,7 +113,7 @@ let let configFile = format.generate "${name}.json" instance.settings; in - mkIf (instance.enable) { + lib.mkIf (instance.enable) { description = "${flavour} daemon - ${name}"; wantedBy = [ "multi-user.target" ]; after = [ "network.target" ]; @@ -127,8 +124,8 @@ let User = instance.user; Group = instance.group; RuntimeDirectory = flavour; - ExecStart = "${getExe instance.package} ${ - optionalString ((getName instance.package) == "vault") "agent" + ExecStart = "${lib.getExe instance.package} ${ + lib.optionalString ((lib.getName instance.package) == "vault") "agent" } -config ${configFile}"; ExecReload = "${pkgs.coreutils}/bin/kill -SIGHUP $MAINPID"; KillSignal = "SIGINT"; @@ -146,17 +143,17 @@ in }; }; - config = mkMerge ( + config = lib.mkMerge ( map ( flavour: let cfg = config.services.${flavour}; in - mkIf (cfg.instances != { }) { - systemd.services = mapAttrs' ( + lib.mkIf (cfg.instances != { }) { + systemd.services = lib.mapAttrs' ( name: instance: - nameValuePair "${flavour}-${name}" (createAgentInstance { + lib.nameValuePair "${flavour}-${name}" (createAgentInstance { inherit name instance flavour; }) ) cfg.instances; @@ -168,7 +165,7 @@ in ] ); - meta.maintainers = with maintainers; [ + meta.maintainers = with lib.maintainers; [ emilylange tcheronneau ]; From c24987c6ade7ef9a1d46261bf754005e5f496fcb Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Sun, 29 Dec 2024 21:50:39 +0100 Subject: [PATCH 245/429] nixos/services.vault: remove `with lib;` --- nixos/modules/services/security/vault.nix | 75 +++++++++++------------ 1 file changed, 36 insertions(+), 39 deletions(-) diff --git a/nixos/modules/services/security/vault.nix b/nixos/modules/services/security/vault.nix index cab8937a8615..46a915b92a86 100644 --- a/nixos/modules/services/security/vault.nix +++ b/nixos/modules/services/security/vault.nix @@ -5,9 +5,6 @@ pkgs, ... }: - -with lib; - let cfg = config.services.vault; opt = options.services.vault; @@ -32,10 +29,10 @@ let } ''} storage "${cfg.storageBackend}" { - ${optionalString (cfg.storagePath != null) ''path = "${cfg.storagePath}"''} - ${optionalString (cfg.storageConfig != null) cfg.storageConfig} + ${lib.optionalString (cfg.storagePath != null) ''path = "${cfg.storagePath}"''} + ${lib.optionalString (cfg.storageConfig != null) cfg.storageConfig} } - ${optionalString (cfg.telemetryConfig != "") '' + ${lib.optionalString (cfg.telemetryConfig != "") '' telemetry { ${cfg.telemetryConfig} } @@ -44,10 +41,10 @@ let ''; allConfigPaths = [ configFile ] ++ cfg.extraSettingsPaths; - configOptions = escapeShellArgs ( + configOptions = lib.escapeShellArgs ( lib.optional cfg.dev "-dev" ++ lib.optional (cfg.dev && cfg.devRootTokenID != null) "-dev-root-token-id=${cfg.devRootTokenID}" - ++ (concatMap (p: [ + ++ (lib.concatMap (p: [ "-config" p ]) allConfigPaths) @@ -58,56 +55,56 @@ in { options = { services.vault = { - enable = mkEnableOption "Vault daemon"; + enable = lib.mkEnableOption "Vault daemon"; - package = mkPackageOption pkgs "vault" { }; + package = lib.mkPackageOption pkgs "vault" { }; - dev = mkOption { - type = types.bool; + dev = lib.mkOption { + type = lib.types.bool; default = false; description = '' In this mode, Vault runs in-memory and starts unsealed. This option is not meant production but for development and testing i.e. for nixos tests. ''; }; - devRootTokenID = mkOption { - type = types.nullOr types.str; + devRootTokenID = lib.mkOption { + type = lib.types.nullOr lib.types.str; default = null; description = '' Initial root token. This only applies when {option}`services.vault.dev` is true ''; }; - address = mkOption { - type = types.str; + address = lib.mkOption { + type = lib.types.str; default = "127.0.0.1:8200"; description = "The name of the ip interface to listen to"; }; - tlsCertFile = mkOption { - type = types.nullOr types.str; + tlsCertFile = lib.mkOption { + type = lib.types.nullOr lib.types.str; default = null; example = "/path/to/your/cert.pem"; description = "TLS certificate file. TLS will be disabled unless this option is set"; }; - tlsKeyFile = mkOption { - type = types.nullOr types.str; + tlsKeyFile = lib.mkOption { + type = lib.types.nullOr lib.types.str; default = null; example = "/path/to/your/key.pem"; description = "TLS private key file. TLS will be disabled unless this option is set"; }; - listenerExtraConfig = mkOption { - type = types.lines; + listenerExtraConfig = lib.mkOption { + type = lib.types.lines; default = '' tls_min_version = "tls12" ''; description = "Extra text appended to the listener section."; }; - storageBackend = mkOption { - type = types.enum [ + storageBackend = lib.mkOption { + type = lib.types.enum [ "inmem" "file" "consul" @@ -127,11 +124,11 @@ in description = "The name of the type of storage backend"; }; - storagePath = mkOption { - type = types.nullOr types.path; + storagePath = lib.mkOption { + type = lib.types.nullOr lib.types.path; default = if cfg.storageBackend == "file" || cfg.storageBackend == "raft" then "/var/lib/vault" else null; - defaultText = literalExpression '' + defaultText = lib.literalExpression '' if config.${opt.storageBackend} == "file" || cfg.storageBackend == "raft" then "/var/lib/vault" else null @@ -139,8 +136,8 @@ in description = "Data directory for file backend"; }; - storageConfig = mkOption { - type = types.nullOr types.lines; + storageConfig = lib.mkOption { + type = lib.types.nullOr lib.types.lines; default = null; description = '' HCL configuration to insert in the storageBackend section. @@ -152,20 +149,20 @@ in ''; }; - telemetryConfig = mkOption { - type = types.lines; + telemetryConfig = lib.mkOption { + type = lib.types.lines; default = ""; description = "Telemetry configuration"; }; - extraConfig = mkOption { - type = types.lines; + extraConfig = lib.mkOption { + type = lib.types.lines; default = ""; description = "Extra text appended to {file}`vault.hcl`."; }; - extraSettingsPaths = mkOption { - type = types.listOf types.path; + extraSettingsPaths = lib.mkOption { + type = lib.types.listOf lib.types.path; default = [ ]; description = '' Configuration files to load besides the immutable one defined by the NixOS module. @@ -196,7 +193,7 @@ in }; }; - config = mkIf cfg.enable { + config = lib.mkIf cfg.enable { assertions = [ { assertion = cfg.storageBackend == "inmem" -> (cfg.storagePath == null && cfg.storageConfig == null); @@ -219,7 +216,7 @@ in }; users.groups.vault.gid = config.ids.gids.vault; - systemd.tmpfiles.rules = optional ( + systemd.tmpfiles.rules = lib.optional ( cfg.storagePath != null ) "d '${cfg.storagePath}' 0700 vault vault - -"; @@ -229,7 +226,7 @@ in wantedBy = [ "multi-user.target" ]; after = [ "network.target" - ] ++ optional (config.services.consul.enable && cfg.storageBackend == "consul") "consul.service"; + ] ++ lib.optional (config.services.consul.enable && cfg.storageBackend == "consul") "consul.service"; restartIfChanged = false; # do not restart on "nixos-rebuild switch". It would seal the storage and disrupt the clients. @@ -255,7 +252,7 @@ in Restart = "on-failure"; }; - unitConfig.RequiresMountsFor = optional (cfg.storagePath != null) cfg.storagePath; + unitConfig.RequiresMountsFor = lib.optional (cfg.storagePath != null) cfg.storagePath; }; }; From cae64813e8dbc3c3b329d9f94e2d9f9256a2053d Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Sun, 29 Dec 2024 22:25:53 +0100 Subject: [PATCH 246/429] nixos/services.vault: fmt --- nixos/modules/services/security/vault.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/nixos/modules/services/security/vault.nix b/nixos/modules/services/security/vault.nix index 46a915b92a86..f3a7eddebaf1 100644 --- a/nixos/modules/services/security/vault.nix +++ b/nixos/modules/services/security/vault.nix @@ -224,9 +224,11 @@ in description = "Vault server daemon"; wantedBy = [ "multi-user.target" ]; - after = [ - "network.target" - ] ++ lib.optional (config.services.consul.enable && cfg.storageBackend == "consul") "consul.service"; + after = + [ + "network.target" + ] + ++ lib.optional (config.services.consul.enable && cfg.storageBackend == "consul") "consul.service"; restartIfChanged = false; # do not restart on "nixos-rebuild switch". It would seal the storage and disrupt the clients. From 1f4bd3abb7469d1a601173f24fff535075540b31 Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Sun, 29 Dec 2024 21:50:39 +0100 Subject: [PATCH 247/429] nixos/services.yubikey-agent: remove `with lib;` --- .../modules/services/security/yubikey-agent.nix | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/nixos/modules/services/security/yubikey-agent.nix b/nixos/modules/services/security/yubikey-agent.nix index c746730ca51d..872e605f6881 100644 --- a/nixos/modules/services/security/yubikey-agent.nix +++ b/nixos/modules/services/security/yubikey-agent.nix @@ -1,21 +1,17 @@ # Global configuration for yubikey-agent. - { config, lib, pkgs, ... }: - -with lib; - let cfg = config.services.yubikey-agent; in { ###### interface - meta.maintainers = with maintainers; [ + meta.maintainers = with lib.maintainers; [ philandstuff rawkode ]; @@ -23,8 +19,8 @@ in options = { services.yubikey-agent = { - enable = mkOption { - type = types.bool; + enable = lib.mkOption { + type = lib.types.bool; default = false; description = '' Whether to start yubikey-agent when you log in. Also sets @@ -35,17 +31,17 @@ in ''; }; - package = mkPackageOption pkgs "yubikey-agent" { }; + package = lib.mkPackageOption pkgs "yubikey-agent" { }; }; }; - config = mkIf cfg.enable { + config = lib.mkIf cfg.enable { environment.systemPackages = [ cfg.package ]; systemd.packages = [ cfg.package ]; # This overrides the systemd user unit shipped with the # yubikey-agent package - systemd.user.services.yubikey-agent = mkIf (config.programs.gnupg.agent.pinentryPackage != null) { + systemd.user.services.yubikey-agent = lib.mkIf (config.programs.gnupg.agent.pinentryPackage != null) { path = [ config.programs.gnupg.agent.pinentryPackage ]; wantedBy = [ "default.target" ]; }; From 3ef002a0ebe5c12d646ac77b82468f1e4b5e26d8 Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Sun, 29 Dec 2024 22:26:16 +0100 Subject: [PATCH 248/429] nixos/services.yubikey-agent: fmt --- nixos/modules/services/security/yubikey-agent.nix | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/nixos/modules/services/security/yubikey-agent.nix b/nixos/modules/services/security/yubikey-agent.nix index 872e605f6881..0cfc34b13553 100644 --- a/nixos/modules/services/security/yubikey-agent.nix +++ b/nixos/modules/services/security/yubikey-agent.nix @@ -41,10 +41,12 @@ in # This overrides the systemd user unit shipped with the # yubikey-agent package - systemd.user.services.yubikey-agent = lib.mkIf (config.programs.gnupg.agent.pinentryPackage != null) { - path = [ config.programs.gnupg.agent.pinentryPackage ]; - wantedBy = [ "default.target" ]; - }; + systemd.user.services.yubikey-agent = + lib.mkIf (config.programs.gnupg.agent.pinentryPackage != null) + { + path = [ config.programs.gnupg.agent.pinentryPackage ]; + wantedBy = [ "default.target" ]; + }; # Yubikey-agent expects pcsd to be running in order to function. services.pcscd.enable = true; From fb31348d4dff29ae614ef0072fe978ae7bb96c72 Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Sun, 29 Dec 2024 21:50:39 +0100 Subject: [PATCH 249/429] nixos/services.automatic-timezoned: remove `with lib;` --- nixos/modules/services/system/automatic-timezoned.nix | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/nixos/modules/services/system/automatic-timezoned.nix b/nixos/modules/services/system/automatic-timezoned.nix index aa84a8887c87..8fc87fb93cd0 100644 --- a/nixos/modules/services/system/automatic-timezoned.nix +++ b/nixos/modules/services/system/automatic-timezoned.nix @@ -4,17 +4,14 @@ pkgs, ... }: - -with lib; - let cfg = config.services.automatic-timezoned; in { options = { services.automatic-timezoned = { - enable = mkOption { - type = types.bool; + enable = lib.mkOption { + type = lib.types.bool; default = false; description = '' Enable `automatic-timezoned`, simple daemon for keeping the system @@ -28,11 +25,11 @@ in to make the choice deliberate. An error will be presented otherwise. ''; }; - package = mkPackageOption pkgs "automatic-timezoned" { }; + package = lib.mkPackageOption pkgs "automatic-timezoned" { }; }; }; - config = mkIf cfg.enable { + config = lib.mkIf cfg.enable { # This will give users an error if they have set an explicit time # zone, rather than having the service silently override it. time.timeZone = null; From 81f97e6d28c44e90475b2396298bac4c0852b9bf Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Sun, 29 Dec 2024 21:50:39 +0100 Subject: [PATCH 250/429] nixos/services.cachix-agent: remove `with lib;` --- .../services/system/cachix-agent/default.nix | 31 +++++++++---------- 1 file changed, 14 insertions(+), 17 deletions(-) diff --git a/nixos/modules/services/system/cachix-agent/default.nix b/nixos/modules/services/system/cachix-agent/default.nix index e4df9ae5cc9c..a75bd6f7b287 100644 --- a/nixos/modules/services/system/cachix-agent/default.nix +++ b/nixos/modules/services/system/cachix-agent/default.nix @@ -4,9 +4,6 @@ lib, ... }: - -with lib; - let cfg = config.services.cachix-agent; in @@ -14,37 +11,37 @@ in meta.maintainers = [ lib.maintainers.domenkozar ]; options.services.cachix-agent = { - enable = mkEnableOption "Cachix Deploy Agent: https://docs.cachix.org/deploy/"; + enable = lib.mkEnableOption "Cachix Deploy Agent: https://docs.cachix.org/deploy/"; - name = mkOption { - type = types.str; + name = lib.mkOption { + type = lib.types.str; description = "Agent name, usually same as the hostname"; default = config.networking.hostName; defaultText = "config.networking.hostName"; }; - verbose = mkOption { - type = types.bool; + verbose = lib.mkOption { + type = lib.types.bool; description = "Enable verbose output"; default = false; }; - profile = mkOption { - type = types.nullOr types.str; + profile = lib.mkOption { + type = lib.types.nullOr lib.types.str; default = null; description = "Profile name, defaults to 'system' (NixOS)."; }; - host = mkOption { - type = types.nullOr types.str; + host = lib.mkOption { + type = lib.types.nullOr lib.types.str; default = null; description = "Cachix uri to use."; }; - package = mkPackageOption pkgs "cachix" { }; + package = lib.mkPackageOption pkgs "cachix" { }; - credentialsFile = mkOption { - type = types.path; + credentialsFile = lib.mkOption { + type = lib.types.path; default = "/etc/cachix-agent.token"; description = '' Required file that needs to contain CACHIX_AGENT_TOKEN=... @@ -52,7 +49,7 @@ in }; }; - config = mkIf cfg.enable { + config = lib.mkIf cfg.enable { systemd.services.cachix-agent = { description = "Cachix Deploy Agent"; wants = [ "network-online.target" ]; @@ -76,7 +73,7 @@ in ${cfg.package}/bin/cachix ${lib.optionalString cfg.verbose "--verbose"} ${ lib.optionalString (cfg.host != null) "--host ${cfg.host}" } \ - deploy agent ${cfg.name} ${optionalString (cfg.profile != null) cfg.profile} + deploy agent ${cfg.name} ${lib.optionalString (cfg.profile != null) cfg.profile} ''; }; }; From 354e3ac4e2ce8279488668d1d06dc95cdc145262 Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Sun, 29 Dec 2024 21:50:39 +0100 Subject: [PATCH 251/429] nixos/services.cachix-watch-store: remove `with lib;` --- .../services/system/cachix-watch-store.nix | 37 +++++++++---------- 1 file changed, 17 insertions(+), 20 deletions(-) diff --git a/nixos/modules/services/system/cachix-watch-store.nix b/nixos/modules/services/system/cachix-watch-store.nix index 3505fe3a9a09..32fc5eec3964 100644 --- a/nixos/modules/services/system/cachix-watch-store.nix +++ b/nixos/modules/services/system/cachix-watch-store.nix @@ -4,9 +4,6 @@ lib, ... }: - -with lib; - let cfg = config.services.cachix-watch-store; in @@ -17,56 +14,56 @@ in ]; options.services.cachix-watch-store = { - enable = mkEnableOption "Cachix Watch Store: https://docs.cachix.org"; + enable = lib.mkEnableOption "Cachix Watch Store: https://docs.cachix.org"; - cacheName = mkOption { - type = types.str; + cacheName = lib.mkOption { + type = lib.types.str; description = "Cachix binary cache name"; }; - cachixTokenFile = mkOption { - type = types.path; + cachixTokenFile = lib.mkOption { + type = lib.types.path; description = '' Required file that needs to contain the cachix auth token. ''; }; - signingKeyFile = mkOption { - type = types.nullOr types.path; + signingKeyFile = lib.mkOption { + type = lib.types.nullOr lib.types.path; description = '' Optional file containing a self-managed signing key to sign uploaded store paths. ''; default = null; }; - compressionLevel = mkOption { - type = types.nullOr types.int; + compressionLevel = lib.mkOption { + type = lib.types.nullOr lib.types.int; description = "The compression level for ZSTD compression (between 0 and 16)"; default = null; }; - jobs = mkOption { - type = types.nullOr types.int; + jobs = lib.mkOption { + type = lib.types.nullOr lib.types.int; description = "Number of threads used for pushing store paths"; default = null; }; - host = mkOption { - type = types.nullOr types.str; + host = lib.mkOption { + type = lib.types.nullOr lib.types.str; default = null; description = "Cachix host to connect to"; }; - verbose = mkOption { - type = types.bool; + verbose = lib.mkOption { + type = lib.types.bool; description = "Enable verbose output"; default = false; }; - package = mkPackageOption pkgs "cachix" { }; + package = lib.mkPackageOption pkgs "cachix" { }; }; - config = mkIf cfg.enable { + config = lib.mkIf cfg.enable { systemd.services.cachix-watch-store-agent = { description = "Cachix watch store Agent"; wants = [ "network-online.target" ]; From 128623b2f167738923573566940e2089856475bc Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Sun, 29 Dec 2024 21:50:39 +0100 Subject: [PATCH 252/429] nixos/services.cloud-init: remove `with lib;` --- nixos/modules/services/system/cloud-init.nix | 61 ++++++++++---------- 1 file changed, 29 insertions(+), 32 deletions(-) diff --git a/nixos/modules/services/system/cloud-init.nix b/nixos/modules/services/system/cloud-init.nix index d9ec130add91..cf8585dc90bb 100644 --- a/nixos/modules/services/system/cloud-init.nix +++ b/nixos/modules/services/system/cloud-init.nix @@ -4,9 +4,6 @@ pkgs, ... }: - -with lib; - let cfg = config.services.cloud-init; path = @@ -31,8 +28,8 @@ in { options = { services.cloud-init = { - enable = mkOption { - type = types.bool; + enable = lib.mkOption { + type = lib.types.bool; default = false; description = '' Enable the cloud-init service. This services reads @@ -50,35 +47,35 @@ in ''; }; - btrfs.enable = mkOption { - type = types.bool; + btrfs.enable = lib.mkOption { + type = lib.types.bool; default = hasFs "btrfs"; - defaultText = literalExpression ''hasFs "btrfs"''; + defaultText = lib.literalExpression ''hasFs "btrfs"''; description = '' Allow the cloud-init service to operate `btrfs` filesystem. ''; }; - ext4.enable = mkOption { - type = types.bool; + ext4.enable = lib.mkOption { + type = lib.types.bool; default = hasFs "ext4"; - defaultText = literalExpression ''hasFs "ext4"''; + defaultText = lib.literalExpression ''hasFs "ext4"''; description = '' Allow the cloud-init service to operate `ext4` filesystem. ''; }; - xfs.enable = mkOption { - type = types.bool; + xfs.enable = lib.mkOption { + type = lib.types.bool; default = hasFs "xfs"; - defaultText = literalExpression ''hasFs "xfs"''; + defaultText = lib.literalExpression ''hasFs "xfs"''; description = '' Allow the cloud-init service to operate `xfs` filesystem. ''; }; - network.enable = mkOption { - type = types.bool; + network.enable = lib.mkOption { + type = lib.types.bool; default = false; description = '' Allow the cloud-init service to configure network interfaces @@ -86,26 +83,26 @@ in ''; }; - extraPackages = mkOption { - type = types.listOf types.package; + extraPackages = lib.mkOption { + type = lib.types.listOf lib.types.package; default = [ ]; description = '' List of additional packages to be available within cloud-init jobs. ''; }; - settings = mkOption { + settings = lib.mkOption { description = '' Structured cloud-init configuration. ''; - type = types.submodule { + type = lib.types.submodule { freeformType = settingsFormat.type; }; default = { }; }; - config = mkOption { - type = types.str; + config = lib.mkOption { + type = lib.types.str; default = ""; description = '' raw cloud-init configuration. @@ -118,20 +115,20 @@ in }; - config = mkIf cfg.enable { + config = lib.mkIf cfg.enable { services.cloud-init.settings = { - system_info = mkDefault { + system_info = lib.mkDefault { distro = "nixos"; network = { renderers = [ "networkd" ]; }; }; - users = mkDefault [ "root" ]; - disable_root = mkDefault false; - preserve_hostname = mkDefault false; + users = lib.mkDefault [ "root" ]; + disable_root = lib.mkDefault false; + preserve_hostname = lib.mkDefault false; - cloud_init_modules = mkDefault [ + cloud_init_modules = lib.mkDefault [ "migrator" "seed_random" "bootcmd" @@ -145,7 +142,7 @@ in "users-groups" ]; - cloud_config_modules = mkDefault [ + cloud_config_modules = lib.mkDefault [ "disk_setup" "mounts" "ssh-import-id" @@ -156,7 +153,7 @@ in "ssh" ]; - cloud_final_modules = mkDefault [ + cloud_final_modules = lib.mkDefault [ "rightscale_userdata" "scripts-vendor" "scripts-per-once" @@ -174,7 +171,7 @@ in environment.etc."cloud/cloud.cfg" = if cfg.config == "" then { source = cfgfile; } else { text = cfg.config; }; - systemd.network.enable = mkIf cfg.network.enable true; + systemd.network.enable = lib.mkIf cfg.network.enable true; systemd.services.cloud-init-local = { description = "Initial cloud-init job (pre-networking)"; @@ -272,5 +269,5 @@ in }; }; - meta.maintainers = [ maintainers.zimbatm ]; + meta.maintainers = [ lib.maintainers.zimbatm ]; } From 08f1e99c34d9236fb1a2447b178ac33f899ddbca Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Sun, 29 Dec 2024 21:50:39 +0100 Subject: [PATCH 253/429] nixos/services.localtimed: remove `with lib;` --- nixos/modules/services/system/localtimed.nix | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/nixos/modules/services/system/localtimed.nix b/nixos/modules/services/system/localtimed.nix index 745d767d0744..404cdaba7b42 100644 --- a/nixos/modules/services/system/localtimed.nix +++ b/nixos/modules/services/system/localtimed.nix @@ -4,9 +4,6 @@ pkgs, ... }: - -with lib; - let cfg = config.services.localtimed; in @@ -15,8 +12,8 @@ in options = { services.localtimed = { - enable = mkOption { - type = types.bool; + enable = lib.mkOption { + type = lib.types.bool; default = false; description = '' Enable `localtimed`, a simple daemon for keeping the @@ -29,12 +26,12 @@ in to make the choice deliberate. An error will be presented otherwise. ''; }; - package = mkPackageOption pkgs "localtime" { }; - geoclue2Package = mkPackageOption pkgs "Geoclue2" { default = "geoclue2-with-demo-agent"; }; + package = lib.mkPackageOption pkgs "localtime" { }; + geoclue2Package = lib.mkPackageOption pkgs "Geoclue2" { default = "geoclue2-with-demo-agent"; }; }; }; - config = mkIf cfg.enable { + config = lib.mkIf cfg.enable { # This will give users an error if they have set an explicit time # zone, rather than having the service silently override it. time.timeZone = null; From 0a49bde2427d988307a9858870ae25636dae2be5 Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Sun, 29 Dec 2024 21:50:40 +0100 Subject: [PATCH 254/429] nixos/nix: remove `with lib;` --- nixos/modules/services/system/nix-daemon.nix | 66 +++++++++----------- 1 file changed, 31 insertions(+), 35 deletions(-) diff --git a/nixos/modules/services/system/nix-daemon.nix b/nixos/modules/services/system/nix-daemon.nix index 4a761048c713..3e5b0d16fca0 100644 --- a/nixos/modules/services/system/nix-daemon.nix +++ b/nixos/modules/services/system/nix-daemon.nix @@ -1,6 +1,5 @@ /* Declares what makes the nix-daemon work on systemd. - See also - nixos/modules/config/nix.nix: the nix.conf - nixos/modules/config/nix-remote-build.nix: the nix.conf @@ -11,16 +10,13 @@ pkgs, ... }: - -with lib; - let cfg = config.nix; nixPackage = cfg.package.out; - isNixAtLeast = versionAtLeast (getVersion nixPackage); + isNixAtLeast = lib.versionAtLeast (lib.getVersion nixPackage); makeNixBuildUser = nr: { name = "nixbld${toString nr}"; @@ -39,13 +35,13 @@ let }; }; - nixbldUsers = listToAttrs (map makeNixBuildUser (range 1 cfg.nrBuildUsers)); + nixbldUsers = lib.listToAttrs (map makeNixBuildUser (lib.range 1 cfg.nrBuildUsers)); in { imports = [ - (mkRenamedOptionModuleWith { + (lib.mkRenamedOptionModuleWith { sinceRelease = 2205; from = [ "nix" @@ -56,7 +52,7 @@ in "daemonIOSchedPriority" ]; }) - (mkRenamedOptionModuleWith { + (lib.mkRenamedOptionModuleWith { sinceRelease = 2211; from = [ "nix" @@ -67,7 +63,7 @@ in "readOnlyNixStore" ]; }) - (mkRemovedOptionModule [ "nix" "daemonNiceLevel" ] "Consider nix.daemonCPUSchedPolicy instead.") + (lib.mkRemovedOptionModule [ "nix" "daemonNiceLevel" ] "Consider nix.daemonCPUSchedPolicy instead.") ]; ###### interface @@ -76,8 +72,8 @@ in nix = { - enable = mkOption { - type = types.bool; + enable = lib.mkOption { + type = lib.types.bool; default = true; description = '' Whether to enable Nix. @@ -85,17 +81,17 @@ in ''; }; - package = mkOption { - type = types.package; + package = lib.mkOption { + type = lib.types.package; default = pkgs.nix; - defaultText = literalExpression "pkgs.nix"; + defaultText = lib.literalExpression "pkgs.nix"; description = '' This option specifies the Nix package instance to use throughout the system. ''; }; - daemonCPUSchedPolicy = mkOption { - type = types.enum [ + daemonCPUSchedPolicy = lib.mkOption { + type = lib.types.enum [ "other" "batch" "idle" @@ -128,8 +124,8 @@ in ''; }; - daemonIOSchedClass = mkOption { - type = types.enum [ + daemonIOSchedClass = lib.mkOption { + type = lib.types.enum [ "best-effort" "idle" ]; @@ -154,8 +150,8 @@ in ''; }; - daemonIOSchedPriority = mkOption { - type = types.int; + daemonIOSchedPriority = lib.mkOption { + type = lib.types.int; default = 4; example = 1; description = '' @@ -168,15 +164,15 @@ in }; # Environment variables for running Nix. - envVars = mkOption { - type = types.attrs; + envVars = lib.mkOption { + type = lib.types.attrs; internal = true; default = { }; description = "Environment variables used by Nix."; }; - nrBuildUsers = mkOption { - type = types.int; + nrBuildUsers = lib.mkOption { + type = lib.types.int; description = '' Number of `nixbld` user accounts created to perform secure concurrent builds. If you receive an error @@ -189,19 +185,19 @@ in ###### implementation - config = mkIf cfg.enable { + config = lib.mkIf cfg.enable { environment.systemPackages = [ nixPackage pkgs.nix-info - ] ++ optional (config.programs.bash.completion.enable) pkgs.nix-bash-completions; + ] ++ lib.optional (config.programs.bash.completion.enable) pkgs.nix-bash-completions; systemd.packages = [ nixPackage ]; - systemd.tmpfiles = mkMerge [ - (mkIf (isNixAtLeast "2.8") { + systemd.tmpfiles = lib.mkMerge [ + (lib.mkIf (isNixAtLeast "2.8") { packages = [ nixPackage ]; }) - (mkIf (!isNixAtLeast "2.8") { + (lib.mkIf (!isNixAtLeast "2.8") { rules = [ "d /nix/var/nix/daemon-socket 0755 root root - -" ]; @@ -215,7 +211,7 @@ in nixPackage pkgs.util-linux config.programs.ssh.package - ] ++ optionals cfg.distributedBuilds [ pkgs.gzip ]; + ] ++ lib.optionals cfg.distributedBuilds [ pkgs.gzip ]; environment = cfg.envVars @@ -274,20 +270,20 @@ in # Set up the environment variables for running Nix. environment.sessionVariables = cfg.envVars; - nix.nrBuildUsers = mkDefault ( + nix.nrBuildUsers = lib.mkDefault ( if cfg.settings.auto-allocate-uids or false then 0 else - max 32 (if cfg.settings.max-jobs == "auto" then 0 else cfg.settings.max-jobs) + lib.max 32 (if cfg.settings.max-jobs == "auto" then 0 else cfg.settings.max-jobs) ); users.users = nixbldUsers; - services.displayManager.hiddenUsers = attrNames nixbldUsers; + services.displayManager.hiddenUsers = lib.attrNames nixbldUsers; # Legacy configuration conversion. - nix.settings = mkMerge [ - (mkIf (isNixAtLeast "2.3pre") { sandbox-fallback = false; }) + nix.settings = lib.mkMerge [ + (lib.mkIf (isNixAtLeast "2.3pre") { sandbox-fallback = false; }) ]; }; From 710d6186c13110f3630f2659c1e9c026eacfcbbd Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Sun, 29 Dec 2024 21:50:40 +0100 Subject: [PATCH 255/429] nixos/services.nscd: remove `with lib;` --- nixos/modules/services/system/nscd.nix | 31 ++++++++++++-------------- 1 file changed, 14 insertions(+), 17 deletions(-) diff --git a/nixos/modules/services/system/nscd.nix b/nixos/modules/services/system/nscd.nix index c5b14e23fdda..ad5ccbcd335a 100644 --- a/nixos/modules/services/system/nscd.nix +++ b/nixos/modules/services/system/nscd.nix @@ -4,9 +4,6 @@ pkgs, ... }: - -with lib; - let nssModulesPath = config.system.nssModules.path; @@ -22,8 +19,8 @@ in services.nscd = { - enable = mkOption { - type = types.bool; + enable = lib.mkOption { + type = lib.types.bool; default = true; description = '' Whether to enable the Name Service Cache Daemon. @@ -32,8 +29,8 @@ in ''; }; - enableNsncd = mkOption { - type = types.bool; + enableNsncd = lib.mkOption { + type = lib.types.bool; default = true; description = '' Whether to use nsncd instead of nscd from glibc. @@ -42,24 +39,24 @@ in ''; }; - user = mkOption { - type = types.str; + user = lib.mkOption { + type = lib.types.str; default = "nscd"; description = '' User account under which nscd runs. ''; }; - group = mkOption { - type = types.str; + group = lib.mkOption { + type = lib.types.str; default = "nscd"; description = '' User group under which nscd runs. ''; }; - config = mkOption { - type = types.lines; + config = lib.mkOption { + type = lib.types.lines; default = builtins.readFile ./nscd.conf; description = '' Configuration to use for Name Service Cache Daemon. @@ -67,8 +64,8 @@ in ''; }; - package = mkOption { - type = types.package; + package = lib.mkOption { + type = lib.types.package; default = if pkgs.stdenv.hostPlatform.libc == "glibc" then pkgs.stdenv.cc.libc.bin else pkgs.glibc.bin; defaultText = lib.literalExpression '' @@ -88,7 +85,7 @@ in ###### implementation - config = mkIf cfg.enable { + config = lib.mkIf cfg.enable { environment.etc."nscd.conf".text = cfg.config; users.users.${cfg.user} = { @@ -125,7 +122,7 @@ in config.environment.etc."nsswitch.conf".source config.environment.etc."nscd.conf".source ] - ++ optionals config.users.mysql.enable [ + ++ lib.optionals config.users.mysql.enable [ config.environment.etc."libnss-mysql.cfg".source config.environment.etc."libnss-mysql-root.cfg".source ] From e8c85ce9ab346d93e01b781718b1c7f27592a705 Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Sun, 29 Dec 2024 21:50:40 +0100 Subject: [PATCH 256/429] nixos/services.saslauthd: remove `with lib;` --- nixos/modules/services/system/saslauthd.nix | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/nixos/modules/services/system/saslauthd.nix b/nixos/modules/services/system/saslauthd.nix index 17dae880a0ef..333cc5a4ba11 100644 --- a/nixos/modules/services/system/saslauthd.nix +++ b/nixos/modules/services/system/saslauthd.nix @@ -4,9 +4,6 @@ pkgs, ... }: - -with lib; - let cfg = config.services.saslauthd; @@ -21,18 +18,18 @@ in services.saslauthd = { - enable = mkEnableOption "saslauthd, the Cyrus SASL authentication daemon"; + enable = lib.mkEnableOption "saslauthd, the Cyrus SASL authentication daemon"; - package = mkPackageOption pkgs [ "cyrus_sasl" "bin" ] { }; + package = lib.mkPackageOption pkgs [ "cyrus_sasl" "bin" ] { }; - mechanism = mkOption { - type = types.str; + mechanism = lib.mkOption { + type = lib.types.str; default = "pam"; description = "Auth mechanism to use"; }; - config = mkOption { - type = types.lines; + config = lib.mkOption { + type = lib.types.lines; default = ""; description = "Configuration to use for Cyrus SASL authentication daemon."; }; @@ -43,7 +40,7 @@ in ###### implementation - config = mkIf cfg.enable { + config = lib.mkIf cfg.enable { systemd.services.saslauthd = { description = "Cyrus SASL authentication daemon"; From c05dd62835f0ddff584f6c75acbcc6a43d770199 Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Sun, 29 Dec 2024 21:50:40 +0100 Subject: [PATCH 257/429] nixos/services.uptimed: remove `with lib;` --- nixos/modules/services/system/uptimed.nix | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/nixos/modules/services/system/uptimed.nix b/nixos/modules/services/system/uptimed.nix index b0c4daa3c186..faa949c3089b 100644 --- a/nixos/modules/services/system/uptimed.nix +++ b/nixos/modules/services/system/uptimed.nix @@ -4,9 +4,6 @@ pkgs, ... }: - -with lib; - let cfg = config.services.uptimed; stateDir = "/var/lib/uptimed"; @@ -14,8 +11,8 @@ in { options = { services.uptimed = { - enable = mkOption { - type = types.bool; + enable = lib.mkOption { + type = lib.types.bool; default = false; description = '' Enable `uptimed`, allowing you to track @@ -25,7 +22,7 @@ in }; }; - config = mkIf cfg.enable { + config = lib.mkIf cfg.enable { environment.systemPackages = [ pkgs.uptimed ]; From 16c697e1e338f64d881cc795b959c4df38706258 Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Sun, 29 Dec 2024 21:50:40 +0100 Subject: [PATCH 258/429] nixos/services.deluge: remove `with lib;` --- nixos/modules/services/torrent/deluge.nix | 89 +++++++++++------------ 1 file changed, 43 insertions(+), 46 deletions(-) diff --git a/nixos/modules/services/torrent/deluge.nix b/nixos/modules/services/torrent/deluge.nix index 90573fea57b3..4d7d59175ded 100644 --- a/nixos/modules/services/torrent/deluge.nix +++ b/nixos/modules/services/torrent/deluge.nix @@ -1,16 +1,13 @@ { config, lib, pkgs, ... }: - -with lib; - let cfg = config.services.deluge; cfg_web = config.services.deluge.web; - isDeluge1 = versionOlder cfg.package.version "2.0.0"; + isDeluge1 = lib.versionOlder cfg.package.version "2.0.0"; openFilesLimit = 4096; listenPortsDefault = [ 6881 6889 ]; - listToRange = x: { from = elemAt x 0; to = elemAt x 1; }; + listToRange = x: { from = lib.elemAt x 0; to = lib.elemAt x 1; }; configDir = "${cfg.dataDir}/.config/deluge"; configFile = pkgs.writeText "core.conf" (builtins.toJSON cfg.config); @@ -37,20 +34,20 @@ in { options = { services = { deluge = { - enable = mkEnableOption "Deluge daemon"; + enable = lib.mkEnableOption "Deluge daemon"; - openFilesLimit = mkOption { + openFilesLimit = lib.mkOption { default = openFilesLimit; - type = types.either types.int types.str; + type = lib.types.either lib.types.int lib.types.str; description = '' Number of files to allow deluged to open. ''; }; - config = mkOption { - type = types.attrs; + config = lib.mkOption { + type = lib.types.attrs; default = {}; - example = literalExpression '' + example = lib.literalExpression '' { download_location = "/srv/torrents/"; max_upload_speed = "1000.0"; @@ -70,8 +67,8 @@ in { ''; }; - declarative = mkOption { - type = types.bool; + declarative = lib.mkOption { + type = lib.types.bool; default = false; description = '' Whether to use a declarative deluge configuration. @@ -83,9 +80,9 @@ in { ''; }; - openFirewall = mkOption { + openFirewall = lib.mkOption { default = false; - type = types.bool; + type = lib.types.bool; description = '' Whether to open the firewall for the ports in {option}`services.deluge.config.listen_ports`. It only takes effet if @@ -99,16 +96,16 @@ in { ''; }; - dataDir = mkOption { - type = types.path; + dataDir = lib.mkOption { + type = lib.types.path; default = "/var/lib/deluge"; description = '' The directory where deluge will create files. ''; }; - authFile = mkOption { - type = types.path; + authFile = lib.mkOption { + type = lib.types.path; example = "/run/keys/deluge-auth"; description = '' The file managing the authentication for deluge, the format of this @@ -121,24 +118,24 @@ in { ''; }; - user = mkOption { - type = types.str; + user = lib.mkOption { + type = lib.types.str; default = "deluge"; description = '' User account under which deluge runs. ''; }; - group = mkOption { - type = types.str; + group = lib.mkOption { + type = lib.types.str; default = "deluge"; description = '' Group under which deluge runs. ''; }; - extraPackages = mkOption { - type = types.listOf types.package; + extraPackages = lib.mkOption { + type = lib.types.listOf lib.types.package; default = []; description = '' Extra packages available at runtime to enable Deluge's plugins. For example, @@ -147,22 +144,22 @@ in { ''; }; - package = mkPackageOption pkgs "deluge-2_x" { }; + package = lib.mkPackageOption pkgs "deluge-2_x" { }; }; deluge.web = { - enable = mkEnableOption "Deluge Web daemon"; + enable = lib.mkEnableOption "Deluge Web daemon"; - port = mkOption { - type = types.port; + port = lib.mkOption { + type = lib.types.port; default = 8112; description = '' Deluge web UI port. ''; }; - openFirewall = mkOption { - type = types.bool; + openFirewall = lib.mkOption { + type = lib.types.bool; default = false; description = '' Open ports in the firewall for deluge web daemon @@ -172,10 +169,10 @@ in { }; }; - config = mkIf cfg.enable { + config = lib.mkIf cfg.enable { - services.deluge.package = mkDefault ( - if versionAtLeast config.system.stateVersion "20.09" then + services.deluge.package = lib.mkDefault ( + if lib.versionAtLeast config.system.stateVersion "20.09" then pkgs.deluge-2_x else # deluge-1_x is no longer packaged and this will resolve to an error @@ -201,13 +198,13 @@ in { "${cfg.dataDir}/.config".d = defaultConfig; "${cfg.dataDir}/.config/deluge".d = defaultConfig; } - // optionalAttrs (cfg.config ? download_location) { + // lib.optionalAttrs (cfg.config ? download_location) { ${cfg.config.download_location}.d = defaultConfig; } - // optionalAttrs (cfg.config ? torrentfiles_location) { + // lib.optionalAttrs (cfg.config ? torrentfiles_location) { ${cfg.config.torrentfiles_location}.d = defaultConfig; } - // optionalAttrs (cfg.config ? move_completed_path) { + // lib.optionalAttrs (cfg.config ? move_completed_path) { ${cfg.config.move_completed_path}.d = defaultConfig; }; @@ -233,7 +230,7 @@ in { preStart = preStart; }; - systemd.services.delugeweb = mkIf cfg_web.enable { + systemd.services.delugeweb = lib.mkIf cfg_web.enable { after = [ "network.target" "deluged.service"]; requires = [ "deluged.service" ]; description = "Deluge BitTorrent WebUI"; @@ -242,7 +239,7 @@ in { serviceConfig = { ExecStart = '' ${cfg.package}/bin/deluge-web \ - ${optionalString (!isDeluge1) "--do-not-daemonize"} \ + ${lib.optionalString (!isDeluge1) "--do-not-daemonize"} \ --config ${configDir} \ --port ${toString cfg.web.port} ''; @@ -251,19 +248,19 @@ in { }; }; - networking.firewall = mkMerge [ - (mkIf (cfg.declarative && cfg.openFirewall && !(cfg.config.random_port or true)) { - allowedTCPPortRanges = singleton (listToRange (cfg.config.listen_ports or listenPortsDefault)); - allowedUDPPortRanges = singleton (listToRange (cfg.config.listen_ports or listenPortsDefault)); + networking.firewall = lib.mkMerge [ + (lib.mkIf (cfg.declarative && cfg.openFirewall && !(cfg.config.random_port or true)) { + allowedTCPPortRanges = lib.singleton (listToRange (cfg.config.listen_ports or listenPortsDefault)); + allowedUDPPortRanges = lib.singleton (listToRange (cfg.config.listen_ports or listenPortsDefault)); }) - (mkIf (cfg.web.openFirewall) { + (lib.mkIf (cfg.web.openFirewall) { allowedTCPPorts = [ cfg.web.port ]; }) ]; environment.systemPackages = [ cfg.package ]; - users.users = mkIf (cfg.user == "deluge") { + users.users = lib.mkIf (cfg.user == "deluge") { deluge = { group = cfg.group; uid = config.ids.uids.deluge; @@ -272,7 +269,7 @@ in { }; }; - users.groups = mkIf (cfg.group == "deluge") { + users.groups = lib.mkIf (cfg.group == "deluge") { deluge = { gid = config.ids.gids.deluge; }; From 2718eb3e96af4c5d3895a978b0b94e2af9fb8997 Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Sun, 29 Dec 2024 21:50:40 +0100 Subject: [PATCH 259/429] nixos/services.flexget: remove `with lib;` --- nixos/modules/services/torrent/flexget.nix | 35 ++++++++++------------ 1 file changed, 16 insertions(+), 19 deletions(-) diff --git a/nixos/modules/services/torrent/flexget.nix b/nixos/modules/services/torrent/flexget.nix index 35ade70d8b63..0e5d8d667676 100644 --- a/nixos/modules/services/torrent/flexget.nix +++ b/nixos/modules/services/torrent/flexget.nix @@ -4,63 +4,60 @@ pkgs, ... }: - -with lib; - let cfg = config.services.flexget; pkg = cfg.package; ymlFile = pkgs.writeText "flexget.yml" '' ${cfg.config} - ${optionalString cfg.systemScheduler "schedules: no"} + ${lib.optionalString cfg.systemScheduler "schedules: no"} ''; configFile = "${toString cfg.homeDir}/flexget.yml"; in { options = { services.flexget = { - enable = mkEnableOption "FlexGet daemon"; + enable = lib.mkEnableOption "FlexGet daemon"; - package = mkPackageOption pkgs "flexget" { }; + package = lib.mkPackageOption pkgs "flexget" { }; - user = mkOption { + user = lib.mkOption { default = "deluge"; example = "some_user"; - type = types.str; + type = lib.types.str; description = "The user under which to run flexget."; }; - homeDir = mkOption { + homeDir = lib.mkOption { default = "/var/lib/deluge"; example = "/home/flexget"; - type = types.path; + type = lib.types.path; description = "Where files live."; }; - interval = mkOption { + interval = lib.mkOption { default = "10m"; example = "1h"; - type = types.str; + type = lib.types.str; description = "When to perform a {command}`flexget` run. See {command}`man 7 systemd.time` for the format."; }; - systemScheduler = mkOption { + systemScheduler = lib.mkOption { default = true; example = false; - type = types.bool; + type = lib.types.bool; description = "When true, execute the runs via the flexget-runner.timer. If false, you have to specify the settings yourself in the YML file."; }; - config = mkOption { + config = lib.mkOption { default = ""; - type = types.lines; + type = lib.types.lines; description = "The YAML configuration for FlexGet."; }; }; }; - config = mkIf cfg.enable { + config = lib.mkIf cfg.enable { environment.systemPackages = [ pkg ]; @@ -81,7 +78,7 @@ in wantedBy = [ "multi-user.target" ]; }; - flexget-runner = mkIf cfg.systemScheduler { + flexget-runner = lib.mkIf cfg.systemScheduler { description = "FlexGet Runner"; after = [ "flexget.service" ]; wants = [ "flexget.service" ]; @@ -94,7 +91,7 @@ in }; }; - systemd.timers.flexget-runner = mkIf cfg.systemScheduler { + systemd.timers.flexget-runner = lib.mkIf cfg.systemScheduler { description = "Run FlexGet every ${cfg.interval}"; wantedBy = [ "timers.target" ]; timerConfig = { From fd713acb0a5fa68a25e7d31ec7bf5c1f14e04c4f Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Sun, 29 Dec 2024 21:50:40 +0100 Subject: [PATCH 260/429] nixos/services.magnetico: remove `with lib;` --- nixos/modules/services/torrent/magnetico.nix | 49 +++++++++----------- 1 file changed, 23 insertions(+), 26 deletions(-) diff --git a/nixos/modules/services/torrent/magnetico.nix b/nixos/modules/services/torrent/magnetico.nix index fda552aff8fd..51a4dc4c715f 100644 --- a/nixos/modules/services/torrent/magnetico.nix +++ b/nixos/modules/services/torrent/magnetico.nix @@ -4,9 +4,6 @@ pkgs, ... }: - -with lib; - let cfg = config.services.magnetico; @@ -22,7 +19,7 @@ let ); # default options in magneticod/main.go - dbURI = concatStrings [ + dbURI = lib.concatStrings [ "sqlite3://${dataDir}/database.sqlite3" "?_journal_mode=WAL" "&_busy_timeout=3000" @@ -63,10 +60,10 @@ in ###### interface options.services.magnetico = { - enable = mkEnableOption "Magnetico, Bittorrent DHT crawler"; + enable = lib.mkEnableOption "Magnetico, Bittorrent DHT crawler"; - crawler.address = mkOption { - type = types.str; + crawler.address = lib.mkOption { + type = lib.types.str; default = "0.0.0.0"; example = "1.2.3.4"; description = '' @@ -74,8 +71,8 @@ in ''; }; - crawler.port = mkOption { - type = types.port; + crawler.port = lib.mkOption { + type = lib.types.port; default = 0; description = '' Port to be used for indexing DHT nodes. @@ -84,8 +81,8 @@ in ''; }; - crawler.maxNeighbors = mkOption { - type = types.ints.positive; + crawler.maxNeighbors = lib.mkOption { + type = lib.types.ints.positive; default = 1000; description = '' Maximum number of simultaneous neighbors of an indexer. @@ -95,24 +92,24 @@ in ''; }; - crawler.maxLeeches = mkOption { - type = types.ints.positive; + crawler.maxLeeches = lib.mkOption { + type = lib.types.ints.positive; default = 200; description = '' Maximum number of simultaneous leeches. ''; }; - crawler.extraOptions = mkOption { - type = types.listOf types.str; + crawler.extraOptions = lib.mkOption { + type = lib.types.listOf lib.types.str; default = [ ]; description = '' Extra command line arguments to pass to magneticod. ''; }; - web.address = mkOption { - type = types.str; + web.address = lib.mkOption { + type = lib.types.str; default = "localhost"; example = "1.2.3.4"; description = '' @@ -120,16 +117,16 @@ in ''; }; - web.port = mkOption { - type = types.port; + web.port = lib.mkOption { + type = lib.types.port; default = 8080; description = '' Port the web interface will listen to. ''; }; - web.credentials = mkOption { - type = types.attrsOf types.str; + web.credentials = lib.mkOption { + type = lib.types.attrsOf lib.types.str; default = { }; example = lib.literalExpression '' { @@ -156,8 +153,8 @@ in ''; }; - web.credentialsFile = mkOption { - type = types.nullOr types.path; + web.credentialsFile = lib.mkOption { + type = lib.types.nullOr lib.types.path; default = null; description = '' The path to the file holding the credentials to access the web @@ -174,8 +171,8 @@ in ''; }; - web.extraOptions = mkOption { - type = types.listOf types.str; + web.extraOptions = lib.mkOption { + type = lib.types.listOf lib.types.str; default = [ ]; description = '' Extra command line arguments to pass to magneticow. @@ -186,7 +183,7 @@ in ###### implementation - config = mkIf cfg.enable { + config = lib.mkIf cfg.enable { users.users.magnetico = { description = "Magnetico daemons user"; From 4db4628f76a3721de945936f0b98bf69fd4d9aaf Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Sun, 29 Dec 2024 21:50:40 +0100 Subject: [PATCH 261/429] nixos/services.opentracker: remove `with lib;` --- nixos/modules/services/torrent/opentracker.nix | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/nixos/modules/services/torrent/opentracker.nix b/nixos/modules/services/torrent/opentracker.nix index 518830d4c279..22938e9359d4 100644 --- a/nixos/modules/services/torrent/opentracker.nix +++ b/nixos/modules/services/torrent/opentracker.nix @@ -4,19 +4,17 @@ pkgs, ... }: - -with lib; let cfg = config.services.opentracker; in { options.services.opentracker = { - enable = mkEnableOption "opentracker"; + enable = lib.mkEnableOption "opentracker"; - package = mkPackageOption pkgs "opentracker" { }; + package = lib.mkPackageOption pkgs "opentracker" { }; - extraOptions = mkOption { - type = types.separatedString " "; + extraOptions = lib.mkOption { + type = lib.types.separatedString " "; description = '' Configuration Arguments for opentracker See https://erdgeist.org/arts/software/opentracker/ for all params From 336a76b1956375162be31bb79fa08ebe70cfd41d Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Sun, 29 Dec 2024 21:50:41 +0100 Subject: [PATCH 262/429] nixos/services.peerflix: remove `with lib;` --- nixos/modules/services/torrent/peerflix.nix | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/nixos/modules/services/torrent/peerflix.nix b/nixos/modules/services/torrent/peerflix.nix index abfbae6b7780..ff1aba7b9efc 100644 --- a/nixos/modules/services/torrent/peerflix.nix +++ b/nixos/modules/services/torrent/peerflix.nix @@ -5,9 +5,6 @@ pkgs, ... }: - -with lib; - let cfg = config.services.peerflix; opt = options.services.peerflix; @@ -25,29 +22,29 @@ in ###### interface options.services.peerflix = { - enable = mkOption { + enable = lib.mkOption { description = "Whether to enable peerflix service."; default = false; - type = types.bool; + type = lib.types.bool; }; - stateDir = mkOption { + stateDir = lib.mkOption { description = "Peerflix state directory."; default = "/var/lib/peerflix"; - type = types.path; + type = lib.types.path; }; - downloadDir = mkOption { + downloadDir = lib.mkOption { description = "Peerflix temporary download directory."; default = "${cfg.stateDir}/torrents"; - defaultText = literalExpression ''"''${config.${opt.stateDir}}/torrents"''; - type = types.path; + defaultText = lib.literalExpression ''"''${config.${opt.stateDir}}/torrents"''; + type = lib.types.path; }; }; ###### implementation - config = mkIf cfg.enable { + config = lib.mkIf cfg.enable { systemd.tmpfiles.rules = [ "d '${cfg.stateDir}' - peerflix - - -" ]; From c1f8b214cc4a8d826643d4557161f345452a9b0e Mon Sep 17 00:00:00 2001 From: Emily Date: Sat, 28 Dec 2024 19:17:27 +0000 Subject: [PATCH 263/429] foundationdb: 7.1.32 -> 7.3.42 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Includes fixes for GCC 14 and using non‐vendored libraries. --- .../manual/release-notes/rl-2505.section.md | 2 + .../services/databases/foundationdb.md | 4 +- pkgs/servers/foundationdb/cmake.nix | 27 ++-- pkgs/servers/foundationdb/default.nix | 10 +- .../don-t-run-tests-requiring-doctest.patch | 128 ------------------ .../patches/fix-open-with-O_CREAT.patch | 25 ---- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 4 +- pkgs/top-level/python-aliases.nix | 1 + pkgs/top-level/python-packages.nix | 2 +- 10 files changed, 26 insertions(+), 178 deletions(-) delete mode 100644 pkgs/servers/foundationdb/patches/don-t-run-tests-requiring-doctest.patch delete mode 100644 pkgs/servers/foundationdb/patches/fix-open-with-O_CREAT.patch diff --git a/nixos/doc/manual/release-notes/rl-2505.section.md b/nixos/doc/manual/release-notes/rl-2505.section.md index 39e75a30446e..c47101b1b1ff 100644 --- a/nixos/doc/manual/release-notes/rl-2505.section.md +++ b/nixos/doc/manual/release-notes/rl-2505.section.md @@ -141,6 +141,8 @@ - `ente-auth` now uses the name `enteauth` for its binary. The previous name was `ente_auth`. +- `foundationdb` was upgraded to 7.3. + - `fluxus` has been removed, as it depends on `racket_7_9` and had no updates in 9 years. - `renovate` was updated to v39. See the [upstream release notes](https://docs.renovatebot.com/release-notes-for-major-versions/#version-39) for breaking changes. diff --git a/nixos/modules/services/databases/foundationdb.md b/nixos/modules/services/databases/foundationdb.md index 9f7addc9c140..3cf17f1e6362 100644 --- a/nixos/modules/services/databases/foundationdb.md +++ b/nixos/modules/services/databases/foundationdb.md @@ -18,7 +18,7 @@ To enable FoundationDB, add the following to your ```nix { services.foundationdb.enable = true; - services.foundationdb.package = pkgs.foundationdb71; # FoundationDB 7.1.x + services.foundationdb.package = pkgs.foundationdb73; # FoundationDB 7.r3.x } ``` @@ -68,7 +68,7 @@ necessary Python modules). ```ShellSession a@link> cat fdb-status.py #! /usr/bin/env nix-shell -#! nix-shell -i python -p python pythonPackages.foundationdb71 +#! nix-shell -i python -p python pythonPackages.foundationdb73 import fdb import json diff --git a/pkgs/servers/foundationdb/cmake.nix b/pkgs/servers/foundationdb/cmake.nix index 015177d558c0..42a9b38ea781 100644 --- a/pkgs/servers/foundationdb/cmake.nix +++ b/pkgs/servers/foundationdb/cmake.nix @@ -2,7 +2,7 @@ { lib, fetchFromGitHub , cmake, ninja, python3, openjdk8, mono, pkg-config -, msgpack-cxx, toml11 +, msgpack-cxx, toml11, jemalloc, doctest , gccStdenv, llvmPackages , useClang ? false @@ -37,7 +37,9 @@ let inherit rev hash; }; - buildInputs = [ ssl boost msgpack-cxx toml11 ]; + buildInputs = [ ssl boost msgpack-cxx toml11 jemalloc ]; + + checkInputs = [ doctest ]; nativeBuildInputs = [ pkg-config cmake ninja python3 openjdk8 mono ] ++ lib.optionals useClang [ llvmPackages.lld ]; @@ -55,9 +57,7 @@ let # > Could not find lz4_STATIC_LIBRARIES using the following names: liblz4.a "-DSSD_ROCKSDB_EXPERIMENTAL=FALSE" - # FoundationDB's CMake is hardcoded to pull in jemalloc as an external - # project at build time. - "-DUSE_JEMALLOC=FALSE" + "-DBUILD_DOCUMENTATION=FALSE" # LTO brings up overall build time, but results in much smaller # binaries for all users and the cache. @@ -68,8 +68,8 @@ let # Same with LLD when Clang is available. (lib.optionalString useClang "-DUSE_LD=LLD") (lib.optionalString (!useClang) "-DUSE_LD=GOLD") - ] ++ lib.optionals (lib.versionOlder version "7.2.0") - [ # FIXME: why can't openssl be found automatically? + + # FIXME: why can't openssl be found automatically? "-DOPENSSL_USE_STATIC_LIBS=FALSE" "-DOPENSSL_CRYPTO_LIBRARY=${ssl.out}/lib/libcrypto.so" "-DOPENSSL_SSL_LIBRARY=${ssl.out}/lib/libssl.so" @@ -77,19 +77,16 @@ let hardeningDisable = [ "fortify" ]; - env.NIX_CFLAGS_COMPILE = toString [ - # Needed with GCC 12 - "-Wno-error=missing-template-keyword" - # Needed to compile on aarch64 - (lib.optionalString stdenv.hostPlatform.isAarch64 "-march=armv8-a+crc") - ]; - inherit patches; - # allow using any msgpack-cxx version postPatch = '' + # allow using any msgpack-cxx version substituteInPlace cmake/GetMsgpack.cmake \ --replace-warn 'find_package(msgpack-cxx 6 QUIET CONFIG)' 'find_package(msgpack-cxx QUIET CONFIG)' + + # Use our doctest package + substituteInPlace bindings/c/test/unit/third_party/CMakeLists.txt \ + --replace-fail '/opt/doctest_proj_2.4.8' '${doctest}/include' ''; # the install phase for cmake is pretty wonky right now since it's not designed to diff --git a/pkgs/servers/foundationdb/default.nix b/pkgs/servers/foundationdb/default.nix index 95b4aeddcedf..4962b521f372 100644 --- a/pkgs/servers/foundationdb/default.nix +++ b/pkgs/servers/foundationdb/default.nix @@ -15,23 +15,23 @@ pkg-config, msgpack-cxx, toml11, + jemalloc, + doctest, }@args: let cmakeBuild = import ./cmake.nix args; in { - foundationdb71 = cmakeBuild { - version = "7.1.32"; - hash = "sha256-CNJ4w1ECadj2KtcfbBPBQpXQeq9BAiw54hUgRTWPFzY="; + foundationdb73 = cmakeBuild { + version = "7.3.42"; + hash = "sha256-jQcm+HLai5da2pZZ7iLdN6fpQZxf5+/kkfv9OSXQ57c="; boost = boost178; ssl = openssl; patches = [ ./patches/disable-flowbench.patch - ./patches/don-t-run-tests-requiring-doctest.patch ./patches/don-t-use-static-boost-libs.patch - ./patches/fix-open-with-O_CREAT.patch # GetMsgpack: add 4+ versions of upstream # https://github.com/apple/foundationdb/pull/10935 (fetchpatch { diff --git a/pkgs/servers/foundationdb/patches/don-t-run-tests-requiring-doctest.patch b/pkgs/servers/foundationdb/patches/don-t-run-tests-requiring-doctest.patch deleted file mode 100644 index 702245bd52ff..000000000000 --- a/pkgs/servers/foundationdb/patches/don-t-run-tests-requiring-doctest.patch +++ /dev/null @@ -1,128 +0,0 @@ -From 10c502fd36df24f1fdbdeff446982ff5247ba20e Mon Sep 17 00:00:00 2001 -From: Jente Hidskes Ankarberg -Date: Thu, 9 Feb 2023 12:40:21 +0100 -Subject: [PATCH] Don't run tests requiring doctest - -Doctest is unconditionally pulled in as an external project, which we can't do ---- - bindings/c/CMakeLists.txt | 59 --------------------------------------- - 1 file changed, 59 deletions(-) - -diff --git bindings/c/CMakeLists.txt bindings/c/CMakeLists.txt -index b1a187b99..25b626819 100644 ---- a/bindings/c/CMakeLists.txt -+++ b/bindings/c/CMakeLists.txt -@@ -84,7 +84,6 @@ if(NOT WIN32) - test/mako/mako.h - test/mako/utils.c - test/mako/utils.h) -- add_subdirectory(test/unit/third_party) - find_package(Threads REQUIRED) - set(UNIT_TEST_SRCS - test/unit/unit_tests.cpp -@@ -93,10 +92,6 @@ if(NOT WIN32) - - set(UNIT_TEST_VERSION_510_SRCS test/unit/unit_tests_version_510.cpp) - set(TRACE_PARTIAL_FILE_SUFFIX_TEST_SRCS test/unit/trace_partial_file_suffix_test.cpp) -- set(DISCONNECTED_TIMEOUT_UNIT_TEST_SRCS -- test/unit/disconnected_timeout_tests.cpp -- test/unit/fdb_api.cpp -- test/unit/fdb_api.hpp) - - set(API_TESTER_SRCS - test/apitester/fdb_c_api_tester.cpp -@@ -128,11 +123,7 @@ if(NOT WIN32) - add_library(fdb_c_txn_size_test OBJECT test/txn_size_test.c test/test.h) - add_library(fdb_c_client_memory_test OBJECT test/client_memory_test.cpp test/unit/fdb_api.cpp test/unit/fdb_api.hpp) - add_library(mako OBJECT ${MAKO_SRCS}) -- add_library(fdb_c_setup_tests OBJECT test/unit/setup_tests.cpp) -- add_library(fdb_c_unit_tests OBJECT ${UNIT_TEST_SRCS}) -- add_library(fdb_c_unit_tests_version_510 OBJECT ${UNIT_TEST_VERSION_510_SRCS}) - add_library(trace_partial_file_suffix_test OBJECT ${TRACE_PARTIAL_FILE_SUFFIX_TEST_SRCS}) -- add_library(disconnected_timeout_unit_tests OBJECT ${DISCONNECTED_TIMEOUT_UNIT_TEST_SRCS}) - add_library(fdb_c_api_tester OBJECT ${API_TESTER_SRCS}) - else() - add_executable(fdb_c_performance_test test/performance_test.c test/test.h) -@@ -140,11 +131,7 @@ if(NOT WIN32) - add_executable(fdb_c_txn_size_test test/txn_size_test.c test/test.h) - add_executable(fdb_c_client_memory_test test/client_memory_test.cpp test/unit/fdb_api.cpp test/unit/fdb_api.hpp) - add_executable(mako ${MAKO_SRCS}) -- add_executable(fdb_c_setup_tests test/unit/setup_tests.cpp) -- add_executable(fdb_c_unit_tests ${UNIT_TEST_SRCS}) -- add_executable(fdb_c_unit_tests_version_510 ${UNIT_TEST_VERSION_510_SRCS}) - add_executable(trace_partial_file_suffix_test ${TRACE_PARTIAL_FILE_SUFFIX_TEST_SRCS}) -- add_executable(disconnected_timeout_unit_tests ${DISCONNECTED_TIMEOUT_UNIT_TEST_SRCS}) - add_executable(fdb_c_api_tester ${API_TESTER_SRCS}) - strip_debug_symbols(fdb_c_performance_test) - strip_debug_symbols(fdb_c_ryw_benchmark) -@@ -155,20 +142,7 @@ if(NOT WIN32) - target_link_libraries(fdb_c_ryw_benchmark PRIVATE fdb_c Threads::Threads) - target_link_libraries(fdb_c_txn_size_test PRIVATE fdb_c Threads::Threads) - target_link_libraries(fdb_c_client_memory_test PRIVATE fdb_c Threads::Threads) -- -- add_dependencies(fdb_c_setup_tests doctest) -- add_dependencies(fdb_c_unit_tests doctest) -- add_dependencies(fdb_c_unit_tests_version_510 doctest) -- add_dependencies(disconnected_timeout_unit_tests doctest) -- target_include_directories(fdb_c_setup_tests PUBLIC ${DOCTEST_INCLUDE_DIR}) -- target_include_directories(fdb_c_unit_tests PUBLIC ${DOCTEST_INCLUDE_DIR}) -- target_include_directories(fdb_c_unit_tests_version_510 PUBLIC ${DOCTEST_INCLUDE_DIR}) -- target_include_directories(disconnected_timeout_unit_tests PUBLIC ${DOCTEST_INCLUDE_DIR}) -- target_link_libraries(fdb_c_setup_tests PRIVATE fdb_c Threads::Threads) -- target_link_libraries(fdb_c_unit_tests PRIVATE fdb_c Threads::Threads fdbclient) -- target_link_libraries(fdb_c_unit_tests_version_510 PRIVATE fdb_c Threads::Threads) - target_link_libraries(trace_partial_file_suffix_test PRIVATE fdb_c Threads::Threads flow) -- target_link_libraries(disconnected_timeout_unit_tests PRIVATE fdb_c Threads::Threads) - - if(USE_SANITIZER) - target_link_libraries(fdb_c_api_tester PRIVATE fdb_c toml11_target Threads::Threads fmt::fmt boost_asan) -@@ -203,46 +177,13 @@ endif() - DEPENDS fdb_c - COMMENT "Copy libfdb_c to use as external client for test") - add_custom_target(external_client DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/libfdb_c_external.so) -- add_dependencies(fdb_c_unit_tests external_client) -- add_dependencies(disconnected_timeout_unit_tests external_client) - add_dependencies(fdb_c_api_tester external_client) - -- add_fdbclient_test( -- NAME fdb_c_setup_tests -- COMMAND $) -- add_fdbclient_test( -- NAME fdb_c_unit_tests -- COMMAND $ -- @CLUSTER_FILE@ -- fdb) -- add_fdbclient_test( -- NAME fdb_c_unit_tests_version_510 -- COMMAND $ -- @CLUSTER_FILE@ -- fdb) - add_fdbclient_test( - NAME trace_partial_file_suffix_test - COMMAND $ - @CLUSTER_FILE@ - fdb) -- add_fdbclient_test( -- NAME fdb_c_external_client_unit_tests -- COMMAND $ -- @CLUSTER_FILE@ -- fdb -- ${CMAKE_CURRENT_BINARY_DIR}/libfdb_c_external.so -- ) -- add_unavailable_fdbclient_test( -- NAME disconnected_timeout_unit_tests -- COMMAND $ -- @CLUSTER_FILE@ -- ) -- add_unavailable_fdbclient_test( -- NAME disconnected_timeout_external_client_unit_tests -- COMMAND $ -- @CLUSTER_FILE@ -- ${CMAKE_CURRENT_BINARY_DIR}/libfdb_c_external.so -- ) - add_fdbclient_test( - NAME fdb_c_api_tests - DISABLE_LOG_DUMP --- -2.37.1 (Apple Git-137.1) - diff --git a/pkgs/servers/foundationdb/patches/fix-open-with-O_CREAT.patch b/pkgs/servers/foundationdb/patches/fix-open-with-O_CREAT.patch deleted file mode 100644 index 23a642cb28fd..000000000000 --- a/pkgs/servers/foundationdb/patches/fix-open-with-O_CREAT.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 533d064ce028a7ebd0ef3a845cb69f10ca04b09f Mon Sep 17 00:00:00 2001 -From: Jente Hidskes Ankarberg -Date: Fri, 17 Feb 2023 00:07:20 +0100 -Subject: [PATCH 2/2] fix open with O_CREAT - ---- - fdbbackup/FileDecoder.actor.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git fdbbackup/FileDecoder.actor.cpp fdbbackup/FileDecoder.actor.cpp -index 71f693259..547147ea0 100644 ---- a/fdbbackup/FileDecoder.actor.cpp -+++ b/fdbbackup/FileDecoder.actor.cpp -@@ -433,7 +433,7 @@ public: - platform::createDirectory(path); - } - } -- self->lfd = open(self->file.fileName.c_str(), O_WRONLY | O_CREAT | O_TRUNC); -+ self->lfd = open(self->file.fileName.c_str(), O_WRONLY | O_CREAT | O_TRUNC, 0600); - if (self->lfd == -1) { - TraceEvent(SevError, "OpenLocalFileFailed").detail("File", self->file.fileName); - throw platform_error(); --- -2.38.1 - diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 39f79cb6efe0..3d51373e780a 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -403,6 +403,7 @@ mapAliases { fmt_8 = throw "fmt_8 has been removed as it is obsolete and was no longer used in the tree"; # Added 2024-11-12 foldingathome = throw "'foldingathome' has been renamed to/replaced by 'fahclient'"; # Converted to throw 2024-10-17 forgejo-actions-runner = forgejo-runner; # Added 2024-04-04 + foundationdb71 = throw "foundationdb71 has been removed; please upgrade to foundationdb73"; # Added 2024-12-28 fractal-next = fractal; # added 2023-11-25 framework-system-tools = framework-tool; # added 2023-12-09 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 86ce4f1eb9a2..2832235302bf 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3413,10 +3413,10 @@ with pkgs; fdbPackages = dontRecurseIntoAttrs (callPackage ../servers/foundationdb { }); inherit (fdbPackages) - foundationdb71 + foundationdb73 ; - foundationdb = foundationdb71; + foundationdb = foundationdb73; fuse-ext2 = darwin.apple_sdk_11_0.callPackage ../tools/filesystems/fuse-ext2 { }; diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index 83264b2be12a..0821a1968fc0 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -233,6 +233,7 @@ mapAliases ({ foundationdb52 = throw "foundationdb52 is no longer maintained, use foundationdb71 instead"; # added 2023-06-06 foundationdb60 = throw "foundationdb60 is no longer maintained, use foundationdb71 instead"; # added 2023-06-06 foundationdb61 = throw "foundationdb61 is no longer maintained, use foundationdb71 instead"; # added 2023-06-06 + foundationdb71 = throw "foundationdb71 has been removed, use foundationdb73 instead"; # added 2024-12-28 functorch = throw "functorch is now part of the torch package and has therefore been removed. See https://github.com/pytorch/functorch/releases/tag/v1.13.0 for more info."; # added 2022-12-01 functools32 = throw "functool32 was removed from nixpkgs, because python 2.7 has reach end of life in early 2020"; # added 2024-05-16 fritzprofiles = throw "fritzprofiles was removed from nixpkgs, because it was removed as dependency of home-assistant for which it was pacakged."; # added 2024-01-05 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 1056a924484e..f793a2d92bd2 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4903,7 +4903,7 @@ self: super: with self; { formulaic = callPackage ../development/python-modules/formulaic { }; - foundationdb71 = callPackage ../servers/foundationdb/python.nix { foundationdb = pkgs.foundationdb71; }; + foundationdb73 = callPackage ../servers/foundationdb/python.nix { foundationdb = pkgs.foundationdb73; }; fountains = callPackage ../development/python-modules/fountains { }; From e28c1469642d1b4219fde849de6df2712bc3f181 Mon Sep 17 00:00:00 2001 From: Emily Date: Sat, 28 Dec 2024 22:25:33 +0000 Subject: [PATCH 264/429] foundationdb: unpin Boost --- pkgs/servers/foundationdb/cmake.nix | 5 +++++ pkgs/servers/foundationdb/default.nix | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/foundationdb/cmake.nix b/pkgs/servers/foundationdb/cmake.nix index 42a9b38ea781..56470052a64d 100644 --- a/pkgs/servers/foundationdb/cmake.nix +++ b/pkgs/servers/foundationdb/cmake.nix @@ -87,6 +87,11 @@ let # Use our doctest package substituteInPlace bindings/c/test/unit/third_party/CMakeLists.txt \ --replace-fail '/opt/doctest_proj_2.4.8' '${doctest}/include' + + # Upstream upgraded to Boost 1.86 with no code changes; see: + # + substituteInPlace cmake/CompileBoost.cmake \ + --replace-fail 'find_package(Boost 1.78.0 EXACT ' 'find_package(Boost ' ''; # the install phase for cmake is pretty wonky right now since it's not designed to diff --git a/pkgs/servers/foundationdb/default.nix b/pkgs/servers/foundationdb/default.nix index 4962b521f372..35937a8302af 100644 --- a/pkgs/servers/foundationdb/default.nix +++ b/pkgs/servers/foundationdb/default.nix @@ -11,7 +11,7 @@ openjdk8, mono, openssl, - boost178, + boost, pkg-config, msgpack-cxx, toml11, @@ -26,7 +26,7 @@ in foundationdb73 = cmakeBuild { version = "7.3.42"; hash = "sha256-jQcm+HLai5da2pZZ7iLdN6fpQZxf5+/kkfv9OSXQ57c="; - boost = boost178; + inherit boost; ssl = openssl; patches = [ From 3c5ffd9fa4f86d7cbd8ed59aa1f9e8b26bb5d085 Mon Sep 17 00:00:00 2001 From: Emily Date: Sat, 28 Dec 2024 22:28:55 +0000 Subject: [PATCH 265/429] foundationdb: unpin OpenJDK --- pkgs/servers/foundationdb/cmake.nix | 4 ++-- pkgs/servers/foundationdb/default.nix | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/foundationdb/cmake.nix b/pkgs/servers/foundationdb/cmake.nix index 56470052a64d..2d88687b00cc 100644 --- a/pkgs/servers/foundationdb/cmake.nix +++ b/pkgs/servers/foundationdb/cmake.nix @@ -1,7 +1,7 @@ # This builder is for FoundationDB CMake build system. { lib, fetchFromGitHub -, cmake, ninja, python3, openjdk8, mono, pkg-config +, cmake, ninja, python3, openjdk, mono, pkg-config , msgpack-cxx, toml11, jemalloc, doctest , gccStdenv, llvmPackages @@ -41,7 +41,7 @@ let checkInputs = [ doctest ]; - nativeBuildInputs = [ pkg-config cmake ninja python3 openjdk8 mono ] + nativeBuildInputs = [ pkg-config cmake ninja python3 openjdk mono ] ++ lib.optionals useClang [ llvmPackages.lld ]; separateDebugInfo = true; diff --git a/pkgs/servers/foundationdb/default.nix b/pkgs/servers/foundationdb/default.nix index 35937a8302af..5a48c9337243 100644 --- a/pkgs/servers/foundationdb/default.nix +++ b/pkgs/servers/foundationdb/default.nix @@ -8,7 +8,7 @@ cmake, ninja, python3, - openjdk8, + openjdk, mono, openssl, boost, From 8417d0294f4261db5eddf614284d88fa8bf8ba07 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 30 Dec 2024 12:40:58 +0000 Subject: [PATCH 266/429] jan: 0.5.11 -> 0.5.12 --- pkgs/by-name/ja/jan/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ja/jan/package.nix b/pkgs/by-name/ja/jan/package.nix index c7badcedf789..e7c8416b9924 100644 --- a/pkgs/by-name/ja/jan/package.nix +++ b/pkgs/by-name/ja/jan/package.nix @@ -5,10 +5,10 @@ let pname = "jan"; - version = "0.5.11"; + version = "0.5.12"; src = fetchurl { url = "https://github.com/janhq/jan/releases/download/v${version}/jan-linux-x86_64-${version}.AppImage"; - hash = "sha256-dIXo7roUTu8wLdnqs1bCA9eVBC+UQMZtqSMwql9egWk="; + hash = "sha256-tIylP5VOt53wK/KfgsK6HiMX0YhuiJMDLn0L9XY6aJQ="; }; appimageContents = appimageTools.extractType2 { inherit pname version src; }; From eef440c26fba55c4802557b7a66a5db7bd5962e5 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 30 Dec 2024 12:42:15 +0000 Subject: [PATCH 267/429] qtractor: 1.5.0 -> 1.5.1 --- pkgs/by-name/qt/qtractor/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/qt/qtractor/package.nix b/pkgs/by-name/qt/qtractor/package.nix index c3c0c0d5875d..e107adce1fea 100644 --- a/pkgs/by-name/qt/qtractor/package.nix +++ b/pkgs/by-name/qt/qtractor/package.nix @@ -30,11 +30,11 @@ stdenv.mkDerivation rec { pname = "qtractor"; - version = "1.5.0"; + version = "1.5.1"; src = fetchurl { url = "mirror://sourceforge/qtractor/qtractor-${version}.tar.gz"; - hash = "sha256-p2Fuads2uTiEIXRS7sqe8Fa3XEKwW1ND/pPnUhFlLdY="; + hash = "sha256-jBJ8qruWBeukuW7zzi9rRayJL+FC1e3f+O3cb6QfdiE="; }; nativeBuildInputs = [ From ad9a59fc2cd7e074d8a90d86d72b59599272e2b2 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 30 Dec 2024 12:47:14 +0000 Subject: [PATCH 268/429] agebox: 0.7.2 -> 0.8.0 --- pkgs/by-name/ag/agebox/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ag/agebox/package.nix b/pkgs/by-name/ag/agebox/package.nix index 62219e46e576..5267e0984456 100644 --- a/pkgs/by-name/ag/agebox/package.nix +++ b/pkgs/by-name/ag/agebox/package.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "agebox"; - version = "0.7.2"; + version = "0.8.0"; src = fetchFromGitHub { owner = "slok"; repo = pname; rev = "v${version}"; - hash = "sha256-QH0kkquLnB00oKuwb5j2ZoAKPnZkSHJRGaq3RXO5ggg="; + hash = "sha256-/FTNvGV7PsJmpSU1dI/kjfiY5G7shomvLd3bvFqORfg="; }; vendorHash = "sha256-s3LZgQpUF0t9ETNloJux4gXXSn5Kg+pcuhJSMfWWnSo="; From b54549515f576939b5043a92988211635e9dee63 Mon Sep 17 00:00:00 2001 From: DontEatOreo <57304299+DontEatOreo@users.noreply.github.com> Date: Mon, 30 Dec 2024 13:04:26 +0000 Subject: [PATCH 269/429] arc-browser: 1.73.0-56815 -> 1.74.0-57065 Changelog: https://arc.net/e/5358013E-071A-4C95-82C5-F6E4D1F725FA --- pkgs/by-name/ar/arc-browser/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ar/arc-browser/package.nix b/pkgs/by-name/ar/arc-browser/package.nix index f1045b0cdb47..fd67cb00283f 100644 --- a/pkgs/by-name/ar/arc-browser/package.nix +++ b/pkgs/by-name/ar/arc-browser/package.nix @@ -10,11 +10,11 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "arc-browser"; - version = "1.73.0-56815"; + version = "1.74.0-57065"; src = fetchurl { url = "https://releases.arc.net/release/Arc-${finalAttrs.version}.dmg"; - hash = "sha256-PbYX3p6QFnwDgah6ehHW83uSyC7itLfaE+ECC/mbYAU="; + hash = "sha256-muTTHJOQKY/oqGJ4OXgoyOhgAo0hW6Y12Dknq/KWTMw="; }; nativeBuildInputs = [ undmg ]; From 5037a45d4113d8b8022a1f85e3bb75243efe1a64 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20van=20Br=C3=BCgge?= Date: Sun, 29 Dec 2024 15:48:45 +0000 Subject: [PATCH 270/429] tandoor-recipes: add jvanbruegge as maintainer --- nixos/modules/services/misc/tandoor-recipes.nix | 2 +- pkgs/applications/misc/tandoor-recipes/common.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/modules/services/misc/tandoor-recipes.nix b/nixos/modules/services/misc/tandoor-recipes.nix index 1baa60f9f9cd..3355e4ab98e0 100644 --- a/nixos/modules/services/misc/tandoor-recipes.nix +++ b/nixos/modules/services/misc/tandoor-recipes.nix @@ -31,7 +31,7 @@ let ''; in { - meta.maintainers = with lib.maintainers; [ ]; + meta.maintainers = with lib.maintainers; [ jvanbruegge ]; options.services.tandoor-recipes = { enable = lib.mkOption { diff --git a/pkgs/applications/misc/tandoor-recipes/common.nix b/pkgs/applications/misc/tandoor-recipes/common.nix index 57f687d522e6..75109f6bef59 100644 --- a/pkgs/applications/misc/tandoor-recipes/common.nix +++ b/pkgs/applications/misc/tandoor-recipes/common.nix @@ -14,6 +14,6 @@ rec { meta = with lib; { homepage = "https://tandoor.dev/"; license = licenses.agpl3Only; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ jvanbruegge ]; }; } From afc8eddc2547a9a5525421e37a814b83cac33b2d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20van=20Br=C3=BCgge?= Date: Sun, 29 Dec 2024 15:58:49 +0000 Subject: [PATCH 271/429] tandoor-recipes: fix build --- .../misc/tandoor-recipes/default.nix | 96 ++++++------------- .../misc/tandoor-recipes/frontend.nix | 6 +- 2 files changed, 33 insertions(+), 69 deletions(-) diff --git a/pkgs/applications/misc/tandoor-recipes/default.nix b/pkgs/applications/misc/tandoor-recipes/default.nix index b6d99325f120..be9e72dd8a57 100644 --- a/pkgs/applications/misc/tandoor-recipes/default.nix +++ b/pkgs/applications/misc/tandoor-recipes/default.nix @@ -1,52 +1,15 @@ { callPackage , nixosTests -, python311 -, fetchFromGitHub +, python3 }: let - # python-ldap-3.4.4 does not work with python3(12) - python = python311.override { - self = python; - packageOverrides = self: super: { - validators = super.validators.overridePythonAttrs (_: rec { - version = "0.20.0"; - src = fetchFromGitHub { - owner = "python-validators"; - repo = "validators"; - rev = version; - hash = "sha256-ZnLyTHlsrXthGnaPzlV2ga/UTm5SSEHLTwC/tobiPak="; - }; - propagatedBuildInputs = [ super.decorator super.six ]; - }); - - djangorestframework = super.djangorestframework.overridePythonAttrs (oldAttrs: rec { - version = "3.14.0"; - src = oldAttrs.src.override { - rev = version; - hash = "sha256-Fnj0n3NS3SetOlwSmGkLE979vNJnYE6i6xwVBslpNz4="; - }; - nativeCheckInputs = with super; [ - pytest7CheckHook - pytest-django - ]; - }); - - # python3.11-extruct-0.16.0 doesn't work with lxml-5.2.2 - lxml = super.lxml.overridePythonAttrs (oldAttrs: rec { - version = "5.1.0"; - src = oldAttrs.src.override { - rev = version; - hash = "sha256-eWLYzZWatYDmhuBTZynsdytlNFKKmtWQ1XIyzVD8sDY="; - }; - }); - }; - }; + python = python3; common = callPackage ./common.nix { }; frontend = callPackage ./frontend.nix { }; in -python.pkgs.pythonPackages.buildPythonPackage rec { +python.pkgs.pythonPackages.buildPythonPackage { pname = "tandoor-recipes"; inherit (common) version src; @@ -62,50 +25,51 @@ python.pkgs.pythonPackages.buildPythonPackage rec { ''; propagatedBuildInputs = with python.pkgs; [ - aiohttp - beautifulsoup4 - bleach - bleach-allowlist - boto3 - cryptography django - django-allauth + cryptography django-annoying - django-auth-ldap django-cleanup - django-cors-headers django-crispy-forms django-crispy-bootstrap4 - django-hcaptcha - django-js-reverse - django-oauth-toolkit - django-prometheus - django-scopes - django-storages django-tables2 - django-webpack-loader - django-treebeard djangorestframework drf-writable-nested + django-oauth-toolkit + bleach gunicorn - icalendar - jinja2 lxml markdown - microdata pillow psycopg2 - pyppeteer python-dotenv - pytube - pyyaml - recipe-scrapers requests six - uritemplate - validators webdavclient3 whitenoise + icalendar + pyyaml + uritemplate + beautifulsoup4 + microdata + jinja2 + django-webpack-loader + django-js-reverse + django-allauth + recipe-scrapers + django-scopes + django-treebeard + django-cors-headers + django-storages + boto3 + django-prometheus + django-hcaptcha + python-ldap + django-auth-ldap + pyppeteer + pytubefix + aiohttp + inflection + redis ]; configurePhase = '' diff --git a/pkgs/applications/misc/tandoor-recipes/frontend.nix b/pkgs/applications/misc/tandoor-recipes/frontend.nix index 0248e5ffbae0..1e0735d15fe7 100644 --- a/pkgs/applications/misc/tandoor-recipes/frontend.nix +++ b/pkgs/applications/misc/tandoor-recipes/frontend.nix @@ -3,7 +3,7 @@ fetchYarnDeps, fixup-yarn-lock, callPackage, - nodejs, + nodejs_20, yarn, }: let @@ -22,8 +22,8 @@ stdenv.mkDerivation { nativeBuildInputs = [ fixup-yarn-lock - nodejs - yarn + nodejs_20 + (yarn.override { nodejs = nodejs_20; }) ]; configurePhase = '' From 2a9a4592271769749c0da32819a6f757e2f821eb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20van=20Br=C3=BCgge?= Date: Sun, 29 Dec 2024 15:59:19 +0000 Subject: [PATCH 272/429] tandoor-recipes: fix update script to use nixpkgs root as workdir This is what e.g. ./maintainers/scripts/update.nix expects --- pkgs/applications/misc/tandoor-recipes/update.sh | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/misc/tandoor-recipes/update.sh b/pkgs/applications/misc/tandoor-recipes/update.sh index 63021d76f6b7..f197ead847e4 100755 --- a/pkgs/applications/misc/tandoor-recipes/update.sh +++ b/pkgs/applications/misc/tandoor-recipes/update.sh @@ -1,5 +1,5 @@ #!/usr/bin/env nix-shell -#!nix-shell -I nixpkgs=../../../../ -i bash -p nix wget prefetch-yarn-deps nix-prefetch-github jq +#!nix-shell -I nixpkgs=./ -i bash -p nix wget prefetch-yarn-deps nix-prefetch-github jq # shellcheck shell=bash @@ -36,6 +36,7 @@ popd # Use friendlier hashes yarn_hash=$(nix hash to-sri --type sha256 "$yarn_hash") -sed -i -E -e "s#version = \".*\"#version = \"$version\"#" common.nix -sed -i -E -e "s#hash = \".*\"#hash = \"$src_hash\"#" common.nix -sed -i -E -e "s#yarnHash = \".*\"#yarnHash = \"$yarn_hash\"#" common.nix +common="./pkgs/applications/misc/tandoor-recipes/common.nix" +sed -i -E -e "s#version = \".*\"#version = \"$version\"#" $common +sed -i -E -e "s#hash = \".*\"#hash = \"$src_hash\"#" $common +sed -i -E -e "s#yarnHash = \".*\"#yarnHash = \"$yarn_hash\"#" $common From b36c4cd2261db2e718c988e8a3a41cc96ad8b2c8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20van=20Br=C3=BCgge?= Date: Sun, 29 Dec 2024 16:14:40 +0000 Subject: [PATCH 273/429] tandoor-recipes: 1.5.19 -> 1.5.25 --- pkgs/applications/misc/tandoor-recipes/common.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/tandoor-recipes/common.nix b/pkgs/applications/misc/tandoor-recipes/common.nix index 75109f6bef59..b0a3dbf1e7e9 100644 --- a/pkgs/applications/misc/tandoor-recipes/common.nix +++ b/pkgs/applications/misc/tandoor-recipes/common.nix @@ -1,15 +1,15 @@ { lib, fetchFromGitHub }: rec { - version = "1.5.19"; + version = "1.5.25"; src = fetchFromGitHub { owner = "TandoorRecipes"; repo = "recipes"; rev = version; - hash = "sha256-HsBy2HzxBpnwh2RqFQJG0HYReWI0a7E7KsJ5TD+GokY="; + hash = "sha256-Yw68wxLqoyPRQmP/krSaxByv24CKh7Y7O07NU+dL5mo="; }; - yarnHash = "sha256-BnOw9QRXRRoM+CW6OGbjWhLo4h6JX3ZR1kJd8Z/w02M="; + yarnHash = "sha256-lU8QrTkI32XOHefIkj/0fa2UKhuZpQIT1wyweQnzXmQ="; meta = with lib; { homepage = "https://tandoor.dev/"; From a5b038c5e945a3ca6f31696081b976042fbb3077 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Mon, 30 Dec 2024 14:13:23 +0100 Subject: [PATCH 274/429] almanah: Fix build Missing header was uncovered by gcc update. --- pkgs/by-name/al/almanah/package.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/by-name/al/almanah/package.nix b/pkgs/by-name/al/almanah/package.nix index 6529d736bc1b..6cb95674d289 100644 --- a/pkgs/by-name/al/almanah/package.nix +++ b/pkgs/by-name/al/almanah/package.nix @@ -57,6 +57,13 @@ stdenv.mkDerivation rec { url = "https://gitlab.gnome.org/GNOME/almanah/-/commit/0ba7f05cba7feaf2ae2c220596aead5dfc676675.patch"; sha256 = "5uvHTPzQloEq8SVt3EnZ+8mziBdXsDmu/e92/RtyFzE="; }) + + # Add missing GtkSourceView include + # https://gitlab.gnome.org/GNOME/almanah/-/merge_requests/23 + (fetchpatch { + url = "https://gitlab.gnome.org/GNOME/almanah/-/commit/533f30c7e60437cbea7ca5ae901e768922c1a710.patch"; + hash = "sha256-Ekhn4nRMC+fXLn4kqNwyCAg2cZru5QUcdzR1yJbcZGc="; + }) ]; nativeBuildInputs = [ From 178d2789689fecf76ea11cf54ff15ef1998cb3de Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 30 Dec 2024 14:39:16 +0100 Subject: [PATCH 275/429] python312Packages.voip-utils: 0.2.1 -> 0.2.2 Diff: https://github.com/home-assistant-libs/voip-utils/compare/refs/tags/v0.2.1...v0.2.2 Changelog: https://github.com/home-assistant-libs/voip-utils/blob/refs/tags/v0.2.2/CHANGELOG.md --- pkgs/development/python-modules/voip-utils/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/voip-utils/default.nix b/pkgs/development/python-modules/voip-utils/default.nix index 6cf7ebb9375d..6efe98de158c 100644 --- a/pkgs/development/python-modules/voip-utils/default.nix +++ b/pkgs/development/python-modules/voip-utils/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "voip-utils"; - version = "0.2.1"; + version = "0.2.2"; pyproject = true; src = fetchFromGitHub { owner = "home-assistant-libs"; repo = "voip-utils"; rev = "refs/tags/v${version}"; - hash = "sha256-ONvbkYP1hGMYOVZs5gvs/cr+Tde9gT3jloP6veqE/Ac="; + hash = "sha256-OlvZSVuoGQi0QEusl01nbw3oD75NfMsbpNOPQgWYu+c="; }; postPatch = '' From 89c7dec6d5596b4170f4abd332bc6ab5d136e616 Mon Sep 17 00:00:00 2001 From: Jonas Heinrich Date: Mon, 30 Dec 2024 15:27:03 +0100 Subject: [PATCH 276/429] invoiceplane: 1.6.1 -> 1.6.2 --- pkgs/by-name/in/invoiceplane/package.nix | 16 +- pkgs/by-name/in/invoiceplane/yarn.lock | 2614 ---------------------- 2 files changed, 5 insertions(+), 2625 deletions(-) delete mode 100644 pkgs/by-name/in/invoiceplane/yarn.lock diff --git a/pkgs/by-name/in/invoiceplane/package.nix b/pkgs/by-name/in/invoiceplane/package.nix index c00465be363c..a6e962622d24 100644 --- a/pkgs/by-name/in/invoiceplane/package.nix +++ b/pkgs/by-name/in/invoiceplane/package.nix @@ -17,16 +17,16 @@ php.buildComposerProject (finalAttrs: { pname = "invoiceplane"; - version = "1.6.1"; + version = "1.6.2"; src = fetchFromGitHub { owner = "InvoicePlane"; repo = "InvoicePlane"; rev = "refs/tags/v${finalAttrs.version}"; - hash = "sha256-rVt3HkAh3zBVwt1a4ZGiuC/Khvb3Ugk42hT5mul4qRA="; + hash = "sha256-E2TZ/FhlVKZpGuczXb/QLn27gGiO7YYlAkPSolTEoeQ="; }; - vendorHash = "sha256-qYjNn7VQGkUfJ74coUpUOfAOkgi3eLoo/ITpcOcTenk="; + vendorHash = "sha256-k7YBs6x/ABNTHPx9/EZXa4W9kcLQqpruV7YFGAADZq0="; buildInputs = [ libsass ]; @@ -42,16 +42,10 @@ php.buildComposerProject (finalAttrs: { ]; offlineCache = fetchYarnDeps { - yarnLock = ./yarn.lock; - hash = "sha256-t9GYFqKY3YZ/l5LZXIHIgehgvxIbMMuYLwXvvdQaryM="; + yarnLock = "${finalAttrs.src}/yarn.lock"; + hash = "sha256-KVlqC9zSijPP4/ifLBHD04fm6IQJpil0Gy9M3FNvUUw="; }; - # Upstream yarn.lock and package.json out of sync - # https://github.com/InvoicePlane/InvoicePlane/issues/1109 - preConfigure = '' - cp ${./yarn.lock} ./yarn.lock - ''; - # Upstream composer.json file is missing the name, description and license fields composerStrictValidation = false; diff --git a/pkgs/by-name/in/invoiceplane/yarn.lock b/pkgs/by-name/in/invoiceplane/yarn.lock deleted file mode 100644 index bdefcf7f7f4a..000000000000 --- a/pkgs/by-name/in/invoiceplane/yarn.lock +++ /dev/null @@ -1,2614 +0,0 @@ -# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY. -# yarn lockfile v1 - - -"@babel/code-frame@^7.0.0": - version "7.22.13" - resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.22.13.tgz#e3c1c099402598483b7a8c46a721d1038803755e" - integrity sha512-XktuhWlJ5g+3TJXc5upd9Ks1HutSArik6jf2eAjYFyIOf4ej3RN+184cZbzDvbPnuTJIUhPKKJE3cIsYTiAT3w== - dependencies: - "@babel/highlight" "^7.22.13" - chalk "^2.4.2" - -"@babel/helper-validator-identifier@^7.22.20": - version "7.22.20" - resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.22.20.tgz#c4ae002c61d2879e724581d96665583dbc1dc0e0" - integrity sha512-Y4OZ+ytlatR8AI+8KZfKuL5urKp7qey08ha31L8b3BwewJAoJamTzyvxPR/5D+KkdJCGPq/+8TukHBlY10FX9A== - -"@babel/highlight@^7.22.13": - version "7.22.20" - resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.22.20.tgz#4ca92b71d80554b01427815e06f2df965b9c1f54" - integrity sha512-dkdMCN3py0+ksCgYmGG8jKeGA/8Tk+gJwSYYlFGxG5lmhfKNoAy004YpLxpS1W2J8m/EK2Ew+yOs9pVRwO89mg== - dependencies: - "@babel/helper-validator-identifier" "^7.22.20" - chalk "^2.4.2" - js-tokens "^4.0.0" - -"@gar/promisify@^1.0.1", "@gar/promisify@^1.1.3": - version "1.1.3" - resolved "https://registry.yarnpkg.com/@gar/promisify/-/promisify-1.1.3.tgz#555193ab2e3bb3b6adc3d551c9c030d9e860daf6" - integrity sha512-k2Ty1JcVojjJFwrg/ThKi2ujJ7XNLYaFGNB/bWT9wGR+oSMJHMa5w+CUq6p/pVrKeNNgA7pCqEcjSnHVoqJQFw== - -"@npmcli/fs@^1.0.0": - version "1.1.1" - resolved "https://registry.yarnpkg.com/@npmcli/fs/-/fs-1.1.1.tgz#72f719fe935e687c56a4faecf3c03d06ba593257" - integrity sha512-8KG5RD0GVP4ydEzRn/I4BNDuxDtqVbOdm8675T49OIG/NGhaK0pjPX7ZcDlvKYbA+ulvVK3ztfcF4uBdOxuJbQ== - dependencies: - "@gar/promisify" "^1.0.1" - semver "^7.3.5" - -"@npmcli/fs@^2.1.0": - version "2.1.2" - resolved "https://registry.yarnpkg.com/@npmcli/fs/-/fs-2.1.2.tgz#a9e2541a4a2fec2e69c29b35e6060973da79b865" - integrity sha512-yOJKRvohFOaLqipNtwYB9WugyZKhC/DZC4VYPmpaCzDBrA8YpK3qHZ8/HGscMnE4GqbkLNuVcCnxkeQEdGt6LQ== - dependencies: - "@gar/promisify" "^1.1.3" - semver "^7.3.5" - -"@npmcli/move-file@^1.0.1": - version "1.1.2" - resolved "https://registry.yarnpkg.com/@npmcli/move-file/-/move-file-1.1.2.tgz#1a82c3e372f7cae9253eb66d72543d6b8685c674" - integrity sha512-1SUf/Cg2GzGDyaf15aR9St9TWlb+XvbZXWpDx8YKs7MLzMH/BCeopv+y9vzrzgkfykCGuWOlSu3mZhj2+FQcrg== - dependencies: - mkdirp "^1.0.4" - rimraf "^3.0.2" - -"@npmcli/move-file@^2.0.0": - version "2.0.1" - resolved "https://registry.yarnpkg.com/@npmcli/move-file/-/move-file-2.0.1.tgz#26f6bdc379d87f75e55739bab89db525b06100e4" - integrity sha512-mJd2Z5TjYWq/ttPLLGqArdtnC74J6bOzg4rMDnN+p1xTacZ2yPRCk2y0oSWQtygLR9YVQXgOcONrwtnk3JupxQ== - dependencies: - mkdirp "^1.0.4" - rimraf "^3.0.2" - -"@tootallnate/once@1": - version "1.1.2" - resolved "https://registry.yarnpkg.com/@tootallnate/once/-/once-1.1.2.tgz#ccb91445360179a04e7fe6aff78c00ffc1eeaf82" - integrity sha512-RbzJvlNzmRq5c3O09UipeuXno4tA1FE6ikOjxZK0tuxVv3412l64l5t1W5pj4+rJq9vpkm/kwiR07aZXnsKPxw== - -"@tootallnate/once@2": - version "2.0.0" - resolved "https://registry.yarnpkg.com/@tootallnate/once/-/once-2.0.0.tgz#f544a148d3ab35801c1f633a7441fd87c2e484bf" - integrity sha512-XCuKFP5PS55gnMVu3dty8KPatLqUoy/ZYzDzAGCQ8JNFCkLXzmI7vNHCR+XpbZaMWQK/vQubr7PkYq8g470J/A== - -"@types/minimatch@^3.0.3": - version "3.0.5" - resolved "https://registry.yarnpkg.com/@types/minimatch/-/minimatch-3.0.5.tgz#1001cc5e6a3704b83c236027e77f2f58ea010f40" - integrity sha512-Klz949h02Gz2uZCMGwDUSDS1YBlTdDDgbWHi+81l29tQALUtvz4rAYi5uoVhE5Lagoq6DeqAUlbrHvW/mXDgdQ== - -"@types/minimist@^1.2.0": - version "1.2.4" - resolved "https://registry.yarnpkg.com/@types/minimist/-/minimist-1.2.4.tgz#81f886786411c45bba3f33e781ab48bd56bfca2e" - integrity sha512-Kfe/D3hxHTusnPNRbycJE1N77WHDsdS4AjUYIzlDzhDrS47NrwuL3YW4VITxwR7KCVpzwgy4Rbj829KSSQmwXQ== - -"@types/normalize-package-data@^2.4.0": - version "2.4.3" - resolved "https://registry.yarnpkg.com/@types/normalize-package-data/-/normalize-package-data-2.4.3.tgz#291c243e4b94dbfbc0c0ee26b7666f1d5c030e2c" - integrity sha512-ehPtgRgaULsFG8x0NeYJvmyH1hmlfsNLujHe9dQEia/7MAJYdzMSi19JtchUHjmBA6XC/75dK55mzZH+RyieSg== - -abbrev@1: - version "1.1.1" - resolved "https://registry.yarnpkg.com/abbrev/-/abbrev-1.1.1.tgz#f8f2c887ad10bf67f634f005b6987fed3179aac8" - integrity sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q== - -agent-base@6, agent-base@^6.0.2: - version "6.0.2" - resolved "https://registry.yarnpkg.com/agent-base/-/agent-base-6.0.2.tgz#49fff58577cfee3f37176feab4c22e00f86d7f77" - integrity sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ== - dependencies: - debug "4" - -agentkeepalive@^4.1.3, agentkeepalive@^4.2.1: - version "4.5.0" - resolved "https://registry.yarnpkg.com/agentkeepalive/-/agentkeepalive-4.5.0.tgz#2673ad1389b3c418c5a20c5d7364f93ca04be923" - integrity sha512-5GG/5IbQQpC9FpkRGsSvZI5QYeSCzlJHdpBQntCsuTOxhKD8lqKhrleg2Yi7yvMIf82Ycmmqln9U8V9qwEiJew== - dependencies: - humanize-ms "^1.2.1" - -aggregate-error@^3.0.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/aggregate-error/-/aggregate-error-3.1.0.tgz#92670ff50f5359bdb7a3e0d40d0ec30c5737687a" - integrity sha512-4I7Td01quW/RpocfNayFdFVk1qSuoh0E7JrbRJ16nH01HhKFQ88INq9Sd+nd72zqRySlr9BmDA8xlEJ6vJMrYA== - dependencies: - clean-stack "^2.0.0" - indent-string "^4.0.0" - -ansi-regex@^2.0.0: - version "2.1.1" - resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-2.1.1.tgz#c3b33ab5ee360d86e0e628f0468ae7ef27d654df" - integrity sha512-TIGnTpdo+E3+pCyAluZvtED5p5wCqLdezCyhPZzKPcxvFplEt4i+W7OONCKgeZFT3+y5NZZfOOS/Bdcanm1MYA== - -ansi-regex@^5.0.1: - version "5.0.1" - resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-5.0.1.tgz#082cb2c89c9fe8659a311a53bd6a4dc5301db304" - integrity sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ== - -ansi-styles@^2.2.1: - version "2.2.1" - resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-2.2.1.tgz#b432dd3358b634cf75e1e4664368240533c1ddbe" - integrity sha512-kmCevFghRiWM7HB5zTPULl4r9bVFSWjz62MhqizDGUrq2NWuNMQyuv4tHHoKJHs69M/MF64lEcHdYIocrdWQYA== - -ansi-styles@^3.2.1: - version "3.2.1" - resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-3.2.1.tgz#41fbb20243e50b12be0f04b8dedbf07520ce841d" - integrity sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA== - dependencies: - color-convert "^1.9.0" - -ansi-styles@^4.0.0, ansi-styles@^4.1.0: - version "4.3.0" - resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-4.3.0.tgz#edd803628ae71c04c85ae7a0906edad34b648937" - integrity sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg== - dependencies: - color-convert "^2.0.1" - -"aproba@^1.0.3 || ^2.0.0": - version "2.0.0" - resolved "https://registry.yarnpkg.com/aproba/-/aproba-2.0.0.tgz#52520b8ae5b569215b354efc0caa3fe1e45a8adc" - integrity sha512-lYe4Gx7QT+MKGbDsA+Z+he/Wtef0BiwDOlK/XkBrdfsh9J/jPPXbX0tE9x9cl27Tmu5gg3QUbUrQYa/y+KOHPQ== - -are-we-there-yet@^3.0.0: - version "3.0.1" - resolved "https://registry.yarnpkg.com/are-we-there-yet/-/are-we-there-yet-3.0.1.tgz#679df222b278c64f2cdba1175cdc00b0d96164bd" - integrity sha512-QZW4EDmGwlYur0Yyf/b2uGucHQMa8aFUP7eu9ddR73vvhFyt4V0Vl3QHPcTNJ8l6qYOBdxgXdnBXQrHilfRQBg== - dependencies: - delegates "^1.0.0" - readable-stream "^3.6.0" - -argparse@^1.0.7: - version "1.0.10" - resolved "https://registry.yarnpkg.com/argparse/-/argparse-1.0.10.tgz#bcd6791ea5ae09725e17e5ad988134cd40b3d911" - integrity sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg== - dependencies: - sprintf-js "~1.0.2" - -array-differ@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/array-differ/-/array-differ-3.0.0.tgz#3cbb3d0f316810eafcc47624734237d6aee4ae6b" - integrity sha512-THtfYS6KtME/yIAhKjZ2ul7XI96lQGHRputJQHO80LAWQnuGP4iCIN8vdMRboGbIEYBwU33q8Tch1os2+X0kMg== - -array-each@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/array-each/-/array-each-1.0.1.tgz#a794af0c05ab1752846ee753a1f211a05ba0c44f" - integrity sha512-zHjL5SZa68hkKHBFBK6DJCTtr9sfTCPCaph/L7tMSLcTFgy+zX7E+6q5UArbtOtMBCtxdICpfTCspRse+ywyXA== - -array-slice@^1.0.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/array-slice/-/array-slice-1.1.0.tgz#e368ea15f89bc7069f7ffb89aec3a6c7d4ac22d4" - integrity sha512-B1qMD3RBP7O8o0H2KbrXDyB0IccejMF15+87Lvlor12ONPRHP6gTjXMNkt/d3ZuOGbAe66hFmaCfECI24Ufp6w== - -array-union@^2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/array-union/-/array-union-2.1.0.tgz#b798420adbeb1de828d84acd8a2e23d3efe85e8d" - integrity sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw== - -arrify@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/arrify/-/arrify-1.0.1.tgz#898508da2226f380df904728456849c1501a4b0d" - integrity sha512-3CYzex9M9FGQjCGMGyi6/31c8GJbgb0qGyrx5HWxPd0aCwh4cB2YjMb2Xf9UuoogrMrlO9cTqnB5rI5GHZTcUA== - -arrify@^2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/arrify/-/arrify-2.0.1.tgz#c9655e9331e0abcd588d2a7cad7e9956f66701fa" - integrity sha512-3duEwti880xqi4eAMN8AyR4a0ByT90zoYdLlevfrvU43vb0YZwZVfxOgxWrLXXXpyugL0hNZc9G6BiB5B3nUug== - -async-foreach@^0.1.3: - version "0.1.3" - resolved "https://registry.yarnpkg.com/async-foreach/-/async-foreach-0.1.3.tgz#36121f845c0578172de419a97dbeb1d16ec34542" - integrity sha512-VUeSMD8nEGBWaZK4lizI1sf3yEC7pnAQ/mrI7pC2fBz2s/tq5jWWEngTwaf0Gruu/OoXRGLGg1XFqpYBiGTYJA== - -async@^2.6.0: - version "2.6.4" - resolved "https://registry.yarnpkg.com/async/-/async-2.6.4.tgz#706b7ff6084664cd7eae713f6f965433b5504221" - integrity sha512-mzo5dfJYwAn29PeiJ0zvwTo04zj8HDJj0Mn8TD7sno7q12prdbnasKJHhkm2c1LgrhlJ0teaea8860oxi51mGA== - dependencies: - lodash "^4.17.14" - -async@^3.2.3, async@~3.2.0: - version "3.2.5" - resolved "https://registry.yarnpkg.com/async/-/async-3.2.5.tgz#ebd52a8fdaf7a2289a24df399f8d8485c8a46b66" - integrity sha512-baNZyqaaLhyLVKm/DlvdW051MSgO6b8eVfIezl9E5PqWxFgzLm/wQntEW4zOytVburDEr0JlALEpdOFwvErLsg== - -autoprefixer@^9.8.8: - version "9.8.8" - resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-9.8.8.tgz#fd4bd4595385fa6f06599de749a4d5f7a474957a" - integrity sha512-eM9d/swFopRt5gdJ7jrpCwgvEMIayITpojhkkSMRsFHYuH5bkSQ4p/9qTEHtmNudUZh22Tehu7I6CxAW0IXTKA== - dependencies: - browserslist "^4.12.0" - caniuse-lite "^1.0.30001109" - normalize-range "^0.1.2" - num2fraction "^1.2.2" - picocolors "^0.2.1" - postcss "^7.0.32" - postcss-value-parser "^4.1.0" - -balanced-match@^1.0.0: - version "1.0.2" - resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.2.tgz#e83e3a7e3f300b34cb9d87f615fa0cbf357690ee" - integrity sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw== - -body@^5.1.0: - version "5.1.0" - resolved "https://registry.yarnpkg.com/body/-/body-5.1.0.tgz#e4ba0ce410a46936323367609ecb4e6553125069" - integrity sha512-chUsBxGRtuElD6fmw1gHLpvnKdVLK302peeFa9ZqAEk8TyzZ3fygLyUEDDPTJvL9+Bor0dIwn6ePOsRM2y0zQQ== - dependencies: - continuable-cache "^0.3.1" - error "^7.0.0" - raw-body "~1.1.0" - safe-json-parse "~1.0.1" - -bootstrap-datepicker@^1.10: - version "1.10.0" - resolved "https://registry.yarnpkg.com/bootstrap-datepicker/-/bootstrap-datepicker-1.10.0.tgz#61612bbe8bf0a69a5bce32bbcdda93ebb6ccf24a" - integrity sha512-lWxtSYddAQOpbAO8UhYhHLcK6425eWoSjb5JDvZU3ePHEPF6A3eUr51WKaFy4PccU19JRxUG6wEU3KdhtKfvpg== - dependencies: - jquery ">=3.4.0 <4.0.0" - -bootstrap-sass@3.4.1: - version "3.4.1" - resolved "https://registry.yarnpkg.com/bootstrap-sass/-/bootstrap-sass-3.4.1.tgz#6843c73b1c258a0ac5cb2cc6f6f5285b664a8e9a" - integrity sha512-p5rxsK/IyEDQm2CwiHxxUi0MZZtvVFbhWmyMOt4lLkA4bujDA1TGoKT0i1FKIWiugAdP+kK8T5KMDFIKQCLYIA== - -brace-expansion@^1.1.7: - version "1.1.11" - resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.11.tgz#3c7fcbf529d87226f3d2f52b966ff5271eb441dd" - integrity sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA== - dependencies: - balanced-match "^1.0.0" - concat-map "0.0.1" - -brace-expansion@^2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-2.0.1.tgz#1edc459e0f0c548486ecf9fc99f2221364b9a0ae" - integrity sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA== - dependencies: - balanced-match "^1.0.0" - -braces@^3.0.2: - version "3.0.2" - resolved "https://registry.yarnpkg.com/braces/-/braces-3.0.2.tgz#3454e1a462ee8d599e236df336cd9ea4f8afe107" - integrity sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A== - dependencies: - fill-range "^7.0.1" - -browserslist@^4.12.0: - version "4.22.1" - resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.22.1.tgz#ba91958d1a59b87dab6fed8dfbcb3da5e2e9c619" - integrity sha512-FEVc202+2iuClEhZhrWy6ZiAcRLvNMyYcxZ8raemul1DYVOVdFsbqckWLdsixQZCpJlwe77Z3UTalE7jsjnKfQ== - dependencies: - caniuse-lite "^1.0.30001541" - electron-to-chromium "^1.4.535" - node-releases "^2.0.13" - update-browserslist-db "^1.0.13" - -bytes@1: - version "1.0.0" - resolved "https://registry.yarnpkg.com/bytes/-/bytes-1.0.0.tgz#3569ede8ba34315fab99c3e92cb04c7220de1fa8" - integrity sha512-/x68VkHLeTl3/Ll8IvxdwzhrT+IyKc52e/oyHhA2RwqPqswSnjVbSddfPRwAsJtbilMAPSRWwAlpxdYsSWOTKQ== - -cacache@^15.2.0: - version "15.3.0" - resolved "https://registry.yarnpkg.com/cacache/-/cacache-15.3.0.tgz#dc85380fb2f556fe3dda4c719bfa0ec875a7f1eb" - integrity sha512-VVdYzXEn+cnbXpFgWs5hTT7OScegHVmLhJIR8Ufqk3iFD6A6j5iSX1KuBTfNEv4tdJWE2PzA6IVFtcLC7fN9wQ== - dependencies: - "@npmcli/fs" "^1.0.0" - "@npmcli/move-file" "^1.0.1" - chownr "^2.0.0" - fs-minipass "^2.0.0" - glob "^7.1.4" - infer-owner "^1.0.4" - lru-cache "^6.0.0" - minipass "^3.1.1" - minipass-collect "^1.0.2" - minipass-flush "^1.0.5" - minipass-pipeline "^1.2.2" - mkdirp "^1.0.3" - p-map "^4.0.0" - promise-inflight "^1.0.1" - rimraf "^3.0.2" - ssri "^8.0.1" - tar "^6.0.2" - unique-filename "^1.1.1" - -cacache@^16.1.0: - version "16.1.3" - resolved "https://registry.yarnpkg.com/cacache/-/cacache-16.1.3.tgz#a02b9f34ecfaf9a78c9f4bc16fceb94d5d67a38e" - integrity sha512-/+Emcj9DAXxX4cwlLmRI9c166RuL3w30zp4R7Joiv2cQTtTtA+jeuCAjH3ZlGnYS3tKENSrKhAzVVP9GVyzeYQ== - dependencies: - "@npmcli/fs" "^2.1.0" - "@npmcli/move-file" "^2.0.0" - chownr "^2.0.0" - fs-minipass "^2.1.0" - glob "^8.0.1" - infer-owner "^1.0.4" - lru-cache "^7.7.1" - minipass "^3.1.6" - minipass-collect "^1.0.2" - minipass-flush "^1.0.5" - minipass-pipeline "^1.2.4" - mkdirp "^1.0.4" - p-map "^4.0.0" - promise-inflight "^1.0.1" - rimraf "^3.0.2" - ssri "^9.0.0" - tar "^6.1.11" - unique-filename "^2.0.0" - -call-bind@^1.0.0: - version "1.0.5" - resolved "https://registry.yarnpkg.com/call-bind/-/call-bind-1.0.5.tgz#6fa2b7845ce0ea49bf4d8b9ef64727a2c2e2e513" - integrity sha512-C3nQxfFZxFRVoJoGKKI8y3MOEo129NQ+FgQ08iye+Mk4zNZZGdjfs06bVTr+DBSlA66Q2VEcMki/cUCP4SercQ== - dependencies: - function-bind "^1.1.2" - get-intrinsic "^1.2.1" - set-function-length "^1.1.1" - -camelcase-keys@^6.2.2: - version "6.2.2" - resolved "https://registry.yarnpkg.com/camelcase-keys/-/camelcase-keys-6.2.2.tgz#5e755d6ba51aa223ec7d3d52f25778210f9dc3c0" - integrity sha512-YrwaA0vEKazPBkn0ipTiMpSajYDSe+KjQfrjhcBMxJt/znbvlHd8Pw/Vamaz5EB4Wfhs3SUR3Z9mwRu/P3s3Yg== - dependencies: - camelcase "^5.3.1" - map-obj "^4.0.0" - quick-lru "^4.0.1" - -camelcase@^5.3.1: - version "5.3.1" - resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-5.3.1.tgz#e3c9b31569e106811df242f715725a1f4c494320" - integrity sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg== - -caniuse-lite@^1.0.30001109, caniuse-lite@^1.0.30001541: - version "1.0.30001561" - resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001561.tgz#752f21f56f96f1b1a52e97aae98c57c562d5d9da" - integrity sha512-NTt0DNoKe958Q0BE0j0c1V9jbUzhBxHIEJy7asmGrpE0yG63KTV7PLHPnK2E1O9RsQrQ081I3NLuXGS6zht3cw== - -chalk@^1.1.1: - version "1.1.3" - resolved "https://registry.yarnpkg.com/chalk/-/chalk-1.1.3.tgz#a8115c55e4a702fe4d150abd3872822a7e09fc98" - integrity sha512-U3lRVLMSlsCfjqYPbLyVv11M9CPW4I728d6TCKMAOJueEeB9/8o+eSsMnxPJD+Q+K909sdESg7C+tIkoH6on1A== - dependencies: - ansi-styles "^2.2.1" - escape-string-regexp "^1.0.2" - has-ansi "^2.0.0" - strip-ansi "^3.0.0" - supports-color "^2.0.0" - -chalk@^2.1.0, chalk@^2.4.1, chalk@^2.4.2: - version "2.4.2" - resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.2.tgz#cd42541677a54333cf541a49108c1432b44c9424" - integrity sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ== - dependencies: - ansi-styles "^3.2.1" - escape-string-regexp "^1.0.5" - supports-color "^5.3.0" - -chalk@^4.1.0, chalk@^4.1.2, chalk@~4.1.0: - version "4.1.2" - resolved "https://registry.yarnpkg.com/chalk/-/chalk-4.1.2.tgz#aac4e2b7734a740867aeb16bf02aad556a1e7a01" - integrity sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA== - dependencies: - ansi-styles "^4.1.0" - supports-color "^7.1.0" - -chownr@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/chownr/-/chownr-2.0.0.tgz#15bfbe53d2eab4cf70f18a8cd68ebe5b3cb1dece" - integrity sha512-bIomtDF5KGpdogkLd9VspvFzk9KfpyyGlS8YFVZl7TGPBHL5snIOnxeshwVgPteQ9b4Eydl+pVbIyE1DcvCWgQ== - -clean-stack@^2.0.0: - version "2.2.0" - resolved "https://registry.yarnpkg.com/clean-stack/-/clean-stack-2.2.0.tgz#ee8472dbb129e727b31e8a10a427dee9dfe4008b" - integrity sha512-4diC9HaTE+KRAMWhDhrGOECgWZxoevMc5TlkObMqNSsVU62PYzXZ/SMTjzyGAFF1YusgxGcSWTEXBhp0CPwQ1A== - -clipboard@^2.0.11: - version "2.0.11" - resolved "https://registry.yarnpkg.com/clipboard/-/clipboard-2.0.11.tgz#62180360b97dd668b6b3a84ec226975762a70be5" - integrity sha512-C+0bbOqkezLIsmWSvlsXS0Q0bmkugu7jcfMIACB+RDEntIzQIkdr148we28AfSloQLRdZlYL/QYyrq05j/3Faw== - dependencies: - good-listener "^1.2.2" - select "^1.1.2" - tiny-emitter "^2.0.0" - -cliui@^8.0.1: - version "8.0.1" - resolved "https://registry.yarnpkg.com/cliui/-/cliui-8.0.1.tgz#0c04b075db02cbfe60dc8e6cf2f5486b1a3608aa" - integrity sha512-BSeNnyus75C4//NQ9gQt1/csTXyo/8Sb+afLAkzAptFuMsod9HFokGNudZpi/oQV73hnVK+sR+5PVRMd+Dr7YQ== - dependencies: - string-width "^4.2.0" - strip-ansi "^6.0.1" - wrap-ansi "^7.0.0" - -color-convert@^1.9.0: - version "1.9.3" - resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-1.9.3.tgz#bb71850690e1f136567de629d2d5471deda4c1e8" - integrity sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg== - dependencies: - color-name "1.1.3" - -color-convert@^2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-2.0.1.tgz#72d3a68d598c9bdb3af2ad1e84f21d896abd4de3" - integrity sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ== - dependencies: - color-name "~1.1.4" - -color-name@1.1.3: - version "1.1.3" - resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.3.tgz#a7d0558bd89c42f795dd42328f740831ca53bc25" - integrity sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw== - -color-name@~1.1.4: - version "1.1.4" - resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.4.tgz#c2a09a87acbde69543de6f63fa3995c826c536a2" - integrity sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA== - -color-support@^1.1.3: - version "1.1.3" - resolved "https://registry.yarnpkg.com/color-support/-/color-support-1.1.3.tgz#93834379a1cc9a0c61f82f52f0d04322251bd5a2" - integrity sha512-qiBjkpbMLO/HL68y+lh4q0/O1MZFj2RX6X/KmMa3+gJD3z+WwI1ZzDHysvqHGS3mP6mznPckpXmw1nI9cJjyRg== - -colors@~1.1.2: - version "1.1.2" - resolved "https://registry.yarnpkg.com/colors/-/colors-1.1.2.tgz#168a4701756b6a7f51a12ce0c97bfa28c084ed63" - integrity sha512-ENwblkFQpqqia6b++zLD/KUWafYlVY/UNnAp7oz7LY7E924wmpye416wBOmvv/HMWzl8gL1kJlfvId/1Dg176w== - -concat-map@0.0.1: - version "0.0.1" - resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b" - integrity sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg== - -console-control-strings@^1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/console-control-strings/-/console-control-strings-1.1.0.tgz#3d7cf4464db6446ea644bf4b39507f9851008e8e" - integrity sha512-ty/fTekppD2fIwRvnZAVdeOiGd1c7YXEixbgJTNzqcxJWKQnjJ/V1bNEEE6hygpM3WjwHFUVK6HTjWSzV4a8sQ== - -continuable-cache@^0.3.1: - version "0.3.1" - resolved "https://registry.yarnpkg.com/continuable-cache/-/continuable-cache-0.3.1.tgz#bd727a7faed77e71ff3985ac93351a912733ad0f" - integrity sha512-TF30kpKhTH8AGCG3dut0rdd/19B7Z+qCnrMoBLpyQu/2drZdNrrpcjPEoJeSVsQM+8KmWG5O56oPDjSSUsuTyA== - -core-util-is@~1.0.0: - version "1.0.3" - resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.3.tgz#a6042d3634c2b27e9328f837b965fac83808db85" - integrity sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ== - -cross-spawn@^7.0.3: - version "7.0.3" - resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-7.0.3.tgz#f73a85b9d5d41d045551c177e2882d4ac85728a6" - integrity sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w== - dependencies: - path-key "^3.1.0" - shebang-command "^2.0.0" - which "^2.0.1" - -dateformat@~4.6.2: - version "4.6.3" - resolved "https://registry.yarnpkg.com/dateformat/-/dateformat-4.6.3.tgz#556fa6497e5217fedb78821424f8a1c22fa3f4b5" - integrity sha512-2P0p0pFGzHS5EMnhdxQi7aJN+iMheud0UhG4dlE1DLAlvL8JHjJJTX/CSm4JXwV0Ka5nGk3zC5mcb5bUQUxxMA== - -debug@4, debug@^4.3.3: - version "4.3.4" - resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.4.tgz#1319f6579357f2338d3337d2cdd4914bb5dcc865" - integrity sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ== - dependencies: - ms "2.1.2" - -debug@^3.1.0: - version "3.2.7" - resolved "https://registry.yarnpkg.com/debug/-/debug-3.2.7.tgz#72580b7e9145fb39b6676f9c5e5fb100b934179a" - integrity sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ== - dependencies: - ms "^2.1.1" - -decamelize-keys@^1.1.0: - version "1.1.1" - resolved "https://registry.yarnpkg.com/decamelize-keys/-/decamelize-keys-1.1.1.tgz#04a2d523b2f18d80d0158a43b895d56dff8d19d8" - integrity sha512-WiPxgEirIV0/eIOMcnFBA3/IJZAZqKnwAwWyvvdi4lsr1WCN22nhdf/3db3DoZcUjTV2SqfzIwNyp6y2xs3nmg== - dependencies: - decamelize "^1.1.0" - map-obj "^1.0.0" - -decamelize@^1.1.0, decamelize@^1.2.0: - version "1.2.0" - resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-1.2.0.tgz#f6534d15148269b20352e7bee26f501f9a191290" - integrity sha512-z2S+W9X73hAUUki+N+9Za2lBlun89zigOyGrsax+KUQ6wKW4ZoWpEYBkGhQjwAjjDCkWxhY0VKEhk8wzY7F5cA== - -define-data-property@^1.1.1: - version "1.1.1" - resolved "https://registry.yarnpkg.com/define-data-property/-/define-data-property-1.1.1.tgz#c35f7cd0ab09883480d12ac5cb213715587800b3" - integrity sha512-E7uGkTzkk1d0ByLeSc6ZsFS79Axg+m1P/VsgYsxHgiuc3tFSj+MjMIwe90FC4lOAZzNBdY7kkO2P2wKdsQ1vgQ== - dependencies: - get-intrinsic "^1.2.1" - gopd "^1.0.1" - has-property-descriptors "^1.0.0" - -delegate@^3.1.2: - version "3.2.0" - resolved "https://registry.yarnpkg.com/delegate/-/delegate-3.2.0.tgz#b66b71c3158522e8ab5744f720d8ca0c2af59166" - integrity sha512-IofjkYBZaZivn0V8nnsMJGBr4jVLxHDheKSW88PyxS5QC4Vo9ZbZVvhzlSxY87fVq3STR6r+4cGepyHkcWOQSw== - -delegates@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/delegates/-/delegates-1.0.0.tgz#84c6e159b81904fdca59a0ef44cd870d31250f9a" - integrity sha512-bd2L678uiWATM6m5Z1VzNCErI3jiGzt6HGY8OVICs40JQq/HALfbyNJmp0UDakEY4pMMaN0Ly5om/B1VI/+xfQ== - -detect-file@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/detect-file/-/detect-file-1.0.0.tgz#f0d66d03672a825cb1b73bdb3fe62310c8e552b7" - integrity sha512-DtCOLG98P007x7wiiOmfI0fi3eIKyWiLTGJ2MDnVi/E04lWGbf+JzrRHMm0rgIIZJGtHpKpbVgLWHrv8xXpc3Q== - -diff@^3.0.0: - version "3.5.0" - resolved "https://registry.yarnpkg.com/diff/-/diff-3.5.0.tgz#800c0dd1e0a8bfbc95835c202ad220fe317e5a12" - integrity sha512-A46qtFgd+g7pDZinpnwiRJtxbC1hpgf0uzP3iG89scHk0AUC7A1TGxf5OiiOUv/JMZR8GOt8hL900hV0bOy5xA== - -dropzone@^5.9.3: - version "5.9.3" - resolved "https://registry.yarnpkg.com/dropzone/-/dropzone-5.9.3.tgz#b3070ae090fa48cbc04c17535635537ca72d70d6" - integrity sha512-Azk8kD/2/nJIuVPK+zQ9sjKMRIpRvNyqn9XwbBHNq+iNuSccbJS6hwm1Woy0pMST0erSo0u4j+KJaodndDk4vA== - -duplexer@^0.1.1: - version "0.1.2" - resolved "https://registry.yarnpkg.com/duplexer/-/duplexer-0.1.2.tgz#3abe43aef3835f8ae077d136ddce0f276b0400e6" - integrity sha512-jtD6YG370ZCIi/9GTaJKQxWTZD045+4R4hTk/x1UyoqadyJ9x9CgSi1RlVDQF8U2sxLLSnFkCaMihqljHIWgMg== - -electron-to-chromium@^1.4.535: - version "1.4.576" - resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.576.tgz#0c6940fdc0d60f7e34bd742b29d8fa847c9294d1" - integrity sha512-yXsZyXJfAqzWk1WKryr0Wl0MN2D47xodPvEEwlVePBnhU5E7raevLQR+E6b9JAD3GfL/7MbAL9ZtWQQPcLx7wA== - -emoji-regex@^8.0.0: - version "8.0.0" - resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-8.0.0.tgz#e818fd69ce5ccfcb404594f842963bf53164cc37" - integrity sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A== - -encoding@^0.1.12, encoding@^0.1.13: - version "0.1.13" - resolved "https://registry.yarnpkg.com/encoding/-/encoding-0.1.13.tgz#56574afdd791f54a8e9b2785c0582a2d26210fa9" - integrity sha512-ETBauow1T35Y/WZMkio9jiM0Z5xjHHmJ4XmjZOq1l/dXz3lr2sRn87nJy20RupqSh1F2m3HHPSp8ShIPQJrJ3A== - dependencies: - iconv-lite "^0.6.2" - -env-paths@^2.2.0: - version "2.2.1" - resolved "https://registry.yarnpkg.com/env-paths/-/env-paths-2.2.1.tgz#420399d416ce1fbe9bc0a07c62fa68d67fd0f8f2" - integrity sha512-+h1lkLKhZMTYjog1VEpJNG7NZJWcuc2DDk/qsqSTRRCOXiLjeQ1d1/udrUGhqMxUgAlwKNZ0cf2uqan5GLuS2A== - -err-code@^2.0.2: - version "2.0.3" - resolved "https://registry.yarnpkg.com/err-code/-/err-code-2.0.3.tgz#23c2f3b756ffdfc608d30e27c9a941024807e7f9" - integrity sha512-2bmlRpNKBxT/CRmPOlyISQpNj+qSeYvcym/uT0Jx2bMOlKLtSy1ZmLuVxSEKKyor/N5yhvp/ZiG1oE3DEYMSFA== - -error-ex@^1.3.1: - version "1.3.2" - resolved "https://registry.yarnpkg.com/error-ex/-/error-ex-1.3.2.tgz#b4ac40648107fdcdcfae242f428bea8a14d4f1bf" - integrity sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g== - dependencies: - is-arrayish "^0.2.1" - -error@^7.0.0: - version "7.2.1" - resolved "https://registry.yarnpkg.com/error/-/error-7.2.1.tgz#eab21a4689b5f684fc83da84a0e390de82d94894" - integrity sha512-fo9HBvWnx3NGUKMvMwB/CBCMMrfEJgbDTVDEkPygA3Bdd3lM1OyCd+rbQ8BwnpF6GdVeOLDNmyL4N5Bg80ZvdA== - dependencies: - string-template "~0.2.1" - -escalade@^3.1.1: - version "3.1.1" - resolved "https://registry.yarnpkg.com/escalade/-/escalade-3.1.1.tgz#d8cfdc7000965c5a0174b4a82eaa5c0552742e40" - integrity sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw== - -escape-string-regexp@^1.0.2, escape-string-regexp@^1.0.5: - version "1.0.5" - resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4" - integrity sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg== - -esprima@^4.0.0: - version "4.0.1" - resolved "https://registry.yarnpkg.com/esprima/-/esprima-4.0.1.tgz#13b04cdb3e6c5d19df91ab6987a8695619b0aa71" - integrity sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A== - -eventemitter2@~0.4.13: - version "0.4.14" - resolved "https://registry.yarnpkg.com/eventemitter2/-/eventemitter2-0.4.14.tgz#8f61b75cde012b2e9eb284d4545583b5643b61ab" - integrity sha512-K7J4xq5xAD5jHsGM5ReWXRTFa3JRGofHiMcVgQ8PRwgWxzjHpMWCIzsmyf60+mh8KLsqYPcjUMa0AC4hd6lPyQ== - -exit@~0.1.2: - version "0.1.2" - resolved "https://registry.yarnpkg.com/exit/-/exit-0.1.2.tgz#0632638f8d877cc82107d30a0fff1a17cba1cd0c" - integrity sha512-Zk/eNKV2zbjpKzrsQ+n1G6poVbErQxJ0LBOJXaKZ1EViLzH+hrLu9cdXI4zw9dBQJslwBEpbQ2P1oS7nDxs6jQ== - -expand-tilde@^2.0.0, expand-tilde@^2.0.2: - version "2.0.2" - resolved "https://registry.yarnpkg.com/expand-tilde/-/expand-tilde-2.0.2.tgz#97e801aa052df02454de46b02bf621642cdc8502" - integrity sha512-A5EmesHW6rfnZ9ysHQjPdJRni0SRar0tjtG5MNtm9n5TUvsYU8oozprtRD4AqHxcZWWlVuAmQo2nWKfN9oyjTw== - dependencies: - homedir-polyfill "^1.0.1" - -extend@^3.0.2: - version "3.0.2" - resolved "https://registry.yarnpkg.com/extend/-/extend-3.0.2.tgz#f8b1136b4071fbd8eb140aff858b1019ec2915fa" - integrity sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g== - -faye-websocket@~0.10.0: - version "0.10.0" - resolved "https://registry.yarnpkg.com/faye-websocket/-/faye-websocket-0.10.0.tgz#4e492f8d04dfb6f89003507f6edbf2d501e7c6f4" - integrity sha512-Xhj93RXbMSq8urNCUq4p9l0P6hnySJ/7YNRhYNug0bLOuii7pKO7xQFb5mx9xZXWCar88pLPb805PvUkwrLZpQ== - dependencies: - websocket-driver ">=0.5.1" - -figures@^3.2.0: - version "3.2.0" - resolved "https://registry.yarnpkg.com/figures/-/figures-3.2.0.tgz#625c18bd293c604dc4a8ddb2febf0c88341746af" - integrity sha512-yaduQFRKLXYOGgEn6AZau90j3ggSOyiqXU0F9JZfeXYhNa+Jk4X+s45A2zg5jns87GAFa34BBm2kXw4XpNcbdg== - dependencies: - escape-string-regexp "^1.0.5" - -file-sync-cmp@^0.1.0: - version "0.1.1" - resolved "https://registry.yarnpkg.com/file-sync-cmp/-/file-sync-cmp-0.1.1.tgz#a5e7a8ffbfa493b43b923bbd4ca89a53b63b612b" - integrity sha512-0k45oWBokCqh2MOexeYKpyqmGKG+8mQ2Wd8iawx+uWd/weWJQAZ6SoPybagdCI4xFisag8iAR77WPm4h3pTfxA== - -fill-range@^7.0.1: - version "7.0.1" - resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-7.0.1.tgz#1919a6a7c75fe38b2c7c77e5198535da9acdda40" - integrity sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ== - dependencies: - to-regex-range "^5.0.1" - -find-up@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/find-up/-/find-up-3.0.0.tgz#49169f1d7993430646da61ecc5ae355c21c97b73" - integrity sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg== - dependencies: - locate-path "^3.0.0" - -find-up@^4.1.0: - version "4.1.0" - resolved "https://registry.yarnpkg.com/find-up/-/find-up-4.1.0.tgz#97afe7d6cdc0bc5928584b7c8d7b16e8a9aa5d19" - integrity sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw== - dependencies: - locate-path "^5.0.0" - path-exists "^4.0.0" - -findup-sync@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/findup-sync/-/findup-sync-4.0.0.tgz#956c9cdde804052b881b428512905c4a5f2cdef0" - integrity sha512-6jvvn/12IC4quLBL1KNokxC7wWTvYncaVUYSoxWw7YykPLuRrnv4qdHcSOywOI5RpkOVGeQRtWM8/q+G6W6qfQ== - dependencies: - detect-file "^1.0.0" - is-glob "^4.0.0" - micromatch "^4.0.2" - resolve-dir "^1.0.1" - -findup-sync@~5.0.0: - version "5.0.0" - resolved "https://registry.yarnpkg.com/findup-sync/-/findup-sync-5.0.0.tgz#54380ad965a7edca00cc8f63113559aadc541bd2" - integrity sha512-MzwXju70AuyflbgeOhzvQWAvvQdo1XL0A9bVvlXsYcFEBM87WR4OakL4OfZq+QRmr+duJubio+UtNQCPsVESzQ== - dependencies: - detect-file "^1.0.0" - is-glob "^4.0.3" - micromatch "^4.0.4" - resolve-dir "^1.0.1" - -fined@^1.2.0: - version "1.2.0" - resolved "https://registry.yarnpkg.com/fined/-/fined-1.2.0.tgz#d00beccf1aa2b475d16d423b0238b713a2c4a37b" - integrity sha512-ZYDqPLGxDkDhDZBjZBb+oD1+j0rA4E0pXY50eplAAOPg2N/gUBSSk5IM1/QhPfyVo19lJ+CvXpqfvk+b2p/8Ng== - dependencies: - expand-tilde "^2.0.2" - is-plain-object "^2.0.3" - object.defaults "^1.1.0" - object.pick "^1.2.0" - parse-filepath "^1.0.1" - -flagged-respawn@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/flagged-respawn/-/flagged-respawn-1.0.1.tgz#e7de6f1279ddd9ca9aac8a5971d618606b3aab41" - integrity sha512-lNaHNVymajmk0OJMBn8fVUAU1BtDeKIqKoVhk4xAALB57aALg6b4W0MfJ/cUE0g9YBXy5XhSlPIpYIJ7HaY/3Q== - -font-awesome@^4.7: - version "4.7.0" - resolved "https://registry.yarnpkg.com/font-awesome/-/font-awesome-4.7.0.tgz#8fa8cf0411a1a31afd07b06d2902bb9fc815a133" - integrity sha512-U6kGnykA/6bFmg1M/oT9EkFeIYv7JlX3bozwQJWiiLz6L0w3F5vBVPxHlwyX/vtNq1ckcpRKOB9f2Qal/VtFpg== - -for-in@^1.0.1: - version "1.0.2" - resolved "https://registry.yarnpkg.com/for-in/-/for-in-1.0.2.tgz#81068d295a8142ec0ac726c6e2200c30fb6d5e80" - integrity sha512-7EwmXrOjyL+ChxMhmG5lnW9MPt1aIeZEwKhQzoBUdTV0N3zuwWDZYVJatDvZ2OyzPUvdIAZDsCetk3coyMfcnQ== - -for-own@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/for-own/-/for-own-1.0.0.tgz#c63332f415cedc4b04dbfe70cf836494c53cb44b" - integrity sha512-0OABksIGrxKK8K4kynWkQ7y1zounQxP+CWnyclVwj81KW3vlLlGUx57DKGcP/LH216GzqnstnPocF16Nxs0Ycg== - dependencies: - for-in "^1.0.1" - -fs-minipass@^2.0.0, fs-minipass@^2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/fs-minipass/-/fs-minipass-2.1.0.tgz#7f5036fdbf12c63c169190cbe4199c852271f9fb" - integrity sha512-V/JgOLFCS+R6Vcq0slCuaeWEdNC3ouDlJMNIsacH2VtALiu9mV4LPrHc5cDl8k5aw6J8jwgWWpiTo5RYhmIzvg== - dependencies: - minipass "^3.0.0" - -fs.realpath@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f" - integrity sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw== - -function-bind@^1.1.2: - version "1.1.2" - resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.2.tgz#2c02d864d97f3ea6c8830c464cbd11ab6eab7a1c" - integrity sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA== - -gauge@^4.0.3: - version "4.0.4" - resolved "https://registry.yarnpkg.com/gauge/-/gauge-4.0.4.tgz#52ff0652f2bbf607a989793d53b751bef2328dce" - integrity sha512-f9m+BEN5jkg6a0fZjleidjN51VE1X+mPFQ2DJ0uv1V39oCLCbsGe6yjbBnp7eK7z/+GAon99a3nHuqbuuthyPg== - dependencies: - aproba "^1.0.3 || ^2.0.0" - color-support "^1.1.3" - console-control-strings "^1.1.0" - has-unicode "^2.0.1" - signal-exit "^3.0.7" - string-width "^4.2.3" - strip-ansi "^6.0.1" - wide-align "^1.1.5" - -gaze@^1.0.0, gaze@^1.1.0: - version "1.1.3" - resolved "https://registry.yarnpkg.com/gaze/-/gaze-1.1.3.tgz#c441733e13b927ac8c0ff0b4c3b033f28812924a" - integrity sha512-BRdNm8hbWzFzWHERTrejLqwHDfS4GibPoq5wjTPIoJHoBtKGPg3xAFfxmM+9ztbXelxcf2hwQcaz1PtmFeue8g== - dependencies: - globule "^1.0.0" - -get-caller-file@^2.0.5: - version "2.0.5" - resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-2.0.5.tgz#4f94412a82db32f36e3b0b9741f8a97feb031f7e" - integrity sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg== - -get-intrinsic@^1.0.2, get-intrinsic@^1.1.3, get-intrinsic@^1.2.1, get-intrinsic@^1.2.2: - version "1.2.2" - resolved "https://registry.yarnpkg.com/get-intrinsic/-/get-intrinsic-1.2.2.tgz#281b7622971123e1ef4b3c90fd7539306da93f3b" - integrity sha512-0gSo4ml/0j98Y3lngkFEot/zhiCeWsbYIlZ+uZOVgzLyLaUw7wxUL+nCTP0XJvJg1AXulJRI3UJi8GsbDuxdGA== - dependencies: - function-bind "^1.1.2" - has-proto "^1.0.1" - has-symbols "^1.0.3" - hasown "^2.0.0" - -get-stdin@^4.0.1: - version "4.0.1" - resolved "https://registry.yarnpkg.com/get-stdin/-/get-stdin-4.0.1.tgz#b968c6b0a04384324902e8bf1a5df32579a450fe" - integrity sha512-F5aQMywwJ2n85s4hJPTT9RPxGmubonuB10MNYo17/xph174n2MIR33HRguhzVag10O/npM7SPk73LMZNP+FaWw== - -getobject@~1.0.0: - version "1.0.2" - resolved "https://registry.yarnpkg.com/getobject/-/getobject-1.0.2.tgz#25ec87a50370f6dcc3c6ba7ef43c4c16215c4c89" - integrity sha512-2zblDBaFcb3rB4rF77XVnuINOE2h2k/OnqXAiy0IrTxUfV1iFp3la33oAQVY9pCpWU268WFYVt2t71hlMuLsOg== - -glob@^7.0.0, glob@^7.0.3, glob@^7.1.3, glob@^7.1.4: - version "7.2.3" - resolved "https://registry.yarnpkg.com/glob/-/glob-7.2.3.tgz#b8df0fb802bbfa8e89bd1d938b4e16578ed44f2b" - integrity sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q== - dependencies: - fs.realpath "^1.0.0" - inflight "^1.0.4" - inherits "2" - minimatch "^3.1.1" - once "^1.3.0" - path-is-absolute "^1.0.0" - -glob@^8.0.1: - version "8.1.0" - resolved "https://registry.yarnpkg.com/glob/-/glob-8.1.0.tgz#d388f656593ef708ee3e34640fdfb99a9fd1c33e" - integrity sha512-r8hpEjiQEYlF2QU0df3dS+nxxSIreXQS1qRhMJM0Q5NDdR386C7jb7Hwwod8Fgiuex+k0GFjgft18yvxm5XoCQ== - dependencies: - fs.realpath "^1.0.0" - inflight "^1.0.4" - inherits "2" - minimatch "^5.0.1" - once "^1.3.0" - -glob@~7.1.1, glob@~7.1.6: - version "7.1.7" - resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.7.tgz#3b193e9233f01d42d0b3f78294bbeeb418f94a90" - integrity sha512-OvD9ENzPLbegENnYP5UUfJIirTg4+XwMWGaQfQTY0JenxNvvIKP3U3/tAQSPIu/lHxXYSZmpXlUHeqAIdKzBLQ== - dependencies: - fs.realpath "^1.0.0" - inflight "^1.0.4" - inherits "2" - minimatch "^3.0.4" - once "^1.3.0" - path-is-absolute "^1.0.0" - -global-modules@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/global-modules/-/global-modules-1.0.0.tgz#6d770f0eb523ac78164d72b5e71a8877265cc3ea" - integrity sha512-sKzpEkf11GpOFuw0Zzjzmt4B4UZwjOcG757PPvrfhxcLFbq0wpsgpOqxpxtxFiCG4DtG93M6XRVbF2oGdev7bg== - dependencies: - global-prefix "^1.0.1" - is-windows "^1.0.1" - resolve-dir "^1.0.0" - -global-prefix@^1.0.1: - version "1.0.2" - resolved "https://registry.yarnpkg.com/global-prefix/-/global-prefix-1.0.2.tgz#dbf743c6c14992593c655568cb66ed32c0122ebe" - integrity sha512-5lsx1NUDHtSjfg0eHlmYvZKv8/nVqX4ckFbM+FrGcQ+04KWcWFo9P5MxPZYSzUvyzmdTbI7Eix8Q4IbELDqzKg== - dependencies: - expand-tilde "^2.0.2" - homedir-polyfill "^1.0.1" - ini "^1.3.4" - is-windows "^1.0.1" - which "^1.2.14" - -globule@^1.0.0: - version "1.3.4" - resolved "https://registry.yarnpkg.com/globule/-/globule-1.3.4.tgz#7c11c43056055a75a6e68294453c17f2796170fb" - integrity sha512-OPTIfhMBh7JbBYDpa5b+Q5ptmMWKwcNcFSR/0c6t8V4f3ZAVBEsKNY37QdVqmLRYSMhOUGYrY0QhSoEpzGr/Eg== - dependencies: - glob "~7.1.1" - lodash "^4.17.21" - minimatch "~3.0.2" - -good-listener@^1.2.2: - version "1.2.2" - resolved "https://registry.yarnpkg.com/good-listener/-/good-listener-1.2.2.tgz#d53b30cdf9313dffb7dc9a0d477096aa6d145c50" - integrity sha512-goW1b+d9q/HIwbVYZzZ6SsTr4IgE+WA44A0GmPIQstuOrgsFcT7VEJ48nmr9GaRtNu0XTKacFLGnBPAM6Afouw== - dependencies: - delegate "^3.1.2" - -gopd@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/gopd/-/gopd-1.0.1.tgz#29ff76de69dac7489b7c0918a5788e56477c332c" - integrity sha512-d65bNlIadxvpb/A2abVdlqKqV563juRnZ1Wtk6s1sIR8uNsXR70xqIzVqxVf1eTqDunwT2MkczEeaezCKTZhwA== - dependencies: - get-intrinsic "^1.1.3" - -graceful-fs@^4.2.6: - version "4.2.11" - resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.11.tgz#4183e4e8bf08bb6e05bbb2f7d2e0c8f712ca40e3" - integrity sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ== - -grunt-cli@~1.4.3: - version "1.4.3" - resolved "https://registry.yarnpkg.com/grunt-cli/-/grunt-cli-1.4.3.tgz#22c9f1a3d2780bf9b0d206e832e40f8f499175ff" - integrity sha512-9Dtx/AhVeB4LYzsViCjUQkd0Kw0McN2gYpdmGYKtE2a5Yt7v1Q+HYZVWhqXc/kGnxlMtqKDxSwotiGeFmkrCoQ== - dependencies: - grunt-known-options "~2.0.0" - interpret "~1.1.0" - liftup "~3.0.1" - nopt "~4.0.1" - v8flags "~3.2.0" - -grunt-contrib-clean@^2.0: - version "2.0.1" - resolved "https://registry.yarnpkg.com/grunt-contrib-clean/-/grunt-contrib-clean-2.0.1.tgz#062e8019d31bfca35af8929a2ee1063c6c46dd2d" - integrity sha512-uRvnXfhiZt8akb/ZRDHJpQQtkkVkqc/opWO4Po/9ehC2hPxgptB9S6JHDC/Nxswo4CJSM0iFPT/Iym3cEMWzKA== - dependencies: - async "^3.2.3" - rimraf "^2.6.2" - -grunt-contrib-concat@^2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/grunt-contrib-concat/-/grunt-contrib-concat-2.1.0.tgz#9ac62117a18b48d1bfccb3eef46c960bbd163d75" - integrity sha512-Vnl95JIOxfhEN7bnYIlCgQz41kkbi7tsZ/9a4usZmxNxi1S2YAIOy8ysFmO8u4MN26Apal1O106BwARdaNxXQw== - dependencies: - chalk "^4.1.2" - source-map "^0.5.3" - -grunt-contrib-copy@^1.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/grunt-contrib-copy/-/grunt-contrib-copy-1.0.0.tgz#7060c6581e904b8ab0d00f076e0a8f6e3e7c3573" - integrity sha512-gFRFUB0ZbLcjKb67Magz1yOHGBkyU6uL29hiEW1tdQ9gQt72NuMKIy/kS6dsCbV0cZ0maNCb0s6y+uT1FKU7jA== - dependencies: - chalk "^1.1.1" - file-sync-cmp "^0.1.0" - -grunt-contrib-uglify@^5.2.2: - version "5.2.2" - resolved "https://registry.yarnpkg.com/grunt-contrib-uglify/-/grunt-contrib-uglify-5.2.2.tgz#447c0b58451a1fca20768371e07e723a870dfe98" - integrity sha512-ITxiWxrjjP+RZu/aJ5GLvdele+sxlznh+6fK9Qckio5ma8f7Iv8woZjRkGfafvpuygxNefOJNc+hfjjBayRn2Q== - dependencies: - chalk "^4.1.2" - maxmin "^3.0.0" - uglify-js "^3.16.1" - uri-path "^1.0.0" - -grunt-contrib-watch@^1.1: - version "1.1.0" - resolved "https://registry.yarnpkg.com/grunt-contrib-watch/-/grunt-contrib-watch-1.1.0.tgz#c143ca5b824b288a024b856639a5345aedb78ed4" - integrity sha512-yGweN+0DW5yM+oo58fRu/XIRrPcn3r4tQx+nL7eMRwjpvk+rQY6R8o94BPK0i2UhTg9FN21hS+m8vR8v9vXfeg== - dependencies: - async "^2.6.0" - gaze "^1.1.0" - lodash "^4.17.10" - tiny-lr "^1.1.1" - -grunt-known-options@~2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/grunt-known-options/-/grunt-known-options-2.0.0.tgz#cac641e897f9a0a680b8c9839803d35f3325103c" - integrity sha512-GD7cTz0I4SAede1/+pAbmJRG44zFLPipVtdL9o3vqx9IEyb7b4/Y3s7r6ofI3CchR5GvYJ+8buCSioDv5dQLiA== - -grunt-legacy-log-utils@~2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/grunt-legacy-log-utils/-/grunt-legacy-log-utils-2.1.0.tgz#49a8c7dc74051476dcc116c32faf9db8646856ef" - integrity sha512-lwquaPXJtKQk0rUM1IQAop5noEpwFqOXasVoedLeNzaibf/OPWjKYvvdqnEHNmU+0T0CaReAXIbGo747ZD+Aaw== - dependencies: - chalk "~4.1.0" - lodash "~4.17.19" - -grunt-legacy-log@~3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/grunt-legacy-log/-/grunt-legacy-log-3.0.0.tgz#1c6eaf92371ea415af31ea84ce50d434ef6d39c4" - integrity sha512-GHZQzZmhyq0u3hr7aHW4qUH0xDzwp2YXldLPZTCjlOeGscAOWWPftZG3XioW8MasGp+OBRIu39LFx14SLjXRcA== - dependencies: - colors "~1.1.2" - grunt-legacy-log-utils "~2.1.0" - hooker "~0.2.3" - lodash "~4.17.19" - -grunt-legacy-util@~2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/grunt-legacy-util/-/grunt-legacy-util-2.0.1.tgz#0f929d13a2faf9988c9917c82bff609e2d9ba255" - integrity sha512-2bQiD4fzXqX8rhNdXkAywCadeqiPiay0oQny77wA2F3WF4grPJXCvAcyoWUJV+po/b15glGkxuSiQCK299UC2w== - dependencies: - async "~3.2.0" - exit "~0.1.2" - getobject "~1.0.0" - hooker "~0.2.3" - lodash "~4.17.21" - underscore.string "~3.3.5" - which "~2.0.2" - -grunt-postcss@^0.9: - version "0.9.0" - resolved "https://registry.yarnpkg.com/grunt-postcss/-/grunt-postcss-0.9.0.tgz#fbe5934a6be9eac893af6d057e2318c97fae9da3" - integrity sha512-lglLcVaoOIqH0sFv7RqwUKkEFGQwnlqyAKbatxZderwZGV1nDyKHN7gZS9LUiTx1t5GOvRBx0BEalHMyVwFAIA== - dependencies: - chalk "^2.1.0" - diff "^3.0.0" - postcss "^6.0.11" - -grunt-sass@^3.1: - version "3.1.0" - resolved "https://registry.yarnpkg.com/grunt-sass/-/grunt-sass-3.1.0.tgz#a5936cc2a80ec08092d9f31c101dc307d1e4f71c" - integrity sha512-90s27H7FoCDcA8C8+R0GwC+ntYD3lG6S/jqcavWm3bn9RiJTmSfOvfbFa1PXx4NbBWuiGQMLfQTj/JvvqT5w6A== - -grunt@^1.6.1: - version "1.6.1" - resolved "https://registry.yarnpkg.com/grunt/-/grunt-1.6.1.tgz#0b4dd1524f26676dcf45d8f636b8d9061a8ede16" - integrity sha512-/ABUy3gYWu5iBmrUSRBP97JLpQUm0GgVveDCp6t3yRNIoltIYw7rEj3g5y1o2PGPR2vfTRGa7WC/LZHLTXnEzA== - dependencies: - dateformat "~4.6.2" - eventemitter2 "~0.4.13" - exit "~0.1.2" - findup-sync "~5.0.0" - glob "~7.1.6" - grunt-cli "~1.4.3" - grunt-known-options "~2.0.0" - grunt-legacy-log "~3.0.0" - grunt-legacy-util "~2.0.1" - iconv-lite "~0.6.3" - js-yaml "~3.14.0" - minimatch "~3.0.4" - nopt "~3.0.6" - -gzip-size@^5.1.1: - version "5.1.1" - resolved "https://registry.yarnpkg.com/gzip-size/-/gzip-size-5.1.1.tgz#cb9bee692f87c0612b232840a873904e4c135274" - integrity sha512-FNHi6mmoHvs1mxZAds4PpdCS6QG8B4C1krxJsMutgxl5t3+GlRTzzI3NEkifXx2pVsOvJdOGSmIgDhQ55FwdPA== - dependencies: - duplexer "^0.1.1" - pify "^4.0.1" - -hard-rejection@^2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/hard-rejection/-/hard-rejection-2.1.0.tgz#1c6eda5c1685c63942766d79bb40ae773cecd883" - integrity sha512-VIZB+ibDhx7ObhAe7OVtoEbuP4h/MuOTHJ+J8h/eBXotJYl0fBgR72xDFCKgIh22OJZIOVNxBMWuhAr10r8HdA== - -has-ansi@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/has-ansi/-/has-ansi-2.0.0.tgz#34f5049ce1ecdf2b0649af3ef24e45ed35416d91" - integrity sha512-C8vBJ8DwUCx19vhm7urhTuUsr4/IyP6l4VzNQDv+ryHQObW3TTTp9yB68WpYgRe2bbaGuZ/se74IqFeVnMnLZg== - dependencies: - ansi-regex "^2.0.0" - -has-flag@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-3.0.0.tgz#b5d454dc2199ae225699f3467e5a07f3b955bafd" - integrity sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw== - -has-flag@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-4.0.0.tgz#944771fd9c81c81265c4d6941860da06bb59479b" - integrity sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ== - -has-property-descriptors@^1.0.0: - version "1.0.1" - resolved "https://registry.yarnpkg.com/has-property-descriptors/-/has-property-descriptors-1.0.1.tgz#52ba30b6c5ec87fd89fa574bc1c39125c6f65340" - integrity sha512-VsX8eaIewvas0xnvinAe9bw4WfIeODpGYikiWYLH+dma0Jw6KHYqWiWfhQlgOVK8D6PvjubK5Uc4P0iIhIcNVg== - dependencies: - get-intrinsic "^1.2.2" - -has-proto@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/has-proto/-/has-proto-1.0.1.tgz#1885c1305538958aff469fef37937c22795408e0" - integrity sha512-7qE+iP+O+bgF9clE5+UoBFzE65mlBiVj3tKCrlNQ0Ogwm0BjpT/gK4SlLYDMybDh5I3TCTKnPPa0oMG7JDYrhg== - -has-symbols@^1.0.3: - version "1.0.3" - resolved "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.0.3.tgz#bb7b2c4349251dce87b125f7bdf874aa7c8b39f8" - integrity sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A== - -has-unicode@^2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/has-unicode/-/has-unicode-2.0.1.tgz#e0e6fe6a28cf51138855e086d1691e771de2a8b9" - integrity sha512-8Rf9Y83NBReMnx0gFzA8JImQACstCYWUplepDa9xprwwtmgEZUF0h/i5xSA625zB/I37EtrswSST6OXxwaaIJQ== - -hasown@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/hasown/-/hasown-2.0.0.tgz#f4c513d454a57b7c7e1650778de226b11700546c" - integrity sha512-vUptKVTpIJhcczKBbgnS+RtcuYMB8+oNzPK2/Hp3hanz8JmpATdmmgLgSaadVREkDm+e2giHwY3ZRkyjSIDDFA== - dependencies: - function-bind "^1.1.2" - -homedir-polyfill@^1.0.1: - version "1.0.3" - resolved "https://registry.yarnpkg.com/homedir-polyfill/-/homedir-polyfill-1.0.3.tgz#743298cef4e5af3e194161fbadcc2151d3a058e8" - integrity sha512-eSmmWE5bZTK2Nou4g0AI3zZ9rswp7GRKoKXS1BLUkvPviOqs4YTN1djQIqrXy9k5gEtdLPy86JjRwsNM9tnDcA== - dependencies: - parse-passwd "^1.0.0" - -hooker@~0.2.3: - version "0.2.3" - resolved "https://registry.yarnpkg.com/hooker/-/hooker-0.2.3.tgz#b834f723cc4a242aa65963459df6d984c5d3d959" - integrity sha512-t+UerCsQviSymAInD01Pw+Dn/usmz1sRO+3Zk1+lx8eg+WKpD2ulcwWqHHL0+aseRBr+3+vIhiG1K1JTwaIcTA== - -hosted-git-info@^2.1.4: - version "2.8.9" - resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.8.9.tgz#dffc0bf9a21c02209090f2aa69429e1414daf3f9" - integrity sha512-mxIDAb9Lsm6DoOJ7xH+5+X4y1LU/4Hi50L9C5sIswK3JzULS4bwk1FvjdBgvYR4bzT4tuUQiC15FE2f5HbLvYw== - -hosted-git-info@^4.0.1: - version "4.1.0" - resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-4.1.0.tgz#827b82867e9ff1c8d0c4d9d53880397d2c86d224" - integrity sha512-kyCuEOWjJqZuDbRHzL8V93NzQhwIB71oFWSyzVo+KPZI+pnQPPxucdkrOZvkLRnrf5URsQM+IJ09Dw29cRALIA== - dependencies: - lru-cache "^6.0.0" - -html5shiv@^3.7: - version "3.7.3" - resolved "https://registry.yarnpkg.com/html5shiv/-/html5shiv-3.7.3.tgz#d78a84a367bcb9a710100d57802c387b084631d2" - integrity sha512-SZwGvLGNtgp8GbgFX7oXEp8OR1aBt5LliX6dG0kdD1kl3KhMonN0QcSa/A3TsTgFewaGCbIryQunjayWDXzxmw== - -http-cache-semantics@^4.1.0: - version "4.1.1" - resolved "https://registry.yarnpkg.com/http-cache-semantics/-/http-cache-semantics-4.1.1.tgz#abe02fcb2985460bf0323be664436ec3476a6d5a" - integrity sha512-er295DKPVsV82j5kw1Gjt+ADA/XYHsajl82cGNQG2eyoPkvgUhX+nDIyelzhIWbbsXP39EHcI6l5tYs2FYqYXQ== - -http-parser-js@>=0.5.1: - version "0.5.8" - resolved "https://registry.yarnpkg.com/http-parser-js/-/http-parser-js-0.5.8.tgz#af23090d9ac4e24573de6f6aecc9d84a48bf20e3" - integrity sha512-SGeBX54F94Wgu5RH3X5jsDtf4eHyRogWX1XGT3b4HuW3tQPM4AaBzoUji/4AAJNXCEOWZ5O0DgZmJw1947gD5Q== - -http-proxy-agent@^4.0.1: - version "4.0.1" - resolved "https://registry.yarnpkg.com/http-proxy-agent/-/http-proxy-agent-4.0.1.tgz#8a8c8ef7f5932ccf953c296ca8291b95aa74aa3a" - integrity sha512-k0zdNgqWTGA6aeIRVpvfVob4fL52dTfaehylg0Y4UvSySvOq/Y+BOyPrgpUrA7HylqvU8vIZGsRuXmspskV0Tg== - dependencies: - "@tootallnate/once" "1" - agent-base "6" - debug "4" - -http-proxy-agent@^5.0.0: - version "5.0.0" - resolved "https://registry.yarnpkg.com/http-proxy-agent/-/http-proxy-agent-5.0.0.tgz#5129800203520d434f142bc78ff3c170800f2b43" - integrity sha512-n2hY8YdoRE1i7r6M0w9DIw5GgZN0G25P8zLCRQ8rjXtTU3vsNFBI/vWK/UIeE6g5MUUz6avwAPXmL6Fy9D/90w== - dependencies: - "@tootallnate/once" "2" - agent-base "6" - debug "4" - -https-proxy-agent@^5.0.0: - version "5.0.1" - resolved "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-5.0.1.tgz#c59ef224a04fe8b754f3db0063a25ea30d0005d6" - integrity sha512-dFcAjpTQFgoLMzC2VwU+C/CbS7uRL0lWmxDITmqm7C+7F0Odmj6s9l6alZc6AELXhrnggM2CeWSXHGOdX2YtwA== - dependencies: - agent-base "6" - debug "4" - -humanize-ms@^1.2.1: - version "1.2.1" - resolved "https://registry.yarnpkg.com/humanize-ms/-/humanize-ms-1.2.1.tgz#c46e3159a293f6b896da29316d8b6fe8bb79bbed" - integrity sha512-Fl70vYtsAFb/C06PTS9dZBo7ihau+Tu/DNCk/OyHhea07S+aeMWpFFkUaXRa8fI+ScZbEI8dfSxwY7gxZ9SAVQ== - dependencies: - ms "^2.0.0" - -iconv-lite@^0.6.2, iconv-lite@~0.6.3: - version "0.6.3" - resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.6.3.tgz#a52f80bf38da1952eb5c681790719871a1a72501" - integrity sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw== - dependencies: - safer-buffer ">= 2.1.2 < 3.0.0" - -imurmurhash@^0.1.4: - version "0.1.4" - resolved "https://registry.yarnpkg.com/imurmurhash/-/imurmurhash-0.1.4.tgz#9218b9b2b928a238b13dc4fb6b6d576f231453ea" - integrity sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA== - -indent-string@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/indent-string/-/indent-string-4.0.0.tgz#624f8f4497d619b2d9768531d58f4122854d7251" - integrity sha512-EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg== - -infer-owner@^1.0.4: - version "1.0.4" - resolved "https://registry.yarnpkg.com/infer-owner/-/infer-owner-1.0.4.tgz#c4cefcaa8e51051c2a40ba2ce8a3d27295af9467" - integrity sha512-IClj+Xz94+d7irH5qRyfJonOdfTzuDaifE6ZPWfx0N0+/ATZCbuTPq2prFl526urkQd90WyUKIh1DfBQ2hMz9A== - -inflight@^1.0.4: - version "1.0.6" - resolved "https://registry.yarnpkg.com/inflight/-/inflight-1.0.6.tgz#49bd6331d7d02d0c09bc910a1075ba8165b56df9" - integrity sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA== - dependencies: - once "^1.3.0" - wrappy "1" - -inherits@2, inherits@^2.0.3, inherits@~2.0.3: - version "2.0.4" - resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz#0fa2c64f932917c3433a0ded55363aae37416b7c" - integrity sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ== - -ini@^1.3.4: - version "1.3.8" - resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.8.tgz#a29da425b48806f34767a4efce397269af28432c" - integrity sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew== - -interpret@~1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/interpret/-/interpret-1.1.0.tgz#7ed1b1410c6a0e0f78cf95d3b8440c63f78b8614" - integrity sha512-CLM8SNMDu7C5psFCn6Wg/tgpj/bKAg7hc2gWqcuR9OD5Ft9PhBpIu8PLicPeis+xDd6YX2ncI8MCA64I9tftIA== - -ip@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/ip/-/ip-2.0.0.tgz#4cf4ab182fee2314c75ede1276f8c80b479936da" - integrity sha512-WKa+XuLG1A1R0UWhl2+1XQSi+fZWMsYKffMZTTYsiZaUD8k2yDAj5atimTUD2TZkyCkNEeYE5NhFZmupOGtjYQ== - -is-absolute@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/is-absolute/-/is-absolute-1.0.0.tgz#395e1ae84b11f26ad1795e73c17378e48a301576" - integrity sha512-dOWoqflvcydARa360Gvv18DZ/gRuHKi2NU/wU5X1ZFzdYfH29nkiNZsF3mp4OJ3H4yo9Mx8A/uAGNzpzPN3yBA== - dependencies: - is-relative "^1.0.0" - is-windows "^1.0.1" - -is-arrayish@^0.2.1: - version "0.2.1" - resolved "https://registry.yarnpkg.com/is-arrayish/-/is-arrayish-0.2.1.tgz#77c99840527aa8ecb1a8ba697b80645a7a926a9d" - integrity sha512-zz06S8t0ozoDXMG+ube26zeCTNXcKIPJZJi8hBrF4idCLms4CG9QtK7qBl1boi5ODzFpjswb5JPmHCbMpjaYzg== - -is-core-module@^2.13.0, is-core-module@^2.5.0: - version "2.13.1" - resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.13.1.tgz#ad0d7532c6fea9da1ebdc82742d74525c6273384" - integrity sha512-hHrIjvZsftOsvKSn2TRYl63zvxsgE0K+0mYMoH6gD4omR5IWB2KynivBQczo3+wF1cCkjzvptnI9Q0sPU66ilw== - dependencies: - hasown "^2.0.0" - -is-extglob@^2.1.1: - version "2.1.1" - resolved "https://registry.yarnpkg.com/is-extglob/-/is-extglob-2.1.1.tgz#a88c02535791f02ed37c76a1b9ea9773c833f8c2" - integrity sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ== - -is-fullwidth-code-point@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz#f116f8064fe90b3f7844a38997c0b75051269f1d" - integrity sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg== - -is-glob@^4.0.0, is-glob@^4.0.3: - version "4.0.3" - resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-4.0.3.tgz#64f61e42cbbb2eec2071a9dac0b28ba1e65d5084" - integrity sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg== - dependencies: - is-extglob "^2.1.1" - -is-lambda@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/is-lambda/-/is-lambda-1.0.1.tgz#3d9877899e6a53efc0160504cde15f82e6f061d5" - integrity sha512-z7CMFGNrENq5iFB9Bqo64Xk6Y9sg+epq1myIcdHaGnbMTYOxvzsEtdYqQUylB7LxfkvgrrjP32T6Ywciio9UIQ== - -is-number@^7.0.0: - version "7.0.0" - resolved "https://registry.yarnpkg.com/is-number/-/is-number-7.0.0.tgz#7535345b896734d5f80c4d06c50955527a14f12b" - integrity sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng== - -is-plain-obj@^1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/is-plain-obj/-/is-plain-obj-1.1.0.tgz#71a50c8429dfca773c92a390a4a03b39fcd51d3e" - integrity sha512-yvkRyxmFKEOQ4pNXCmJG5AEQNlXJS5LaONXo5/cLdTZdWvsZ1ioJEonLGAosKlMWE8lwUy/bJzMjcw8az73+Fg== - -is-plain-object@^2.0.3, is-plain-object@^2.0.4: - version "2.0.4" - resolved "https://registry.yarnpkg.com/is-plain-object/-/is-plain-object-2.0.4.tgz#2c163b3fafb1b606d9d17928f05c2a1c38e07677" - integrity sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og== - dependencies: - isobject "^3.0.1" - -is-relative@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/is-relative/-/is-relative-1.0.0.tgz#a1bb6935ce8c5dba1e8b9754b9b2dcc020e2260d" - integrity sha512-Kw/ReK0iqwKeu0MITLFuj0jbPAmEiOsIwyIXvvbfa6QfmN9pkD1M+8pdk7Rl/dTKbH34/XBFMbgD4iMJhLQbGA== - dependencies: - is-unc-path "^1.0.0" - -is-unc-path@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/is-unc-path/-/is-unc-path-1.0.0.tgz#d731e8898ed090a12c352ad2eaed5095ad322c9d" - integrity sha512-mrGpVd0fs7WWLfVsStvgF6iEJnbjDFZh9/emhRDcGWTduTfNHd9CHeUwH3gYIjdbwo4On6hunkztwOaAw0yllQ== - dependencies: - unc-path-regex "^0.1.2" - -is-windows@^1.0.1: - version "1.0.2" - resolved "https://registry.yarnpkg.com/is-windows/-/is-windows-1.0.2.tgz#d1850eb9791ecd18e6182ce12a30f396634bb19d" - integrity sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA== - -isarray@~1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11" - integrity sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ== - -isexe@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz#e8fbf374dc556ff8947a10dcb0572d633f2cfa10" - integrity sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw== - -isobject@^3.0.0, isobject@^3.0.1: - version "3.0.1" - resolved "https://registry.yarnpkg.com/isobject/-/isobject-3.0.1.tgz#4e431e92b11a9731636aa1f9c8d1ccbcfdab78df" - integrity sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg== - -jquery-ui@^1.13.2: - version "1.13.2" - resolved "https://registry.yarnpkg.com/jquery-ui/-/jquery-ui-1.13.2.tgz#de03580ae6604773602f8d786ad1abfb75232034" - integrity sha512-wBZPnqWs5GaYJmo1Jj0k/mrSkzdQzKDwhXNtHKcBdAcKVxMM3KNYFq+iJ2i1rwiG53Z8M4mTn3Qxrm17uH1D4Q== - dependencies: - jquery ">=1.8.0 <4.0.0" - -"jquery@>=1.8.0 <4.0.0", "jquery@>=3.4.0 <4.0.0", jquery@^3.7.1: - version "3.7.1" - resolved "https://registry.yarnpkg.com/jquery/-/jquery-3.7.1.tgz#083ef98927c9a6a74d05a6af02806566d16274de" - integrity sha512-m4avr8yL8kmFN8psrbFFFmB/If14iN5o9nw/NgnnM+kybDJpRsAynV2BsfpTYrTRysYUdADVD7CkUUizgkpLfg== - -js-base64@^2.4.9: - version "2.6.4" - resolved "https://registry.yarnpkg.com/js-base64/-/js-base64-2.6.4.tgz#f4e686c5de1ea1f867dbcad3d46d969428df98c4" - integrity sha512-pZe//GGmwJndub7ZghVHz7vjb2LgC1m8B07Au3eYqeqv9emhESByMXxaEgkUkEqJe87oBbSniGYoQNIBklc7IQ== - -js-cookie@^2.2.1: - version "2.2.1" - resolved "https://registry.yarnpkg.com/js-cookie/-/js-cookie-2.2.1.tgz#69e106dc5d5806894562902aa5baec3744e9b2b8" - integrity sha512-HvdH2LzI/EAZcUwA8+0nKNtWHqS+ZmijLA30RwZA0bo7ToCckjK5MkGhjED9KoRcXO6BaGI3I9UIzSA1FKFPOQ== - -js-tokens@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-4.0.0.tgz#19203fb59991df98e3a287050d4647cdeaf32499" - integrity sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ== - -js-yaml@~3.14.0: - version "3.14.1" - resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.14.1.tgz#dae812fdb3825fa306609a8717383c50c36a0537" - integrity sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g== - dependencies: - argparse "^1.0.7" - esprima "^4.0.0" - -json-parse-even-better-errors@^2.3.0: - version "2.3.1" - resolved "https://registry.yarnpkg.com/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz#7c47805a94319928e05777405dc12e1f7a4ee02d" - integrity sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w== - -kind-of@^6.0.2, kind-of@^6.0.3: - version "6.0.3" - resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-6.0.3.tgz#07c05034a6c349fa06e24fa35aa76db4580ce4dd" - integrity sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw== - -liftup@~3.0.1: - version "3.0.1" - resolved "https://registry.yarnpkg.com/liftup/-/liftup-3.0.1.tgz#1cb81aff0f368464ed3a5f1a7286372d6b1a60ce" - integrity sha512-yRHaiQDizWSzoXk3APcA71eOI/UuhEkNN9DiW2Tt44mhYzX4joFoCZlxsSOF7RyeLlfqzFLQI1ngFq3ggMPhOw== - dependencies: - extend "^3.0.2" - findup-sync "^4.0.0" - fined "^1.2.0" - flagged-respawn "^1.0.1" - is-plain-object "^2.0.4" - object.map "^1.0.1" - rechoir "^0.7.0" - resolve "^1.19.0" - -lines-and-columns@^1.1.6: - version "1.2.4" - resolved "https://registry.yarnpkg.com/lines-and-columns/-/lines-and-columns-1.2.4.tgz#eca284f75d2965079309dc0ad9255abb2ebc1632" - integrity sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg== - -livereload-js@^2.3.0: - version "2.4.0" - resolved "https://registry.yarnpkg.com/livereload-js/-/livereload-js-2.4.0.tgz#447c31cf1ea9ab52fc20db615c5ddf678f78009c" - integrity sha512-XPQH8Z2GDP/Hwz2PCDrh2mth4yFejwA1OZ/81Ti3LgKyhDcEjsSsqFWZojHG0va/duGd+WyosY7eXLDoOyqcPw== - -load-grunt-tasks@^5.1: - version "5.1.0" - resolved "https://registry.yarnpkg.com/load-grunt-tasks/-/load-grunt-tasks-5.1.0.tgz#14894c27a7e34ebbef9937c39cc35c573cd04c1c" - integrity sha512-oNj0Jlka1TsfDe+9He0kcA1cRln+TMoTsEByW7ij6kyktNLxBKJtslCFEvFrLC2Dj0S19IWJh3fOCIjLby2Xrg== - dependencies: - arrify "^2.0.1" - multimatch "^4.0.0" - pkg-up "^3.1.0" - resolve-pkg "^2.0.0" - -locate-path@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-3.0.0.tgz#dbec3b3ab759758071b58fe59fc41871af21400e" - integrity sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A== - dependencies: - p-locate "^3.0.0" - path-exists "^3.0.0" - -locate-path@^5.0.0: - version "5.0.0" - resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-5.0.0.tgz#1afba396afd676a6d42504d0a67a3a7eb9f62aa0" - integrity sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g== - dependencies: - p-locate "^4.1.0" - -lodash@^4.17.10, lodash@^4.17.11, lodash@^4.17.14, lodash@^4.17.15, lodash@^4.17.21, lodash@~4.17.19, lodash@~4.17.21: - version "4.17.21" - resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c" - integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg== - -lru-cache@^6.0.0: - version "6.0.0" - resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-6.0.0.tgz#6d6fe6570ebd96aaf90fcad1dafa3b2566db3a94" - integrity sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA== - dependencies: - yallist "^4.0.0" - -lru-cache@^7.7.1: - version "7.18.3" - resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-7.18.3.tgz#f793896e0fd0e954a59dfdd82f0773808df6aa89" - integrity sha512-jumlc0BIUrS3qJGgIkWZsyfAM7NCWiBcCDhnd+3NNM5KbBmLTgHVfWBcg6W+rLUsIpzpERPsvwUP7CckAQSOoA== - -make-fetch-happen@^10.0.4: - version "10.2.1" - resolved "https://registry.yarnpkg.com/make-fetch-happen/-/make-fetch-happen-10.2.1.tgz#f5e3835c5e9817b617f2770870d9492d28678164" - integrity sha512-NgOPbRiaQM10DYXvN3/hhGVI2M5MtITFryzBGxHM5p4wnFxsVCbxkrBrDsk+EZ5OB4jEOT7AjDxtdF+KVEFT7w== - dependencies: - agentkeepalive "^4.2.1" - cacache "^16.1.0" - http-cache-semantics "^4.1.0" - http-proxy-agent "^5.0.0" - https-proxy-agent "^5.0.0" - is-lambda "^1.0.1" - lru-cache "^7.7.1" - minipass "^3.1.6" - minipass-collect "^1.0.2" - minipass-fetch "^2.0.3" - minipass-flush "^1.0.5" - minipass-pipeline "^1.2.4" - negotiator "^0.6.3" - promise-retry "^2.0.1" - socks-proxy-agent "^7.0.0" - ssri "^9.0.0" - -make-fetch-happen@^9.1.0: - version "9.1.0" - resolved "https://registry.yarnpkg.com/make-fetch-happen/-/make-fetch-happen-9.1.0.tgz#53085a09e7971433e6765f7971bf63f4e05cb968" - integrity sha512-+zopwDy7DNknmwPQplem5lAZX/eCOzSvSNNcSKm5eVwTkOBzoktEfXsa9L23J/GIRhxRsaxzkPEhrJEpE2F4Gg== - dependencies: - agentkeepalive "^4.1.3" - cacache "^15.2.0" - http-cache-semantics "^4.1.0" - http-proxy-agent "^4.0.1" - https-proxy-agent "^5.0.0" - is-lambda "^1.0.1" - lru-cache "^6.0.0" - minipass "^3.1.3" - minipass-collect "^1.0.2" - minipass-fetch "^1.3.2" - minipass-flush "^1.0.5" - minipass-pipeline "^1.2.4" - negotiator "^0.6.2" - promise-retry "^2.0.1" - socks-proxy-agent "^6.0.0" - ssri "^8.0.0" - -make-iterator@^1.0.0: - version "1.0.1" - resolved "https://registry.yarnpkg.com/make-iterator/-/make-iterator-1.0.1.tgz#29b33f312aa8f547c4a5e490f56afcec99133ad6" - integrity sha512-pxiuXh0iVEq7VM7KMIhs5gxsfxCux2URptUQaXo4iZZJxBAzTPOLE2BumO5dbfVYq/hBJFBR/a1mFDmOx5AGmw== - dependencies: - kind-of "^6.0.2" - -map-cache@^0.2.0: - version "0.2.2" - resolved "https://registry.yarnpkg.com/map-cache/-/map-cache-0.2.2.tgz#c32abd0bd6525d9b051645bb4f26ac5dc98a0dbf" - integrity sha512-8y/eV9QQZCiyn1SprXSrCmqJN0yNRATe+PO8ztwqrvrbdRLA3eYJF0yaR0YayLWkMbsQSKWS9N2gPcGEc4UsZg== - -map-obj@^1.0.0: - version "1.0.1" - resolved "https://registry.yarnpkg.com/map-obj/-/map-obj-1.0.1.tgz#d933ceb9205d82bdcf4886f6742bdc2b4dea146d" - integrity sha512-7N/q3lyZ+LVCp7PzuxrJr4KMbBE2hW7BT7YNia330OFxIf4d3r5zVpicP2650l7CPN6RM9zOJRl3NGpqSiw3Eg== - -map-obj@^4.0.0: - version "4.3.0" - resolved "https://registry.yarnpkg.com/map-obj/-/map-obj-4.3.0.tgz#9304f906e93faae70880da102a9f1df0ea8bb05a" - integrity sha512-hdN1wVrZbb29eBGiGjJbeP8JbKjq1urkHJ/LIP/NY48MZ1QVXUsQBV1G1zvYFHn1XE06cwjBsOI2K3Ulnj1YXQ== - -maxmin@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/maxmin/-/maxmin-3.0.0.tgz#3ee9acc8a2b9f2b5416e94f5705319df8a9c71e6" - integrity sha512-wcahMInmGtg/7c6a75fr21Ch/Ks1Tb+Jtoan5Ft4bAI0ZvJqyOw8kkM7e7p8hDSzY805vmxwHT50KcjGwKyJ0g== - dependencies: - chalk "^4.1.0" - figures "^3.2.0" - gzip-size "^5.1.1" - pretty-bytes "^5.3.0" - -meow@^9.0.0: - version "9.0.0" - resolved "https://registry.yarnpkg.com/meow/-/meow-9.0.0.tgz#cd9510bc5cac9dee7d03c73ee1f9ad959f4ea364" - integrity sha512-+obSblOQmRhcyBt62furQqRAQpNyWXo8BuQ5bN7dG8wmwQ+vwHKp/rCFD4CrTP8CsDQD1sjoZ94K417XEUk8IQ== - dependencies: - "@types/minimist" "^1.2.0" - camelcase-keys "^6.2.2" - decamelize "^1.2.0" - decamelize-keys "^1.1.0" - hard-rejection "^2.1.0" - minimist-options "4.1.0" - normalize-package-data "^3.0.0" - read-pkg-up "^7.0.1" - redent "^3.0.0" - trim-newlines "^3.0.0" - type-fest "^0.18.0" - yargs-parser "^20.2.3" - -micromatch@^4.0.2, micromatch@^4.0.4: - version "4.0.5" - resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.5.tgz#bc8999a7cbbf77cdc89f132f6e467051b49090c6" - integrity sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA== - dependencies: - braces "^3.0.2" - picomatch "^2.3.1" - -min-indent@^1.0.0: - version "1.0.1" - resolved "https://registry.yarnpkg.com/min-indent/-/min-indent-1.0.1.tgz#a63f681673b30571fbe8bc25686ae746eefa9869" - integrity sha512-I9jwMn07Sy/IwOj3zVkVik2JTvgpaykDZEigL6Rx6N9LbMywwUSMtxET+7lVoDLLd3O3IXwJwvuuns8UB/HeAg== - -minimatch@^3.0.4, minimatch@^3.1.1: - version "3.1.2" - resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.1.2.tgz#19cd194bfd3e428f049a70817c038d89ab4be35b" - integrity sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw== - dependencies: - brace-expansion "^1.1.7" - -minimatch@^5.0.1: - version "5.1.6" - resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-5.1.6.tgz#1cfcb8cf5522ea69952cd2af95ae09477f122a96" - integrity sha512-lKwV/1brpG6mBUFHtb7NUmtABCb2WZZmm2wNiOA5hAb8VdCS4B3dtMWyvcoViccwAW/COERjXLt0zP1zXUN26g== - dependencies: - brace-expansion "^2.0.1" - -minimatch@~3.0.2, minimatch@~3.0.4: - version "3.0.8" - resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.8.tgz#5e6a59bd11e2ab0de1cfb843eb2d82e546c321c1" - integrity sha512-6FsRAQsxQ61mw+qP1ZzbL9Bc78x2p5OqNgNpnoAFLTrX8n5Kxph0CsnhmKKNXTWjXqU5L0pGPR7hYk+XWZr60Q== - dependencies: - brace-expansion "^1.1.7" - -minimist-options@4.1.0: - version "4.1.0" - resolved "https://registry.yarnpkg.com/minimist-options/-/minimist-options-4.1.0.tgz#c0655713c53a8a2ebd77ffa247d342c40f010619" - integrity sha512-Q4r8ghd80yhO/0j1O3B2BjweX3fiHg9cdOwjJd2J76Q135c+NDxGCqdYKQ1SKBuFfgWbAUzBfvYjPUEeNgqN1A== - dependencies: - arrify "^1.0.1" - is-plain-obj "^1.1.0" - kind-of "^6.0.3" - -minipass-collect@^1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/minipass-collect/-/minipass-collect-1.0.2.tgz#22b813bf745dc6edba2576b940022ad6edc8c617" - integrity sha512-6T6lH0H8OG9kITm/Jm6tdooIbogG9e0tLgpY6mphXSm/A9u8Nq1ryBG+Qspiub9LjWlBPsPS3tWQ/Botq4FdxA== - dependencies: - minipass "^3.0.0" - -minipass-fetch@^1.3.2: - version "1.4.1" - resolved "https://registry.yarnpkg.com/minipass-fetch/-/minipass-fetch-1.4.1.tgz#d75e0091daac1b0ffd7e9d41629faff7d0c1f1b6" - integrity sha512-CGH1eblLq26Y15+Azk7ey4xh0J/XfJfrCox5LDJiKqI2Q2iwOLOKrlmIaODiSQS8d18jalF6y2K2ePUm0CmShw== - dependencies: - minipass "^3.1.0" - minipass-sized "^1.0.3" - minizlib "^2.0.0" - optionalDependencies: - encoding "^0.1.12" - -minipass-fetch@^2.0.3: - version "2.1.2" - resolved "https://registry.yarnpkg.com/minipass-fetch/-/minipass-fetch-2.1.2.tgz#95560b50c472d81a3bc76f20ede80eaed76d8add" - integrity sha512-LT49Zi2/WMROHYoqGgdlQIZh8mLPZmOrN2NdJjMXxYe4nkN6FUyuPuOAOedNJDrx0IRGg9+4guZewtp8hE6TxA== - dependencies: - minipass "^3.1.6" - minipass-sized "^1.0.3" - minizlib "^2.1.2" - optionalDependencies: - encoding "^0.1.13" - -minipass-flush@^1.0.5: - version "1.0.5" - resolved "https://registry.yarnpkg.com/minipass-flush/-/minipass-flush-1.0.5.tgz#82e7135d7e89a50ffe64610a787953c4c4cbb373" - integrity sha512-JmQSYYpPUqX5Jyn1mXaRwOda1uQ8HP5KAT/oDSLCzt1BYRhQU0/hDtsB1ufZfEEzMZ9aAVmsBw8+FWsIXlClWw== - dependencies: - minipass "^3.0.0" - -minipass-pipeline@^1.2.2, minipass-pipeline@^1.2.4: - version "1.2.4" - resolved "https://registry.yarnpkg.com/minipass-pipeline/-/minipass-pipeline-1.2.4.tgz#68472f79711c084657c067c5c6ad93cddea8214c" - integrity sha512-xuIq7cIOt09RPRJ19gdi4b+RiNvDFYe5JH+ggNvBqGqpQXcru3PcRmOZuHBKWK1Txf9+cQ+HMVN4d6z46LZP7A== - dependencies: - minipass "^3.0.0" - -minipass-sized@^1.0.3: - version "1.0.3" - resolved "https://registry.yarnpkg.com/minipass-sized/-/minipass-sized-1.0.3.tgz#70ee5a7c5052070afacfbc22977ea79def353b70" - integrity sha512-MbkQQ2CTiBMlA2Dm/5cY+9SWFEN8pzzOXi6rlM5Xxq0Yqbda5ZQy9sU75a673FE9ZK0Zsbr6Y5iP6u9nktfg2g== - dependencies: - minipass "^3.0.0" - -minipass@^3.0.0, minipass@^3.1.0, minipass@^3.1.1, minipass@^3.1.3, minipass@^3.1.6: - version "3.3.6" - resolved "https://registry.yarnpkg.com/minipass/-/minipass-3.3.6.tgz#7bba384db3a1520d18c9c0e5251c3444e95dd94a" - integrity sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw== - dependencies: - yallist "^4.0.0" - -minipass@^5.0.0: - version "5.0.0" - resolved "https://registry.yarnpkg.com/minipass/-/minipass-5.0.0.tgz#3e9788ffb90b694a5d0ec94479a45b5d8738133d" - integrity sha512-3FnjYuehv9k6ovOEbyOswadCDPX1piCfhV8ncmYtHOjuPwylVWsghTLo7rabjC3Rx5xD4HDx8Wm1xnMF7S5qFQ== - -minizlib@^2.0.0, minizlib@^2.1.1, minizlib@^2.1.2: - version "2.1.2" - resolved "https://registry.yarnpkg.com/minizlib/-/minizlib-2.1.2.tgz#e90d3466ba209b932451508a11ce3d3632145931" - integrity sha512-bAxsR8BVfj60DWXHE3u30oHzfl4G7khkSuPW+qvpd7jFRHm7dLxOjUk1EHACJ/hxLY8phGJ0YhYHZo7jil7Qdg== - dependencies: - minipass "^3.0.0" - yallist "^4.0.0" - -mkdirp@^1.0.3, mkdirp@^1.0.4: - version "1.0.4" - resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-1.0.4.tgz#3eb5ed62622756d79a5f0e2a221dfebad75c2f7e" - integrity sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw== - -ms@2.1.2: - version "2.1.2" - resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.2.tgz#d09d1f357b443f493382a8eb3ccd183872ae6009" - integrity sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w== - -ms@^2.0.0, ms@^2.1.1: - version "2.1.3" - resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.3.tgz#574c8138ce1d2b5861f0b44579dbadd60c6615b2" - integrity sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA== - -multimatch@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/multimatch/-/multimatch-4.0.0.tgz#8c3c0f6e3e8449ada0af3dd29efb491a375191b3" - integrity sha512-lDmx79y1z6i7RNx0ZGCPq1bzJ6ZoDDKbvh7jxr9SJcWLkShMzXrHbYVpTdnhNM5MXpDUxCQ4DgqVttVXlBgiBQ== - dependencies: - "@types/minimatch" "^3.0.3" - array-differ "^3.0.0" - array-union "^2.1.0" - arrify "^2.0.1" - minimatch "^3.0.4" - -nan@^2.17.0: - version "2.18.0" - resolved "https://registry.yarnpkg.com/nan/-/nan-2.18.0.tgz#26a6faae7ffbeb293a39660e88a76b82e30b7554" - integrity sha512-W7tfG7vMOGtD30sHoZSSc/JVYiyDPEyQVso/Zz+/uQd0B0L46gtC+pHha5FFMRpil6fm/AoEcRWyOVi4+E/f8w== - -nanoid@^3.3.7: - version "3.3.7" - resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.3.7.tgz#d0c301a691bc8d54efa0a2226ccf3fe2fd656bd8" - integrity sha512-eSRppjcPIatRIMC1U6UngP8XFcz8MQWGQdt1MTBQ7NaAmvXDfvNxbvWV3x2y6CdEUciCSsDHDQZbhYaB8QEo2g== - -negotiator@^0.6.2, negotiator@^0.6.3: - version "0.6.3" - resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.3.tgz#58e323a72fedc0d6f9cd4d31fe49f51479590ccd" - integrity sha512-+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg== - -node-gyp@^8.4.1: - version "8.4.1" - resolved "https://registry.yarnpkg.com/node-gyp/-/node-gyp-8.4.1.tgz#3d49308fc31f768180957d6b5746845fbd429937" - integrity sha512-olTJRgUtAb/hOXG0E93wZDs5YiJlgbXxTwQAFHyNlRsXQnYzUaF2aGgujZbw+hR8aF4ZG/rST57bWMWD16jr9w== - dependencies: - env-paths "^2.2.0" - glob "^7.1.4" - graceful-fs "^4.2.6" - make-fetch-happen "^9.1.0" - nopt "^5.0.0" - npmlog "^6.0.0" - rimraf "^3.0.2" - semver "^7.3.5" - tar "^6.1.2" - which "^2.0.2" - -node-releases@^2.0.13: - version "2.0.13" - resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-2.0.13.tgz#d5ed1627c23e3461e819b02e57b75e4899b1c81d" - integrity sha512-uYr7J37ae/ORWdZeQ1xxMJe3NtdmqMC/JZK+geofDrkLUApKRHPd18/TxtBOJ4A0/+uUIliorNrfYV6s1b02eQ== - -node-sass@^9.0.0: - version "9.0.0" - resolved "https://registry.yarnpkg.com/node-sass/-/node-sass-9.0.0.tgz#c21cd17bd9379c2d09362b3baf2cbf089bce08ed" - integrity sha512-yltEuuLrfH6M7Pq2gAj5B6Zm7m+gdZoG66wTqG6mIZV/zijq3M2OO2HswtT6oBspPyFhHDcaxWpsBm0fRNDHPg== - dependencies: - async-foreach "^0.1.3" - chalk "^4.1.2" - cross-spawn "^7.0.3" - gaze "^1.0.0" - get-stdin "^4.0.1" - glob "^7.0.3" - lodash "^4.17.15" - make-fetch-happen "^10.0.4" - meow "^9.0.0" - nan "^2.17.0" - node-gyp "^8.4.1" - sass-graph "^4.0.1" - stdout-stream "^1.4.0" - "true-case-path" "^2.2.1" - -nopt@^5.0.0: - version "5.0.0" - resolved "https://registry.yarnpkg.com/nopt/-/nopt-5.0.0.tgz#530942bb58a512fccafe53fe210f13a25355dc88" - integrity sha512-Tbj67rffqceeLpcRXrT7vKAN8CwfPeIBgM7E6iBkmKLV7bEMwpGgYLGv0jACUsECaa/vuxP0IjEont6umdMgtQ== - dependencies: - abbrev "1" - -nopt@~3.0.6: - version "3.0.6" - resolved "https://registry.yarnpkg.com/nopt/-/nopt-3.0.6.tgz#c6465dbf08abcd4db359317f79ac68a646b28ff9" - integrity sha512-4GUt3kSEYmk4ITxzB/b9vaIDfUVWN/Ml1Fwl11IlnIG2iaJ9O6WXZ9SrYM9NLI8OCBieN2Y8SWC2oJV0RQ7qYg== - dependencies: - abbrev "1" - -nopt@~4.0.1: - version "4.0.3" - resolved "https://registry.yarnpkg.com/nopt/-/nopt-4.0.3.tgz#a375cad9d02fd921278d954c2254d5aa57e15e48" - integrity sha512-CvaGwVMztSMJLOeXPrez7fyfObdZqNUK1cPAEzLHrTybIua9pMdmmPR5YwtfNftIOMv3DPUhFaxsZMNTQO20Kg== - dependencies: - abbrev "1" - osenv "^0.1.4" - -normalize-package-data@^2.5.0: - version "2.5.0" - resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-2.5.0.tgz#e66db1838b200c1dfc233225d12cb36520e234a8" - integrity sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA== - dependencies: - hosted-git-info "^2.1.4" - resolve "^1.10.0" - semver "2 || 3 || 4 || 5" - validate-npm-package-license "^3.0.1" - -normalize-package-data@^3.0.0: - version "3.0.3" - resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-3.0.3.tgz#dbcc3e2da59509a0983422884cd172eefdfa525e" - integrity sha512-p2W1sgqij3zMMyRC067Dg16bfzVH+w7hyegmpIvZ4JNjqtGOVAIvLmjBx3yP7YTe9vKJgkoNOPjwQGogDoMXFA== - dependencies: - hosted-git-info "^4.0.1" - is-core-module "^2.5.0" - semver "^7.3.4" - validate-npm-package-license "^3.0.1" - -normalize-range@^0.1.2: - version "0.1.2" - resolved "https://registry.yarnpkg.com/normalize-range/-/normalize-range-0.1.2.tgz#2d10c06bdfd312ea9777695a4d28439456b75942" - integrity sha512-bdok/XvKII3nUpklnV6P2hxtMNrCboOjAcyBuQnWEhO665FwrSNRxU+AqpsyvO6LgGYPspN+lu5CLtw4jPRKNA== - -npmlog@^6.0.0: - version "6.0.2" - resolved "https://registry.yarnpkg.com/npmlog/-/npmlog-6.0.2.tgz#c8166017a42f2dea92d6453168dd865186a70830" - integrity sha512-/vBvz5Jfr9dT/aFWd0FIRf+T/Q2WBsLENygUaFUqstqsycmZAP/t5BvFJTK0viFmSUxiUKTUplWy5vt+rvKIxg== - dependencies: - are-we-there-yet "^3.0.0" - console-control-strings "^1.1.0" - gauge "^4.0.3" - set-blocking "^2.0.0" - -num2fraction@^1.2.2: - version "1.2.2" - resolved "https://registry.yarnpkg.com/num2fraction/-/num2fraction-1.2.2.tgz#6f682b6a027a4e9ddfa4564cd2589d1d4e669ede" - integrity sha512-Y1wZESM7VUThYY+4W+X4ySH2maqcA+p7UR+w8VWNWVAd6lwuXXWz/w/Cz43J/dI2I+PS6wD5N+bJUF+gjWvIqg== - -object-assign@^4.1.0: - version "4.1.1" - resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863" - integrity sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg== - -object-inspect@^1.9.0: - version "1.13.1" - resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.13.1.tgz#b96c6109324ccfef6b12216a956ca4dc2ff94bc2" - integrity sha512-5qoj1RUiKOMsCCNLV1CBiPYE10sziTsnmNxkAI/rZhiD63CF7IqdFGC/XzjWjpSgLf0LxXX3bDFIh0E18f6UhQ== - -object.defaults@^1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/object.defaults/-/object.defaults-1.1.0.tgz#3a7f868334b407dea06da16d88d5cd29e435fecf" - integrity sha512-c/K0mw/F11k4dEUBMW8naXUuBuhxRCfG7W+yFy8EcijU/rSmazOUd1XAEEe6bC0OuXY4HUKjTJv7xbxIMqdxrA== - dependencies: - array-each "^1.0.1" - array-slice "^1.0.0" - for-own "^1.0.0" - isobject "^3.0.0" - -object.map@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/object.map/-/object.map-1.0.1.tgz#cf83e59dc8fcc0ad5f4250e1f78b3b81bd801d37" - integrity sha512-3+mAJu2PLfnSVGHwIWubpOFLscJANBKuB/6A4CxBstc4aqwQY0FWcsppuy4jU5GSB95yES5JHSI+33AWuS4k6w== - dependencies: - for-own "^1.0.0" - make-iterator "^1.0.0" - -object.pick@^1.2.0: - version "1.3.0" - resolved "https://registry.yarnpkg.com/object.pick/-/object.pick-1.3.0.tgz#87a10ac4c1694bd2e1cbf53591a66141fb5dd747" - integrity sha512-tqa/UMy/CCoYmj+H5qc07qvSL9dqcs/WZENZ1JbtWBlATP+iVOe778gE6MSijnyCnORzDuX6hU+LA4SZ09YjFQ== - dependencies: - isobject "^3.0.1" - -once@^1.3.0: - version "1.4.0" - resolved "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1" - integrity sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w== - dependencies: - wrappy "1" - -os-homedir@^1.0.0: - version "1.0.2" - resolved "https://registry.yarnpkg.com/os-homedir/-/os-homedir-1.0.2.tgz#ffbc4988336e0e833de0c168c7ef152121aa7fb3" - integrity sha512-B5JU3cabzk8c67mRRd3ECmROafjYMXbuzlwtqdM8IbS8ktlTix8aFGb2bAGKrSRIlnfKwovGUUr72JUPyOb6kQ== - -os-tmpdir@^1.0.0: - version "1.0.2" - resolved "https://registry.yarnpkg.com/os-tmpdir/-/os-tmpdir-1.0.2.tgz#bbe67406c79aa85c5cfec766fe5734555dfa1274" - integrity sha512-D2FR03Vir7FIu45XBY20mTb+/ZSWB00sjU9jdQXt83gDrI4Ztz5Fs7/yy74g2N5SVQY4xY1qDr4rNddwYRVX0g== - -osenv@^0.1.4: - version "0.1.5" - resolved "https://registry.yarnpkg.com/osenv/-/osenv-0.1.5.tgz#85cdfafaeb28e8677f416e287592b5f3f49ea410" - integrity sha512-0CWcCECdMVc2Rw3U5w9ZjqX6ga6ubk1xDVKxtBQPK7wis/0F2r9T6k4ydGYhecl7YUBxBVxhL5oisPsNxAPe2g== - dependencies: - os-homedir "^1.0.0" - os-tmpdir "^1.0.0" - -p-limit@^2.0.0, p-limit@^2.2.0: - version "2.3.0" - resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-2.3.0.tgz#3dd33c647a214fdfffd835933eb086da0dc21db1" - integrity sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w== - dependencies: - p-try "^2.0.0" - -p-locate@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-3.0.0.tgz#322d69a05c0264b25997d9f40cd8a891ab0064a4" - integrity sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ== - dependencies: - p-limit "^2.0.0" - -p-locate@^4.1.0: - version "4.1.0" - resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-4.1.0.tgz#a3428bb7088b3a60292f66919278b7c297ad4f07" - integrity sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A== - dependencies: - p-limit "^2.2.0" - -p-map@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/p-map/-/p-map-4.0.0.tgz#bb2f95a5eda2ec168ec9274e06a747c3e2904d2b" - integrity sha512-/bjOqmgETBYB5BoEeGVea8dmvHb2m9GLy1E9W43yeyfP6QQCZGFNa+XRceJEuDB6zqr+gKpIAmlLebMpykw/MQ== - dependencies: - aggregate-error "^3.0.0" - -p-try@^2.0.0: - version "2.2.0" - resolved "https://registry.yarnpkg.com/p-try/-/p-try-2.2.0.tgz#cb2868540e313d61de58fafbe35ce9004d5540e6" - integrity sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ== - -parse-filepath@^1.0.1: - version "1.0.2" - resolved "https://registry.yarnpkg.com/parse-filepath/-/parse-filepath-1.0.2.tgz#a632127f53aaf3d15876f5872f3ffac763d6c891" - integrity sha512-FwdRXKCohSVeXqwtYonZTXtbGJKrn+HNyWDYVcp5yuJlesTwNH4rsmRZ+GrKAPJ5bLpRxESMeS+Rl0VCHRvB2Q== - dependencies: - is-absolute "^1.0.0" - map-cache "^0.2.0" - path-root "^0.1.1" - -parse-json@^5.0.0: - version "5.2.0" - resolved "https://registry.yarnpkg.com/parse-json/-/parse-json-5.2.0.tgz#c76fc66dee54231c962b22bcc8a72cf2f99753cd" - integrity sha512-ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg== - dependencies: - "@babel/code-frame" "^7.0.0" - error-ex "^1.3.1" - json-parse-even-better-errors "^2.3.0" - lines-and-columns "^1.1.6" - -parse-passwd@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/parse-passwd/-/parse-passwd-1.0.0.tgz#6d5b934a456993b23d37f40a382d6f1666a8e5c6" - integrity sha512-1Y1A//QUXEZK7YKz+rD9WydcE1+EuPr6ZBgKecAB8tmoW6UFv0NREVJe1p+jRxtThkcbbKkfwIbWJe/IeE6m2Q== - -path-exists@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-3.0.0.tgz#ce0ebeaa5f78cb18925ea7d810d7b59b010fd515" - integrity sha512-bpC7GYwiDYQ4wYLe+FA8lhRjhQCMcQGuSgGGqDkg/QerRWw9CmGRT0iSOVRSZJ29NMLZgIzqaljJ63oaL4NIJQ== - -path-exists@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-4.0.0.tgz#513bdbe2d3b95d7762e8c1137efa195c6c61b5b3" - integrity sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w== - -path-is-absolute@^1.0.0: - version "1.0.1" - resolved "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f" - integrity sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg== - -path-key@^3.1.0: - version "3.1.1" - resolved "https://registry.yarnpkg.com/path-key/-/path-key-3.1.1.tgz#581f6ade658cbba65a0d3380de7753295054f375" - integrity sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q== - -path-parse@^1.0.7: - version "1.0.7" - resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.7.tgz#fbc114b60ca42b30d9daf5858e4bd68bbedb6735" - integrity sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw== - -path-root-regex@^0.1.0: - version "0.1.2" - resolved "https://registry.yarnpkg.com/path-root-regex/-/path-root-regex-0.1.2.tgz#bfccdc8df5b12dc52c8b43ec38d18d72c04ba96d" - integrity sha512-4GlJ6rZDhQZFE0DPVKh0e9jmZ5egZfxTkp7bcRDuPlJXbAwhxcl2dINPUAsjLdejqaLsCeg8axcLjIbvBjN4pQ== - -path-root@^0.1.1: - version "0.1.1" - resolved "https://registry.yarnpkg.com/path-root/-/path-root-0.1.1.tgz#9a4a6814cac1c0cd73360a95f32083c8ea4745b7" - integrity sha512-QLcPegTHF11axjfojBIoDygmS2E3Lf+8+jI6wOVmNVenrKSo3mFdSGiIgdSHenczw3wPtlVMQaFVwGmM7BJdtg== - dependencies: - path-root-regex "^0.1.0" - -picocolors@^0.2.1: - version "0.2.1" - resolved "https://registry.yarnpkg.com/picocolors/-/picocolors-0.2.1.tgz#570670f793646851d1ba135996962abad587859f" - integrity sha512-cMlDqaLEqfSaW8Z7N5Jw+lyIW869EzT73/F5lhtY9cLGoVxSXznfgfXMO0Z5K0o0Q2TkTXq+0KFsdnSe3jDViA== - -picocolors@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/picocolors/-/picocolors-1.0.0.tgz#cb5bdc74ff3f51892236eaf79d68bc44564ab81c" - integrity sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ== - -picocolors@^1.1.0: - version "1.1.1" - resolved "https://registry.yarnpkg.com/picocolors/-/picocolors-1.1.1.tgz#3d321af3eab939b083c8f929a1d12cda81c26b6b" - integrity sha512-xceH2snhtb5M9liqDsmEw56le376mTZkEX/jEb/RxNFyegNul7eNslCXP9FDj/Lcu0X8KEyMceP2ntpaHrDEVA== - -picomatch@^2.3.1: - version "2.3.1" - resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.3.1.tgz#3ba3833733646d9d3e4995946c1365a67fb07a42" - integrity sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA== - -pify@^4.0.1: - version "4.0.1" - resolved "https://registry.yarnpkg.com/pify/-/pify-4.0.1.tgz#4b2cd25c50d598735c50292224fd8c6df41e3231" - integrity sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g== - -pkg-up@^3.1.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/pkg-up/-/pkg-up-3.1.0.tgz#100ec235cc150e4fd42519412596a28512a0def5" - integrity sha512-nDywThFk1i4BQK4twPQ6TA4RT8bDY96yeuCVBWL3ePARCiEKDRSrNGbFIgUJpLp+XeIR65v8ra7WuJOFUBtkMA== - dependencies: - find-up "^3.0.0" - -postcss-value-parser@^4.1.0: - version "4.2.0" - resolved "https://registry.yarnpkg.com/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz#723c09920836ba6d3e5af019f92bc0971c02e514" - integrity sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ== - -postcss@^6.0.11: - version "6.0.23" - resolved "https://registry.yarnpkg.com/postcss/-/postcss-6.0.23.tgz#61c82cc328ac60e677645f979054eb98bc0e3324" - integrity sha512-soOk1h6J3VMTZtVeVpv15/Hpdl2cBLX3CAw4TAbkpTJiNPk9YP/zWcD1ND+xEtvyuuvKzbxliTOIyvkSeSJ6ag== - dependencies: - chalk "^2.4.1" - source-map "^0.6.1" - supports-color "^5.4.0" - -postcss@^7.0.32: - version "7.0.39" - resolved "https://registry.yarnpkg.com/postcss/-/postcss-7.0.39.tgz#9624375d965630e2e1f2c02a935c82a59cb48309" - integrity sha512-yioayjNbHn6z1/Bywyb2Y4s3yvDAeXGOyxqD+LnVOinq6Mdmd++SW2wUNVzavyyHxd6+DxzWGIuosg6P1Rj8uA== - dependencies: - picocolors "^0.2.1" - source-map "^0.6.1" - -postcss@^8.4.31: - version "8.4.47" - resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.4.47.tgz#5bf6c9a010f3e724c503bf03ef7947dcb0fea365" - integrity sha512-56rxCq7G/XfB4EkXq9Egn5GCqugWvDFjafDOThIdMBsI15iqPqR5r15TfSr1YPYeEI19YeaXMCbY6u88Y76GLQ== - dependencies: - nanoid "^3.3.7" - picocolors "^1.1.0" - source-map-js "^1.2.1" - -pretty-bytes@^5.3.0: - version "5.6.0" - resolved "https://registry.yarnpkg.com/pretty-bytes/-/pretty-bytes-5.6.0.tgz#356256f643804773c82f64723fe78c92c62beaeb" - integrity sha512-FFw039TmrBqFK8ma/7OL3sDz/VytdtJr044/QUJtH0wK9lb9jLq9tJyIxUwtQJHwar2BqtiA4iCWSwo9JLkzFg== - -process-nextick-args@~2.0.0: - version "2.0.1" - resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-2.0.1.tgz#7820d9b16120cc55ca9ae7792680ae7dba6d7fe2" - integrity sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag== - -promise-inflight@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/promise-inflight/-/promise-inflight-1.0.1.tgz#98472870bf228132fcbdd868129bad12c3c029e3" - integrity sha512-6zWPyEOFaQBJYcGMHBKTKJ3u6TBsnMFOIZSa6ce1e/ZrrsOlnHRHbabMjLiBYKp+n44X9eUI6VUPaukCXHuG4g== - -promise-retry@^2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/promise-retry/-/promise-retry-2.0.1.tgz#ff747a13620ab57ba688f5fc67855410c370da22" - integrity sha512-y+WKFlBR8BGXnsNlIHFGPZmyDf3DFMoLhaflAnyZgV6rG6xu+JwesTo2Q9R6XwYmtmwAFCkAk3e35jEdoeh/3g== - dependencies: - err-code "^2.0.2" - retry "^0.12.0" - -qs@^6.4.0: - version "6.11.2" - resolved "https://registry.yarnpkg.com/qs/-/qs-6.11.2.tgz#64bea51f12c1f5da1bc01496f48ffcff7c69d7d9" - integrity sha512-tDNIz22aBzCDxLtVH++VnTfzxlfeK5CbqohpSqpJgj1Wg/cQbStNAz3NuqCs5vV+pjBsK4x4pN9HlVh7rcYRiA== - dependencies: - side-channel "^1.0.4" - -quick-lru@^4.0.1: - version "4.0.1" - resolved "https://registry.yarnpkg.com/quick-lru/-/quick-lru-4.0.1.tgz#5b8878f113a58217848c6482026c73e1ba57727f" - integrity sha512-ARhCpm70fzdcvNQfPoy49IaanKkTlRWF2JMzqhcJbhSFRZv7nPTvZJdcY7301IPmvW+/p0RgIWnQDLJxifsQ7g== - -raw-body@~1.1.0: - version "1.1.7" - resolved "https://registry.yarnpkg.com/raw-body/-/raw-body-1.1.7.tgz#1d027c2bfa116acc6623bca8f00016572a87d425" - integrity sha512-WmJJU2e9Y6M5UzTOkHaM7xJGAPQD8PNzx3bAd2+uhZAim6wDk6dAZxPVYLF67XhbR4hmKGh33Lpmh4XWrCH5Mg== - dependencies: - bytes "1" - string_decoder "0.10" - -read-pkg-up@^7.0.1: - version "7.0.1" - resolved "https://registry.yarnpkg.com/read-pkg-up/-/read-pkg-up-7.0.1.tgz#f3a6135758459733ae2b95638056e1854e7ef507" - integrity sha512-zK0TB7Xd6JpCLmlLmufqykGE+/TlOePD6qKClNW7hHDKFh/J7/7gCWGR7joEQEW1bKq3a3yUZSObOoWLFQ4ohg== - dependencies: - find-up "^4.1.0" - read-pkg "^5.2.0" - type-fest "^0.8.1" - -read-pkg@^5.2.0: - version "5.2.0" - resolved "https://registry.yarnpkg.com/read-pkg/-/read-pkg-5.2.0.tgz#7bf295438ca5a33e56cd30e053b34ee7250c93cc" - integrity sha512-Ug69mNOpfvKDAc2Q8DRpMjjzdtrnv9HcSMX+4VsZxD1aZ6ZzrIE7rlzXBtWTyhULSMKg076AW6WR5iZpD0JiOg== - dependencies: - "@types/normalize-package-data" "^2.4.0" - normalize-package-data "^2.5.0" - parse-json "^5.0.0" - type-fest "^0.6.0" - -readable-stream@^2.0.1: - version "2.3.8" - resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.8.tgz#91125e8042bba1b9887f49345f6277027ce8be9b" - integrity sha512-8p0AUk4XODgIewSi0l8Epjs+EVnWiK7NoDIEGU0HhE7+ZyY8D1IMY7odu5lRrFXGg71L15KG8QrPmum45RTtdA== - dependencies: - core-util-is "~1.0.0" - inherits "~2.0.3" - isarray "~1.0.0" - process-nextick-args "~2.0.0" - safe-buffer "~5.1.1" - string_decoder "~1.1.1" - util-deprecate "~1.0.1" - -readable-stream@^3.6.0: - version "3.6.2" - resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-3.6.2.tgz#56a9b36ea965c00c5a93ef31eb111a0f11056967" - integrity sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA== - dependencies: - inherits "^2.0.3" - string_decoder "^1.1.1" - util-deprecate "^1.0.1" - -rechoir@^0.7.0: - version "0.7.1" - resolved "https://registry.yarnpkg.com/rechoir/-/rechoir-0.7.1.tgz#9478a96a1ca135b5e88fc027f03ee92d6c645686" - integrity sha512-/njmZ8s1wVeR6pjTZ+0nCnv8SpZNRMT2D1RLOJQESlYFDBvwpTA4KWJpZ+sBJ4+vhjILRcK7JIFdGCdxEAAitg== - dependencies: - resolve "^1.9.0" - -redent@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/redent/-/redent-3.0.0.tgz#e557b7998316bb53c9f1f56fa626352c6963059f" - integrity sha512-6tDA8g98We0zd0GvVeMT9arEOnTw9qM03L9cJXaCjrip1OO764RDBLBfrB4cwzNGDj5OA5ioymC9GkizgWJDUg== - dependencies: - indent-string "^4.0.0" - strip-indent "^3.0.0" - -require-directory@^2.1.1: - version "2.1.1" - resolved "https://registry.yarnpkg.com/require-directory/-/require-directory-2.1.1.tgz#8c64ad5fd30dab1c976e2344ffe7f792a6a6df42" - integrity sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q== - -resolve-dir@^1.0.0, resolve-dir@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/resolve-dir/-/resolve-dir-1.0.1.tgz#79a40644c362be82f26effe739c9bb5382046f43" - integrity sha512-R7uiTjECzvOsWSfdM0QKFNBVFcK27aHOUwdvK53BcW8zqnGdYp0Fbj82cy54+2A4P2tFM22J5kRfe1R+lM/1yg== - dependencies: - expand-tilde "^2.0.0" - global-modules "^1.0.0" - -resolve-from@^5.0.0: - version "5.0.0" - resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-5.0.0.tgz#c35225843df8f776df21c57557bc087e9dfdfc69" - integrity sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw== - -resolve-pkg@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/resolve-pkg/-/resolve-pkg-2.0.0.tgz#ac06991418a7623edc119084edc98b0e6bf05a41" - integrity sha512-+1lzwXehGCXSeryaISr6WujZzowloigEofRB+dj75y9RRa/obVcYgbHJd53tdYw8pvZj8GojXaaENws8Ktw/hQ== - dependencies: - resolve-from "^5.0.0" - -resolve@^1.10.0, resolve@^1.19.0, resolve@^1.9.0: - version "1.22.8" - resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.22.8.tgz#b6c87a9f2aa06dfab52e3d70ac8cde321fa5a48d" - integrity sha512-oKWePCxqpd6FlLvGV1VU0x7bkPmmCNolxzjMf4NczoDnQcIWrAF+cPtZn5i6n+RfD2d9i0tzpKnG6Yk168yIyw== - dependencies: - is-core-module "^2.13.0" - path-parse "^1.0.7" - supports-preserve-symlinks-flag "^1.0.0" - -retry@^0.12.0: - version "0.12.0" - resolved "https://registry.yarnpkg.com/retry/-/retry-0.12.0.tgz#1b42a6266a21f07421d1b0b54b7dc167b01c013b" - integrity sha512-9LkiTwjUh6rT555DtE9rTX+BKByPfrMzEAtnlEtdEwr3Nkffwiihqe2bWADg+OQRjt9gl6ICdmB/ZFDCGAtSow== - -rimraf@^2.6.2: - version "2.7.1" - resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.7.1.tgz#35797f13a7fdadc566142c29d4f07ccad483e3ec" - integrity sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w== - dependencies: - glob "^7.1.3" - -rimraf@^3.0.2: - version "3.0.2" - resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-3.0.2.tgz#f1a5402ba6220ad52cc1282bac1ae3aa49fd061a" - integrity sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA== - dependencies: - glob "^7.1.3" - -safe-buffer@>=5.1.0, safe-buffer@~5.2.0: - version "5.2.1" - resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.1.tgz#1eaf9fa9bdb1fdd4ec75f58f9cdb4e6b7827eec6" - integrity sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ== - -safe-buffer@~5.1.0, safe-buffer@~5.1.1: - version "5.1.2" - resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d" - integrity sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g== - -safe-json-parse@~1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/safe-json-parse/-/safe-json-parse-1.0.1.tgz#3e76723e38dfdda13c9b1d29a1e07ffee4b30b57" - integrity sha512-o0JmTu17WGUaUOHa1l0FPGXKBfijbxK6qoHzlkihsDXxzBHvJcA7zgviKR92Xs841rX9pK16unfphLq0/KqX7A== - -"safer-buffer@>= 2.1.2 < 3.0.0": - version "2.1.2" - resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a" - integrity sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg== - -sass-graph@^4.0.1: - version "4.0.1" - resolved "https://registry.yarnpkg.com/sass-graph/-/sass-graph-4.0.1.tgz#2ff8ca477224d694055bf4093f414cf6cfad1d2e" - integrity sha512-5YCfmGBmxoIRYHnKK2AKzrAkCoQ8ozO+iumT8K4tXJXRVCPf+7s1/9KxTSW3Rbvf+7Y7b4FR3mWyLnQr3PHocA== - dependencies: - glob "^7.0.0" - lodash "^4.17.11" - scss-tokenizer "^0.4.3" - yargs "^17.2.1" - -scss-tokenizer@^0.4.3: - version "0.4.3" - resolved "https://registry.yarnpkg.com/scss-tokenizer/-/scss-tokenizer-0.4.3.tgz#1058400ee7d814d71049c29923d2b25e61dc026c" - integrity sha512-raKLgf1LI5QMQnG+RxHz6oK0sL3x3I4FN2UDLqgLOGO8hodECNnNh5BXn7fAyBxrA8zVzdQizQ6XjNJQ+uBwMw== - dependencies: - js-base64 "^2.4.9" - source-map "^0.7.3" - -select2@^4.1.0-rc.0: - version "4.1.0-rc.0" - resolved "https://registry.yarnpkg.com/select2/-/select2-4.1.0-rc.0.tgz#ba3cd3901dda0155e1c0219ab41b74ba51ea22d8" - integrity sha512-Hr9TdhyHCZUtwznEH2CBf7967mEM0idtJ5nMtjvk3Up5tPukOLXbHUNmh10oRfeNIhj+3GD3niu+g6sVK+gK0A== - -select@^1.1.2: - version "1.1.2" - resolved "https://registry.yarnpkg.com/select/-/select-1.1.2.tgz#0e7350acdec80b1108528786ec1d4418d11b396d" - integrity sha512-OwpTSOfy6xSs1+pwcNrv0RBMOzI39Lp3qQKUTPVVPRjCdNa5JH/oPRiqsesIskK8TVgmRiHwO4KXlV2Li9dANA== - -"semver@2 || 3 || 4 || 5": - version "5.7.2" - resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.2.tgz#48d55db737c3287cd4835e17fa13feace1c41ef8" - integrity sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g== - -semver@^7.3.4, semver@^7.3.5: - version "7.5.4" - resolved "https://registry.yarnpkg.com/semver/-/semver-7.5.4.tgz#483986ec4ed38e1c6c48c34894a9182dbff68a6e" - integrity sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA== - dependencies: - lru-cache "^6.0.0" - -set-blocking@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/set-blocking/-/set-blocking-2.0.0.tgz#045f9782d011ae9a6803ddd382b24392b3d890f7" - integrity sha512-KiKBS8AnWGEyLzofFfmvKwpdPzqiy16LvQfK3yv/fVH7Bj13/wl3JSR1J+rfgRE9q7xUJK4qvgS8raSOeLUehw== - -set-function-length@^1.1.1: - version "1.1.1" - resolved "https://registry.yarnpkg.com/set-function-length/-/set-function-length-1.1.1.tgz#4bc39fafb0307224a33e106a7d35ca1218d659ed" - integrity sha512-VoaqjbBJKiWtg4yRcKBQ7g7wnGnLV3M8oLvVWwOk2PdYY6PEFegR1vezXR0tw6fZGF9csVakIRjrJiy2veSBFQ== - dependencies: - define-data-property "^1.1.1" - get-intrinsic "^1.2.1" - gopd "^1.0.1" - has-property-descriptors "^1.0.0" - -shebang-command@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/shebang-command/-/shebang-command-2.0.0.tgz#ccd0af4f8835fbdc265b82461aaf0c36663f34ea" - integrity sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA== - dependencies: - shebang-regex "^3.0.0" - -shebang-regex@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-3.0.0.tgz#ae16f1644d873ecad843b0307b143362d4c42172" - integrity sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A== - -side-channel@^1.0.4: - version "1.0.4" - resolved "https://registry.yarnpkg.com/side-channel/-/side-channel-1.0.4.tgz#efce5c8fdc104ee751b25c58d4290011fa5ea2cf" - integrity sha512-q5XPytqFEIKHkGdiMIrY10mvLRvnQh42/+GoBlFW3b2LXLE2xxJpZFdm94we0BaoV3RwJyGqg5wS7epxTv0Zvw== - dependencies: - call-bind "^1.0.0" - get-intrinsic "^1.0.2" - object-inspect "^1.9.0" - -signal-exit@^3.0.7: - version "3.0.7" - resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.7.tgz#a9a1767f8af84155114eaabd73f99273c8f59ad9" - integrity sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ== - -smart-buffer@^4.2.0: - version "4.2.0" - resolved "https://registry.yarnpkg.com/smart-buffer/-/smart-buffer-4.2.0.tgz#6e1d71fa4f18c05f7d0ff216dd16a481d0e8d9ae" - integrity sha512-94hK0Hh8rPqQl2xXc3HsaBoOXKV20MToPkcXvwbISWLEs+64sBq5kFgn2kJDHb1Pry9yrP0dxrCI9RRci7RXKg== - -socks-proxy-agent@^6.0.0: - version "6.2.1" - resolved "https://registry.yarnpkg.com/socks-proxy-agent/-/socks-proxy-agent-6.2.1.tgz#2687a31f9d7185e38d530bef1944fe1f1496d6ce" - integrity sha512-a6KW9G+6B3nWZ1yB8G7pJwL3ggLy1uTzKAgCb7ttblwqdz9fMGJUuTy3uFzEP48FAs9FLILlmzDlE2JJhVQaXQ== - dependencies: - agent-base "^6.0.2" - debug "^4.3.3" - socks "^2.6.2" - -socks-proxy-agent@^7.0.0: - version "7.0.0" - resolved "https://registry.yarnpkg.com/socks-proxy-agent/-/socks-proxy-agent-7.0.0.tgz#dc069ecf34436621acb41e3efa66ca1b5fed15b6" - integrity sha512-Fgl0YPZ902wEsAyiQ+idGd1A7rSFx/ayC1CQVMw5P+EQx2V0SgpGtf6OKFhVjPflPUl9YMmEOnmfjCdMUsygww== - dependencies: - agent-base "^6.0.2" - debug "^4.3.3" - socks "^2.6.2" - -socks@^2.6.2: - version "2.7.1" - resolved "https://registry.yarnpkg.com/socks/-/socks-2.7.1.tgz#d8e651247178fde79c0663043e07240196857d55" - integrity sha512-7maUZy1N7uo6+WVEX6psASxtNlKaNVMlGQKkG/63nEDdLOWNbiUMoLK7X4uYoLhQstau72mLgfEWcXcwsaHbYQ== - dependencies: - ip "^2.0.0" - smart-buffer "^4.2.0" - -source-map-js@^1.2.1: - version "1.2.1" - resolved "https://registry.yarnpkg.com/source-map-js/-/source-map-js-1.2.1.tgz#1ce5650fddd87abc099eda37dcff024c2667ae46" - integrity sha512-UXWMKhLOwVKb728IUtQPXxfYU+usdybtUrK/8uGE8CQMvrhOpwvzDBwj0QhSL7MQc7vIsISBG8VQ8+IDQxpfQA== - -source-map@^0.5.3: - version "0.5.7" - resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.7.tgz#8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc" - integrity sha512-LbrmJOMUSdEVxIKvdcJzQC+nQhe8FUZQTXQy6+I75skNgn3OoQ0DZA8YnFa7gp8tqtL3KPf1kmo0R5DoApeSGQ== - -source-map@^0.6.1: - version "0.6.1" - resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263" - integrity sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g== - -source-map@^0.7.3: - version "0.7.4" - resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.7.4.tgz#a9bbe705c9d8846f4e08ff6765acf0f1b0898656" - integrity sha512-l3BikUxvPOcn5E74dZiq5BGsTb5yEwhaTSzccU6t4sDOH8NWJCstKO5QT2CvtFoK6F0saL7p9xHAqHOlCPJygA== - -spdx-correct@^3.0.0: - version "3.2.0" - resolved "https://registry.yarnpkg.com/spdx-correct/-/spdx-correct-3.2.0.tgz#4f5ab0668f0059e34f9c00dce331784a12de4e9c" - integrity sha512-kN9dJbvnySHULIluDHy32WHRUu3Og7B9sbY7tsFLctQkIqnMh3hErYgdMjTYuqmcXX+lK5T1lnUt3G7zNswmZA== - dependencies: - spdx-expression-parse "^3.0.0" - spdx-license-ids "^3.0.0" - -spdx-exceptions@^2.1.0: - version "2.3.0" - resolved "https://registry.yarnpkg.com/spdx-exceptions/-/spdx-exceptions-2.3.0.tgz#3f28ce1a77a00372683eade4a433183527a2163d" - integrity sha512-/tTrYOC7PPI1nUAgx34hUpqXuyJG+DTHJTnIULG4rDygi4xu/tfgmq1e1cIRwRzwZgo4NLySi+ricLkZkw4i5A== - -spdx-expression-parse@^3.0.0: - version "3.0.1" - resolved "https://registry.yarnpkg.com/spdx-expression-parse/-/spdx-expression-parse-3.0.1.tgz#cf70f50482eefdc98e3ce0a6833e4a53ceeba679" - integrity sha512-cbqHunsQWnJNE6KhVSMsMeH5H/L9EpymbzqTQ3uLwNCLZ1Q481oWaofqH7nO6V07xlXwY6PhQdQ2IedWx/ZK4Q== - dependencies: - spdx-exceptions "^2.1.0" - spdx-license-ids "^3.0.0" - -spdx-license-ids@^3.0.0: - version "3.0.16" - resolved "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-3.0.16.tgz#a14f64e0954f6e25cc6587bd4f392522db0d998f" - integrity sha512-eWN+LnM3GR6gPu35WxNgbGl8rmY1AEmoMDvL/QD6zYmPWgywxWqJWNdLGT+ke8dKNWrcYgYjPpG5gbTfghP8rw== - -sprintf-js@^1.1.1: - version "1.1.3" - resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.1.3.tgz#4914b903a2f8b685d17fdf78a70e917e872e444a" - integrity sha512-Oo+0REFV59/rz3gfJNKQiBlwfHaSESl1pcGyABQsnnIfWOFt6JNj5gCog2U6MLZ//IGYD+nA8nI+mTShREReaA== - -sprintf-js@~1.0.2: - version "1.0.3" - resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.0.3.tgz#04e6926f662895354f3dd015203633b857297e2c" - integrity sha512-D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g== - -ssri@^8.0.0, ssri@^8.0.1: - version "8.0.1" - resolved "https://registry.yarnpkg.com/ssri/-/ssri-8.0.1.tgz#638e4e439e2ffbd2cd289776d5ca457c4f51a2af" - integrity sha512-97qShzy1AiyxvPNIkLWoGua7xoQzzPjQ0HAH4B0rWKo7SZ6USuPcrUiAFrws0UH8RrbWmgq3LMTObhPIHbbBeQ== - dependencies: - minipass "^3.1.1" - -ssri@^9.0.0: - version "9.0.1" - resolved "https://registry.yarnpkg.com/ssri/-/ssri-9.0.1.tgz#544d4c357a8d7b71a19700074b6883fcb4eae057" - integrity sha512-o57Wcn66jMQvfHG1FlYbWeZWW/dHZhJXjpIcTfXldXEk5nz5lStPo3mK0OJQfGR3RbZUlbISexbljkJzuEj/8Q== - dependencies: - minipass "^3.1.1" - -stdout-stream@^1.4.0: - version "1.4.1" - resolved "https://registry.yarnpkg.com/stdout-stream/-/stdout-stream-1.4.1.tgz#5ac174cdd5cd726104aa0c0b2bd83815d8d535de" - integrity sha512-j4emi03KXqJWcIeF8eIXkjMFN1Cmb8gUlDYGeBALLPo5qdyTfA9bOtl8m33lRoC+vFMkP3gl0WsDr6+gzxbbTA== - dependencies: - readable-stream "^2.0.1" - -string-template@~0.2.1: - version "0.2.1" - resolved "https://registry.yarnpkg.com/string-template/-/string-template-0.2.1.tgz#42932e598a352d01fc22ec3367d9d84eec6c9add" - integrity sha512-Yptehjogou2xm4UJbxJ4CxgZx12HBfeystp0y3x7s4Dj32ltVVG1Gg8YhKjHZkHicuKpZX/ffilA8505VbUbpw== - -"string-width@^1.0.2 || 2 || 3 || 4", string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3: - version "4.2.3" - resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010" - integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g== - dependencies: - emoji-regex "^8.0.0" - is-fullwidth-code-point "^3.0.0" - strip-ansi "^6.0.1" - -string_decoder@0.10: - version "0.10.31" - resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-0.10.31.tgz#62e203bc41766c6c28c9fc84301dab1c5310fa94" - integrity sha512-ev2QzSzWPYmy9GuqfIVildA4OdcGLeFZQrq5ys6RtiuF+RQQiZWr8TZNyAcuVXyQRYfEO+MsoB/1BuQVhOJuoQ== - -string_decoder@^1.1.1: - version "1.3.0" - resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.3.0.tgz#42f114594a46cf1a8e30b0a84f56c78c3edac21e" - integrity sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA== - dependencies: - safe-buffer "~5.2.0" - -string_decoder@~1.1.1: - version "1.1.1" - resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.1.1.tgz#9cf1611ba62685d7030ae9e4ba34149c3af03fc8" - integrity sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg== - dependencies: - safe-buffer "~5.1.0" - -strip-ansi@^3.0.0: - version "3.0.1" - resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-3.0.1.tgz#6a385fb8853d952d5ff05d0e8aaf94278dc63dcf" - integrity sha512-VhumSSbBqDTP8p2ZLKj40UjBCV4+v8bUSEpUb4KjRgWk9pbqGF4REFj6KEagidb2f/M6AzC0EmFyDNGaw9OCzg== - dependencies: - ansi-regex "^2.0.0" - -strip-ansi@^6.0.0, strip-ansi@^6.0.1: - version "6.0.1" - resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9" - integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A== - dependencies: - ansi-regex "^5.0.1" - -strip-indent@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/strip-indent/-/strip-indent-3.0.0.tgz#c32e1cee940b6b3432c771bc2c54bcce73cd3001" - integrity sha512-laJTa3Jb+VQpaC6DseHhF7dXVqHTfJPCRDaEbid/drOhgitgYku/letMUqOXFoWV0zIIUbjpdH2t+tYj4bQMRQ== - dependencies: - min-indent "^1.0.0" - -supports-color@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-2.0.0.tgz#535d045ce6b6363fa40117084629995e9df324c7" - integrity sha512-KKNVtd6pCYgPIKU4cp2733HWYCpplQhddZLBUryaAHou723x+FRzQ5Df824Fj+IyyuiQTRoub4SnIFfIcrp70g== - -supports-color@^5.3.0, supports-color@^5.4.0: - version "5.5.0" - resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-5.5.0.tgz#e2e69a44ac8772f78a1ec0b35b689df6530efc8f" - integrity sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow== - dependencies: - has-flag "^3.0.0" - -supports-color@^7.1.0: - version "7.2.0" - resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-7.2.0.tgz#1b7dcdcb32b8138801b3e478ba6a51caa89648da" - integrity sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw== - dependencies: - has-flag "^4.0.0" - -supports-preserve-symlinks-flag@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz#6eda4bd344a3c94aea376d4cc31bc77311039e09" - integrity sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w== - -tar@^6.0.2, tar@^6.1.11, tar@^6.1.2: - version "6.2.0" - resolved "https://registry.yarnpkg.com/tar/-/tar-6.2.0.tgz#b14ce49a79cb1cd23bc9b016302dea5474493f73" - integrity sha512-/Wo7DcT0u5HUV486xg675HtjNd3BXZ6xDbzsCUZPt5iw8bTQ63bP0Raut3mvro9u+CUyq7YQd8Cx55fsZXxqLQ== - dependencies: - chownr "^2.0.0" - fs-minipass "^2.0.0" - minipass "^5.0.0" - minizlib "^2.1.1" - mkdirp "^1.0.3" - yallist "^4.0.0" - -tiny-emitter@^2.0.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/tiny-emitter/-/tiny-emitter-2.1.0.tgz#1d1a56edfc51c43e863cbb5382a72330e3555423" - integrity sha512-NB6Dk1A9xgQPMoGqC5CVXn123gWyte215ONT5Pp5a0yt4nlEoO1ZWeCwpncaekPHXO60i47ihFnZPiRPjRMq4Q== - -tiny-lr@^1.1.1: - version "1.1.1" - resolved "https://registry.yarnpkg.com/tiny-lr/-/tiny-lr-1.1.1.tgz#9fa547412f238fedb068ee295af8b682c98b2aab" - integrity sha512-44yhA3tsaRoMOjQQ+5v5mVdqef+kH6Qze9jTpqtVufgYjYt08zyZAwNwwVBj3i1rJMnR52IxOW0LK0vBzgAkuA== - dependencies: - body "^5.1.0" - debug "^3.1.0" - faye-websocket "~0.10.0" - livereload-js "^2.3.0" - object-assign "^4.1.0" - qs "^6.4.0" - -to-regex-range@^5.0.1: - version "5.0.1" - resolved "https://registry.yarnpkg.com/to-regex-range/-/to-regex-range-5.0.1.tgz#1648c44aae7c8d988a326018ed72f5b4dd0392e4" - integrity sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ== - dependencies: - is-number "^7.0.0" - -trim-newlines@^3.0.0: - version "3.0.1" - resolved "https://registry.yarnpkg.com/trim-newlines/-/trim-newlines-3.0.1.tgz#260a5d962d8b752425b32f3a7db0dcacd176c144" - integrity sha512-c1PTsA3tYrIsLGkJkzHF+w9F2EyxfXGo4UyJc4pFL++FMjnq0HJS69T3M7d//gKrFKwy429bouPescbjecU+Zw== - -"true-case-path@^2.2.1": - version "2.2.1" - resolved "https://registry.yarnpkg.com/true-case-path/-/true-case-path-2.2.1.tgz#c5bf04a5bbec3fd118be4084461b3a27c4d796bf" - integrity sha512-0z3j8R7MCjy10kc/g+qg7Ln3alJTodw9aDuVWZa3uiWqfuBMKeAeP2ocWcxoyM3D73yz3Jt/Pu4qPr4wHSdB/Q== - -type-fest@^0.18.0: - version "0.18.1" - resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.18.1.tgz#db4bc151a4a2cf4eebf9add5db75508db6cc841f" - integrity sha512-OIAYXk8+ISY+qTOwkHtKqzAuxchoMiD9Udx+FSGQDuiRR+PJKJHc2NJAXlbhkGwTt/4/nKZxELY1w3ReWOL8mw== - -type-fest@^0.6.0: - version "0.6.0" - resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.6.0.tgz#8d2a2370d3df886eb5c90ada1c5bf6188acf838b" - integrity sha512-q+MB8nYR1KDLrgr4G5yemftpMC7/QLqVndBmEEdqzmNj5dcFOO4Oo8qlwZE3ULT3+Zim1F8Kq4cBnikNhlCMlg== - -type-fest@^0.8.1: - version "0.8.1" - resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.8.1.tgz#09e249ebde851d3b1e48d27c105444667f17b83d" - integrity sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA== - -uglify-js@^3.16.1: - version "3.17.4" - resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.17.4.tgz#61678cf5fa3f5b7eb789bb345df29afb8257c22c" - integrity sha512-T9q82TJI9e/C1TAxYvfb16xO120tMVFZrGA3f9/P4424DNu6ypK103y0GPFVa17yotwSyZW5iYXgjYHkGrJW/g== - -unc-path-regex@^0.1.2: - version "0.1.2" - resolved "https://registry.yarnpkg.com/unc-path-regex/-/unc-path-regex-0.1.2.tgz#e73dd3d7b0d7c5ed86fbac6b0ae7d8c6a69d50fa" - integrity sha512-eXL4nmJT7oCpkZsHZUOJo8hcX3GbsiDOa0Qu9F646fi8dT3XuSVopVqAcEiVzSKKH7UoDti23wNX3qGFxcW5Qg== - -underscore.string@~3.3.5: - version "3.3.6" - resolved "https://registry.yarnpkg.com/underscore.string/-/underscore.string-3.3.6.tgz#ad8cf23d7423cb3b53b898476117588f4e2f9159" - integrity sha512-VoC83HWXmCrF6rgkyxS9GHv8W9Q5nhMKho+OadDJGzL2oDYbYEppBaCMH6pFlwLeqj2QS+hhkw2kpXkSdD1JxQ== - dependencies: - sprintf-js "^1.1.1" - util-deprecate "^1.0.2" - -unique-filename@^1.1.1: - version "1.1.1" - resolved "https://registry.yarnpkg.com/unique-filename/-/unique-filename-1.1.1.tgz#1d69769369ada0583103a1e6ae87681b56573230" - integrity sha512-Vmp0jIp2ln35UTXuryvjzkjGdRyf9b2lTXuSYUiPmzRcl3FDtYqAwOnTJkAngD9SWhnoJzDbTKwaOrZ+STtxNQ== - dependencies: - unique-slug "^2.0.0" - -unique-filename@^2.0.0: - version "2.0.1" - resolved "https://registry.yarnpkg.com/unique-filename/-/unique-filename-2.0.1.tgz#e785f8675a9a7589e0ac77e0b5c34d2eaeac6da2" - integrity sha512-ODWHtkkdx3IAR+veKxFV+VBkUMcN+FaqzUUd7IZzt+0zhDZFPFxhlqwPF3YQvMHx1TD0tdgYl+kuPnJ8E6ql7A== - dependencies: - unique-slug "^3.0.0" - -unique-slug@^2.0.0: - version "2.0.2" - resolved "https://registry.yarnpkg.com/unique-slug/-/unique-slug-2.0.2.tgz#baabce91083fc64e945b0f3ad613e264f7cd4e6c" - integrity sha512-zoWr9ObaxALD3DOPfjPSqxt4fnZiWblxHIgeWqW8x7UqDzEtHEQLzji2cuJYQFCU6KmoJikOYAZlrTHHebjx2w== - dependencies: - imurmurhash "^0.1.4" - -unique-slug@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/unique-slug/-/unique-slug-3.0.0.tgz#6d347cf57c8a7a7a6044aabd0e2d74e4d76dc7c9" - integrity sha512-8EyMynh679x/0gqE9fT9oilG+qEt+ibFyqjuVTsZn1+CMxH+XLlpvr2UZx4nVcCwTpx81nICr2JQFkM+HPLq4w== - dependencies: - imurmurhash "^0.1.4" - -update-browserslist-db@^1.0.13: - version "1.0.13" - resolved "https://registry.yarnpkg.com/update-browserslist-db/-/update-browserslist-db-1.0.13.tgz#3c5e4f5c083661bd38ef64b6328c26ed6c8248c4" - integrity sha512-xebP81SNcPuNpPP3uzeW1NYXxI3rxyJzF3pD6sH4jE7o/IX+WtSpwnVU+qIsDPyk0d3hmFQ7mjqc6AtV604hbg== - dependencies: - escalade "^3.1.1" - picocolors "^1.0.0" - -uri-path@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/uri-path/-/uri-path-1.0.0.tgz#9747f018358933c31de0fccfd82d138e67262e32" - integrity sha512-8pMuAn4KacYdGMkFaoQARicp4HSw24/DHOVKWqVRJ8LhhAwPPFpdGvdL9184JVmUwe7vz7Z9n6IqI6t5n2ELdg== - -util-deprecate@^1.0.1, util-deprecate@^1.0.2, util-deprecate@~1.0.1: - version "1.0.2" - resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf" - integrity sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw== - -v8flags@~3.2.0: - version "3.2.0" - resolved "https://registry.yarnpkg.com/v8flags/-/v8flags-3.2.0.tgz#b243e3b4dfd731fa774e7492128109a0fe66d656" - integrity sha512-mH8etigqMfiGWdeXpaaqGfs6BndypxusHHcv2qSHyZkGEznCd/qAXCWWRzeowtL54147cktFOC4P5y+kl8d8Jg== - dependencies: - homedir-polyfill "^1.0.1" - -validate-npm-package-license@^3.0.1: - version "3.0.4" - resolved "https://registry.yarnpkg.com/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz#fc91f6b9c7ba15c857f4cb2c5defeec39d4f410a" - integrity sha512-DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew== - dependencies: - spdx-correct "^3.0.0" - spdx-expression-parse "^3.0.0" - -websocket-driver@>=0.5.1: - version "0.7.4" - resolved "https://registry.yarnpkg.com/websocket-driver/-/websocket-driver-0.7.4.tgz#89ad5295bbf64b480abcba31e4953aca706f5760" - integrity sha512-b17KeDIQVjvb0ssuSDF2cYXSg2iztliJ4B9WdsuB6J952qCPKmnVq4DyW5motImXHDC1cBT/1UezrJVsKw5zjg== - dependencies: - http-parser-js ">=0.5.1" - safe-buffer ">=5.1.0" - websocket-extensions ">=0.1.1" - -websocket-extensions@>=0.1.1: - version "0.1.4" - resolved "https://registry.yarnpkg.com/websocket-extensions/-/websocket-extensions-0.1.4.tgz#7f8473bc839dfd87608adb95d7eb075211578a42" - integrity sha512-OqedPIGOfsDlo31UNwYbCFMSaO9m9G/0faIHj5/dZFDMFqPTcx6UwqyOy3COEaEOg/9VsGIpdqn62W5KhoKSpg== - -which@^1.2.14: - version "1.3.1" - resolved "https://registry.yarnpkg.com/which/-/which-1.3.1.tgz#a45043d54f5805316da8d62f9f50918d3da70b0a" - integrity sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ== - dependencies: - isexe "^2.0.0" - -which@^2.0.1, which@^2.0.2, which@~2.0.2: - version "2.0.2" - resolved "https://registry.yarnpkg.com/which/-/which-2.0.2.tgz#7c6a8dd0a636a0327e10b59c9286eee93f3f51b1" - integrity sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA== - dependencies: - isexe "^2.0.0" - -wide-align@^1.1.5: - version "1.1.5" - resolved "https://registry.yarnpkg.com/wide-align/-/wide-align-1.1.5.tgz#df1d4c206854369ecf3c9a4898f1b23fbd9d15d3" - integrity sha512-eDMORYaPNZ4sQIuuYPDHdQvf4gyCF9rEEV/yPxGfwPkRodwEgiMUUXTx/dex+Me0wxx53S+NgUHaP7y3MGlDmg== - dependencies: - string-width "^1.0.2 || 2 || 3 || 4" - -wrap-ansi@^7.0.0: - version "7.0.0" - resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43" - integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q== - dependencies: - ansi-styles "^4.0.0" - string-width "^4.1.0" - strip-ansi "^6.0.0" - -wrappy@1: - version "1.0.2" - resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f" - integrity sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ== - -y18n@^5.0.5: - version "5.0.8" - resolved "https://registry.yarnpkg.com/y18n/-/y18n-5.0.8.tgz#7f4934d0f7ca8c56f95314939ddcd2dd91ce1d55" - integrity sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA== - -yallist@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/yallist/-/yallist-4.0.0.tgz#9bb92790d9c0effec63be73519e11a35019a3a72" - integrity sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A== - -yargs-parser@^20.2.3: - version "20.2.9" - resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-20.2.9.tgz#2eb7dc3b0289718fc295f362753845c41a0c94ee" - integrity sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w== - -yargs-parser@^21.1.1: - version "21.1.1" - resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-21.1.1.tgz#9096bceebf990d21bb31fa9516e0ede294a77d35" - integrity sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw== - -yargs@^17.2.1: - version "17.7.2" - resolved "https://registry.yarnpkg.com/yargs/-/yargs-17.7.2.tgz#991df39aca675a192b816e1e0363f9d75d2aa269" - integrity sha512-7dSzzRQ++CKnNI/krKnYRV7JKKPUXMEh61soaHKg9mrWEhzFWhFnxPxGl+69cD1Ou63C13NUPCnmIcrvqCuM6w== - dependencies: - cliui "^8.0.1" - escalade "^3.1.1" - get-caller-file "^2.0.5" - require-directory "^2.1.1" - string-width "^4.2.3" - y18n "^5.0.5" - yargs-parser "^21.1.1" - -zxcvbn@^4.4: - version "4.4.2" - resolved "https://registry.yarnpkg.com/zxcvbn/-/zxcvbn-4.4.2.tgz#28ec17cf09743edcab056ddd8b1b06262cc73c30" - integrity sha512-Bq0B+ixT/DMyG8kgX2xWcI5jUvCwqrMxSFam7m0lAf78nf04hv6lNCsyLYdyYTrCVMqNDY/206K7eExYCeSyUQ== From 3520763800a4766c2c800985d39f1634b460699a Mon Sep 17 00:00:00 2001 From: Nabeen Tiwaree Date: Mon, 30 Dec 2024 10:03:23 -0500 Subject: [PATCH 277/429] Update pkgs/by-name/rw/rwalk/package.nix MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Gaétan Lepage <33058747+GaetanLepage@users.noreply.github.com> --- pkgs/by-name/rw/rwalk/package.nix | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/pkgs/by-name/rw/rwalk/package.nix b/pkgs/by-name/rw/rwalk/package.nix index 72ea23c1fadc..e76362f508c8 100644 --- a/pkgs/by-name/rw/rwalk/package.nix +++ b/pkgs/by-name/rw/rwalk/package.nix @@ -19,13 +19,7 @@ rustPlatform.buildRustPackage rec { hash = "sha256-rEecl8KdPqPreCRq8CZCBfpedInYD7+gfCwCst+VS90="; }; - cargoLock = { - lockFile = ./Cargo.lock; - }; - - postPatch = '' - ln -s ${./Cargo.lock} Cargo.lock - ''; + cargoHash = "..."; nativeBuildInputs = [ pkg-config From b9cc3de65b0d54852b840083eff3756513c6dfa1 Mon Sep 17 00:00:00 2001 From: Nabeen Tiwaree Date: Mon, 30 Dec 2024 10:03:36 -0500 Subject: [PATCH 278/429] Update pkgs/by-name/rw/rwalk/package.nix MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Gaétan Lepage <33058747+GaetanLepage@users.noreply.github.com> --- pkgs/by-name/rw/rwalk/package.nix | 3 --- 1 file changed, 3 deletions(-) diff --git a/pkgs/by-name/rw/rwalk/package.nix b/pkgs/by-name/rw/rwalk/package.nix index e76362f508c8..c547eaba905a 100644 --- a/pkgs/by-name/rw/rwalk/package.nix +++ b/pkgs/by-name/rw/rwalk/package.nix @@ -28,9 +28,6 @@ rustPlatform.buildRustPackage rec { buildInputs = [ openssl - ] - ++ lib.optionals stdenv.isDarwin [ - darwin.apple_sdk.frameworks.Security ]; env = { From e71336029a3e10310d7b67b8e3359b2a63aa9be2 Mon Sep 17 00:00:00 2001 From: Nabeen Tiwaree Date: Mon, 30 Dec 2024 10:03:46 -0500 Subject: [PATCH 279/429] Update pkgs/by-name/rw/rwalk/package.nix MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Gaétan Lepage <33058747+GaetanLepage@users.noreply.github.com> --- pkgs/by-name/rw/rwalk/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/rw/rwalk/package.nix b/pkgs/by-name/rw/rwalk/package.nix index c547eaba905a..541b8da37d70 100644 --- a/pkgs/by-name/rw/rwalk/package.nix +++ b/pkgs/by-name/rw/rwalk/package.nix @@ -37,7 +37,7 @@ rustPlatform.buildRustPackage rec { meta = { description = "A blazingly fast web directory scanner written in Rust"; homepage = "https://github.com/cestef/rwalk"; - changelog = "https://github.com/cestef/rwalk/blob/${src.tag}/CHANGELOG.md"; + changelog = "https://github.com/cestef/rwalk/blob/v${version}/CHANGELOG.md"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ pwnwriter ]; mainProgram = "rwalk"; From 6773cf93145373a606e95e6daee982a9c3bcf1f9 Mon Sep 17 00:00:00 2001 From: Nabeen Tiwaree Date: Mon, 30 Dec 2024 10:03:56 -0500 Subject: [PATCH 280/429] Update pkgs/by-name/rw/rwalk/package.nix MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Gaétan Lepage <33058747+GaetanLepage@users.noreply.github.com> --- pkgs/by-name/rw/rwalk/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/rw/rwalk/package.nix b/pkgs/by-name/rw/rwalk/package.nix index 541b8da37d70..fdfee841305f 100644 --- a/pkgs/by-name/rw/rwalk/package.nix +++ b/pkgs/by-name/rw/rwalk/package.nix @@ -35,7 +35,7 @@ rustPlatform.buildRustPackage rec { }; meta = { - description = "A blazingly fast web directory scanner written in Rust"; + description = "Blazingly fast web directory scanner written in Rust"; homepage = "https://github.com/cestef/rwalk"; changelog = "https://github.com/cestef/rwalk/blob/v${version}/CHANGELOG.md"; license = lib.licenses.mit; From 328da3a39d153f3da6a81530e3e8639b7a53f4ad Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Mon, 30 Dec 2024 14:44:38 +0100 Subject: [PATCH 281/429] nixos/services.colord: remove `with lib;` --- nixos/modules/services/x11/colord.nix | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/nixos/modules/services/x11/colord.nix b/nixos/modules/services/x11/colord.nix index 1a9ade712739..7b8b1bb48c66 100644 --- a/nixos/modules/services/x11/colord.nix +++ b/nixos/modules/services/x11/colord.nix @@ -4,9 +4,6 @@ pkgs, ... }: - -with lib; - let cfg = config.services.colord; @@ -17,12 +14,12 @@ in options = { services.colord = { - enable = mkEnableOption "colord, the color management daemon"; + enable = lib.mkEnableOption "colord, the color management daemon"; }; }; - config = mkIf cfg.enable { + config = lib.mkIf cfg.enable { environment.systemPackages = [ pkgs.colord ]; From bbb879169e16caa9b19f68ff0ae9cc546f5e3ac0 Mon Sep 17 00:00:00 2001 From: natsukium Date: Tue, 31 Dec 2024 00:23:14 +0900 Subject: [PATCH 282/429] python312Packages.async-cache: refactor --- .../python-modules/async-cache/default.nix | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/async-cache/default.nix b/pkgs/development/python-modules/async-cache/default.nix index d54fb2d48c7a..b6cdfbf3edc7 100644 --- a/pkgs/development/python-modules/async-cache/default.nix +++ b/pkgs/development/python-modules/async-cache/default.nix @@ -2,11 +2,14 @@ lib, buildPythonPackage, fetchFromGitHub, + setuptools, + pytestCheckHook, }: -buildPythonPackage rec { +buildPythonPackage { pname = "async-cache"; version = "1.1.1"; + pyproject = true; src = fetchFromGitHub { owner = "iamsinghrajat"; @@ -15,10 +18,16 @@ buildPythonPackage rec { hash = "sha256-AVSdtWPs1c8AE5PNOq+BdXzBXkI0aeFVzxxPl/ATyU0="; }; - meta = with lib; { + build-system = [ setuptools ]; + + pythonImportsCheck = [ "cache" ]; + + nativeCheckInputs = [ pytestCheckHook ]; + + meta = { description = "Caching solution for asyncio"; homepage = "https://github.com/iamsinghrajat/async-cache"; - license = licenses.mit; - maintainers = [ maintainers.lukegb ]; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.lukegb ]; }; } From 6fe2a04f0d7cc7e9bbecffcc00280adae8354f1e Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Mon, 30 Dec 2024 14:44:39 +0100 Subject: [PATCH 283/429] nixos/services.xserver.desktopManager.cde: remove `with lib;` --- nixos/modules/services/x11/desktop-managers/cde.nix | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/nixos/modules/services/x11/desktop-managers/cde.nix b/nixos/modules/services/x11/desktop-managers/cde.nix index 8dae3ce0d886..908431f329ef 100644 --- a/nixos/modules/services/x11/desktop-managers/cde.nix +++ b/nixos/modules/services/x11/desktop-managers/cde.nix @@ -4,19 +4,16 @@ pkgs, ... }: - -with lib; - let xcfg = config.services.xserver; cfg = xcfg.desktopManager.cde; in { options.services.xserver.desktopManager.cde = { - enable = mkEnableOption "Common Desktop Environment"; + enable = lib.mkEnableOption "Common Desktop Environment"; - extraPackages = mkOption { - type = with types; listOf package; + extraPackages = lib.mkOption { + type = with lib.types; listOf package; default = with pkgs.xorg; [ xclock bitmap @@ -29,7 +26,7 @@ in xwd xwud ]; - defaultText = literalExpression '' + defaultText = lib.literalExpression '' with pkgs.xorg; [ xclock bitmap xlsfonts xfd xrefresh xload xwininfo xdpyinfo xwd xwud ] @@ -40,7 +37,7 @@ in }; }; - config = mkIf (xcfg.enable && cfg.enable) { + config = lib.mkIf (xcfg.enable && cfg.enable) { environment.systemPackages = cfg.extraPackages; services.rpcbind.enable = true; From b48d0ec75778feada71aeb70091c49d3ea89b3e3 Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Mon, 30 Dec 2024 14:44:39 +0100 Subject: [PATCH 284/429] nixos/services.xserver.desktopManager.cinnamon: remove `with lib;` --- .../x11/desktop-managers/cinnamon.nix | 89 +++++++++---------- 1 file changed, 43 insertions(+), 46 deletions(-) diff --git a/nixos/modules/services/x11/desktop-managers/cinnamon.nix b/nixos/modules/services/x11/desktop-managers/cinnamon.nix index c64c2293a439..43103a663092 100644 --- a/nixos/modules/services/x11/desktop-managers/cinnamon.nix +++ b/nixos/modules/services/x11/desktop-managers/cinnamon.nix @@ -1,7 +1,4 @@ { config, lib, pkgs, utils, ... }: - -with lib; - let cfg = config.services.xserver.desktopManager.cinnamon; @@ -18,16 +15,16 @@ in { options = { services.cinnamon = { - apps.enable = mkEnableOption "Cinnamon default applications"; + apps.enable = lib.mkEnableOption "Cinnamon default applications"; }; services.xserver.desktopManager.cinnamon = { - enable = mkEnableOption "the cinnamon desktop manager"; + enable = lib.mkEnableOption "the cinnamon desktop manager"; - sessionPath = mkOption { + sessionPath = lib.mkOption { default = []; - type = types.listOf types.package; - example = literalExpression "[ pkgs.gpaste ]"; + type = lib.types.listOf lib.types.package; + example = lib.literalExpression "[ pkgs.gpaste ]"; description = '' Additional list of packages to be added to the session search path. Useful for GSettings-conditional autostart. @@ -36,53 +33,53 @@ in ''; }; - extraGSettingsOverrides = mkOption { + extraGSettingsOverrides = lib.mkOption { default = ""; - type = types.lines; + type = lib.types.lines; description = "Additional gsettings overrides."; }; - extraGSettingsOverridePackages = mkOption { + extraGSettingsOverridePackages = lib.mkOption { default = []; - type = types.listOf types.path; + type = lib.types.listOf lib.types.path; description = "List of packages for which gsettings are overridden."; }; }; - environment.cinnamon.excludePackages = mkOption { + environment.cinnamon.excludePackages = lib.mkOption { default = []; - example = literalExpression "[ pkgs.blueman ]"; - type = types.listOf types.package; + example = lib.literalExpression "[ pkgs.blueman ]"; + type = lib.types.listOf lib.types.package; description = "Which packages cinnamon should exclude from the default environment"; }; }; - config = mkMerge [ - (mkIf cfg.enable { + config = lib.mkMerge [ + (lib.mkIf cfg.enable { services.displayManager.sessionPackages = [ pkgs.cinnamon-common ]; services.xserver.displayManager.lightdm.greeters.slick = { - enable = mkDefault true; + enable = lib.mkDefault true; # Taken from mint-artwork.gschema.override - theme = mkIf (notExcluded pkgs.mint-themes) { - name = mkDefault "Mint-Y-Aqua"; - package = mkDefault pkgs.mint-themes; + theme = lib.mkIf (notExcluded pkgs.mint-themes) { + name = lib.mkDefault "Mint-Y-Aqua"; + package = lib.mkDefault pkgs.mint-themes; }; - iconTheme = mkIf (notExcluded pkgs.mint-y-icons) { - name = mkDefault "Mint-Y-Sand"; - package = mkDefault pkgs.mint-y-icons; + iconTheme = lib.mkIf (notExcluded pkgs.mint-y-icons) { + name = lib.mkDefault "Mint-Y-Sand"; + package = lib.mkDefault pkgs.mint-y-icons; }; - cursorTheme = mkIf (notExcluded pkgs.mint-cursor-themes) { - name = mkDefault "Bibata-Modern-Classic"; - package = mkDefault pkgs.mint-cursor-themes; + cursorTheme = lib.mkIf (notExcluded pkgs.mint-cursor-themes) { + name = lib.mkDefault "Bibata-Modern-Classic"; + package = lib.mkDefault pkgs.mint-cursor-themes; }; }; # Have to take care of GDM + Cinnamon on Wayland users environment.extraInit = '' - ${concatMapStrings (p: '' + ${lib.concatMapStrings (p: '' if [ -d "${p}/share/gsettings-schemas/${p.name}" ]; then export XDG_DATA_DIRS=$XDG_DATA_DIRS''${XDG_DATA_DIRS:+:}${p}/share/gsettings-schemas/${p.name} fi @@ -95,30 +92,30 @@ in ''; # Default services - services.blueman.enable = mkDefault (notExcluded pkgs.blueman); - hardware.bluetooth.enable = mkDefault true; + services.blueman.enable = lib.mkDefault (notExcluded pkgs.blueman); + hardware.bluetooth.enable = lib.mkDefault true; security.polkit.enable = true; services.accounts-daemon.enable = true; - services.system-config-printer.enable = (mkIf config.services.printing.enable (mkDefault true)); + services.system-config-printer.enable = (lib.mkIf config.services.printing.enable (lib.mkDefault true)); services.dbus.packages = with pkgs; [ cinnamon-common cinnamon-screensaver nemo-with-extensions xapp ]; - services.cinnamon.apps.enable = mkDefault true; + services.cinnamon.apps.enable = lib.mkDefault true; services.gnome.evolution-data-server.enable = true; services.gnome.glib-networking.enable = true; services.gnome.gnome-keyring.enable = true; services.gvfs.enable = true; - services.power-profiles-daemon.enable = mkDefault true; - services.switcherooControl.enable = mkDefault true; # xapp-gpu-offload-helper - services.touchegg.enable = mkDefault true; + services.power-profiles-daemon.enable = lib.mkDefault true; + services.switcherooControl.enable = lib.mkDefault true; # xapp-gpu-offload-helper + services.touchegg.enable = lib.mkDefault true; services.udisks2.enable = true; - services.upower.enable = mkDefault config.powerManagement.enable; - services.libinput.enable = mkDefault true; + services.upower.enable = lib.mkDefault config.powerManagement.enable; + services.libinput.enable = lib.mkDefault true; services.xserver.updateDbusEnvironment = true; - networking.networkmanager.enable = mkDefault true; + networking.networkmanager.enable = lib.mkDefault true; # Enable colord server services.colord.enable = true; @@ -204,9 +201,9 @@ in pkgs.xdg-desktop-portal-gtk ]; - services.orca.enable = mkDefault (notExcluded pkgs.orca); + services.orca.enable = lib.mkDefault (notExcluded pkgs.orca); - xdg.portal.configPackages = mkDefault [ pkgs.cinnamon-common ]; + xdg.portal.configPackages = lib.mkDefault [ pkgs.cinnamon-common ]; # Override GSettings schemas environment.sessionVariables.NIX_GSETTINGS_OVERRIDES_DIR = "${nixos-gsettings-overrides}/share/gsettings-schemas/nixos-gsettings-overrides/glib-2.0/schemas"; @@ -217,8 +214,8 @@ in ]; # Shell integration for VTE terminals - programs.bash.vteIntegration = mkDefault true; - programs.zsh.vteIntegration = mkDefault true; + programs.bash.vteIntegration = lib.mkDefault true; + programs.zsh.vteIntegration = lib.mkDefault true; # Default Fonts fonts.packages = with pkgs; [ @@ -227,10 +224,10 @@ in ]; }) - (mkIf serviceCfg.apps.enable { - programs.gnome-disks.enable = mkDefault (notExcluded pkgs.gnome-disk-utility); - programs.gnome-terminal.enable = mkDefault (notExcluded pkgs.gnome-terminal); - programs.file-roller.enable = mkDefault (notExcluded pkgs.file-roller); + (lib.mkIf serviceCfg.apps.enable { + programs.gnome-disks.enable = lib.mkDefault (notExcluded pkgs.gnome-disk-utility); + programs.gnome-terminal.enable = lib.mkDefault (notExcluded pkgs.gnome-terminal); + programs.file-roller.enable = lib.mkDefault (notExcluded pkgs.file-roller); environment.systemPackages = with pkgs; utils.removePackagesByName [ # cinnamon team apps From 5fac14d6a43840a04b034cdb32711ec429376dee Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Mon, 30 Dec 2024 14:44:39 +0100 Subject: [PATCH 285/429] nixos/services.xserver.desktopManager.deepin: remove `with lib;` --- .../services/x11/desktop-managers/deepin.nix | 57 +++++++++---------- 1 file changed, 27 insertions(+), 30 deletions(-) diff --git a/nixos/modules/services/x11/desktop-managers/deepin.nix b/nixos/modules/services/x11/desktop-managers/deepin.nix index ca9fb229df97..76ffb71bb2a4 100644 --- a/nixos/modules/services/x11/desktop-managers/deepin.nix +++ b/nixos/modules/services/x11/desktop-managers/deepin.nix @@ -5,9 +5,6 @@ utils, ... }: - -with lib; - let xcfg = config.services.xserver; cfg = xcfg.desktopManager.deepin; @@ -21,68 +18,68 @@ in options = { services.xserver.desktopManager.deepin = { - enable = mkEnableOption "Deepin desktop manager"; - extraGSettingsOverrides = mkOption { + enable = lib.mkEnableOption "Deepin desktop manager"; + extraGSettingsOverrides = lib.mkOption { default = ""; - type = types.lines; + type = lib.types.lines; description = "Additional gsettings overrides."; }; - extraGSettingsOverridePackages = mkOption { + extraGSettingsOverridePackages = lib.mkOption { default = [ ]; - type = types.listOf types.path; + type = lib.types.listOf lib.types.path; description = "List of packages for which gsettings are overridden."; }; }; - environment.deepin.excludePackages = mkOption { + environment.deepin.excludePackages = lib.mkOption { default = [ ]; - type = types.listOf types.package; + type = lib.types.listOf lib.types.package; description = "List of default packages to exclude from the configuration"; }; }; - config = mkIf cfg.enable { + config = lib.mkIf cfg.enable { services.displayManager.sessionPackages = [ pkgs.deepin.dde-session ]; - services.displayManager.defaultSession = mkDefault "dde-x11"; + services.displayManager.defaultSession = lib.mkDefault "dde-x11"; # Update the DBus activation environment after launching the desktop manager. services.xserver.displayManager.sessionCommands = '' ${lib.getBin pkgs.dbus}/bin/dbus-update-activation-environment --systemd --all ''; - hardware.bluetooth.enable = mkDefault true; + hardware.bluetooth.enable = lib.mkDefault true; security.polkit.enable = true; - services.deepin.dde-daemon.enable = mkForce true; - services.deepin.dde-api.enable = mkForce true; - services.deepin.app-services.enable = mkForce true; + services.deepin.dde-daemon.enable = lib.mkForce true; + services.deepin.dde-api.enable = lib.mkForce true; + services.deepin.app-services.enable = lib.mkForce true; - services.colord.enable = mkDefault true; - services.accounts-daemon.enable = mkDefault true; - services.gvfs.enable = mkDefault true; - services.gnome.glib-networking.enable = mkDefault true; - services.gnome.gnome-keyring.enable = mkDefault true; - services.bamf.enable = mkDefault true; + services.colord.enable = lib.mkDefault true; + services.accounts-daemon.enable = lib.mkDefault true; + services.gvfs.enable = lib.mkDefault true; + services.gnome.glib-networking.enable = lib.mkDefault true; + services.gnome.gnome-keyring.enable = lib.mkDefault true; + services.bamf.enable = lib.mkDefault true; - services.libinput.enable = mkDefault true; + services.libinput.enable = lib.mkDefault true; services.udisks2.enable = true; - services.upower.enable = mkDefault config.powerManagement.enable; - networking.networkmanager.enable = mkDefault true; - programs.dconf.enable = mkDefault true; - programs.gnupg.agent.pinentryPackage = mkDefault pkgs.pinentry-qt; + services.upower.enable = lib.mkDefault config.powerManagement.enable; + networking.networkmanager.enable = lib.mkDefault true; + programs.dconf.enable = lib.mkDefault true; + programs.gnupg.agent.pinentryPackage = lib.mkDefault pkgs.pinentry-qt; fonts.packages = with pkgs; [ noto-fonts ]; xdg.mime.enable = true; xdg.menus.enable = true; xdg.icons.enable = true; - xdg.portal.enable = mkDefault true; - xdg.portal.extraPortals = mkDefault [ + xdg.portal.enable = lib.mkDefault true; + xdg.portal.extraPortals = lib.mkDefault [ pkgs.xdg-desktop-portal-gtk ]; # https://github.com/NixOS/nixpkgs/pull/247766#issuecomment-1722839259 - xdg.portal.config.deepin.default = mkDefault [ "gtk" ]; + xdg.portal.config.deepin.default = lib.mkDefault [ "gtk" ]; environment.sessionVariables = { NIX_GSETTINGS_OVERRIDES_DIR = "${nixos-gsettings-overrides}/share/gsettings-schemas/nixos-gsettings-overrides/glib-2.0/schemas"; From e0836261f2de158bd8fb2714de241f84e812dcda Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Mon, 30 Dec 2024 14:44:39 +0100 Subject: [PATCH 286/429] nixos/services.xserver.desktopManager.enlightenment: remove `with lib;` --- .../x11/desktop-managers/enlightenment.nix | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/nixos/modules/services/x11/desktop-managers/enlightenment.nix b/nixos/modules/services/x11/desktop-managers/enlightenment.nix index 05ed81e57992..8acd66a1bcdc 100644 --- a/nixos/modules/services/x11/desktop-managers/enlightenment.nix +++ b/nixos/modules/services/x11/desktop-managers/enlightenment.nix @@ -4,9 +4,6 @@ lib, ... }: - -with lib; - let e = pkgs.enlightenment; @@ -23,11 +20,11 @@ in { meta = { - maintainers = teams.enlightenment.members; + maintainers = lib.teams.enlightenment.members; }; imports = [ - (mkRenamedOptionModule + (lib.mkRenamedOptionModule [ "services" "xserver" "desktopManager" "e19" "enable" ] [ "services" "xserver" "desktopManager" "enlightenment" "enable" ] ) @@ -35,15 +32,15 @@ in options = { - services.xserver.desktopManager.enlightenment.enable = mkOption { - type = types.bool; + services.xserver.desktopManager.enlightenment.enable = lib.mkOption { + type = lib.types.bool; default = false; description = "Enable the Enlightenment desktop environment."; }; }; - config = mkIf cfg.enable { + config = lib.mkIf cfg.enable { environment.systemPackages = with pkgs; [ enlightenment.econnman @@ -105,7 +102,7 @@ in services.udisks2.enable = true; services.upower.enable = config.powerManagement.enable; - services.libinput.enable = mkDefault true; + services.libinput.enable = lib.mkDefault true; services.dbus.packages = [ e.efl ]; From 3ba85539d7802abc2631ce007df36a77fc91b732 Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Mon, 30 Dec 2024 14:44:39 +0100 Subject: [PATCH 287/429] nixos/services.xserver.desktopManager.kodi: remove `with lib;` --- nixos/modules/services/x11/desktop-managers/kodi.nix | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/nixos/modules/services/x11/desktop-managers/kodi.nix b/nixos/modules/services/x11/desktop-managers/kodi.nix index 0dd2f8ffb829..0330c5b353e1 100644 --- a/nixos/modules/services/x11/desktop-managers/kodi.nix +++ b/nixos/modules/services/x11/desktop-managers/kodi.nix @@ -4,9 +4,6 @@ pkgs, ... }: - -with lib; - let cfg = config.services.xserver.desktopManager.kodi; in @@ -14,19 +11,19 @@ in { options = { services.xserver.desktopManager.kodi = { - enable = mkOption { - type = types.bool; + enable = lib.mkOption { + type = lib.types.bool; default = false; description = "Enable the kodi multimedia center."; }; - package = mkPackageOption pkgs "kodi" { + package = lib.mkPackageOption pkgs "kodi" { example = "kodi.withPackages (p: with p; [ jellyfin pvr-iptvsimple vfs-sftp ])"; }; }; }; - config = mkIf cfg.enable { + config = lib.mkIf cfg.enable { services.xserver.desktopManager.session = [ { name = "kodi"; From 93da453c9e851e6d40078ac0f12e9f195b802bc3 Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Mon, 30 Dec 2024 14:44:39 +0100 Subject: [PATCH 288/429] nixos/services.xserver.desktopManager.lumina: remove `with lib;` --- .../modules/services/x11/desktop-managers/lumina.nix | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/nixos/modules/services/x11/desktop-managers/lumina.nix b/nixos/modules/services/x11/desktop-managers/lumina.nix index 74fabced3af3..9931ecffddcb 100644 --- a/nixos/modules/services/x11/desktop-managers/lumina.nix +++ b/nixos/modules/services/x11/desktop-managers/lumina.nix @@ -4,9 +4,6 @@ pkgs, ... }: - -with lib; - let xcfg = config.services.xserver; @@ -16,20 +13,20 @@ in { meta = { - maintainers = teams.lumina.members; + maintainers = lib.teams.lumina.members; }; options = { - services.xserver.desktopManager.lumina.enable = mkOption { - type = types.bool; + services.xserver.desktopManager.lumina.enable = lib.mkOption { + type = lib.types.bool; default = false; description = "Enable the Lumina desktop manager"; }; }; - config = mkIf cfg.enable { + config = lib.mkIf cfg.enable { services.displayManager.sessionPackages = [ pkgs.lumina.lumina From dab162464324e263d9c899c3271c7105b4a20b7e Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Mon, 30 Dec 2024 14:44:39 +0100 Subject: [PATCH 289/429] nixos/services.xserver.desktopManager.lxqt: remove `with lib;` --- .../services/x11/desktop-managers/lxqt.nix | 27 +++++++++---------- 1 file changed, 12 insertions(+), 15 deletions(-) diff --git a/nixos/modules/services/x11/desktop-managers/lxqt.nix b/nixos/modules/services/x11/desktop-managers/lxqt.nix index ac86c385bcc8..a5af6fa57930 100644 --- a/nixos/modules/services/x11/desktop-managers/lxqt.nix +++ b/nixos/modules/services/x11/desktop-managers/lxqt.nix @@ -1,7 +1,4 @@ { config, lib, pkgs, utils, ... }: - -with lib; - let xcfg = config.services.xserver; cfg = xcfg.desktopManager.lxqt; @@ -10,29 +7,29 @@ in { meta = { - maintainers = teams.lxqt.members; + maintainers = lib.teams.lxqt.members; }; options = { - services.xserver.desktopManager.lxqt.enable = mkOption { - type = types.bool; + services.xserver.desktopManager.lxqt.enable = lib.mkOption { + type = lib.types.bool; default = false; description = "Enable the LXQt desktop manager"; }; - environment.lxqt.excludePackages = mkOption { + environment.lxqt.excludePackages = lib.mkOption { default = []; - example = literalExpression "[ pkgs.lxqt.qterminal ]"; - type = types.listOf types.package; + example = lib.literalExpression "[ pkgs.lxqt.qterminal ]"; + type = lib.types.listOf lib.types.package; description = "Which LXQt packages to exclude from the default environment"; }; }; - config = mkIf cfg.enable { + config = lib.mkIf cfg.enable { - services.xserver.desktopManager.session = singleton { + services.xserver.desktopManager.session = lib.singleton { name = "lxqt"; bgSupport = true; start = '' @@ -62,19 +59,19 @@ in # Link some extra directories in /run/current-system/software/share environment.pathsToLink = [ "/share" ]; - programs.gnupg.agent.pinentryPackage = mkDefault pkgs.pinentry-qt; + programs.gnupg.agent.pinentryPackage = lib.mkDefault pkgs.pinentry-qt; # virtual file systems support for PCManFM-QT services.gvfs.enable = true; services.upower.enable = config.powerManagement.enable; - services.libinput.enable = mkDefault true; + services.libinput.enable = lib.mkDefault true; - xdg.portal.lxqt.enable = mkDefault true; + xdg.portal.lxqt.enable = lib.mkDefault true; # https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1050804 - xdg.portal.config.lxqt.default = mkDefault [ "lxqt" "gtk" ]; + xdg.portal.config.lxqt.default = lib.mkDefault [ "lxqt" "gtk" ]; }; } From 60f9b34caea659098c7e6def23551a11b06004e9 Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Mon, 30 Dec 2024 14:44:39 +0100 Subject: [PATCH 290/429] nixos/services.xserver.desktopManager.mate: remove `with lib;` --- .../services/x11/desktop-managers/mate.nix | 45 +++++++++---------- 1 file changed, 21 insertions(+), 24 deletions(-) diff --git a/nixos/modules/services/x11/desktop-managers/mate.nix b/nixos/modules/services/x11/desktop-managers/mate.nix index e5144bc9d102..6bb3fad79dac 100644 --- a/nixos/modules/services/x11/desktop-managers/mate.nix +++ b/nixos/modules/services/x11/desktop-managers/mate.nix @@ -5,9 +5,6 @@ utils, ... }: - -with lib; - let xcfg = config.services.xserver; @@ -19,48 +16,48 @@ in options = { services.xserver.desktopManager.mate = { - enable = mkOption { - type = types.bool; + enable = lib.mkOption { + type = lib.types.bool; default = false; description = "Enable the MATE desktop environment"; }; - debug = mkEnableOption "mate-session debug messages"; + debug = lib.mkEnableOption "mate-session debug messages"; - extraPanelApplets = mkOption { + extraPanelApplets = lib.mkOption { default = [ ]; - example = literalExpression "with pkgs.mate; [ mate-applets ]"; - type = types.listOf types.package; + example = lib.literalExpression "with pkgs.mate; [ mate-applets ]"; + type = lib.types.listOf lib.types.package; description = "Extra applets to add to mate-panel."; }; - extraCajaExtensions = mkOption { + extraCajaExtensions = lib.mkOption { default = [ ]; example = lib.literalExpression "with pkgs.mate; [ caja-extensions ]"; - type = types.listOf types.package; + type = lib.types.listOf lib.types.package; description = "Extra extensions to add to caja."; }; - enableWaylandSession = mkEnableOption "MATE Wayland session"; + enableWaylandSession = lib.mkEnableOption "MATE Wayland session"; }; - environment.mate.excludePackages = mkOption { + environment.mate.excludePackages = lib.mkOption { default = [ ]; - example = literalExpression "[ pkgs.mate.mate-terminal pkgs.mate.pluma ]"; - type = types.listOf types.package; + example = lib.literalExpression "[ pkgs.mate.mate-terminal pkgs.mate.pluma ]"; + type = lib.types.listOf lib.types.package; description = "Which MATE packages to exclude from the default environment"; }; }; - config = mkMerge [ - (mkIf (cfg.enable || cfg.enableWaylandSession) { + config = lib.mkMerge [ + (lib.mkIf (cfg.enable || cfg.enableWaylandSession) { services.displayManager.sessionPackages = [ pkgs.mate.mate-session-manager ]; # Debugging - environment.sessionVariables.MATE_SESSION_DEBUG = mkIf cfg.debug "1"; + environment.sessionVariables.MATE_SESSION_DEBUG = lib.mkIf cfg.debug "1"; environment.systemPackages = utils.removePackagesByName ( pkgs.mate.basePackages @@ -83,11 +80,11 @@ in programs.dconf.enable = true; # Shell integration for VTE terminals - programs.bash.vteIntegration = mkDefault true; - programs.zsh.vteIntegration = mkDefault true; + programs.bash.vteIntegration = lib.mkDefault true; + programs.zsh.vteIntegration = lib.mkDefault true; # Mate uses this for printing - programs.system-config-printer.enable = (mkIf config.services.printing.enable (mkDefault true)); + programs.system-config-printer.enable = (lib.mkIf config.services.printing.enable (lib.mkDefault true)); services.gnome.at-spi2-core.enable = true; services.gnome.glib-networking.enable = true; @@ -95,15 +92,15 @@ in services.udev.packages = [ pkgs.mate.mate-settings-daemon ]; services.gvfs.enable = true; services.upower.enable = config.powerManagement.enable; - services.libinput.enable = mkDefault true; + services.libinput.enable = lib.mkDefault true; security.pam.services.mate-screensaver.unixAuth = true; - xdg.portal.configPackages = mkDefault [ pkgs.mate.mate-desktop ]; + xdg.portal.configPackages = lib.mkDefault [ pkgs.mate.mate-desktop ]; environment.pathsToLink = [ "/share" ]; }) - (mkIf cfg.enableWaylandSession { + (lib.mkIf cfg.enableWaylandSession { programs.wayfire.enable = true; programs.wayfire.plugins = [ pkgs.wayfirePlugins.firedecor ]; From ce58eb372513c14de283b67e76f6df9d892091b1 Mon Sep 17 00:00:00 2001 From: natsukium Date: Tue, 31 Dec 2024 00:33:39 +0900 Subject: [PATCH 291/429] python312Packages.azure-appconfiguration: fix typo --- .../python-modules/azure-appconfiguration/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/azure-appconfiguration/default.nix b/pkgs/development/python-modules/azure-appconfiguration/default.nix index 02d8447c12ad..d7614813c05b 100644 --- a/pkgs/development/python-modules/azure-appconfiguration/default.nix +++ b/pkgs/development/python-modules/azure-appconfiguration/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "azure-appconfiguration"; version = "1.7.1"; - pyporject = true; + pyproject = true; disabled = pythonOlder "3.7"; From abd35c43330a11d8e4d7c4df81d9eddb7248319d Mon Sep 17 00:00:00 2001 From: misuzu Date: Sun, 29 Dec 2024 16:07:15 +0200 Subject: [PATCH 292/429] python3Packages.ltpycld2: fixup build with gcc14 --- pkgs/development/python-modules/ltpycld2/default.nix | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/ltpycld2/default.nix b/pkgs/development/python-modules/ltpycld2/default.nix index 510259d72d6e..35063a66a5be 100644 --- a/pkgs/development/python-modules/ltpycld2/default.nix +++ b/pkgs/development/python-modules/ltpycld2/default.nix @@ -21,11 +21,14 @@ buildPythonPackage rec { pythonImportsCheck = [ "pycld2" ]; - meta = with lib; { + # Fix build with gcc14 + # https://github.com/aboSamoor/pycld2/pull/62 + env.NIX_CFLAGS_COMPILE = "-Wno-narrowing"; + + meta = { description = "Python bindings around Google Chromium's embedded compact language detection library (CLD2)"; homepage = "https://github.com/LibreTranslate/pycld2"; - license = licenses.asl20; - maintainers = with maintainers; [ misuzu ]; - broken = stdenv.hostPlatform.isDarwin; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ misuzu ]; }; } From 5d5963f8e6e07a6c4d54ee3d4f089fb751212aa6 Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Mon, 30 Dec 2024 16:57:13 +0100 Subject: [PATCH 293/429] nixos/services.xserver.desktopManager.mate: fmt --- nixos/modules/services/x11/desktop-managers/mate.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/nixos/modules/services/x11/desktop-managers/mate.nix b/nixos/modules/services/x11/desktop-managers/mate.nix index 6bb3fad79dac..1f908bbf512a 100644 --- a/nixos/modules/services/x11/desktop-managers/mate.nix +++ b/nixos/modules/services/x11/desktop-managers/mate.nix @@ -84,7 +84,9 @@ in programs.zsh.vteIntegration = lib.mkDefault true; # Mate uses this for printing - programs.system-config-printer.enable = (lib.mkIf config.services.printing.enable (lib.mkDefault true)); + programs.system-config-printer.enable = ( + lib.mkIf config.services.printing.enable (lib.mkDefault true) + ); services.gnome.at-spi2-core.enable = true; services.gnome.glib-networking.enable = true; From 0737eac7e02f15b4a633e4dfe4f723d2ff73364c Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Mon, 30 Dec 2024 14:44:39 +0100 Subject: [PATCH 294/429] nixos/services.xserver.desktopManager.runXdgAutostartIfNone: remove `with lib;` --- nixos/modules/services/x11/desktop-managers/none.nix | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/nixos/modules/services/x11/desktop-managers/none.nix b/nixos/modules/services/x11/desktop-managers/none.nix index d4b7e3b392da..0e5caf37300a 100644 --- a/nixos/modules/services/x11/desktop-managers/none.nix +++ b/nixos/modules/services/x11/desktop-managers/none.nix @@ -4,14 +4,13 @@ pkgs, ... }: -with lib; let runXdgAutostart = config.services.xserver.desktopManager.runXdgAutostartIfNone; in { options = { - services.xserver.desktopManager.runXdgAutostartIfNone = mkOption { - type = types.bool; + services.xserver.desktopManager.runXdgAutostartIfNone = lib.mkOption { + type = lib.types.bool; default = false; description = '' Whether to run XDG autostart files for sessions without a desktop manager @@ -27,18 +26,18 @@ in }; }; - config = mkMerge [ + config = lib.mkMerge [ { services.xserver.desktopManager.session = [ { name = "none"; - start = optionalString runXdgAutostart '' + start = lib.optionalString runXdgAutostart '' /run/current-system/systemd/bin/systemctl --user start xdg-autostart-if-no-desktop-manager.target ''; } ]; } - (mkIf runXdgAutostart { + (lib.mkIf runXdgAutostart { systemd.user.targets.xdg-autostart-if-no-desktop-manager = { description = "Run XDG autostart files"; # From `plasma-workspace`, `share/systemd/user/plasma-workspace@.target`. From fa4e66d55061b7f0018a476b5d5c18aae0498071 Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Mon, 30 Dec 2024 14:44:40 +0100 Subject: [PATCH 295/429] nixos/services.xserver.desktopManager.pantheon: remove `with lib;` --- .../x11/desktop-managers/pantheon.nix | 103 +++++++++--------- 1 file changed, 50 insertions(+), 53 deletions(-) diff --git a/nixos/modules/services/x11/desktop-managers/pantheon.nix b/nixos/modules/services/x11/desktop-managers/pantheon.nix index 14e7e25252de..ebb6f25c6db6 100644 --- a/nixos/modules/services/x11/desktop-managers/pantheon.nix +++ b/nixos/modules/services/x11/desktop-managers/pantheon.nix @@ -1,7 +1,4 @@ { config, lib, utils, pkgs, ... }: - -with lib; - let cfg = config.services.xserver.desktopManager.pantheon; @@ -19,7 +16,7 @@ in meta = { doc = ./pantheon.md; - maintainers = teams.pantheon.members; + maintainers = lib.teams.pantheon.members; }; options = { @@ -27,24 +24,24 @@ in services.pantheon = { contractor = { - enable = mkEnableOption "contractor, a desktop-wide extension service used by Pantheon"; + enable = lib.mkEnableOption "contractor, a desktop-wide extension service used by Pantheon"; }; - apps.enable = mkEnableOption "Pantheon default applications"; + apps.enable = lib.mkEnableOption "Pantheon default applications"; }; services.xserver.desktopManager.pantheon = { - enable = mkOption { - type = types.bool; + enable = lib.mkOption { + type = lib.types.bool; default = false; description = "Enable the pantheon desktop manager"; }; - sessionPath = mkOption { + sessionPath = lib.mkOption { default = []; - type = types.listOf types.package; - example = literalExpression "[ pkgs.gpaste ]"; + type = lib.types.listOf lib.types.package; + example = lib.literalExpression "[ pkgs.gpaste ]"; description = '' Additional list of packages to be added to the session search path. Useful for GSettings-conditional autostart. @@ -53,46 +50,46 @@ in ''; }; - extraWingpanelIndicators = mkOption { + extraWingpanelIndicators = lib.mkOption { default = null; - type = with types; nullOr (listOf package); + type = with lib.types; nullOr (listOf package); description = "Indicators to add to Wingpanel."; }; - extraSwitchboardPlugs = mkOption { + extraSwitchboardPlugs = lib.mkOption { default = null; - type = with types; nullOr (listOf package); + type = with lib.types; nullOr (listOf package); description = "Plugs to add to Switchboard."; }; - extraGSettingsOverrides = mkOption { + extraGSettingsOverrides = lib.mkOption { default = ""; - type = types.lines; + type = lib.types.lines; description = "Additional gsettings overrides."; }; - extraGSettingsOverridePackages = mkOption { + extraGSettingsOverridePackages = lib.mkOption { default = []; - type = types.listOf types.path; + type = lib.types.listOf lib.types.path; description = "List of packages for which gsettings are overridden."; }; - debug = mkEnableOption "gnome-session debug messages"; + debug = lib.mkEnableOption "gnome-session debug messages"; }; - environment.pantheon.excludePackages = mkOption { + environment.pantheon.excludePackages = lib.mkOption { default = []; - example = literalExpression "[ pkgs.pantheon.elementary-camera ]"; - type = types.listOf types.package; + example = lib.literalExpression "[ pkgs.pantheon.elementary-camera ]"; + type = lib.types.listOf lib.types.package; description = "Which packages pantheon should exclude from the default environment"; }; }; - config = mkMerge [ - (mkIf cfg.enable { + config = lib.mkMerge [ + (lib.mkIf cfg.enable { services.xserver.desktopManager.pantheon.sessionPath = utils.removePackagesByName [ pkgs.pantheon.pantheon-agent-geoclue2 ] config.environment.pantheon.excludePackages; @@ -101,21 +98,21 @@ in # Ensure lightdm is used when Pantheon is enabled # Without it screen locking will be nonfunctional because of the use of lightlocker - warnings = optional (config.services.xserver.displayManager.lightdm.enable != true) + warnings = lib.optional (config.services.xserver.displayManager.lightdm.enable != true) '' Using Pantheon without LightDM as a displayManager will break screenlocking from the UI. ''; - services.xserver.displayManager.lightdm.greeters.pantheon.enable = mkDefault true; + services.xserver.displayManager.lightdm.greeters.pantheon.enable = lib.mkDefault true; # Without this, elementary LightDM greeter will pre-select non-existent `default` session # https://github.com/elementary/greeter/issues/368 - services.displayManager.defaultSession = mkDefault "pantheon"; + services.displayManager.defaultSession = lib.mkDefault "pantheon"; services.xserver.displayManager.sessionCommands = '' if test "$XDG_CURRENT_DESKTOP" = "Pantheon"; then true - ${concatMapStrings (p: '' + ${lib.concatMapStrings (p: '' if [ -d "${p}/share/gsettings-schemas/${p.name}" ]; then export XDG_DATA_DIRS=$XDG_DATA_DIRS''${XDG_DATA_DIRS:+:}${p}/share/gsettings-schemas/${p.name} fi @@ -129,38 +126,38 @@ in ''; # Default services - hardware.bluetooth.enable = mkDefault true; + hardware.bluetooth.enable = lib.mkDefault true; security.polkit.enable = true; services.accounts-daemon.enable = true; services.bamf.enable = true; - services.colord.enable = mkDefault true; - services.fwupd.enable = mkDefault true; + services.colord.enable = lib.mkDefault true; + services.fwupd.enable = lib.mkDefault true; # TODO: Enable once #177946 is resolved # services.packagekit.enable = mkDefault true; - services.power-profiles-daemon.enable = mkDefault true; - services.touchegg.enable = mkDefault true; + services.power-profiles-daemon.enable = lib.mkDefault true; + services.touchegg.enable = lib.mkDefault true; services.touchegg.package = pkgs.pantheon.touchegg; - services.tumbler.enable = mkDefault true; - services.system-config-printer.enable = (mkIf config.services.printing.enable (mkDefault true)); + services.tumbler.enable = lib.mkDefault true; + services.system-config-printer.enable = (lib.mkIf config.services.printing.enable (lib.mkDefault true)); services.dbus.packages = with pkgs.pantheon; [ switchboard-plug-power elementary-default-settings # accountsservice extensions ]; - services.pantheon.apps.enable = mkDefault true; - services.pantheon.contractor.enable = mkDefault true; + services.pantheon.apps.enable = lib.mkDefault true; + services.pantheon.contractor.enable = lib.mkDefault true; services.gnome.at-spi2-core.enable = true; services.gnome.evolution-data-server.enable = true; services.gnome.glib-networking.enable = true; services.gnome.gnome-keyring.enable = true; services.gvfs.enable = true; - services.gnome.rygel.enable = mkDefault true; + services.gnome.rygel.enable = lib.mkDefault true; services.udisks2.enable = true; services.upower.enable = config.powerManagement.enable; - services.libinput.enable = mkDefault true; - services.switcherooControl.enable = mkDefault true; + services.libinput.enable = lib.mkDefault true; + services.switcherooControl.enable = lib.mkDefault true; services.xserver.updateDbusEnvironment = true; - services.zeitgeist.enable = mkDefault true; - services.geoclue2.enable = mkDefault true; + services.zeitgeist.enable = lib.mkDefault true; + services.geoclue2.enable = lib.mkDefault true; # pantheon has pantheon-agent-geoclue2 services.geoclue2.enableDemoAgent = false; services.geoclue2.appConfig."io.elementary.desktop.agent-geoclue2" = { @@ -173,7 +170,7 @@ in # https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/1443 pkgs.pantheon.mutter ]; - services.orca.enable = mkDefault (notExcluded pkgs.orca); + services.orca.enable = lib.mkDefault (notExcluded pkgs.orca); systemd.packages = with pkgs; [ gnome-session pantheon.gala @@ -181,7 +178,7 @@ in pantheon.elementary-session-settings ]; programs.dconf.enable = true; - networking.networkmanager.enable = mkDefault true; + networking.networkmanager.enable = lib.mkDefault true; systemd.user.targets."gnome-session-x11-services".wants = [ "org.gnome.SettingsDaemon.XSettings.service" @@ -246,12 +243,12 @@ in xdg-desktop-portal-pantheon ]); - xdg.portal.configPackages = mkDefault [ pkgs.pantheon.elementary-default-settings ]; + xdg.portal.configPackages = lib.mkDefault [ pkgs.pantheon.elementary-default-settings ]; # Override GSettings schemas environment.sessionVariables.NIX_GSETTINGS_OVERRIDES_DIR = "${nixos-gsettings-desktop-schemas}/share/gsettings-schemas/nixos-gsettings-overrides/glib-2.0/schemas"; - environment.sessionVariables.GNOME_SESSION_DEBUG = mkIf cfg.debug "1"; + environment.sessionVariables.GNOME_SESSION_DEBUG = lib.mkIf cfg.debug "1"; environment.pathsToLink = [ # FIXME: modules should link subdirs of `/share` rather than relying on this @@ -265,8 +262,8 @@ in programs.nm-applet.indicator = false; # Shell integration for VTE terminals - programs.bash.vteIntegration = mkDefault true; - programs.zsh.vteIntegration = mkDefault true; + programs.bash.vteIntegration = lib.mkDefault true; + programs.zsh.vteIntegration = lib.mkDefault true; # Default Fonts fonts.packages = with pkgs; [ @@ -282,9 +279,9 @@ in }; }) - (mkIf serviceCfg.apps.enable { - programs.evince.enable = mkDefault (notExcluded pkgs.evince); - programs.file-roller.enable = mkDefault (notExcluded pkgs.file-roller); + (lib.mkIf serviceCfg.apps.enable { + programs.evince.enable = lib.mkDefault (notExcluded pkgs.evince); + programs.file-roller.enable = lib.mkDefault (notExcluded pkgs.file-roller); environment.systemPackages = utils.removePackagesByName ([ pkgs.gnome-font-viewer @@ -315,7 +312,7 @@ in ]; }) - (mkIf serviceCfg.contractor.enable { + (lib.mkIf serviceCfg.contractor.enable { environment.systemPackages = with pkgs.pantheon; [ contractor file-roller-contract From 61ad8be6822b932399523ce7c32279a1661deb04 Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Mon, 30 Dec 2024 14:44:40 +0100 Subject: [PATCH 296/429] nixos/services.xserver.desktopManager.retroarch: remove `with lib;` --- .../services/x11/desktop-managers/retroarch.nix | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/nixos/modules/services/x11/desktop-managers/retroarch.nix b/nixos/modules/services/x11/desktop-managers/retroarch.nix index 445de823e03f..9f292087a073 100644 --- a/nixos/modules/services/x11/desktop-managers/retroarch.nix +++ b/nixos/modules/services/x11/desktop-managers/retroarch.nix @@ -4,23 +4,20 @@ pkgs, ... }: - -with lib; - let cfg = config.services.xserver.desktopManager.retroarch; in { options.services.xserver.desktopManager.retroarch = { - enable = mkEnableOption "RetroArch"; + enable = lib.mkEnableOption "RetroArch"; - package = mkPackageOption pkgs "retroarch" { + package = lib.mkPackageOption pkgs "retroarch" { example = "retroarch-full"; }; - extraArgs = mkOption { - type = types.listOf types.str; + extraArgs = lib.mkOption { + type = lib.types.listOf lib.types.str; default = [ ]; example = [ "--verbose" @@ -30,12 +27,12 @@ in }; }; - config = mkIf cfg.enable { + config = lib.mkIf cfg.enable { services.xserver.desktopManager.session = [ { name = "RetroArch"; start = '' - ${cfg.package}/bin/retroarch -f ${escapeShellArgs cfg.extraArgs} & + ${cfg.package}/bin/retroarch -f ${lib.escapeShellArgs cfg.extraArgs} & waitPID=$! ''; } @@ -44,5 +41,5 @@ in environment.systemPackages = [ cfg.package ]; }; - meta.maintainers = with maintainers; [ j0hax ]; + meta.maintainers = with lib.maintainers; [ j0hax ]; } From ee971f5c8f1881e62ae3547407fc86f1777cee8f Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Mon, 30 Dec 2024 14:44:40 +0100 Subject: [PATCH 297/429] nixos/services.xserver.desktopManager.surf-display: remove `with lib;` --- .../x11/desktop-managers/surf-display.nix | 33 +++++++++---------- 1 file changed, 15 insertions(+), 18 deletions(-) diff --git a/nixos/modules/services/x11/desktop-managers/surf-display.nix b/nixos/modules/services/x11/desktop-managers/surf-display.nix index 519388cf11a5..7eb088cce11e 100644 --- a/nixos/modules/services/x11/desktop-managers/surf-display.nix +++ b/nixos/modules/services/x11/desktop-managers/surf-display.nix @@ -4,9 +4,6 @@ pkgs, ... }: - -with lib; - let cfg = config.services.xserver.desktopManager.surf-display; @@ -51,18 +48,18 @@ in { options = { services.xserver.desktopManager.surf-display = { - enable = mkEnableOption "surf-display as a kiosk browser session"; + enable = lib.mkEnableOption "surf-display as a kiosk browser session"; - defaultWwwUri = mkOption { - type = types.str; + defaultWwwUri = lib.mkOption { + type = lib.types.str; default = "${pkgs.surf-display}/share/surf-display/empty-page.html"; - defaultText = literalExpression ''"''${pkgs.surf-display}/share/surf-display/empty-page.html"''; + defaultText = lib.literalExpression ''"''${pkgs.surf-display}/share/surf-display/empty-page.html"''; example = "https://www.example.com/"; description = "Default URI to display."; }; - inactivityInterval = mkOption { - type = types.int; + inactivityInterval = lib.mkOption { + type = lib.types.int; default = 300; example = 0; description = '' @@ -75,16 +72,16 @@ in ''; }; - screensaverSettings = mkOption { - type = types.separatedString " "; + screensaverSettings = lib.mkOption { + type = lib.types.separatedString " "; default = ""; description = '' Screensaver settings, see `man 1 xset` for possible options. ''; }; - pointerButtonMap = mkOption { - type = types.str; + pointerButtonMap = lib.mkOption { + type = lib.types.str; default = "1 0 0 4 5 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0"; description = '' Disable right and middle pointer device click in browser sessions @@ -93,15 +90,15 @@ in ''; }; - hideIdlePointer = mkOption { - type = types.str; + hideIdlePointer = lib.mkOption { + type = lib.types.str; default = "yes"; example = "no"; description = "Hide idle mouse pointer."; }; - extraConfig = mkOption { - type = types.lines; + extraConfig = lib.mkOption { + type = lib.types.lines; default = ""; example = '' # Enforce fixed resolution for all displays (default: not set): @@ -124,7 +121,7 @@ in }; }; - config = mkIf cfg.enable { + config = lib.mkIf cfg.enable { services.displayManager.sessionPackages = [ pkgs.surf-display ]; From 4b798ee63e85e8607a6e61ea7f755121737ac84c Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Mon, 30 Dec 2024 14:44:40 +0100 Subject: [PATCH 298/429] nixos/services.xserver.desktopManager.xfce: remove `with lib;` --- .../services/x11/desktop-managers/xfce.nix | 65 +++++++++---------- 1 file changed, 31 insertions(+), 34 deletions(-) diff --git a/nixos/modules/services/x11/desktop-managers/xfce.nix b/nixos/modules/services/x11/desktop-managers/xfce.nix index 05f252731f72..e5d23ab2259b 100644 --- a/nixos/modules/services/x11/desktop-managers/xfce.nix +++ b/nixos/modules/services/x11/desktop-managers/xfce.nix @@ -1,7 +1,4 @@ { config, lib, pkgs, utils, ... }: - -with lib; - let cfg = config.services.xserver.desktopManager.xfce; excludePackages = config.environment.xfce.excludePackages; @@ -9,70 +6,70 @@ let in { meta = { - maintainers = teams.xfce.members; + maintainers = lib.teams.xfce.members; }; imports = [ # added 2019-08-18 # needed to preserve some semblance of UI familarity # with original XFCE module - (mkRenamedOptionModule + (lib.mkRenamedOptionModule [ "services" "xserver" "desktopManager" "xfce4-14" "extraSessionCommands" ] [ "services" "xserver" "displayManager" "sessionCommands" ]) # added 2019-11-04 # xfce4-14 module removed and promoted to xfce. # Needed for configs that used xfce4-14 module to migrate to this one. - (mkRenamedOptionModule + (lib.mkRenamedOptionModule [ "services" "xserver" "desktopManager" "xfce4-14" "enable" ] [ "services" "xserver" "desktopManager" "xfce" "enable" ]) - (mkRenamedOptionModule + (lib.mkRenamedOptionModule [ "services" "xserver" "desktopManager" "xfce4-14" "noDesktop" ] [ "services" "xserver" "desktopManager" "xfce" "noDesktop" ]) - (mkRenamedOptionModule + (lib.mkRenamedOptionModule [ "services" "xserver" "desktopManager" "xfce4-14" "enableXfwm" ] [ "services" "xserver" "desktopManager" "xfce" "enableXfwm" ]) - (mkRenamedOptionModule + (lib.mkRenamedOptionModule [ "services" "xserver" "desktopManager" "xfce" "extraSessionCommands" ] [ "services" "xserver" "displayManager" "sessionCommands" ]) - (mkRemovedOptionModule [ "services" "xserver" "desktopManager" "xfce" "screenLock" ] "") + (lib.mkRemovedOptionModule [ "services" "xserver" "desktopManager" "xfce" "screenLock" ] "") # added 2022-06-26 # thunar has its own module - (mkRenamedOptionModule + (lib.mkRenamedOptionModule [ "services" "xserver" "desktopManager" "xfce" "thunarPlugins" ] [ "programs" "thunar" "plugins" ]) ]; options = { services.xserver.desktopManager.xfce = { - enable = mkOption { - type = types.bool; + enable = lib.mkOption { + type = lib.types.bool; default = false; description = "Enable the Xfce desktop environment."; }; - noDesktop = mkOption { - type = types.bool; + noDesktop = lib.mkOption { + type = lib.types.bool; default = false; description = "Don't install XFCE desktop components (xfdesktop and panel)."; }; - enableXfwm = mkOption { - type = types.bool; + enableXfwm = lib.mkOption { + type = lib.types.bool; default = true; description = "Enable the XFWM (default) window manager."; }; - enableScreensaver = mkOption { - type = types.bool; + enableScreensaver = lib.mkOption { + type = lib.types.bool; default = true; description = "Enable the XFCE screensaver."; }; - enableWaylandSession = mkEnableOption "the experimental Xfce Wayland session"; + enableWaylandSession = lib.mkEnableOption "the experimental Xfce Wayland session"; - waylandSessionCompositor = mkOption { + waylandSessionCompositor = lib.mkOption { type = lib.types.str; default = ""; example = "wayfire"; @@ -87,15 +84,15 @@ in }; }; - environment.xfce.excludePackages = mkOption { + environment.xfce.excludePackages = lib.mkOption { default = []; - example = literalExpression "[ pkgs.xfce.xfce4-volumed-pulse ]"; - type = types.listOf types.package; + example = lib.literalExpression "[ pkgs.xfce.xfce4-volumed-pulse ]"; + type = lib.types.listOf lib.types.package; description = "Which packages XFCE should exclude from the default environment"; }; }; - config = mkIf cfg.enable { + config = lib.mkIf cfg.enable { environment.systemPackages = utils.removePackagesByName (with pkgs; [ glib # for gsettings gtk3.out # gtk-update-icon-cache @@ -147,10 +144,10 @@ in xfce.xfdesktop ] ++ optional cfg.enableScreensaver xfce.xfce4-screensaver) excludePackages; - programs.gnupg.agent.pinentryPackage = mkDefault pkgs.pinentry-gtk2; + programs.gnupg.agent.pinentryPackage = lib.mkDefault pkgs.pinentry-gtk2; programs.xfconf.enable = true; programs.thunar.enable = true; - programs.labwc.enable = mkDefault (cfg.enableWaylandSession && ( + programs.labwc.enable = lib.mkDefault (cfg.enableWaylandSession && ( cfg.waylandSessionCompositor == "" || lib.substring 0 5 cfg.waylandSessionCompositor == "labwc")); environment.pathsToLink = [ @@ -173,7 +170,7 @@ in # Copied from https://gitlab.xfce.org/xfce/xfce4-session/-/blob/xfce4-session-4.19.2/xfce-wayland.desktop.in # to maintain consistent l10n state with X11 session file and to support the waylandSessionCompositor option. - services.displayManager.sessionPackages = optionals cfg.enableWaylandSession [ + services.displayManager.sessionPackages = lib.optionals cfg.enableWaylandSession [ ((pkgs.writeTextDir "share/wayland-sessions/xfce-wayland.desktop" '' [Desktop Entry] Version=1.0 @@ -198,16 +195,16 @@ in services.gnome.glib-networking.enable = true; services.gvfs.enable = true; services.tumbler.enable = true; - services.system-config-printer.enable = (mkIf config.services.printing.enable (mkDefault true)); - services.libinput.enable = mkDefault true; # used in xfce4-settings-manager - services.colord.enable = mkDefault true; + services.system-config-printer.enable = (lib.mkIf config.services.printing.enable (lib.mkDefault true)); + services.libinput.enable = lib.mkDefault true; # used in xfce4-settings-manager + services.colord.enable = lib.mkDefault true; # Enable default programs programs.dconf.enable = true; # Shell integration for VTE terminals - programs.bash.vteIntegration = mkDefault true; - programs.zsh.vteIntegration = mkDefault true; + programs.bash.vteIntegration = lib.mkDefault true; + programs.zsh.vteIntegration = lib.mkDefault true; # Systemd services systemd.packages = utils.removePackagesByName (with pkgs.xfce; [ @@ -216,6 +213,6 @@ in security.pam.services.xfce4-screensaver.unixAuth = cfg.enableScreensaver; - xdg.portal.configPackages = mkDefault [ pkgs.xfce.xfce4-session ]; + xdg.portal.configPackages = lib.mkDefault [ pkgs.xfce.xfce4-session ]; }; } From dcd408ab4aac66db2a40c8d4aa3edcc0bfc2f439 Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Mon, 30 Dec 2024 14:44:40 +0100 Subject: [PATCH 299/429] nixos/services.xserver.desktopManager.xterm: remove `with lib;` --- .../services/x11/desktop-managers/xterm.nix | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/nixos/modules/services/x11/desktop-managers/xterm.nix b/nixos/modules/services/x11/desktop-managers/xterm.nix index c4db014db796..562401c9d057 100644 --- a/nixos/modules/services/x11/desktop-managers/xterm.nix +++ b/nixos/modules/services/x11/desktop-managers/xterm.nix @@ -4,9 +4,6 @@ pkgs, ... }: - -with lib; - let cfg = config.services.xserver.desktopManager.xterm; @@ -17,18 +14,18 @@ in { options = { - services.xserver.desktopManager.xterm.enable = mkOption { - type = types.bool; - default = versionOlder config.system.stateVersion "19.09" && xSessionEnabled; - defaultText = literalExpression ''versionOlder config.system.stateVersion "19.09" && config.services.xserver.enable;''; + services.xserver.desktopManager.xterm.enable = lib.mkOption { + type = lib.types.bool; + default = lib.versionOlder config.system.stateVersion "19.09" && xSessionEnabled; + defaultText = lib.literalExpression ''versionOlder config.system.stateVersion "19.09" && config.services.xserver.enable;''; description = "Enable a xterm terminal as a desktop manager."; }; }; - config = mkIf cfg.enable { + config = lib.mkIf cfg.enable { - services.xserver.desktopManager.session = singleton { + services.xserver.desktopManager.session = lib.singleton { name = "xterm"; start = '' ${pkgs.xterm}/bin/xterm -ls & From 0a91efc713add71e9ce992eb7e468e1b26063f33 Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Mon, 30 Dec 2024 14:44:40 +0100 Subject: [PATCH 300/429] nixos/services.xserver.displayManager.lightdm.greeters.enso: remove `with lib;` --- .../lightdm-greeters/enso-os.nix | 54 +++++++++---------- 1 file changed, 26 insertions(+), 28 deletions(-) diff --git a/nixos/modules/services/x11/display-managers/lightdm-greeters/enso-os.nix b/nixos/modules/services/x11/display-managers/lightdm-greeters/enso-os.nix index 85de2ce62849..797294397447 100644 --- a/nixos/modules/services/x11/display-managers/lightdm-greeters/enso-os.nix +++ b/nixos/modules/services/x11/display-managers/lightdm-greeters/enso-os.nix @@ -4,8 +4,6 @@ pkgs, ... }: - -with lib; let dmcfg = config.services.xserver.displayManager; ldmcfg = dmcfg.lightdm; @@ -29,8 +27,8 @@ in { options = { services.xserver.displayManager.lightdm.greeters.enso = { - enable = mkOption { - type = types.bool; + enable = lib.mkOption { + type = lib.types.bool; default = false; description = '' Whether to enable enso-os-greeter as the lightdm greeter @@ -38,17 +36,17 @@ in }; theme = { - package = mkOption { - type = types.package; + package = lib.mkOption { + type = lib.types.package; default = pkgs.gnome-themes-extra; - defaultText = literalExpression "pkgs.gnome-themes-extra"; + defaultText = lib.literalExpression "pkgs.gnome-themes-extra"; description = '' The package path that contains the theme given in the name option. ''; }; - name = mkOption { - type = types.str; + name = lib.mkOption { + type = lib.types.str; default = "Adwaita"; description = '' Name of the theme to use for the lightdm-enso-os-greeter @@ -57,17 +55,17 @@ in }; iconTheme = { - package = mkOption { - type = types.package; + package = lib.mkOption { + type = lib.types.package; default = pkgs.papirus-icon-theme; - defaultText = literalExpression "pkgs.papirus-icon-theme"; + defaultText = lib.literalExpression "pkgs.papirus-icon-theme"; description = '' The package path that contains the icon theme given in the name option. ''; }; - name = mkOption { - type = types.str; + name = lib.mkOption { + type = lib.types.str; default = "ePapirus"; description = '' Name of the icon theme to use for the lightdm-enso-os-greeter @@ -76,17 +74,17 @@ in }; cursorTheme = { - package = mkOption { - type = types.package; + package = lib.mkOption { + type = lib.types.package; default = pkgs.capitaine-cursors; - defaultText = literalExpression "pkgs.capitaine-cursors"; + defaultText = lib.literalExpression "pkgs.capitaine-cursors"; description = '' The package path that contains the cursor theme given in the name option. ''; }; - name = mkOption { - type = types.str; + name = lib.mkOption { + type = lib.types.str; default = "capitane-cursors"; description = '' Name of the cursor theme to use for the lightdm-enso-os-greeter @@ -94,24 +92,24 @@ in }; }; - blur = mkOption { - type = types.bool; + blur = lib.mkOption { + type = lib.types.bool; default = false; description = '' Whether or not to enable blur ''; }; - brightness = mkOption { - type = types.int; + brightness = lib.mkOption { + type = lib.types.int; default = 7; description = '' Brightness ''; }; - extraConfig = mkOption { - type = types.lines; + extraConfig = lib.mkOption { + type = lib.types.lines; default = ""; description = '' Extra configuration that should be put in the greeter.conf @@ -121,7 +119,7 @@ in }; }; - config = mkIf (ldmcfg.enable && cfg.enable) { + config = lib.mkIf (ldmcfg.enable && cfg.enable) { environment.etc."lightdm/greeter.conf".source = ensoGreeterConf; environment.systemPackages = [ @@ -131,14 +129,14 @@ in ]; services.xserver.displayManager.lightdm = { - greeter = mkDefault { + greeter = lib.mkDefault { package = pkgs.lightdm-enso-os-greeter.xgreeters; name = "pantheon-greeter"; }; greeters = { gtk = { - enable = mkDefault false; + enable = lib.mkDefault false; }; }; }; From 2b59e102bad9db456c13876893ddfd2b1a88f420 Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Mon, 30 Dec 2024 14:44:40 +0100 Subject: [PATCH 301/429] nixos/services.xserver.displayManager.lightdm.greeters.gtk: remove `with lib;` --- .../display-managers/lightdm-greeters/gtk.nix | 63 +++++++++---------- 1 file changed, 30 insertions(+), 33 deletions(-) diff --git a/nixos/modules/services/x11/display-managers/lightdm-greeters/gtk.nix b/nixos/modules/services/x11/display-managers/lightdm-greeters/gtk.nix index 468ab09c66a5..0852bc666a5c 100644 --- a/nixos/modules/services/x11/display-managers/lightdm-greeters/gtk.nix +++ b/nixos/modules/services/x11/display-managers/lightdm-greeters/gtk.nix @@ -4,9 +4,6 @@ pkgs, ... }: - -with lib; - let dmcfg = config.services.xserver.displayManager; @@ -27,9 +24,9 @@ let cursor-theme-name = ${cfg.cursorTheme.name} cursor-theme-size = ${toString cfg.cursorTheme.size} background = ${ldmcfg.background} - ${optionalString (cfg.clock-format != null) "clock-format = ${cfg.clock-format}"} - ${optionalString (cfg.indicators != null) "indicators = ${concatStringsSep ";" cfg.indicators}"} - ${optionalString (xcfg.dpi != null) "xft-dpi=${toString xcfg.dpi}"} + ${lib.optionalString (cfg.clock-format != null) "clock-format = ${cfg.clock-format}"} + ${lib.optionalString (cfg.indicators != null) "indicators = ${lib.concatStringsSep ";" cfg.indicators}"} + ${lib.optionalString (xcfg.dpi != null) "xft-dpi=${toString xcfg.dpi}"} ${cfg.extraConfig} ''; @@ -39,8 +36,8 @@ in services.xserver.displayManager.lightdm.greeters.gtk = { - enable = mkOption { - type = types.bool; + enable = lib.mkOption { + type = lib.types.bool; default = true; description = '' Whether to enable lightdm-gtk-greeter as the lightdm greeter. @@ -49,17 +46,17 @@ in theme = { - package = mkOption { - type = types.package; + package = lib.mkOption { + type = lib.types.package; default = pkgs.gnome-themes-extra; - defaultText = literalExpression "pkgs.gnome-themes-extra"; + defaultText = lib.literalExpression "pkgs.gnome-themes-extra"; description = '' The package path that contains the theme given in the name option. ''; }; - name = mkOption { - type = types.str; + name = lib.mkOption { + type = lib.types.str; default = "Adwaita"; description = '' Name of the theme to use for the lightdm-gtk-greeter. @@ -70,17 +67,17 @@ in iconTheme = { - package = mkOption { - type = types.package; + package = lib.mkOption { + type = lib.types.package; default = pkgs.adwaita-icon-theme; - defaultText = literalExpression "pkgs.adwaita-icon-theme"; + defaultText = lib.literalExpression "pkgs.adwaita-icon-theme"; description = '' The package path that contains the icon theme given in the name option. ''; }; - name = mkOption { - type = types.str; + name = lib.mkOption { + type = lib.types.str; default = "Adwaita"; description = '' Name of the icon theme to use for the lightdm-gtk-greeter. @@ -91,25 +88,25 @@ in cursorTheme = { - package = mkOption { - type = types.package; + package = lib.mkOption { + type = lib.types.package; default = pkgs.adwaita-icon-theme; - defaultText = literalExpression "pkgs.adwaita-icon-theme"; + defaultText = lib.literalExpression "pkgs.adwaita-icon-theme"; description = '' The package path that contains the cursor theme given in the name option. ''; }; - name = mkOption { - type = types.str; + name = lib.mkOption { + type = lib.types.str; default = "Adwaita"; description = '' Name of the cursor theme to use for the lightdm-gtk-greeter. ''; }; - size = mkOption { - type = types.int; + size = lib.mkOption { + type = lib.types.int; default = 16; description = '' Size of the cursor theme to use for the lightdm-gtk-greeter. @@ -117,8 +114,8 @@ in }; }; - clock-format = mkOption { - type = types.nullOr types.str; + clock-format = lib.mkOption { + type = lib.types.nullOr lib.types.str; default = null; example = "%F"; description = '' @@ -129,8 +126,8 @@ in ''; }; - indicators = mkOption { - type = types.nullOr (types.listOf types.str); + indicators = lib.mkOption { + type = lib.types.nullOr (lib.types.listOf lib.types.str); default = null; example = [ "~host" @@ -155,8 +152,8 @@ in ''; }; - extraConfig = mkOption { - type = types.lines; + extraConfig = lib.mkOption { + type = lib.types.lines; default = ""; description = '' Extra configuration that should be put in the lightdm-gtk-greeter.conf @@ -168,9 +165,9 @@ in }; - config = mkIf (ldmcfg.enable && cfg.enable) { + config = lib.mkIf (ldmcfg.enable && cfg.enable) { - services.xserver.displayManager.lightdm.greeter = mkDefault { + services.xserver.displayManager.lightdm.greeter = lib.mkDefault { package = pkgs.lightdm-gtk-greeter.xgreeters; name = "lightdm-gtk-greeter"; }; From 1253a9438782651cf25347f6fa63282b3d50200c Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Mon, 30 Dec 2024 16:57:42 +0100 Subject: [PATCH 302/429] nixos/services.xserver.displayManager.lightdm.greeters.gtk: fmt --- .../services/x11/display-managers/lightdm-greeters/gtk.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/nixos/modules/services/x11/display-managers/lightdm-greeters/gtk.nix b/nixos/modules/services/x11/display-managers/lightdm-greeters/gtk.nix index 0852bc666a5c..e903efea28d8 100644 --- a/nixos/modules/services/x11/display-managers/lightdm-greeters/gtk.nix +++ b/nixos/modules/services/x11/display-managers/lightdm-greeters/gtk.nix @@ -25,7 +25,9 @@ let cursor-theme-size = ${toString cfg.cursorTheme.size} background = ${ldmcfg.background} ${lib.optionalString (cfg.clock-format != null) "clock-format = ${cfg.clock-format}"} - ${lib.optionalString (cfg.indicators != null) "indicators = ${lib.concatStringsSep ";" cfg.indicators}"} + ${lib.optionalString ( + cfg.indicators != null + ) "indicators = ${lib.concatStringsSep ";" cfg.indicators}"} ${lib.optionalString (xcfg.dpi != null) "xft-dpi=${toString xcfg.dpi}"} ${cfg.extraConfig} ''; From f8865e84017ed97d55098804b44edb308e0c58aa Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Mon, 30 Dec 2024 14:44:40 +0100 Subject: [PATCH 303/429] nixos/services.xserver.displayManager.lightdm.greeters.mini: remove `with lib;` --- .../lightdm-greeters/mini.nix | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/nixos/modules/services/x11/display-managers/lightdm-greeters/mini.nix b/nixos/modules/services/x11/display-managers/lightdm-greeters/mini.nix index a3fca737a2b2..f81b711179e6 100644 --- a/nixos/modules/services/x11/display-managers/lightdm-greeters/mini.nix +++ b/nixos/modules/services/x11/display-managers/lightdm-greeters/mini.nix @@ -4,9 +4,6 @@ pkgs, ... }: - -with lib; - let dmcfg = config.services.xserver.displayManager; @@ -56,8 +53,8 @@ in services.xserver.displayManager.lightdm.greeters.mini = { - enable = mkOption { - type = types.bool; + enable = lib.mkOption { + type = lib.types.bool; default = false; description = '' Whether to enable lightdm-mini-greeter as the lightdm greeter. @@ -68,16 +65,16 @@ in ''; }; - user = mkOption { - type = types.str; + user = lib.mkOption { + type = lib.types.str; default = "root"; description = '' The user to login as. ''; }; - extraConfig = mkOption { - type = types.lines; + extraConfig = lib.mkOption { + type = lib.types.lines; default = ""; description = '' Extra configuration that should be put in the lightdm-mini-greeter.conf @@ -89,11 +86,11 @@ in }; - config = mkIf (ldmcfg.enable && cfg.enable) { + config = lib.mkIf (ldmcfg.enable && cfg.enable) { services.xserver.displayManager.lightdm.greeters.gtk.enable = false; - services.xserver.displayManager.lightdm.greeter = mkDefault { + services.xserver.displayManager.lightdm.greeter = lib.mkDefault { package = pkgs.lightdm-mini-greeter.xgreeters; name = "lightdm-mini-greeter"; }; From 2882d6bc3231febbc15baa42df0d93e25203bc96 Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Mon, 30 Dec 2024 14:44:41 +0100 Subject: [PATCH 304/429] nixos/services.xserver.displayManager.lightdm.greeters.mobile: remove `with lib;` --- .../x11/display-managers/lightdm-greeters/mobile.nix | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/nixos/modules/services/x11/display-managers/lightdm-greeters/mobile.nix b/nixos/modules/services/x11/display-managers/lightdm-greeters/mobile.nix index 5d8edbe7c59e..b7c6a9b4ae68 100644 --- a/nixos/modules/services/x11/display-managers/lightdm-greeters/mobile.nix +++ b/nixos/modules/services/x11/display-managers/lightdm-greeters/mobile.nix @@ -4,8 +4,6 @@ pkgs, ... }: - -with lib; let dmcfg = config.services.xserver.displayManager; ldmcfg = dmcfg.lightdm; @@ -14,14 +12,14 @@ in { options = { services.xserver.displayManager.lightdm.greeters.mobile = { - enable = mkEnableOption "lightdm-mobile-greeter as the lightdm greeter"; + enable = lib.mkEnableOption "lightdm-mobile-greeter as the lightdm greeter"; }; }; - config = mkIf (ldmcfg.enable && cfg.enable) { + config = lib.mkIf (ldmcfg.enable && cfg.enable) { services.xserver.displayManager.lightdm.greeters.gtk.enable = false; - services.xserver.displayManager.lightdm.greeter = mkDefault { + services.xserver.displayManager.lightdm.greeter = lib.mkDefault { package = pkgs.lightdm-mobile-greeter.xgreeters; name = "lightdm-mobile-greeter"; }; From 6a56bdff4109e78662c292b923d4f3148fc61a2f Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Mon, 30 Dec 2024 14:44:41 +0100 Subject: [PATCH 305/429] nixos/services.xserver.displayManager.lightdm.greeters.pantheon: remove `with lib;` --- .../display-managers/lightdm-greeters/pantheon.nix | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/nixos/modules/services/x11/display-managers/lightdm-greeters/pantheon.nix b/nixos/modules/services/x11/display-managers/lightdm-greeters/pantheon.nix index f598fd1171a2..8ad6a108dddf 100644 --- a/nixos/modules/services/x11/display-managers/lightdm-greeters/pantheon.nix +++ b/nixos/modules/services/x11/display-managers/lightdm-greeters/pantheon.nix @@ -4,9 +4,6 @@ pkgs, ... }: - -with lib; - let dmcfg = config.services.xserver.displayManager; @@ -23,8 +20,8 @@ in services.xserver.displayManager.lightdm.greeters.pantheon = { - enable = mkOption { - type = types.bool; + enable = lib.mkOption { + type = lib.types.bool; default = false; description = '' Whether to enable elementary-greeter as the lightdm greeter. @@ -35,11 +32,11 @@ in }; - config = mkIf (ldmcfg.enable && cfg.enable) { + config = lib.mkIf (ldmcfg.enable && cfg.enable) { services.xserver.displayManager.lightdm.greeters.gtk.enable = false; - services.xserver.displayManager.lightdm.greeter = mkDefault { + services.xserver.displayManager.lightdm.greeter = lib.mkDefault { package = pkgs.pantheon.elementary-greeter.xgreeters; name = "io.elementary.greeter"; }; From 62a2f3303b0daee70c405159022fe4c81c1e82b9 Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Mon, 30 Dec 2024 14:44:41 +0100 Subject: [PATCH 306/429] nixos/services.xserver.displayManager.lightdm.greeters.slick: remove `with lib;` --- .../lightdm-greeters/slick.nix | 61 +++++++++---------- 1 file changed, 29 insertions(+), 32 deletions(-) diff --git a/nixos/modules/services/x11/display-managers/lightdm-greeters/slick.nix b/nixos/modules/services/x11/display-managers/lightdm-greeters/slick.nix index e2d83ce5dcb4..f90363d58ac2 100644 --- a/nixos/modules/services/x11/display-managers/lightdm-greeters/slick.nix +++ b/nixos/modules/services/x11/display-managers/lightdm-greeters/slick.nix @@ -4,9 +4,6 @@ pkgs, ... }: - -with lib; - let ldmcfg = config.services.xserver.displayManager.lightdm; cfg = ldmcfg.greeters.slick; @@ -26,27 +23,27 @@ let font-name=${cfg.font.name} cursor-theme-name=${cfg.cursorTheme.name} cursor-theme-size=${toString cfg.cursorTheme.size} - draw-user-backgrounds=${boolToString cfg.draw-user-backgrounds} + draw-user-backgrounds=${lib.boolToString cfg.draw-user-backgrounds} ${cfg.extraConfig} ''; in { options = { services.xserver.displayManager.lightdm.greeters.slick = { - enable = mkEnableOption "lightdm-slick-greeter as the lightdm greeter"; + enable = lib.mkEnableOption "lightdm-slick-greeter as the lightdm greeter"; theme = { - package = mkOption { - type = types.package; + package = lib.mkOption { + type = lib.types.package; default = pkgs.gnome-themes-extra; - defaultText = literalExpression "pkgs.gnome-themes-extra"; + defaultText = lib.literalExpression "pkgs.gnome-themes-extra"; description = '' The package path that contains the theme given in the name option. ''; }; - name = mkOption { - type = types.str; + name = lib.mkOption { + type = lib.types.str; default = "Adwaita"; description = '' Name of the theme to use for the lightdm-slick-greeter. @@ -55,17 +52,17 @@ in }; iconTheme = { - package = mkOption { - type = types.package; + package = lib.mkOption { + type = lib.types.package; default = pkgs.adwaita-icon-theme; - defaultText = literalExpression "pkgs.adwaita-icon-theme"; + defaultText = lib.literalExpression "pkgs.adwaita-icon-theme"; description = '' The package path that contains the icon theme given in the name option. ''; }; - name = mkOption { - type = types.str; + name = lib.mkOption { + type = lib.types.str; default = "Adwaita"; description = '' Name of the icon theme to use for the lightdm-slick-greeter. @@ -74,17 +71,17 @@ in }; font = { - package = mkOption { - type = types.package; + package = lib.mkOption { + type = lib.types.package; default = pkgs.ubuntu-classic; - defaultText = literalExpression "pkgs.ubuntu-classic"; + defaultText = lib.literalExpression "pkgs.ubuntu-classic"; description = '' The package path that contains the font given in the name option. ''; }; - name = mkOption { - type = types.str; + name = lib.mkOption { + type = lib.types.str; default = "Ubuntu 11"; description = '' Name of the font to use. @@ -93,25 +90,25 @@ in }; cursorTheme = { - package = mkOption { - type = types.package; + package = lib.mkOption { + type = lib.types.package; default = pkgs.adwaita-icon-theme; - defaultText = literalExpression "pkgs.adwaita-icon-theme"; + defaultText = lib.literalExpression "pkgs.adwaita-icon-theme"; description = '' The package path that contains the cursor theme given in the name option. ''; }; - name = mkOption { - type = types.str; + name = lib.mkOption { + type = lib.types.str; default = "Adwaita"; description = '' Name of the cursor theme to use for the lightdm-slick-greeter. ''; }; - size = mkOption { - type = types.int; + size = lib.mkOption { + type = lib.types.int; default = 24; description = '' Size of the cursor theme to use for the lightdm-slick-greeter. @@ -119,10 +116,10 @@ in }; }; - draw-user-backgrounds = mkEnableOption "draw user backgrounds"; + draw-user-backgrounds = lib.mkEnableOption "draw user backgrounds"; - extraConfig = mkOption { - type = types.lines; + extraConfig = lib.mkOption { + type = lib.types.lines; default = ""; description = '' Extra configuration that should be put in the lightdm-slick-greeter.conf @@ -132,10 +129,10 @@ in }; }; - config = mkIf (ldmcfg.enable && cfg.enable) { + config = lib.mkIf (ldmcfg.enable && cfg.enable) { services.xserver.displayManager.lightdm = { greeters.gtk.enable = false; - greeter = mkDefault { + greeter = lib.mkDefault { package = pkgs.lightdm-slick-greeter.xgreeters; name = "lightdm-slick-greeter"; }; From 4214af11a933406c7ddfbecaf297e624a1aa2b9a Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Mon, 30 Dec 2024 14:44:41 +0100 Subject: [PATCH 307/429] nixos/services.xserver.displayManager.lightdm.greeters.tiny: remove `with lib;` --- .../lightdm-greeters/tiny.nix | 25 ++++++++----------- 1 file changed, 11 insertions(+), 14 deletions(-) diff --git a/nixos/modules/services/x11/display-managers/lightdm-greeters/tiny.nix b/nixos/modules/services/x11/display-managers/lightdm-greeters/tiny.nix index 4780468533de..73e144ddccf9 100644 --- a/nixos/modules/services/x11/display-managers/lightdm-greeters/tiny.nix +++ b/nixos/modules/services/x11/display-managers/lightdm-greeters/tiny.nix @@ -4,9 +4,6 @@ pkgs, ... }: - -with lib; - let dmcfg = config.services.xserver.displayManager; @@ -19,8 +16,8 @@ in services.xserver.displayManager.lightdm.greeters.tiny = { - enable = mkOption { - type = types.bool; + enable = lib.mkOption { + type = lib.types.bool; default = false; description = '' Whether to enable lightdm-tiny-greeter as the lightdm greeter. @@ -32,16 +29,16 @@ in }; label = { - user = mkOption { - type = types.str; + user = lib.mkOption { + type = lib.types.str; default = "Username"; description = '' The string to represent the user_text label. ''; }; - pass = mkOption { - type = types.str; + pass = lib.mkOption { + type = lib.types.str; default = "Password"; description = '' The string to represent the pass_text label. @@ -49,8 +46,8 @@ in }; }; - extraConfig = mkOption { - type = types.lines; + extraConfig = lib.mkOption { + type = lib.types.lines; default = ""; description = '' Section to describe style and ui. @@ -61,7 +58,7 @@ in }; - config = mkIf (ldmcfg.enable && cfg.enable) { + config = lib.mkIf (ldmcfg.enable && cfg.enable) { services.xserver.displayManager.lightdm.greeters.gtk.enable = false; @@ -73,10 +70,10 @@ in static const char *pass_text = "${cfg.label.pass}"; static const char *session = "${dmcfg.defaultSession}"; ''; - config = optionalString (cfg.extraConfig != "") (configHeader + cfg.extraConfig); + config = lib.optionalString (cfg.extraConfig != "") (configHeader + cfg.extraConfig); package = pkgs.lightdm-tiny-greeter.override { conf = config; }; in - mkDefault { + lib.mkDefault { package = package.xgreeters; name = "lightdm-tiny-greeter"; }; From a439faa883c4a152f52f69c2e3c1973274209d0b Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Mon, 30 Dec 2024 14:44:41 +0100 Subject: [PATCH 308/429] nixos/services.xserver.displayManager.lightdm: remove `with lib;` --- .../services/x11/display-managers/lightdm.nix | 59 +++++++++---------- 1 file changed, 28 insertions(+), 31 deletions(-) diff --git a/nixos/modules/services/x11/display-managers/lightdm.nix b/nixos/modules/services/x11/display-managers/lightdm.nix index 3e964ef53266..3ac91f860f6d 100644 --- a/nixos/modules/services/x11/display-managers/lightdm.nix +++ b/nixos/modules/services/x11/display-managers/lightdm.nix @@ -4,9 +4,6 @@ pkgs, ... }: - -with lib; - let xcfg = config.services.xserver; @@ -22,7 +19,7 @@ let # lightdm runs with clearenv(), but we need a few things in the environment for X to startup xserverWrapper = writeScript "xserver-wrapper" '' #! ${pkgs.bash}/bin/bash - ${concatMapStrings (n: "export ${n}=\"${getAttr n xEnv}\"\n") (attrNames xEnv)} + ${lib.concatMapStrings (n: "export ${n}=\"${lib.getAttr n xEnv}\"\n") (lib.attrNames xEnv)} display=$(echo "$@" | xargs -n 1 | grep -P ^:\\d\$ | head -n 1 | sed s/^://) if [ -z "$display" ] @@ -36,13 +33,13 @@ let usersConf = writeText "users.conf" '' [UserList] minimum-uid=1000 - hidden-users=${concatStringsSep " " dmcfg.hiddenUsers} + hidden-users=${lib.concatStringsSep " " dmcfg.hiddenUsers} hidden-shells=/run/current-system/sw/bin/nologin ''; lightdmConf = writeText "lightdm.conf" '' [LightDM] - ${optionalString cfg.greeter.enable '' + ${lib.optionalString cfg.greeter.enable '' greeter-user = ${config.users.users.lightdm.name} greeters-directory = ${cfg.greeter.package} ''} @@ -52,15 +49,15 @@ let [Seat:*] xserver-command = ${xserverWrapper} session-wrapper = ${dmcfg.sessionData.wrapper} - ${optionalString cfg.greeter.enable '' + ${lib.optionalString cfg.greeter.enable '' greeter-session = ${cfg.greeter.name} ''} - ${optionalString dmcfg.autoLogin.enable '' + ${lib.optionalString dmcfg.autoLogin.enable '' autologin-user = ${dmcfg.autoLogin.user} autologin-user-timeout = ${toString cfg.autoLogin.timeout} autologin-session = ${sessionData.autologinSession} ''} - ${optionalString (xcfg.displayManager.setupCommands != "") '' + ${lib.optionalString (xcfg.displayManager.setupCommands != "") '' display-setup-script=${pkgs.writeScript "lightdm-display-setup" '' #!${pkgs.bash}/bin/bash ${xcfg.displayManager.setupCommands} @@ -87,7 +84,7 @@ in ./lightdm-greeters/tiny.nix ./lightdm-greeters/slick.nix ./lightdm-greeters/mobile.nix - (mkRenamedOptionModule + (lib.mkRenamedOptionModule [ "services" "xserver" "displayManager" "lightdm" "autoLogin" "enable" ] [ "services" @@ -96,7 +93,7 @@ in "enable" ] ) - (mkRenamedOptionModule + (lib.mkRenamedOptionModule [ "services" "xserver" "displayManager" "lightdm" "autoLogin" "user" ] [ "services" @@ -111,8 +108,8 @@ in services.xserver.displayManager.lightdm = { - enable = mkOption { - type = types.bool; + enable = lib.mkOption { + type = lib.types.bool; default = false; description = '' Whether to enable lightdm as the display manager. @@ -120,24 +117,24 @@ in }; greeter = { - enable = mkOption { - type = types.bool; + enable = lib.mkOption { + type = lib.types.bool; default = true; description = '' If set to false, run lightdm in greeterless mode. This only works if autologin is enabled and autoLogin.timeout is zero. ''; }; - package = mkOption { - type = types.package; + package = lib.mkOption { + type = lib.types.package; description = '' The LightDM greeter to login via. The package should be a directory containing a .desktop file matching the name in the 'name' option. ''; }; - name = mkOption { - type = types.str; + name = lib.mkOption { + type = lib.types.str; description = '' The name of a .desktop file in the directory specified in the 'package' option. @@ -145,8 +142,8 @@ in }; }; - extraConfig = mkOption { - type = types.lines; + extraConfig = lib.mkOption { + type = lib.types.lines; default = ""; example = '' user-authority-in-system-dir = true @@ -154,17 +151,17 @@ in description = "Extra lines to append to LightDM section."; }; - background = mkOption { - type = types.either types.path (types.strMatching "^#[0-9]\{6\}$"); + background = lib.mkOption { + type = lib.types.either lib.types.path (lib.types.strMatching "^#[0-9]\{6\}$"); # Manual cannot depend on packages, we are actually setting the default in config below. - defaultText = literalExpression "pkgs.nixos-artwork.wallpapers.simple-dark-gray-bottom.gnomeFilePath"; + defaultText = lib.literalExpression "pkgs.nixos-artwork.wallpapers.simple-dark-gray-bottom.gnomeFilePath"; description = '' The background image or color to use. ''; }; - extraSeatDefaults = mkOption { - type = types.lines; + extraSeatDefaults = lib.mkOption { + type = lib.types.lines; default = ""; example = '' greeter-show-manual-login=true @@ -173,8 +170,8 @@ in }; # Configuration for automatic login specific to LightDM - autoLogin.timeout = mkOption { - type = types.int; + autoLogin.timeout = lib.mkOption { + type = lib.types.int; default = 0; description = '' Show the greeter for this many seconds before automatic login occurs. @@ -184,7 +181,7 @@ in }; }; - config = mkIf cfg.enable { + config = lib.mkIf cfg.enable { assertions = [ { @@ -210,12 +207,12 @@ in # Keep in sync with the defaultText value from the option definition. services.xserver.displayManager.lightdm.background = - mkDefault pkgs.nixos-artwork.wallpapers.simple-dark-gray-bottom.gnomeFilePath; + lib.mkDefault pkgs.nixos-artwork.wallpapers.simple-dark-gray-bottom.gnomeFilePath; # Set default session in session chooser to a specified values – basically ignore session history. # Auto-login is already covered by a config value. services.displayManager.preStart = - optionalString (!dmcfg.autoLogin.enable && dmcfg.defaultSession != null) + lib.optionalString (!dmcfg.autoLogin.enable && dmcfg.defaultSession != null) '' ${setSessionScript}/bin/set-session ${dmcfg.defaultSession} ''; From 61ea1027157a8ebe5b619a0e4e6e3d163d7936ec Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Mon, 30 Dec 2024 14:44:41 +0100 Subject: [PATCH 309/429] nixos/services.xserver.displayManager.slim: remove `with lib;` --- nixos/modules/services/x11/display-managers/slim.nix | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/nixos/modules/services/x11/display-managers/slim.nix b/nixos/modules/services/x11/display-managers/slim.nix index c5963b0be7ec..8c522d4a9e93 100644 --- a/nixos/modules/services/x11/display-managers/slim.nix +++ b/nixos/modules/services/x11/display-managers/slim.nix @@ -4,13 +4,10 @@ pkgs, ... }: - -with lib; - { # added 2019-11-11 imports = [ - (mkRemovedOptionModule [ "services" "xserver" "displayManager" "slim" ] '' + (lib.mkRemovedOptionModule [ "services" "xserver" "displayManager" "slim" ] '' The SLIM project is abandoned and their last release was in 2013. Because of this it poses a security risk to your system. Other issues include it not fully supporting systemd and logind sessions. From 1c0fdc5be00239649973ca8d4fd5bbf9dda9315a Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Mon, 30 Dec 2024 14:44:41 +0100 Subject: [PATCH 310/429] nixos/services.xserver.displayManager.startx: remove `with lib;` --- .../modules/services/x11/display-managers/startx.nix | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/nixos/modules/services/x11/display-managers/startx.nix b/nixos/modules/services/x11/display-managers/startx.nix index a990c9ed5ea5..e6e61318c19f 100644 --- a/nixos/modules/services/x11/display-managers/startx.nix +++ b/nixos/modules/services/x11/display-managers/startx.nix @@ -4,9 +4,6 @@ pkgs, ... }: - -with lib; - let cfg = config.services.xserver.displayManager.startx; @@ -19,8 +16,8 @@ in options = { services.xserver.displayManager.startx = { - enable = mkOption { - type = types.bool; + enable = lib.mkOption { + type = lib.types.bool; default = false; description = '' Whether to enable the dummy "startx" pseudo-display manager, @@ -36,7 +33,7 @@ in ###### implementation - config = mkIf cfg.enable { + config = lib.mkIf cfg.enable { services.xserver = { exportConfiguration = true; }; @@ -46,7 +43,7 @@ in # # To send log to Xorg's default log location ($XDG_DATA_HOME/xorg/), we do # not specify a log file when running X - services.xserver.logFile = mkDefault null; + services.xserver.logFile = lib.mkDefault null; # Implement xserverArgs via xinit's system-wide xserverrc environment.etc."X11/xinit/xserverrc".source = pkgs.writeShellScript "xserverrc" '' From 2e19baf26b29c970b7915698a2bd431ae1563883 Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Mon, 30 Dec 2024 14:44:41 +0100 Subject: [PATCH 311/429] nixos/services.xserver.displayManager.xpra: remove `with lib;` --- .../services/x11/display-managers/xpra.nix | 41 +++++++++---------- 1 file changed, 19 insertions(+), 22 deletions(-) diff --git a/nixos/modules/services/x11/display-managers/xpra.nix b/nixos/modules/services/x11/display-managers/xpra.nix index 67b1751ba8ec..c75a293b3654 100644 --- a/nixos/modules/services/x11/display-managers/xpra.nix +++ b/nixos/modules/services/x11/display-managers/xpra.nix @@ -1,7 +1,4 @@ { config, lib, pkgs, ... }: - -with lib; - let cfg = config.services.xserver.displayManager.xpra; dmcfg = config.services.xserver.displayManager; @@ -13,46 +10,46 @@ in options = { services.xserver.displayManager.xpra = { - enable = mkOption { - type = types.bool; + enable = lib.mkOption { + type = lib.types.bool; default = false; description = "Whether to enable xpra as display manager."; }; - bindTcp = mkOption { + bindTcp = lib.mkOption { default = "127.0.0.1:10000"; example = "0.0.0.0:10000"; - type = types.nullOr types.str; + type = lib.types.nullOr lib.types.str; description = "Bind xpra to TCP"; }; - desktop = mkOption { - type = types.nullOr types.str; + desktop = lib.mkOption { + type = lib.types.nullOr lib.types.str; default = null; example = "gnome-shell"; description = "Start a desktop environment instead of seamless mode"; }; - auth = mkOption { - type = types.str; + auth = lib.mkOption { + type = lib.types.str; default = "pam"; example = "password:value=mysecret"; description = "Authentication to use when connecting to xpra"; }; - pulseaudio = mkEnableOption "pulseaudio audio streaming"; + pulseaudio = lib.mkEnableOption "pulseaudio audio streaming"; - extraOptions = mkOption { + extraOptions = lib.mkOption { description = "Extra xpra options"; default = []; - type = types.listOf types.str; + type = lib.types.listOf lib.types.str; }; }; }; ###### implementation - config = mkIf cfg.enable { + config = lib.mkIf cfg.enable { services.xserver.videoDrivers = ["dummy"]; services.xserver.monitorSection = '' @@ -227,7 +224,7 @@ in ''; services.displayManager.execCmd = '' - ${optionalString (cfg.pulseaudio) + ${lib.optionalString (cfg.pulseaudio) "export PULSE_COOKIE=/run/pulse/.config/pulse/cookie"} exec ${pkgs.xpra}/bin/xpra ${if cfg.desktop == null then "start" else "start-desktop --start=${cfg.desktop}"} \ --daemon=off \ @@ -239,20 +236,20 @@ in --speaker=yes \ --mdns=no \ --pulseaudio=no \ - ${optionalString (cfg.pulseaudio) "--sound-source=pulse"} \ + ${lib.optionalString (cfg.pulseaudio) "--sound-source=pulse"} \ --socket-dirs=/run/xpra \ - --xvfb="xpra_Xdummy ${concatStringsSep " " dmcfg.xserverArgs}" \ - ${optionalString (cfg.bindTcp != null) "--bind-tcp=${cfg.bindTcp}"} \ + --xvfb="xpra_Xdummy ${lib.concatStringsSep " " dmcfg.xserverArgs}" \ + ${lib.optionalString (cfg.bindTcp != null) "--bind-tcp=${cfg.bindTcp}"} \ --auth=${cfg.auth} \ - ${concatStringsSep " " cfg.extraOptions} + ${lib.concatStringsSep " " cfg.extraOptions} ''; services.xserver.terminateOnReset = false; environment.systemPackages = [pkgs.xpra]; - services.pulseaudio.enable = mkDefault cfg.pulseaudio; - services.pulseaudio.systemWide = mkDefault cfg.pulseaudio; + services.pulseaudio.enable = lib.mkDefault cfg.pulseaudio; + services.pulseaudio.systemWide = lib.mkDefault cfg.pulseaudio; }; } From 4c8347ad68f5ded7986bb33ca6ef8026b5a34b1e Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Mon, 30 Dec 2024 14:44:41 +0100 Subject: [PATCH 312/429] nixos/services.xserver.xkb.extraLayouts: remove `with lib;` --- nixos/modules/services/x11/extra-layouts.nix | 39 +++++++++----------- 1 file changed, 18 insertions(+), 21 deletions(-) diff --git a/nixos/modules/services/x11/extra-layouts.nix b/nixos/modules/services/x11/extra-layouts.nix index 0327609c25cd..e5e294a5c175 100644 --- a/nixos/modules/services/x11/extra-layouts.nix +++ b/nixos/modules/services/x11/extra-layouts.nix @@ -4,29 +4,26 @@ pkgs, ... }: - -with lib; - let layouts = config.services.xserver.xkb.extraLayouts; layoutOpts = { options = { - description = mkOption { - type = types.str; + description = lib.mkOption { + type = lib.types.str; description = "A short description of the layout."; }; - languages = mkOption { - type = types.listOf types.str; + languages = lib.mkOption { + type = lib.types.listOf lib.types.str; description = '' A list of languages provided by the layout. (Use ISO 639-2 codes, for example: "eng" for english) ''; }; - compatFile = mkOption { - type = types.nullOr types.path; + compatFile = lib.mkOption { + type = lib.types.nullOr lib.types.path; default = null; description = '' The path to the xkb compat file. @@ -36,8 +33,8 @@ let ''; }; - geometryFile = mkOption { - type = types.nullOr types.path; + geometryFile = lib.mkOption { + type = lib.types.nullOr lib.types.path; default = null; description = '' The path to the xkb geometry file. @@ -47,8 +44,8 @@ let ''; }; - keycodesFile = mkOption { - type = types.nullOr types.path; + keycodesFile = lib.mkOption { + type = lib.types.nullOr lib.types.path; default = null; description = '' The path to the xkb keycodes file. @@ -58,8 +55,8 @@ let ''; }; - symbolsFile = mkOption { - type = types.nullOr types.path; + symbolsFile = lib.mkOption { + type = lib.types.nullOr lib.types.path; default = null; description = '' The path to the xkb symbols file. @@ -69,8 +66,8 @@ let ''; }; - typesFile = mkOption { - type = types.nullOr types.path; + typesFile = lib.mkOption { + type = lib.types.nullOr lib.types.path; default = null; description = '' The path to the xkb types file. @@ -111,10 +108,10 @@ in ###### interface options.services.xserver.xkb = { - extraLayouts = mkOption { - type = types.attrsOf (types.submodule layoutOpts); + extraLayouts = lib.mkOption { + type = lib.types.attrsOf (lib.types.submodule layoutOpts); default = { }; - example = literalExpression '' + example = lib.literalExpression '' { mine = { description = "My custom xkb layout."; @@ -136,7 +133,7 @@ in ###### implementation - config = mkIf (layouts != { }) { + config = lib.mkIf (layouts != { }) { environment.sessionVariables = { # runtime override supported by multiple libraries e. g. libxkbcommon From 620887f332ad2860af0eb32066cd617f575c1df6 Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Mon, 30 Dec 2024 14:44:42 +0100 Subject: [PATCH 313/429] nixos/services.fractalart: remove `with lib;` --- nixos/modules/services/x11/fractalart.nix | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/nixos/modules/services/x11/fractalart.nix b/nixos/modules/services/x11/fractalart.nix index 9ec64abc9049..1f6f7d9eaccb 100644 --- a/nixos/modules/services/x11/fractalart.nix +++ b/nixos/modules/services/x11/fractalart.nix @@ -4,39 +4,38 @@ pkgs, ... }: -with lib; let cfg = config.services.fractalart; in { options.services.fractalart = { - enable = mkOption { - type = types.bool; + enable = lib.mkOption { + type = lib.types.bool; default = false; example = true; description = "Enable FractalArt for generating colorful wallpapers on login"; }; - width = mkOption { - type = types.nullOr types.int; + width = lib.mkOption { + type = lib.types.nullOr lib.types.int; default = null; example = 1920; description = "Screen width"; }; - height = mkOption { - type = types.nullOr types.int; + height = lib.mkOption { + type = lib.types.nullOr lib.types.int; default = null; example = 1080; description = "Screen height"; }; }; - config = mkIf cfg.enable { + config = lib.mkIf cfg.enable { environment.systemPackages = [ pkgs.haskellPackages.FractalArt ]; services.xserver.displayManager.sessionCommands = "${pkgs.haskellPackages.FractalArt}/bin/FractalArt --no-bg -f .background-image" - + optionalString (cfg.width != null) " -w ${toString cfg.width}" - + optionalString (cfg.height != null) " -h ${toString cfg.height}"; + + lib.optionalString (cfg.width != null) " -w ${toString cfg.width}" + + lib.optionalString (cfg.height != null) " -h ${toString cfg.height}"; }; } From ae638c0c4cacbadea6f1a04c33ce575147865e90 Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Mon, 30 Dec 2024 14:44:42 +0100 Subject: [PATCH 314/429] nixos/services.xserver.cmt: remove `with lib;` --- nixos/modules/services/x11/hardware/cmt.nix | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/nixos/modules/services/x11/hardware/cmt.nix b/nixos/modules/services/x11/hardware/cmt.nix index 23f07e5de06e..8d037f038625 100644 --- a/nixos/modules/services/x11/hardware/cmt.nix +++ b/nixos/modules/services/x11/hardware/cmt.nix @@ -4,9 +4,6 @@ pkgs, ... }: - -with lib; - let cfg = config.services.xserver.cmt; @@ -18,13 +15,13 @@ in options = { services.xserver.cmt = { - enable = mkOption { - type = types.bool; + enable = lib.mkOption { + type = lib.types.bool; default = false; description = "Enable chrome multitouch input (cmt). Touchpad drivers that are configured for chromebooks."; }; - models = mkOption { - type = types.enum [ + models = lib.mkOption { + type = lib.types.enum [ "atlas" "banjo" "candy" @@ -83,7 +80,7 @@ in }; # closes services }; # closes options - config = mkIf cfg.enable { + config = lib.mkIf cfg.enable { services.xserver.modules = [ pkgs.xf86_input_cmt ]; From 19ac519ddaa3029918c7badd74bf9e47df06a57b Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Mon, 30 Dec 2024 14:44:42 +0100 Subject: [PATCH 315/429] nixos/services.xserver.digimend: remove `with lib;` --- nixos/modules/services/x11/hardware/digimend.nix | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/nixos/modules/services/x11/hardware/digimend.nix b/nixos/modules/services/x11/hardware/digimend.nix index 693db5e90720..a8cc2a7f9937 100644 --- a/nixos/modules/services/x11/hardware/digimend.nix +++ b/nixos/modules/services/x11/hardware/digimend.nix @@ -4,9 +4,6 @@ pkgs, ... }: - -with lib; - let cfg = config.services.xserver.digimend; @@ -21,13 +18,13 @@ in services.xserver.digimend = { - enable = mkEnableOption "the digimend drivers for Huion/XP-Pen/etc. tablets"; + enable = lib.mkEnableOption "the digimend drivers for Huion/XP-Pen/etc. tablets"; }; }; - config = mkIf cfg.enable { + config = lib.mkIf cfg.enable { # digimend drivers use xsetwacom and wacom X11 drivers services.xserver.wacom.enable = true; From ef32b6d67ae37f1d8ed220f0acd19f7a12c52afe Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Mon, 30 Dec 2024 14:44:42 +0100 Subject: [PATCH 316/429] nixos/services.xserver.synaptics: remove `with lib;` --- .../services/x11/hardware/synaptics.nix | 109 +++++++++--------- 1 file changed, 53 insertions(+), 56 deletions(-) diff --git a/nixos/modules/services/x11/hardware/synaptics.nix b/nixos/modules/services/x11/hardware/synaptics.nix index f943242f7bae..914f80d2da1f 100644 --- a/nixos/modules/services/x11/hardware/synaptics.nix +++ b/nixos/modules/services/x11/hardware/synaptics.nix @@ -5,9 +5,6 @@ pkgs, ... }: - -with lib; - let cfg = config.services.xserver.synaptics; opt = options.services.xserver.synaptics; @@ -35,14 +32,14 @@ in services.xserver.synaptics = { - enable = mkOption { - type = types.bool; + enable = lib.mkOption { + type = lib.types.bool; default = false; description = "Whether to enable touchpad support. Deprecated: Consider services.libinput.enable."; }; - dev = mkOption { - type = types.nullOr types.str; + dev = lib.mkOption { + type = lib.types.nullOr lib.types.str; default = null; example = "/dev/input/event0"; description = '' @@ -51,73 +48,73 @@ in ''; }; - accelFactor = mkOption { - type = types.nullOr types.str; + accelFactor = lib.mkOption { + type = lib.types.nullOr lib.types.str; default = "0.001"; description = "Cursor acceleration (how fast speed increases from minSpeed to maxSpeed)."; }; - minSpeed = mkOption { - type = types.nullOr types.str; + minSpeed = lib.mkOption { + type = lib.types.nullOr lib.types.str; default = "0.6"; description = "Cursor speed factor for precision finger motion."; }; - maxSpeed = mkOption { - type = types.nullOr types.str; + maxSpeed = lib.mkOption { + type = lib.types.nullOr lib.types.str; default = "1.0"; description = "Cursor speed factor for highest-speed finger motion."; }; - scrollDelta = mkOption { - type = types.nullOr types.int; + scrollDelta = lib.mkOption { + type = lib.types.nullOr lib.types.int; default = null; example = 75; description = "Move distance of the finger for a scroll event."; }; - twoFingerScroll = mkOption { - type = types.bool; + twoFingerScroll = lib.mkOption { + type = lib.types.bool; default = false; description = "Whether to enable two-finger drag-scrolling. Overridden by horizTwoFingerScroll and vertTwoFingerScroll."; }; - horizTwoFingerScroll = mkOption { - type = types.bool; + horizTwoFingerScroll = lib.mkOption { + type = lib.types.bool; default = cfg.twoFingerScroll; - defaultText = literalExpression "config.${opt.twoFingerScroll}"; + defaultText = lib.literalExpression "config.${opt.twoFingerScroll}"; description = "Whether to enable horizontal two-finger drag-scrolling."; }; - vertTwoFingerScroll = mkOption { - type = types.bool; + vertTwoFingerScroll = lib.mkOption { + type = lib.types.bool; default = cfg.twoFingerScroll; - defaultText = literalExpression "config.${opt.twoFingerScroll}"; + defaultText = lib.literalExpression "config.${opt.twoFingerScroll}"; description = "Whether to enable vertical two-finger drag-scrolling."; }; - horizEdgeScroll = mkOption { - type = types.bool; + horizEdgeScroll = lib.mkOption { + type = lib.types.bool; default = !cfg.horizTwoFingerScroll; - defaultText = literalExpression "! config.${opt.horizTwoFingerScroll}"; + defaultText = lib.literalExpression "! config.${opt.horizTwoFingerScroll}"; description = "Whether to enable horizontal edge drag-scrolling."; }; - vertEdgeScroll = mkOption { - type = types.bool; + vertEdgeScroll = lib.mkOption { + type = lib.types.bool; default = !cfg.vertTwoFingerScroll; - defaultText = literalExpression "! config.${opt.vertTwoFingerScroll}"; + defaultText = lib.literalExpression "! config.${opt.vertTwoFingerScroll}"; description = "Whether to enable vertical edge drag-scrolling."; }; - tapButtons = mkOption { - type = types.bool; + tapButtons = lib.mkOption { + type = lib.types.bool; default = true; description = "Whether to enable tap buttons."; }; - buttonsMap = mkOption { - type = types.listOf types.int; + buttonsMap = lib.mkOption { + type = lib.types.listOf lib.types.int; default = [ 1 2 @@ -132,8 +129,8 @@ in apply = map toString; }; - fingersMap = mkOption { - type = types.listOf types.int; + fingersMap = lib.mkOption { + type = lib.types.listOf lib.types.int; default = [ 1 2 @@ -148,34 +145,34 @@ in apply = map toString; }; - palmDetect = mkOption { - type = types.bool; + palmDetect = lib.mkOption { + type = lib.types.bool; default = false; description = "Whether to enable palm detection (hardware support required)"; }; - palmMinWidth = mkOption { - type = types.nullOr types.int; + palmMinWidth = lib.mkOption { + type = lib.types.nullOr lib.types.int; default = null; example = 5; description = "Minimum finger width at which touch is considered a palm"; }; - palmMinZ = mkOption { - type = types.nullOr types.int; + palmMinZ = lib.mkOption { + type = lib.types.nullOr lib.types.int; default = null; example = 20; description = "Minimum finger pressure at which touch is considered a palm"; }; - horizontalScroll = mkOption { - type = types.bool; + horizontalScroll = lib.mkOption { + type = lib.types.bool; default = true; description = "Whether to enable horizontal scrolling (on touchpad)"; }; - additionalOptions = mkOption { - type = types.str; + additionalOptions = lib.mkOption { + type = lib.types.str; default = ""; example = '' Option "RTCornerButton" "2" @@ -190,7 +187,7 @@ in }; - config = mkIf cfg.enable { + config = lib.mkIf cfg.enable { services.xserver.modules = [ pkg.out ]; @@ -203,12 +200,12 @@ in Section "InputClass" Identifier "synaptics touchpad catchall" MatchIsTouchpad "on" - ${optionalString (cfg.dev != null) ''MatchDevicePath "${cfg.dev}"''} + ${lib.optionalString (cfg.dev != null) ''MatchDevicePath "${cfg.dev}"''} Driver "synaptics" - ${optionalString (cfg.minSpeed != null) ''Option "MinSpeed" "${cfg.minSpeed}"''} - ${optionalString (cfg.maxSpeed != null) ''Option "MaxSpeed" "${cfg.maxSpeed}"''} - ${optionalString (cfg.accelFactor != null) ''Option "AccelFactor" "${cfg.accelFactor}"''} - ${optionalString cfg.tapButtons tapConfig} + ${lib.optionalString (cfg.minSpeed != null) ''Option "MinSpeed" "${cfg.minSpeed}"''} + ${lib.optionalString (cfg.maxSpeed != null) ''Option "MaxSpeed" "${cfg.maxSpeed}"''} + ${lib.optionalString (cfg.accelFactor != null) ''Option "AccelFactor" "${cfg.accelFactor}"''} + ${lib.optionalString cfg.tapButtons tapConfig} Option "ClickFinger1" "${builtins.elemAt cfg.buttonsMap 0}" Option "ClickFinger2" "${builtins.elemAt cfg.buttonsMap 1}" Option "ClickFinger3" "${builtins.elemAt cfg.buttonsMap 2}" @@ -216,19 +213,19 @@ in Option "HorizTwoFingerScroll" "${if cfg.horizTwoFingerScroll then "1" else "0"}" Option "VertEdgeScroll" "${if cfg.vertEdgeScroll then "1" else "0"}" Option "HorizEdgeScroll" "${if cfg.horizEdgeScroll then "1" else "0"}" - ${optionalString cfg.palmDetect ''Option "PalmDetect" "1"''} - ${optionalString ( + ${lib.optionalString cfg.palmDetect ''Option "PalmDetect" "1"''} + ${lib.optionalString ( cfg.palmMinWidth != null ) ''Option "PalmMinWidth" "${toString cfg.palmMinWidth}"''} - ${optionalString (cfg.palmMinZ != null) ''Option "PalmMinZ" "${toString cfg.palmMinZ}"''} - ${optionalString ( + ${lib.optionalString (cfg.palmMinZ != null) ''Option "PalmMinZ" "${toString cfg.palmMinZ}"''} + ${lib.optionalString ( cfg.scrollDelta != null ) ''Option "VertScrollDelta" "${toString cfg.scrollDelta}"''} ${ if !cfg.horizontalScroll then ''Option "HorizScrollDelta" "0"'' else - (optionalString ( + (lib.optionalString ( cfg.scrollDelta != null ) ''Option "HorizScrollDelta" "${toString cfg.scrollDelta}"'') } From 39e4529bdd705fd56a37fdefb1db37b31c77894b Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Mon, 30 Dec 2024 14:44:42 +0100 Subject: [PATCH 317/429] nixos/services.xserver.wacom: remove `with lib;` --- nixos/modules/services/x11/hardware/wacom.nix | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/nixos/modules/services/x11/hardware/wacom.nix b/nixos/modules/services/x11/hardware/wacom.nix index 3707b7f41575..c4e6ed941583 100644 --- a/nixos/modules/services/x11/hardware/wacom.nix +++ b/nixos/modules/services/x11/hardware/wacom.nix @@ -4,9 +4,6 @@ pkgs, ... }: - -with lib; - let cfg = config.services.xserver.wacom; @@ -19,8 +16,8 @@ in services.xserver.wacom = { - enable = mkOption { - type = types.bool; + enable = lib.mkOption { + type = lib.types.bool; default = false; description = '' Whether to enable the Wacom touchscreen/digitizer/tablet. @@ -37,7 +34,7 @@ in }; - config = mkIf cfg.enable { + config = lib.mkIf cfg.enable { environment.systemPackages = [ pkgs.xf86_input_wacom ]; # provides xsetwacom From 68590cbb863a8746780e684879dee6820586e4f8 Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Mon, 30 Dec 2024 14:44:42 +0100 Subject: [PATCH 318/429] nixos/services.xserver.imwheel: remove `with lib;` --- nixos/modules/services/x11/imwheel.nix | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/nixos/modules/services/x11/imwheel.nix b/nixos/modules/services/x11/imwheel.nix index 2898af201a7e..c674555a60f3 100644 --- a/nixos/modules/services/x11/imwheel.nix +++ b/nixos/modules/services/x11/imwheel.nix @@ -4,17 +4,16 @@ pkgs, ... }: -with lib; let cfg = config.services.xserver.imwheel; in { options = { services.xserver.imwheel = { - enable = mkEnableOption "IMWheel service"; + enable = lib.mkEnableOption "IMWheel service"; - extraOptions = mkOption { - type = types.listOf types.str; + extraOptions = lib.mkOption { + type = lib.types.listOf lib.types.str; default = [ "--buttons=45" ]; example = [ "--debug" ]; description = '' @@ -23,10 +22,10 @@ in ''; }; - rules = mkOption { - type = types.attrsOf types.str; + rules = lib.mkOption { + type = lib.types.attrsOf lib.types.str; default = { }; - example = literalExpression '' + example = lib.literalExpression '' { ".*" = ''' None, Up, Button4, 8 @@ -49,11 +48,11 @@ in }; }; - config = mkIf cfg.enable { + config = lib.mkIf cfg.enable { environment.systemPackages = [ pkgs.imwheel ]; environment.etc."X11/imwheel/imwheelrc".source = pkgs.writeText "imwheelrc" ( - concatStringsSep "\n\n" (mapAttrsToList (rule: conf: "\"${rule}\"\n${conf}") cfg.rules) + lib.concatStringsSep "\n\n" (lib.mapAttrsToList (rule: conf: "\"${rule}\"\n${conf}") cfg.rules) ); systemd.user.services.imwheel = { @@ -63,7 +62,7 @@ in serviceConfig = { ExecStart = "${pkgs.imwheel}/bin/imwheel " - + escapeShellArgs ( + + lib.escapeShellArgs ( [ "--detach" "--kill" From f8e4c2bb77617662fb8c56ea26352510411c9203 Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Mon, 30 Dec 2024 14:44:42 +0100 Subject: [PATCH 319/429] nixos/services.picom: remove `with lib;` --- nixos/modules/services/x11/picom.nix | 131 +++++++++++++-------------- 1 file changed, 64 insertions(+), 67 deletions(-) diff --git a/nixos/modules/services/x11/picom.nix b/nixos/modules/services/x11/picom.nix index 237d78484286..41d2acda063d 100644 --- a/nixos/modules/services/x11/picom.nix +++ b/nixos/modules/services/x11/picom.nix @@ -5,9 +5,6 @@ pkgs, ... }: - -with lib; - let cfg = config.services.picom; @@ -15,46 +12,46 @@ let pairOf = x: - with types; + with lib.types; addCheck (listOf x) (y: length y == 2) // { description = "pair of ${x.description}"; }; - mkDefaultAttrs = mapAttrs (n: v: mkDefault v); + mkDefaultAttrs = lib.mapAttrs (n: v: lib.mkDefault v); # Basically a tinkered lib.generators.mkKeyValueDefault # It either serializes a top-level definition "key: { values };" # or an expression "key = { values };" mkAttrsString = top: - mapAttrsToList ( + lib.mapAttrsToList ( k: v: let - sep = if (top && isAttrs v) then ":" else "="; + sep = if (top && lib.isAttrs v) then ":" else "="; in - "${escape [ sep ] k}${sep}${mkValueString v};" + "${lib.escape [ sep ] k}${sep}${mkValueString v};" ); # This serializes a Nix expression to the libconfig format. mkValueString = v: - if types.bool.check v then - boolToString v - else if types.int.check v then + if lib.types.bool.check v then + lib.boolToString v + else if lib.types.int.check v then toString v - else if types.float.check v then + else if lib.types.float.check v then toString v - else if types.str.check v then - "\"${escape [ "\"" ] v}\"" + else if lib.types.str.check v then + "\"${lib.escape [ "\"" ] v}\"" else if builtins.isList v then - "[ ${concatMapStringsSep " , " mkValueString v} ]" - else if types.attrs.check v then - "{ ${concatStringsSep " " (mkAttrsString false v)} }" + "[ ${lib.concatMapStringsSep " , " mkValueString v} ]" + else if lib.types.attrs.check v then + "{ ${lib.concatStringsSep " " (mkAttrsString false v)} }" else throw '' invalid expression used in option services.picom.settings: ${v} ''; - toConf = attrs: concatStringsSep "\n" (mkAttrsString true cfg.settings); + toConf = attrs: lib.concatStringsSep "\n" (mkAttrsString true cfg.settings); configFile = pkgs.writeText "picom.conf" (toConf cfg.settings); @@ -62,38 +59,38 @@ in { imports = [ - (mkAliasOptionModuleMD [ "services" "compton" ] [ "services" "picom" ]) - (mkRemovedOptionModule [ "services" "picom" "refreshRate" ] '' + (lib.mkAliasOptionModuleMD [ "services" "compton" ] [ "services" "picom" ]) + (lib.mkRemovedOptionModule [ "services" "picom" "refreshRate" ] '' This option corresponds to `refresh-rate`, which has been unused since picom v6 and was subsequently removed by upstream. See https://github.com/yshui/picom/commit/bcbc410 '') - (mkRemovedOptionModule [ "services" "picom" "experimentalBackends" ] '' + (lib.mkRemovedOptionModule [ "services" "picom" "experimentalBackends" ] '' This option was removed by upstream since picom v10. '') ]; options.services.picom = { - enable = mkOption { - type = types.bool; + enable = lib.mkOption { + type = lib.types.bool; default = false; description = '' Whether or not to enable Picom as the X.org composite manager. ''; }; - package = mkPackageOption pkgs "picom" { }; + package = lib.mkPackageOption pkgs "picom" { }; - fade = mkOption { - type = types.bool; + fade = lib.mkOption { + type = lib.types.bool; default = false; description = '' Fade windows in and out. ''; }; - fadeDelta = mkOption { - type = types.ints.positive; + fadeDelta = lib.mkOption { + type = lib.types.ints.positive; default = 10; example = 5; description = '' @@ -101,8 +98,8 @@ in ''; }; - fadeSteps = mkOption { - type = pairOf (types.numbers.between 0.01 1); + fadeSteps = lib.mkOption { + type = pairOf (lib.types.numbers.between 0.01 1); default = [ 0.028 0.03 @@ -116,8 +113,8 @@ in ''; }; - fadeExclude = mkOption { - type = types.listOf types.str; + fadeExclude = lib.mkOption { + type = lib.types.listOf lib.types.str; default = [ ]; example = [ "window_type *= 'menu'" @@ -130,16 +127,16 @@ in ''; }; - shadow = mkOption { - type = types.bool; + shadow = lib.mkOption { + type = lib.types.bool; default = false; description = '' Draw window shadows. ''; }; - shadowOffsets = mkOption { - type = pairOf types.int; + shadowOffsets = lib.mkOption { + type = pairOf lib.types.int; default = [ (-15) (-15) @@ -153,8 +150,8 @@ in ''; }; - shadowOpacity = mkOption { - type = types.numbers.between 0 1; + shadowOpacity = lib.mkOption { + type = lib.types.numbers.between 0 1; default = 0.75; example = 0.8; description = '' @@ -162,8 +159,8 @@ in ''; }; - shadowExclude = mkOption { - type = types.listOf types.str; + shadowExclude = lib.mkOption { + type = lib.types.listOf lib.types.str; default = [ ]; example = [ "window_type *= 'menu'" @@ -176,8 +173,8 @@ in ''; }; - activeOpacity = mkOption { - type = types.numbers.between 0 1; + activeOpacity = lib.mkOption { + type = lib.types.numbers.between 0 1; default = 1.0; example = 0.8; description = '' @@ -185,8 +182,8 @@ in ''; }; - inactiveOpacity = mkOption { - type = types.numbers.between 0.1 1; + inactiveOpacity = lib.mkOption { + type = lib.types.numbers.between 0.1 1; default = 1.0; example = 0.8; description = '' @@ -194,8 +191,8 @@ in ''; }; - menuOpacity = mkOption { - type = types.numbers.between 0 1; + menuOpacity = lib.mkOption { + type = lib.types.numbers.between 0 1; default = 1.0; example = 0.8; description = '' @@ -203,8 +200,8 @@ in ''; }; - wintypes = mkOption { - type = types.attrs; + wintypes = lib.mkOption { + type = lib.types.attrs; default = { popup_menu = { opacity = cfg.menuOpacity; @@ -213,7 +210,7 @@ in opacity = cfg.menuOpacity; }; }; - defaultText = literalExpression '' + defaultText = lib.literalExpression '' { popup_menu = { opacity = config.${opt.menuOpacity}; }; dropdown_menu = { opacity = config.${opt.menuOpacity}; }; @@ -225,8 +222,8 @@ in ''; }; - opacityRules = mkOption { - type = types.listOf types.str; + opacityRules = lib.mkOption { + type = lib.types.listOf lib.types.str; default = [ ]; example = [ "95:class_g = 'URxvt' && !_NET_WM_STATE@:32a" @@ -237,8 +234,8 @@ in ''; }; - backend = mkOption { - type = types.enum [ + backend = lib.mkOption { + type = lib.types.enum [ "egl" "glx" "xrender" @@ -250,9 +247,9 @@ in ''; }; - vSync = mkOption { + vSync = lib.mkOption { type = - with types; + with lib.types; either bool (enum [ "none" "drm" @@ -268,9 +265,9 @@ in res = x != "none"; msg = "The type of services.picom.vSync has changed to bool:" - + " interpreting ${x} as ${boolToString res}"; + + " interpreting ${x} as ${lib.boolToString res}"; in - if isBool x then x else warn msg res; + if lib.isBool x then x else lib.warn msg res; description = '' Enable vertical synchronization. Chooses the best method @@ -280,7 +277,7 @@ in }; settings = - with types; + with lib.types; let scalar = oneOf [ @@ -313,10 +310,10 @@ in }; in - mkOption { + lib.mkOption { type = topLevel; default = { }; - example = literalExpression '' + example = lib.literalExpression '' blur = { method = "gaussian"; size = 10; @@ -331,19 +328,19 @@ in }; }; - config = mkIf cfg.enable { + config = lib.mkIf cfg.enable { services.picom.settings = mkDefaultAttrs { # fading fading = cfg.fade; fade-delta = cfg.fadeDelta; - fade-in-step = elemAt cfg.fadeSteps 0; - fade-out-step = elemAt cfg.fadeSteps 1; + fade-in-step = lib.elemAt cfg.fadeSteps 0; + fade-out-step = lib.elemAt cfg.fadeSteps 1; fade-exclude = cfg.fadeExclude; # shadows shadow = cfg.shadow; - shadow-offset-x = elemAt cfg.shadowOffsets 0; - shadow-offset-y = elemAt cfg.shadowOffsets 1; + shadow-offset-x = lib.elemAt cfg.shadowOffsets 0; + shadow-offset-y = lib.elemAt cfg.shadowOffsets 1; shadow-opacity = cfg.shadowOpacity; shadow-exclude = cfg.shadowExclude; @@ -366,12 +363,12 @@ in partOf = [ "graphical-session.target" ]; # Temporarily fixes corrupt colours with Mesa 18 - environment = mkIf (cfg.backend == "glx") { + environment = lib.mkIf (cfg.backend == "glx") { allow_rgb10_configs = "false"; }; serviceConfig = { - ExecStart = "${getExe cfg.package} --config ${configFile}"; + ExecStart = "${lib.getExe cfg.package} --config ${configFile}"; RestartSec = 3; Restart = "always"; }; From 3c25e33c2fa77e6fc52ccdd80585289a7f18d7be Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Mon, 30 Dec 2024 14:44:42 +0100 Subject: [PATCH 320/429] nixos/services.redshift: remove `with lib;` --- nixos/modules/services/x11/redshift.nix | 45 ++++++++++++------------- 1 file changed, 21 insertions(+), 24 deletions(-) diff --git a/nixos/modules/services/x11/redshift.nix b/nixos/modules/services/x11/redshift.nix index 661053c20016..849780b53a77 100644 --- a/nixos/modules/services/x11/redshift.nix +++ b/nixos/modules/services/x11/redshift.nix @@ -4,9 +4,6 @@ pkgs, ... }: - -with lib; - let cfg = config.services.redshift; @@ -16,32 +13,32 @@ in { imports = [ - (mkChangedOptionModule [ "services" "redshift" "latitude" ] [ "location" "latitude" ] ( + (lib.mkChangedOptionModule [ "services" "redshift" "latitude" ] [ "location" "latitude" ] ( config: let - value = getAttrFromPath [ "services" "redshift" "latitude" ] config; + value = lib.getAttrFromPath [ "services" "redshift" "latitude" ] config; in if value == null then throw "services.redshift.latitude is set to null, you can remove this" else builtins.fromJSON value )) - (mkChangedOptionModule [ "services" "redshift" "longitude" ] [ "location" "longitude" ] ( + (lib.mkChangedOptionModule [ "services" "redshift" "longitude" ] [ "location" "longitude" ] ( config: let - value = getAttrFromPath [ "services" "redshift" "longitude" ] config; + value = lib.getAttrFromPath [ "services" "redshift" "longitude" ] config; in if value == null then throw "services.redshift.longitude is set to null, you can remove this" else builtins.fromJSON value )) - (mkRenamedOptionModule [ "services" "redshift" "provider" ] [ "location" "provider" ]) + (lib.mkRenamedOptionModule [ "services" "redshift" "provider" ] [ "location" "provider" ]) ]; options.services.redshift = { - enable = mkOption { - type = types.bool; + enable = lib.mkOption { + type = lib.types.bool; default = false; description = '' Enable Redshift to change your screen's colour temperature depending on @@ -50,16 +47,16 @@ in }; temperature = { - day = mkOption { - type = types.int; + day = lib.mkOption { + type = lib.types.int; default = 5500; description = '' Colour temperature to use during the day, between `1000` and `25000` K. ''; }; - night = mkOption { - type = types.int; + night = lib.mkOption { + type = lib.types.int; default = 3700; description = '' Colour temperature to use at night, between @@ -69,16 +66,16 @@ in }; brightness = { - day = mkOption { - type = types.str; + day = lib.mkOption { + type = lib.types.str; default = "1"; description = '' Screen brightness to apply during the day, between `0.1` and `1.0`. ''; }; - night = mkOption { - type = types.str; + night = lib.mkOption { + type = lib.types.str; default = "1"; description = '' Screen brightness to apply during the night, @@ -87,10 +84,10 @@ in }; }; - package = mkPackageOption pkgs "redshift" { }; + package = lib.mkPackageOption pkgs "redshift" { }; - executable = mkOption { - type = types.str; + executable = lib.mkOption { + type = lib.types.str; default = "/bin/redshift"; example = "/bin/redshift-gtk"; description = '' @@ -98,8 +95,8 @@ in ''; }; - extraOptions = mkOption { - type = types.listOf types.str; + extraOptions = lib.mkOption { + type = lib.types.listOf lib.types.str; default = [ ]; example = [ "-v" @@ -112,7 +109,7 @@ in }; }; - config = mkIf cfg.enable { + config = lib.mkIf cfg.enable { # needed so that .desktop files are installed, which geoclue cares about environment.systemPackages = [ cfg.package ]; From c395f4a881bf11f7901a8d1fdff522e4aef35e25 Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Mon, 30 Dec 2024 14:44:43 +0100 Subject: [PATCH 321/429] nixos/services.touchegg: remove `with lib;` --- nixos/modules/services/x11/touchegg.nix | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/nixos/modules/services/x11/touchegg.nix b/nixos/modules/services/x11/touchegg.nix index def3dac738e0..e641e5cf4727 100644 --- a/nixos/modules/services/x11/touchegg.nix +++ b/nixos/modules/services/x11/touchegg.nix @@ -4,27 +4,24 @@ pkgs, ... }: - -with lib; - let cfg = config.services.touchegg; in { meta = { - maintainers = teams.pantheon.members; + maintainers = lib.teams.pantheon.members; }; ###### interface options.services.touchegg = { - enable = mkEnableOption "touchegg, a multi-touch gesture recognizer"; + enable = lib.mkEnableOption "touchegg, a multi-touch gesture recognizer"; - package = mkPackageOption pkgs "touchegg" { }; + package = lib.mkPackageOption pkgs "touchegg" { }; }; ###### implementation - config = mkIf cfg.enable { + config = lib.mkIf cfg.enable { systemd.services.touchegg = { description = "Touchegg Daemon"; serviceConfig = { From 81af5e84de65e2a62fc036663f6241a4e4daf14c Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Mon, 30 Dec 2024 14:44:43 +0100 Subject: [PATCH 322/429] nixos/services.unclutter-xfixes: remove `with lib;` --- .../modules/services/x11/unclutter-xfixes.nix | 25 ++++++++----------- 1 file changed, 11 insertions(+), 14 deletions(-) diff --git a/nixos/modules/services/x11/unclutter-xfixes.nix b/nixos/modules/services/x11/unclutter-xfixes.nix index 48adb3665f38..32ff1577d5a5 100644 --- a/nixos/modules/services/x11/unclutter-xfixes.nix +++ b/nixos/modules/services/x11/unclutter-xfixes.nix @@ -4,9 +4,6 @@ pkgs, ... }: - -with lib; - let cfg = config.services.unclutter-xfixes; @@ -14,29 +11,29 @@ in { options.services.unclutter-xfixes = { - enable = mkOption { + enable = lib.mkOption { description = "Enable unclutter-xfixes to hide your mouse cursor when inactive."; - type = types.bool; + type = lib.types.bool; default = false; }; - package = mkPackageOption pkgs "unclutter-xfixes" { }; + package = lib.mkPackageOption pkgs "unclutter-xfixes" { }; - timeout = mkOption { + timeout = lib.mkOption { description = "Number of seconds before the cursor is marked inactive."; - type = types.int; + type = lib.types.int; default = 1; }; - threshold = mkOption { + threshold = lib.mkOption { description = "Minimum number of pixels considered cursor movement."; - type = types.int; + type = lib.types.int; default = 1; }; - extraOptions = mkOption { + extraOptions = lib.mkOption { description = "More arguments to pass to the unclutter-xfixes command."; - type = types.listOf types.str; + type = lib.types.listOf lib.types.str; default = [ ]; example = [ "exclude-root" @@ -46,7 +43,7 @@ in }; }; - config = mkIf cfg.enable { + config = lib.mkIf cfg.enable { systemd.user.services.unclutter-xfixes = { description = "unclutter-xfixes"; wantedBy = [ "graphical-session.target" ]; @@ -55,7 +52,7 @@ in ${cfg.package}/bin/unclutter \ --timeout ${toString cfg.timeout} \ --jitter ${toString (cfg.threshold - 1)} \ - ${concatMapStrings (x: " --" + x) cfg.extraOptions} \ + ${lib.concatMapStrings (x: " --" + x) cfg.extraOptions} \ ''; serviceConfig.RestartSec = 3; serviceConfig.Restart = "always"; From 907513b013779e4e4bd68b3e2dc22f02606fe3d7 Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Mon, 30 Dec 2024 14:44:43 +0100 Subject: [PATCH 323/429] nixos/services.unclutter: remove `with lib;` --- nixos/modules/services/x11/unclutter.nix | 39 +++++++++++------------- 1 file changed, 18 insertions(+), 21 deletions(-) diff --git a/nixos/modules/services/x11/unclutter.nix b/nixos/modules/services/x11/unclutter.nix index bb11c8639783..7da1f611373a 100644 --- a/nixos/modules/services/x11/unclutter.nix +++ b/nixos/modules/services/x11/unclutter.nix @@ -4,9 +4,6 @@ pkgs, ... }: - -with lib; - let cfg = config.services.unclutter; @@ -14,42 +11,42 @@ in { options.services.unclutter = { - enable = mkOption { + enable = lib.mkOption { description = "Enable unclutter to hide your mouse cursor when inactive"; - type = types.bool; + type = lib.types.bool; default = false; }; - package = mkPackageOption pkgs "unclutter" { }; + package = lib.mkPackageOption pkgs "unclutter" { }; - keystroke = mkOption { + keystroke = lib.mkOption { description = "Wait for a keystroke before hiding the cursor"; - type = types.bool; + type = lib.types.bool; default = false; }; - timeout = mkOption { + timeout = lib.mkOption { description = "Number of seconds before the cursor is marked inactive"; - type = types.int; + type = lib.types.int; default = 1; }; - threshold = mkOption { + threshold = lib.mkOption { description = "Minimum number of pixels considered cursor movement"; - type = types.int; + type = lib.types.int; default = 1; }; - excluded = mkOption { + excluded = lib.mkOption { description = "Names of windows where unclutter should not apply"; - type = types.listOf types.str; + type = lib.types.listOf lib.types.str; default = [ ]; example = [ "" ]; }; - extraOptions = mkOption { + extraOptions = lib.mkOption { description = "More arguments to pass to the unclutter command"; - type = types.listOf types.str; + type = lib.types.listOf lib.types.str; default = [ ]; example = [ "noevent" @@ -58,7 +55,7 @@ in }; }; - config = mkIf cfg.enable { + config = lib.mkIf cfg.enable { systemd.user.services.unclutter = { description = "unclutter"; wantedBy = [ "graphical-session.target" ]; @@ -67,9 +64,9 @@ in ${cfg.package}/bin/unclutter \ -idle ${toString cfg.timeout} \ -jitter ${toString (cfg.threshold - 1)} \ - ${optionalString cfg.keystroke "-keystroke"} \ - ${concatMapStrings (x: " -" + x) cfg.extraOptions} \ - -not ${concatStringsSep " " cfg.excluded} \ + ${lib.optionalString cfg.keystroke "-keystroke"} \ + ${lib.concatMapStrings (x: " -" + x) cfg.extraOptions} \ + -not ${lib.concatStringsSep " " cfg.excluded} \ ''; serviceConfig.PassEnvironment = "DISPLAY"; serviceConfig.RestartSec = 3; @@ -78,7 +75,7 @@ in }; imports = [ - (mkRenamedOptionModule + (lib.mkRenamedOptionModule [ "services" "unclutter" "threeshold" ] [ "services" "unclutter" "threshold" ] ) From cfd241e856eb25376ece04f94da0ed542c778165 Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Mon, 30 Dec 2024 14:44:43 +0100 Subject: [PATCH 324/429] nixos/services.urxvtd: remove `with lib;` --- nixos/modules/services/x11/urxvtd.nix | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/nixos/modules/services/x11/urxvtd.nix b/nixos/modules/services/x11/urxvtd.nix index 5f8212a3c9ce..b015374bfd28 100644 --- a/nixos/modules/services/x11/urxvtd.nix +++ b/nixos/modules/services/x11/urxvtd.nix @@ -4,18 +4,14 @@ pkgs, ... }: - # maintainer: siddharthist - -with lib; - let cfg = config.services.urxvtd; in { options.services.urxvtd = { - enable = mkOption { - type = types.bool; + enable = lib.mkOption { + type = lib.types.bool; default = false; description = '' Enable urxvtd, the urxvt terminal daemon. To use urxvtd, run @@ -23,10 +19,10 @@ in ''; }; - package = mkPackageOption pkgs "rxvt-unicode" { }; + package = lib.mkPackageOption pkgs "rxvt-unicode" { }; }; - config = mkIf cfg.enable { + config = lib.mkIf cfg.enable { systemd.user.services.urxvtd = { description = "urxvt terminal daemon"; wantedBy = [ "graphical-session.target" ]; From 15928daf29c9b2ca60541f6523c3e3cb9b134815 Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Mon, 30 Dec 2024 14:44:43 +0100 Subject: [PATCH 325/429] nixos/services.xserver.windowManager.2bwm: remove `with lib;` --- nixos/modules/services/x11/window-managers/2bwm.nix | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/nixos/modules/services/x11/window-managers/2bwm.nix b/nixos/modules/services/x11/window-managers/2bwm.nix index ce01fcb17a10..0bafdfee3e7b 100644 --- a/nixos/modules/services/x11/window-managers/2bwm.nix +++ b/nixos/modules/services/x11/window-managers/2bwm.nix @@ -4,9 +4,6 @@ pkgs, ... }: - -with lib; - let cfg = config.services.xserver.windowManager."2bwm"; @@ -18,14 +15,14 @@ in ###### interface options = { - services.xserver.windowManager."2bwm".enable = mkEnableOption "2bwm"; + services.xserver.windowManager."2bwm".enable = lib.mkEnableOption "2bwm"; }; ###### implementation - config = mkIf cfg.enable { + config = lib.mkIf cfg.enable { - services.xserver.windowManager.session = singleton { + services.xserver.windowManager.session = lib.singleton { name = "2bwm"; start = '' ${pkgs._2bwm}/bin/2bwm & From 77cce31b626c4a9ca9de2acb9b62a503eb0b57c5 Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Mon, 30 Dec 2024 14:44:43 +0100 Subject: [PATCH 326/429] nixos/services.xserver.windowManager.afterstep: remove `with lib;` --- nixos/modules/services/x11/window-managers/afterstep.nix | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/nixos/modules/services/x11/window-managers/afterstep.nix b/nixos/modules/services/x11/window-managers/afterstep.nix index d88be7db3757..7ea546442d6f 100644 --- a/nixos/modules/services/x11/window-managers/afterstep.nix +++ b/nixos/modules/services/x11/window-managers/afterstep.nix @@ -4,21 +4,18 @@ pkgs, ... }: - -with lib; - let cfg = config.services.xserver.windowManager.afterstep; in { ###### interface options = { - services.xserver.windowManager.afterstep.enable = mkEnableOption "afterstep"; + services.xserver.windowManager.afterstep.enable = lib.mkEnableOption "afterstep"; }; ###### implementation - config = mkIf cfg.enable { - services.xserver.windowManager.session = singleton { + config = lib.mkIf cfg.enable { + services.xserver.windowManager.session = lib.singleton { name = "afterstep"; start = '' ${pkgs.afterstep}/bin/afterstep & From 380a81dd86cd3f7a0e54dba43643fa4432e98677 Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Mon, 30 Dec 2024 14:44:43 +0100 Subject: [PATCH 327/429] nixos/services.xserver.windowManager.awesome: remove `with lib;` --- .../services/x11/window-managers/awesome.nix | 21 ++++++++----------- 1 file changed, 9 insertions(+), 12 deletions(-) diff --git a/nixos/modules/services/x11/window-managers/awesome.nix b/nixos/modules/services/x11/window-managers/awesome.nix index 8b3d781c4c21..ee9e0cbf816e 100644 --- a/nixos/modules/services/x11/window-managers/awesome.nix +++ b/nixos/modules/services/x11/window-managers/awesome.nix @@ -4,9 +4,6 @@ pkgs, ... }: - -with lib; - let cfg = config.services.xserver.windowManager.awesome; @@ -25,20 +22,20 @@ in services.xserver.windowManager.awesome = { - enable = mkEnableOption "Awesome window manager"; + enable = lib.mkEnableOption "Awesome window manager"; - luaModules = mkOption { + luaModules = lib.mkOption { default = [ ]; - type = types.listOf types.package; + type = lib.types.listOf lib.types.package; description = "List of lua packages available for being used in the Awesome configuration."; - example = literalExpression "[ pkgs.luaPackages.vicious ]"; + example = lib.literalExpression "[ pkgs.luaPackages.vicious ]"; }; - package = mkPackageOption pkgs "awesome" { }; + package = lib.mkPackageOption pkgs "awesome" { }; - noArgb = mkOption { + noArgb = lib.mkOption { default = false; - type = types.bool; + type = lib.types.bool; description = "Disable client transparency support, which can be greatly detrimental to performance in some setups"; }; }; @@ -47,9 +44,9 @@ in ###### implementation - config = mkIf cfg.enable { + config = lib.mkIf cfg.enable { - services.xserver.windowManager.session = singleton { + services.xserver.windowManager.session = lib.singleton { name = "awesome"; start = '' ${awesome}/bin/awesome ${lib.optionalString cfg.noArgb "--no-argb"} ${makeSearchPath cfg.luaModules} & From f85316041af5428c05aa186e3bd8d45bb6b5c627 Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Mon, 30 Dec 2024 14:44:43 +0100 Subject: [PATCH 328/429] nixos/services.xserver.windowManager.berry: remove `with lib;` --- nixos/modules/services/x11/window-managers/berry.nix | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/nixos/modules/services/x11/window-managers/berry.nix b/nixos/modules/services/x11/window-managers/berry.nix index ba094d0e3efc..8fdd4e0f79a8 100644 --- a/nixos/modules/services/x11/window-managers/berry.nix +++ b/nixos/modules/services/x11/window-managers/berry.nix @@ -4,21 +4,18 @@ pkgs, ... }: - -with lib; - let cfg = config.services.xserver.windowManager.berry; in { ###### interface options = { - services.xserver.windowManager.berry.enable = mkEnableOption "berry"; + services.xserver.windowManager.berry.enable = lib.mkEnableOption "berry"; }; ###### implementation - config = mkIf cfg.enable { - services.xserver.windowManager.session = singleton { + config = lib.mkIf cfg.enable { + services.xserver.windowManager.session = lib.singleton { name = "berry"; start = '' ${pkgs.berry}/bin/berry & From acc4e7ea1ff02cef807b7536d77d336308c098b5 Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Mon, 30 Dec 2024 14:44:44 +0100 Subject: [PATCH 329/429] nixos/services.xserver.windowManager.bspwm: remove `with lib;` --- .../services/x11/window-managers/bspwm.nix | 35 +++++++++---------- 1 file changed, 16 insertions(+), 19 deletions(-) diff --git a/nixos/modules/services/x11/window-managers/bspwm.nix b/nixos/modules/services/x11/window-managers/bspwm.nix index 46201036f05a..5a173da6b23b 100644 --- a/nixos/modules/services/x11/window-managers/bspwm.nix +++ b/nixos/modules/services/x11/window-managers/bspwm.nix @@ -4,9 +4,6 @@ pkgs, ... }: - -with lib; - let cfg = config.services.xserver.windowManager.bspwm; in @@ -14,14 +11,14 @@ in { options = { services.xserver.windowManager.bspwm = { - enable = mkEnableOption "bspwm"; + enable = lib.mkEnableOption "bspwm"; - package = mkPackageOption pkgs "bspwm" { + package = lib.mkPackageOption pkgs "bspwm" { example = "bspwm-unstable"; }; - configFile = mkOption { - type = with types; nullOr path; - example = literalExpression ''"''${pkgs.bspwm}/share/doc/bspwm/examples/bspwmrc"''; + configFile = lib.mkOption { + type = with lib.types; nullOr path; + example = lib.literalExpression ''"''${pkgs.bspwm}/share/doc/bspwm/examples/bspwmrc"''; default = null; description = '' Path to the bspwm configuration file. @@ -30,12 +27,12 @@ in }; sxhkd = { - package = mkPackageOption pkgs "sxhkd" { + package = lib.mkPackageOption pkgs "sxhkd" { example = "sxhkd-unstable"; }; - configFile = mkOption { - type = with types; nullOr path; - example = literalExpression ''"''${pkgs.bspwm}/share/doc/bspwm/examples/sxhkdrc"''; + configFile = lib.mkOption { + type = with lib.types; nullOr path; + example = lib.literalExpression ''"''${pkgs.bspwm}/share/doc/bspwm/examples/sxhkdrc"''; default = null; description = '' Path to the sxhkd configuration file. @@ -46,15 +43,15 @@ in }; }; - config = mkIf cfg.enable { - services.xserver.windowManager.session = singleton { + config = lib.mkIf cfg.enable { + services.xserver.windowManager.session = lib.singleton { name = "bspwm"; start = '' export _JAVA_AWT_WM_NONREPARENTING=1 SXHKD_SHELL=/bin/sh ${cfg.sxhkd.package}/bin/sxhkd ${ - optionalString (cfg.sxhkd.configFile != null) "-c \"${cfg.sxhkd.configFile}\"" + lib.optionalString (cfg.sxhkd.configFile != null) "-c \"${cfg.sxhkd.configFile}\"" } & - ${cfg.package}/bin/bspwm ${optionalString (cfg.configFile != null) "-c \"${cfg.configFile}\""} & + ${cfg.package}/bin/bspwm ${lib.optionalString (cfg.configFile != null) "-c \"${cfg.configFile}\""} & waitPID=$! ''; }; @@ -62,17 +59,17 @@ in }; imports = [ - (mkRemovedOptionModule [ "services" "xserver" "windowManager" "bspwm-unstable" "enable" ] + (lib.mkRemovedOptionModule [ "services" "xserver" "windowManager" "bspwm-unstable" "enable" ] "Use services.xserver.windowManager.bspwm.enable and set services.xserver.windowManager.bspwm.package to pkgs.bspwm-unstable to use the unstable version of bspwm." ) - (mkRemovedOptionModule [ + (lib.mkRemovedOptionModule [ "services" "xserver" "windowManager" "bspwm" "startThroughSession" ] "bspwm package does not provide bspwm-session anymore.") - (mkRemovedOptionModule [ + (lib.mkRemovedOptionModule [ "services" "xserver" "windowManager" From 7ed890b292df9e94df189dedaf23512d2d6e62fd Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Mon, 30 Dec 2024 14:44:44 +0100 Subject: [PATCH 330/429] nixos/services.xserver.windowManager.clfswm: remove `with lib;` --- nixos/modules/services/x11/window-managers/clfswm.nix | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/nixos/modules/services/x11/window-managers/clfswm.nix b/nixos/modules/services/x11/window-managers/clfswm.nix index b50b60849495..03eaf6e4911e 100644 --- a/nixos/modules/services/x11/window-managers/clfswm.nix +++ b/nixos/modules/services/x11/window-managers/clfswm.nix @@ -4,9 +4,6 @@ pkgs, ... }: - -with lib; - let cfg = config.services.xserver.windowManager.clfswm; in @@ -14,13 +11,13 @@ in { options = { services.xserver.windowManager.clfswm = { - enable = mkEnableOption "clfswm"; - package = mkPackageOption pkgs [ "sbclPackages" "clfswm" ] { }; + enable = lib.mkEnableOption "clfswm"; + package = lib.mkPackageOption pkgs [ "sbclPackages" "clfswm" ] { }; }; }; - config = mkIf cfg.enable { - services.xserver.windowManager.session = singleton { + config = lib.mkIf cfg.enable { + services.xserver.windowManager.session = lib.singleton { name = "clfswm"; start = '' ${cfg.package}/bin/clfswm & From 9a87ab9c017eeb7d188697303bb1a18dc351cc35 Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Mon, 30 Dec 2024 14:44:44 +0100 Subject: [PATCH 331/429] nixos/services.xserver.windowManager.cwm: remove `with lib;` --- nixos/modules/services/x11/window-managers/cwm.nix | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/nixos/modules/services/x11/window-managers/cwm.nix b/nixos/modules/services/x11/window-managers/cwm.nix index d2be487b0d4c..2f32cc4e7449 100644 --- a/nixos/modules/services/x11/window-managers/cwm.nix +++ b/nixos/modules/services/x11/window-managers/cwm.nix @@ -4,18 +4,15 @@ pkgs, ... }: - -with lib; - let cfg = config.services.xserver.windowManager.cwm; in { options = { - services.xserver.windowManager.cwm.enable = mkEnableOption "cwm"; + services.xserver.windowManager.cwm.enable = lib.mkEnableOption "cwm"; }; - config = mkIf cfg.enable { - services.xserver.windowManager.session = singleton { + config = lib.mkIf cfg.enable { + services.xserver.windowManager.session = lib.singleton { name = "cwm"; start = '' cwm & From 01cb6f9822ad4c24bc380ff364651d6a2810ccea Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Mon, 30 Dec 2024 14:44:44 +0100 Subject: [PATCH 332/429] nixos/services.xserver.windowManager.dwm: remove `with lib;` --- nixos/modules/services/x11/window-managers/dwm.nix | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/nixos/modules/services/x11/window-managers/dwm.nix b/nixos/modules/services/x11/window-managers/dwm.nix index c81a834a0679..1ee79a94016d 100644 --- a/nixos/modules/services/x11/window-managers/dwm.nix +++ b/nixos/modules/services/x11/window-managers/dwm.nix @@ -1,7 +1,4 @@ { config, lib, pkgs, ... }: - -with lib; - let cfg = config.services.xserver.windowManager.dwm; @@ -14,8 +11,8 @@ in options = { services.xserver.windowManager.dwm = { - enable = mkEnableOption "dwm"; - package = mkPackageOption pkgs "dwm" { + enable = lib.mkEnableOption "dwm"; + package = lib.mkPackageOption pkgs "dwm" { example = '' pkgs.dwm.overrideAttrs (oldAttrs: rec { patches = [ @@ -33,9 +30,9 @@ in ###### implementation - config = mkIf cfg.enable { + config = lib.mkIf cfg.enable { - services.xserver.windowManager.session = singleton + services.xserver.windowManager.session = lib.singleton { name = "dwm"; start = '' From b12278959f5012e21686106db1369a93106d503d Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Mon, 30 Dec 2024 14:44:44 +0100 Subject: [PATCH 333/429] nixos/services.xserver.windowManager.e16: remove `with lib;` --- nixos/modules/services/x11/window-managers/e16.nix | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/nixos/modules/services/x11/window-managers/e16.nix b/nixos/modules/services/x11/window-managers/e16.nix index b1ed3ea66417..e7f2f61f3885 100644 --- a/nixos/modules/services/x11/window-managers/e16.nix +++ b/nixos/modules/services/x11/window-managers/e16.nix @@ -4,21 +4,18 @@ pkgs, ... }: - -with lib; - let cfg = config.services.xserver.windowManager.e16; in { ###### interface options = { - services.xserver.windowManager.e16.enable = mkEnableOption "e16"; + services.xserver.windowManager.e16.enable = lib.mkEnableOption "e16"; }; ###### implementation - config = mkIf cfg.enable { - services.xserver.windowManager.session = singleton { + config = lib.mkIf cfg.enable { + services.xserver.windowManager.session = lib.singleton { name = "E16"; start = '' ${pkgs.e16}/bin/e16 & From 075be52dd4ab3a28ce7395546a6edebe641ad98c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 30 Dec 2024 16:20:57 +0000 Subject: [PATCH 334/429] sqlitestudio: 3.4.12 -> 3.4.13 --- pkgs/by-name/sq/sqlitestudio/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/sq/sqlitestudio/package.nix b/pkgs/by-name/sq/sqlitestudio/package.nix index 3f6f302a5b12..6b6533a60736 100644 --- a/pkgs/by-name/sq/sqlitestudio/package.nix +++ b/pkgs/by-name/sq/sqlitestudio/package.nix @@ -11,13 +11,13 @@ }: stdenv.mkDerivation rec { pname = "sqlitestudio"; - version = "3.4.12"; + version = "3.4.13"; src = fetchFromGitHub { owner = "pawelsalawa"; repo = "sqlitestudio"; rev = version; - hash = "sha256-KPHiJTAxRQ3ZNnkKpfj877vTHEPRKNwy7wHfseftukQ="; + hash = "sha256-k7ZedSw4Y1WIUH5IflSrEv4h7zsx40tB8A4/qr9OW9E="; }; nativeBuildInputs = From b9bb21e65e0e183fc1d2b526ed7c977c7c0b4a05 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 30 Dec 2024 17:47:26 +0100 Subject: [PATCH 335/429] python312Packages.habiticalib: init at 0.3.2 Library for the Habitica API https://github.com/tr4nt0r/habiticalib --- .../python-modules/habiticalib/default.nix | 71 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 73 insertions(+) create mode 100644 pkgs/development/python-modules/habiticalib/default.nix diff --git a/pkgs/development/python-modules/habiticalib/default.nix b/pkgs/development/python-modules/habiticalib/default.nix new file mode 100644 index 000000000000..459c7632be60 --- /dev/null +++ b/pkgs/development/python-modules/habiticalib/default.nix @@ -0,0 +1,71 @@ +{ + lib, + aiohttp, + aioresponses, + buildPythonPackage, + fetchFromGitHub, + habitipy, + hatch-regex-commit, + hatchling, + mashumaro, + orjson, + pillow, + pytest-asyncio, + pytest-cov-stub, + pytestCheckHook, + pythonOlder, + syrupy, +}: + +buildPythonPackage rec { + pname = "habiticalib"; + version = "0.3.2"; + pyproject = true; + + disabled = pythonOlder "3.12"; + + src = fetchFromGitHub { + owner = "tr4nt0r"; + repo = "habiticalib"; + tag = "v${version}"; + hash = "sha256-gv0ZrjJPP2ZgBSt221Hjloksu4QE4Iqm1z36YN5p2GI="; + }; + + build-system = [ + hatch-regex-commit + hatchling + ]; + + dependencies = [ + aiohttp + habitipy + mashumaro + orjson + pillow + ]; + + nativeCheckInputs = [ + aioresponses + pytest-asyncio + pytest-cov-stub + pytestCheckHook + syrupy + ]; + + pytestFlagsArray = [ "--snapshot-update" ]; + + pythonImportsCheck = [ "habiticalib" ]; + + disabledTests = [ + # AssertionError + "test_generate_avatar" + ]; + + meta = { + description = "Library for the Habitica API"; + homepage = "https://github.com/tr4nt0r/habiticalib"; + changelog = "https://github.com/tr4nt0r/habiticalib/releases/tag/v${version}"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 67e850576181..43ef40fbca83 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5740,6 +5740,8 @@ self: super: with self; { habitipy = callPackage ../development/python-modules/habitipy { }; + habiticalib = callPackage ../development/python-modules/habiticalib { }; + hachoir = callPackage ../development/python-modules/hachoir { }; hacking = callPackage ../development/python-modules/hacking { }; From 7ed9f658552ffeafec156262839a1541e73c496d Mon Sep 17 00:00:00 2001 From: deftdawg Date: Mon, 30 Dec 2024 13:29:56 -0500 Subject: [PATCH 336/429] grype 0.81.0 -> 0.86.1 --- pkgs/by-name/gr/grype/package.nix | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/gr/grype/package.nix b/pkgs/by-name/gr/grype/package.nix index 93336b33aac0..e581e128b713 100644 --- a/pkgs/by-name/gr/grype/package.nix +++ b/pkgs/by-name/gr/grype/package.nix @@ -9,13 +9,13 @@ buildGoModule rec { pname = "grype"; - version = "0.81.0"; + version = "0.86.1"; src = fetchFromGitHub { owner = "anchore"; repo = "grype"; rev = "refs/tags/v${version}"; - hash = "sha256-iFPUvqdYjSlrGlDrrb0w1HNeU5iAQ7PD4ojeZT3pHZ8="; + hash = "sha256-k4Faw7DqN5H2bGxKEqeUA4+sMZOdbW1139GcqbU56Hk="; # populate values that require us to use git. By doing this in postFetch we # can delete .git afterwards and maintain better reproducibility of the src. leaveDotGit = true; @@ -30,7 +30,7 @@ buildGoModule rec { proxyVendor = true; - vendorHash = "sha256-PXx5SyuKvxOZwJBspIiL8L7QzXzort6ZU3ZfrE8o700="; + vendorHash = "sha256-qrMgc5/ukuri8Oabgq84SCqy26vVWgzlE2UkTd67ss8="; nativeBuildInputs = [ installShellFiles ]; @@ -67,7 +67,13 @@ buildGoModule rec { unset ldflags # patch utility script - patchShebangs grype/db/test-fixtures/tls/generate-x509-cert-pair.sh + patchShebangs grype/db/legacy/distribution/test-fixtures/tls/generate-x509-cert-pair.sh + + # FIXME: these tests fail when building with Nix + substituteInPlace test/cli/config_test.go \ + --replace-fail "Test_configLoading" "Skip_configLoading" + substituteInPlace test/cli/db_providers_test.go \ + --replace-fail "TestDBProviders" "SkipDBProviders" # remove tests that depend on docker substituteInPlace test/cli/cmd_test.go \ From 2b395c3eb923775921c3fb6666b90810da6422cd Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Mon, 30 Dec 2024 19:43:32 +0100 Subject: [PATCH 337/429] python312Packages.orbax-checkpoint: 0.10.3 -> 0.11.0 Diff: https://github.com/google/orbax/compare/v0.10.3...v0.11.0 Changelog: https://github.com/google/orbax/blob/v0.11.0/checkpoint/CHANGELOG.md --- pkgs/development/python-modules/orbax-checkpoint/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/orbax-checkpoint/default.nix b/pkgs/development/python-modules/orbax-checkpoint/default.nix index 3f84d9b6367b..383a04d9a802 100644 --- a/pkgs/development/python-modules/orbax-checkpoint/default.nix +++ b/pkgs/development/python-modules/orbax-checkpoint/default.nix @@ -33,14 +33,14 @@ buildPythonPackage rec { pname = "orbax-checkpoint"; - version = "0.10.3"; + version = "0.11.0"; pyproject = true; src = fetchFromGitHub { owner = "google"; repo = "orbax"; tag = "v${version}"; - hash = "sha256-BTg4kUz5jfoK2uR/deqqJb8PYoj+FfkuoMZAeSjKKnA="; + hash = "sha256-pVRXWJfiiqV2ZFM0CgXdwD6/lnRa1HFFPrfS5975mVA="; }; sourceRoot = "${src.name}/checkpoint"; From 71fc17792c4ae992294a80963bb1a72d16aa20c1 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 30 Dec 2024 20:28:52 +0000 Subject: [PATCH 338/429] lazyjournal: 0.5.0 -> 0.6.0 --- pkgs/by-name/la/lazyjournal/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/la/lazyjournal/package.nix b/pkgs/by-name/la/lazyjournal/package.nix index 01d1be452429..bf03ee5786be 100644 --- a/pkgs/by-name/la/lazyjournal/package.nix +++ b/pkgs/by-name/la/lazyjournal/package.nix @@ -5,7 +5,7 @@ nix-update-script, }: let - version = "0.5.0"; + version = "0.6.0"; in buildGoModule { pname = "lazyjournal"; @@ -15,7 +15,7 @@ buildGoModule { owner = "Lifailon"; repo = "lazyjournal"; tag = version; - hash = "sha256-fqlHeqK861QWpT1KhZrn2nZhXcnpAYe/THNOWyrFxcs="; + hash = "sha256-6ui9DZKFWX/p0qD2U79+HKNAY6Wy4OtzIm64W1PzPR4="; }; vendorHash = "sha256-jh99+zlhr4ogig4Z2FFO6SZ2qTBkOUuiXo5iNk0VTi0="; From f7c8834b27d7d2c83c0446dc41b28b5bde708699 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 30 Dec 2024 20:54:06 +0000 Subject: [PATCH 339/429] pkgsite: 0-unstable-2024-12-16 -> 0-unstable-2024-12-26 --- pkgs/by-name/pk/pkgsite/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/pk/pkgsite/package.nix b/pkgs/by-name/pk/pkgsite/package.nix index 33ed7eae9e5d..7162b1b0b46f 100644 --- a/pkgs/by-name/pk/pkgsite/package.nix +++ b/pkgs/by-name/pk/pkgsite/package.nix @@ -7,13 +7,13 @@ buildGoModule rec { pname = "pkgsite"; - version = "0-unstable-2024-12-16"; + version = "0-unstable-2024-12-26"; src = fetchFromGitHub { owner = "golang"; repo = "pkgsite"; - rev = "06c6edf28e6c1a9f5567f7141512681ba5b75f60"; - hash = "sha256-zsb4NxTxyH354fHtVo8xtFxzOw7XeEnxupfQlh4fAHo="; + rev = "8bad909da0cbaf239510644c5a91d1be27376d9f"; + hash = "sha256-EsShGqT2Pk8VdxNRplliPb5+VoD05/sQzGNTsk0VZEI="; }; vendorHash = "sha256-Ijcj1Nq4WjXcUqmoDkpO9I4rl/4/TMXFMQVAlEK11R8="; From 62cab4e2b98321bc196ffa87d05095dffae56809 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 30 Dec 2024 22:13:30 +0100 Subject: [PATCH 340/429] gitleaks: 8.22.0 -> 8.22.1 Diff: https://github.com/zricethezav/gitleaks/compare/refs/tags/v8.22.0...v8.22.1 Changelog: https://github.com/zricethezav/gitleaks/releases/tag/v8.22.1 --- pkgs/by-name/gi/gitleaks/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/gi/gitleaks/package.nix b/pkgs/by-name/gi/gitleaks/package.nix index 063e64e2b333..397d78fc2dcc 100644 --- a/pkgs/by-name/gi/gitleaks/package.nix +++ b/pkgs/by-name/gi/gitleaks/package.nix @@ -11,16 +11,16 @@ buildGoModule rec { pname = "gitleaks"; - version = "8.22.0"; + version = "8.22.1"; src = fetchFromGitHub { owner = "zricethezav"; repo = "gitleaks"; rev = "refs/tags/v${version}"; - hash = "sha256-f3dSKYRkXt/YT5PgFS7pclRcKvfGl2sFopqfJkEwnhw="; + hash = "sha256-PJczVI2/TogRaw+Hs6HibHuwhKwL2scrCpsTQMsHv6Y="; }; - vendorHash = "sha256-qjchUWWnG2CYXTM4aGkh+UgaJuPQ6yEpetXJ5ORqNuE="; + vendorHash = "sha256-hq3v//fhCUOvKPBZ/+YrLIc4nDLxR9Yc+MeIXY7TArA="; ldflags = [ "-s" From 001d56f546d9a8bb8c8241532e29bf63349aaca7 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 30 Dec 2024 22:16:20 +0100 Subject: [PATCH 341/429] python312Packages.pyexploitdb: 0.2.60 -> 0.2.61 Changelog: https://github.com/Hackman238/pyExploitDb/blob/master/ChangeLog.md --- pkgs/development/python-modules/pyexploitdb/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyexploitdb/default.nix b/pkgs/development/python-modules/pyexploitdb/default.nix index 800cc7cb9da2..32dd507809c6 100644 --- a/pkgs/development/python-modules/pyexploitdb/default.nix +++ b/pkgs/development/python-modules/pyexploitdb/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "pyexploitdb"; - version = "0.2.60"; + version = "0.2.61"; pyproject = true; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "pyExploitDb"; inherit version; - hash = "sha256-+EuTIt7WVlywG6JkEWMOhHMJuPcsqjpxlS7HgH8NCPU="; + hash = "sha256-NbC9NUB4fgbR5nnBZHBA87dAqFn8CtAP2FMcFPJC76g="; }; build-system = [ setuptools ]; From 3c180c85e27a81916d4f8ea73f55e9564c8cc242 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 30 Dec 2024 22:21:08 +0100 Subject: [PATCH 342/429] python312Packages.pydeconz: 118 -> 119 Diff: https://github.com/Kane610/deconz/compare/refs/tags/v118...v119 Changelog: https://github.com/Kane610/deconz/releases/tag/v119 --- .../development/python-modules/pydeconz/default.nix | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/pydeconz/default.nix b/pkgs/development/python-modules/pydeconz/default.nix index 55923513fbfc..e6ad70f617e8 100644 --- a/pkgs/development/python-modules/pydeconz/default.nix +++ b/pkgs/development/python-modules/pydeconz/default.nix @@ -6,6 +6,7 @@ fetchFromGitHub, orjson, pytest-aiohttp, + pytest-cov-stub, pytestCheckHook, pythonOlder, setuptools, @@ -13,7 +14,7 @@ buildPythonPackage rec { pname = "pydeconz"; - version = "118"; + version = "119"; pyproject = true; disabled = pythonOlder "3.12"; @@ -22,19 +23,16 @@ buildPythonPackage rec { owner = "Kane610"; repo = "deconz"; rev = "refs/tags/v${version}"; - hash = "sha256-CbV/LGj09TfLYvaVGr2+LV76DRkz0kw7qsGbtL5A45g="; + hash = "sha256-5138YzxutjyFsYyLGLTzeyCISuY8kV4WA0FLML+VeZQ="; }; postPatch = '' substituteInPlace pyproject.toml \ - --replace-fail "--cov=pydeconz --cov-report term-missing" "" \ - --replace-fail "setuptools==" "setuptools>=" \ + --replace-fail "setuptools==75.6.0" "setuptools" \ --replace-fail "wheel==" "wheel>=" ''; - build-system = [ - setuptools - ]; + build-system = [ setuptools ]; dependencies = [ aiohttp @@ -44,6 +42,7 @@ buildPythonPackage rec { nativeCheckInputs = [ aioresponses pytest-aiohttp + pytest-cov-stub pytestCheckHook ]; From fffe5a0b86ed5ca61d6bf4f8d0903d533b9ebb35 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 30 Dec 2024 22:29:59 +0100 Subject: [PATCH 343/429] python312Packages.reolink-aio: 0.11.5 -> 0.11.6 Diff: https://github.com/starkillerOG/reolink_aio/compare/refs/tags/0.11.5...0.11.6 Changelog: https://github.com/starkillerOG/reolink_aio/releases/tag/0.11.6 --- pkgs/development/python-modules/reolink-aio/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/reolink-aio/default.nix b/pkgs/development/python-modules/reolink-aio/default.nix index 70daa1f7829c..8453f639d58d 100644 --- a/pkgs/development/python-modules/reolink-aio/default.nix +++ b/pkgs/development/python-modules/reolink-aio/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "reolink-aio"; - version = "0.11.5"; + version = "0.11.6"; pyproject = true; disabled = pythonOlder "3.11"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "starkillerOG"; repo = "reolink_aio"; rev = "refs/tags/${version}"; - hash = "sha256-9CKpkwqlRTcA/a5bBCT/3y3odWyRzLElLPtemhg1hcM="; + hash = "sha256-QZPv3bdmk3RVLfINegSbSl8SLrjTKYkdJBiK2jRmYlU="; }; build-system = [ setuptools ]; From 465ffab65d0680ea64052d9a9990788966675d10 Mon Sep 17 00:00:00 2001 From: Adam Dinwoodie Date: Mon, 30 Dec 2024 21:34:18 +0000 Subject: [PATCH 344/429] nixos/taskserver: fix systemd shellcheck warning The taskserver-init systemd unit fails to build with systemd.enableStrictShellChecks enabled, due to using the potentially unsafe `mkdir -m`. Fix that by moving directory creation out to systemd.tmpfiles. --- nixos/modules/services/misc/taskserver/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/nixos/modules/services/misc/taskserver/default.nix b/nixos/modules/services/misc/taskserver/default.nix index 64ff7437fb08..592514718940 100644 --- a/nixos/modules/services/misc/taskserver/default.nix +++ b/nixos/modules/services/misc/taskserver/default.nix @@ -498,16 +498,16 @@ in ca.cert = if needToCreateCA then "${cfg.dataDir}/keys/ca.cert" else "${cfg.pki.manual.ca.cert}"; }; + systemd.tmpfiles.rules = [ + "d ${cfg.dataDir} 0770 ${cfg.user} ${cfg.group}" + "z ${cfg.dataDir} 0770 ${cfg.user} ${cfg.group}" + ]; + systemd.services.taskserver-init = { wantedBy = [ "taskserver.service" ]; before = [ "taskserver.service" ]; description = "Initialize Taskserver Data Directory"; - preStart = '' - mkdir -m 0770 -p "${cfg.dataDir}" - chown "${cfg.user}:${cfg.group}" "${cfg.dataDir}" - ''; - script = '' ${taskd} init touch "${cfg.dataDir}/.is_initialized" From 79bf56ec91ede1c218c6405d130755e002453178 Mon Sep 17 00:00:00 2001 From: Adam Dinwoodie Date: Mon, 30 Dec 2024 21:55:19 +0000 Subject: [PATCH 345/429] nixos/taskserver: fix test deprecation warning --- nixos/tests/taskserver.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/tests/taskserver.nix b/nixos/tests/taskserver.nix index bd4dac40da87..31dfea00435c 100644 --- a/nixos/tests/taskserver.nix +++ b/nixos/tests/taskserver.nix @@ -114,7 +114,7 @@ import ./make-test-python.nix ( testScript = { nodes, ... }: let - cfg = nodes.server.config.services.taskserver; + cfg = nodes.server.services.taskserver; portStr = toString cfg.listenPort; specialisations = "${nodes.server.system.build.toplevel}/specialisation"; newServerSystem = "${specialisations}/manual_config"; From 3bad6652976b9fa03fed374bdda57e2990007253 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 30 Dec 2024 22:20:43 +0000 Subject: [PATCH 346/429] ha-mqtt-discoverable-cli: 0.16.2 -> 0.16.4.1 --- pkgs/by-name/ha/ha-mqtt-discoverable-cli/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ha/ha-mqtt-discoverable-cli/package.nix b/pkgs/by-name/ha/ha-mqtt-discoverable-cli/package.nix index 00075888438a..dfa7b6f4cc2e 100644 --- a/pkgs/by-name/ha/ha-mqtt-discoverable-cli/package.nix +++ b/pkgs/by-name/ha/ha-mqtt-discoverable-cli/package.nix @@ -6,14 +6,14 @@ python3.pkgs.buildPythonApplication rec { pname = "ha-mqtt-discoverable-cli"; - version = "0.16.2"; + version = "0.16.4.1"; pyproject = true; src = fetchFromGitHub { owner = "unixorn"; repo = "ha-mqtt-discoverable-cli"; tag = "v${version}"; - hash = "sha256-RyAgwLMdeLZj+U7Ddp1t/Qy5K/U++3WssVHfzSQ7YoY="; + hash = "sha256-VjHsiF4HxGscG1pysxegPyM+Y18CWW06D3WezD+BLss="; }; pythonRelaxDeps = [ "ha-mqtt-discoverable" ]; From dc3a0821fe3a906bf49df2934cb691b072e2f4be Mon Sep 17 00:00:00 2001 From: Nabeen Tiwaree Date: Mon, 30 Dec 2024 10:04:06 -0500 Subject: [PATCH 347/429] Update pkgs/by-name/rw/rwalk/package.nix MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Gaétan Lepage <33058747+GaetanLepage@users.noreply.github.com> --- pkgs/by-name/rw/rwalk/package.nix | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/rw/rwalk/package.nix b/pkgs/by-name/rw/rwalk/package.nix index fdfee841305f..3a6f657f94ea 100644 --- a/pkgs/by-name/rw/rwalk/package.nix +++ b/pkgs/by-name/rw/rwalk/package.nix @@ -25,15 +25,20 @@ rustPlatform.buildRustPackage rec { pkg-config ]; - buildInputs = - [ - openssl - ]; + buildInputs = [ + openssl + ]; env = { OPENSSL_NO_VENDOR = true; }; + nativeInstallCheckInputs = [ + versionCheckHook + ]; + versionCheckProgramArg = [ "--version" ]; + doInstallCheck = true; + meta = { description = "Blazingly fast web directory scanner written in Rust"; homepage = "https://github.com/cestef/rwalk"; From b5b5aba10ae7a7a1770aa281b914f41311b064ad Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 30 Dec 2024 22:40:09 +0000 Subject: [PATCH 348/429] easytier: 2.1.0 -> 2.1.1 --- pkgs/by-name/ea/easytier/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ea/easytier/package.nix b/pkgs/by-name/ea/easytier/package.nix index d80cff4a277c..7fe5a1aaedf3 100644 --- a/pkgs/by-name/ea/easytier/package.nix +++ b/pkgs/by-name/ea/easytier/package.nix @@ -11,18 +11,18 @@ rustPlatform.buildRustPackage rec { pname = "easytier"; - version = "2.1.0"; + version = "2.1.1"; src = fetchFromGitHub { owner = "EasyTier"; repo = "EasyTier"; tag = "v${version}"; - hash = "sha256-kPKCsKsTNT0vuESquILQJxBltP5MJ6/wKrPGx2g1Z78="; + hash = "sha256-qWICiY2g/wXT0Bt7lrCg7GgL1futOhelViB59UCLPro="; }; useFetchCargoVendor = true; - cargoHash = "sha256-/avdvHl7rfATGxHS5F1drK/J4pT+srX0+qRzA3cniAk="; + cargoHash = "sha256-SpGW/RAbQUFdxqEKRPrTp5MXng7BLiSnofoJG8NsjsU="; nativeBuildInputs = [ protobuf ]; From 70ad61967afdc6e565b27ad86e0903f2153dc2f2 Mon Sep 17 00:00:00 2001 From: DamiDoug <75175586+damidoug@users.noreply.github.com> Date: Fri, 27 Dec 2024 20:05:32 +0100 Subject: [PATCH 349/429] maintainers: add damidoug --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 73c6ad194cb5..1e95ef7e8522 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -4911,6 +4911,12 @@ github = "damhiya"; githubId = 13533446; }; + damidoug = { + email = "contact@damidoug.dev"; + github = "damidoug"; + githubId = 75175586; + name = "Douglas Damiano"; + }; DamienCassou = { email = "damien@cassou.me"; github = "DamienCassou"; From 58d41c40081a918db2f6dbef535fd9c69eb337cd Mon Sep 17 00:00:00 2001 From: DamiDoug <75175586+damidoug@users.noreply.github.com> Date: Fri, 27 Dec 2024 20:34:57 +0100 Subject: [PATCH 350/429] =?UTF-8?q?spotube:=203.8.3=20=E2=86=92=203.9.0=20?= =?UTF-8?q?|=20add=20aarch64-linux=20support?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/by-name/sp/spotube/package.nix | 60 +++++++++++++++++++++-------- 1 file changed, 44 insertions(+), 16 deletions(-) diff --git a/pkgs/by-name/sp/spotube/package.nix b/pkgs/by-name/sp/spotube/package.nix index 3a06aab24701..d181f0f06a0f 100644 --- a/pkgs/by-name/sp/spotube/package.nix +++ b/pkgs/by-name/sp/spotube/package.nix @@ -22,7 +22,7 @@ let pname = "spotube"; - version = "3.8.3"; + version = "3.9.0"; meta = { description = "Open source, cross-platform Spotify client compatible across multiple platforms"; @@ -40,24 +40,50 @@ let "x86_64-linux" "x86_64-darwin" "aarch64-darwin" + "aarch64-linux" ]; sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; }; - fetchArtifact = - { filename, hash }: - fetchurl { - url = "https://github.com/KRTirtho/spotube/releases/download/v${version}/${filename}"; - inherit hash; + sources = + let + fetchArtifact = + { filename, hash }: + fetchurl { + url = "https://github.com/KRTirtho/spotube/releases/download/v${version}/${filename}"; + inherit hash; + }; + in + { + "aarch64-linux" = fetchArtifact { + filename = "Spotube-linux-aarch64.deb"; + hash = "sha256-KBuUAgUU6c/rBkkbpYjSarzckIoi+gRtCkumvtaoras="; + }; + "x86_64-linux" = fetchArtifact { + filename = "Spotube-linux-x86_64.deb"; + hash = "sha256-vzzK3csyKYP6fKKIoysziBsc2tqrg5LXS/6KoXBtNVI="; + }; + "x86_64-darwin" = fetchArtifact { + filename = "Spotube-macos-universal.dmg"; + hash = "sha256-wwIIKY+bmMJZigc2AK/QMg142uvZ+D6LOddzedJM5f8="; + }; + "aarch64-darwin" = fetchArtifact { + filename = "Spotube-macos-universal.dmg"; + hash = "sha256-wwIIKY+bmMJZigc2AK/QMg142uvZ+D6LOddzedJM5f8="; + }; }; + src = sources.${stdenv.hostPlatform.system}; + darwin = stdenv.mkDerivation { - inherit pname version meta; + inherit + pname + version + meta + src + ; - src = fetchArtifact { - filename = "Spotube-macos-universal.dmg"; - hash = "sha256-N1H/Vy5QQi8zAqiqAi5aTnUQcKC/EgL3GUhEfnCkaAQ="; - }; + passthru = { inherit sources; }; sourceRoot = "."; @@ -76,12 +102,14 @@ let }; linux = stdenv.mkDerivation { - inherit pname version meta; + inherit + pname + version + meta + src + ; - src = fetchArtifact { - filename = "Spotube-linux-x86_64.deb"; - hash = "sha256-x75ie9FXunClMT+YZVFlvl2VSDl933QYMRpEYjJ8YhY="; - }; + passthru = { inherit sources; }; nativeBuildInputs = [ autoPatchelfHook From 0416604a6dbae6b7cb5bc845514f112f2c5987bc Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 30 Dec 2024 23:55:31 +0000 Subject: [PATCH 351/429] owmods-cli: 0.14.3 -> 0.15.0 --- pkgs/by-name/ow/owmods-cli/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ow/owmods-cli/package.nix b/pkgs/by-name/ow/owmods-cli/package.nix index fb67678bd27b..a11401d34778 100644 --- a/pkgs/by-name/ow/owmods-cli/package.nix +++ b/pkgs/by-name/ow/owmods-cli/package.nix @@ -17,16 +17,16 @@ rustPlatform.buildRustPackage rec { pname = "owmods-cli"; - version = "0.14.3"; + version = "0.15.0"; src = fetchFromGitHub { owner = "ow-mods"; repo = "ow-mod-man"; rev = "cli_v${version}"; - hash = "sha256-ONvmTBF9y3NMQx1KgNhJt+0nV57xc9cLalpfDqrTSq0="; + hash = "sha256-rTANG+yHE8YfWYUyELoKgj4El+1ZW6vI9NkgADD40pw="; }; - cargoHash = "sha256-I4OX27LHpT5YYW6yEhX+sCuA8m0KZd/qud4xdEUzkyA="; + cargoHash = "sha256-qiimnkUDiFoz/68GYi0QTuYYBjowC01c3GSxUIMjNT4="; nativeBuildInputs = [ pkg-config From 8a50cb2041015e2c7162a6554fc4220d8f07245c Mon Sep 17 00:00:00 2001 From: Niklas Korz Date: Mon, 30 Dec 2024 10:57:29 +0100 Subject: [PATCH 352/429] livekit-libwebrtc: split outputs, remove darwin framework --- pkgs/by-name/li/livekit-libwebrtc/package.nix | 32 ++++++++++--------- pkgs/by-name/ze/zed-editor/package.nix | 19 +++-------- 2 files changed, 22 insertions(+), 29 deletions(-) diff --git a/pkgs/by-name/li/livekit-libwebrtc/package.nix b/pkgs/by-name/li/livekit-libwebrtc/package.nix index 69bf213bc453..d452bc54e5e1 100644 --- a/pkgs/by-name/li/livekit-libwebrtc/package.nix +++ b/pkgs/by-name/li/livekit-libwebrtc/package.nix @@ -147,6 +147,11 @@ stdenv.mkDerivation { substituteInPlace build/toolchain/apple/toolchain.gni --replace-fail "/bin/cp -Rc" "cp -a" ''; + outputs = [ + "dev" + "out" + ]; + nativeBuildInputs = (builtins.concatLists ( lib.mapAttrsToList ( @@ -249,24 +254,24 @@ stdenv.mkDerivation { '' runHook preInstall - mkdir -p $out/{lib,include} - cp obj/webrtc.ninja $out/ - cp args.gn $out/ - cp LICENSE.md $out/ + mkdir -p $out/lib + mkdir -p $dev/include + + install -m0644 obj/webrtc.ninja args.gn LICENSE.md $dev + + pushd ../.. + find . -name "*.h" -print | cpio -pd $dev/include + popd '' + lib.optionalString stdenv.hostPlatform.isLinux '' - cp libwebrtc.so $out/lib/ - cp libthird_party_boringssl.so $out/lib/ + install -m0644 libwebrtc.so libthird_party_boringssl.so $out/lib '' + lib.optionalString stdenv.hostPlatform.isDarwin '' - mkdir -p $out/Library/Frameworks - cp -r WebRTC.framework $out/Library/Frameworks - cp libwebrtc.dylib $out/lib - cp libthird_party_boringssl.dylib $out/lib/ + install -m0644 WebRTC.framework/Versions/A/WebRTC $out/lib/libwebrtc.dylib + install -m0644 libthird_party_boringssl.dylib $out/lib '' + '' - cd ../.. - find . -name "*.h" -print | cpio -pd $out/include + ln -s $out/lib $dev/lib runHook postInstall ''; @@ -274,13 +279,10 @@ stdenv.mkDerivation { postFixup = lib.optionalString stdenv.hostPlatform.isDarwin '' boringssl="$out/lib/libthird_party_boringssl.dylib" webrtc="$out/lib/libwebrtc.dylib" - framework="$out/Library/Frameworks/WebRTC.framework/Versions/A/WebRTC" install_name_tool -id "$boringssl" "$boringssl" install_name_tool -id "$webrtc" "$webrtc" install_name_tool -change @rpath/libthird_party_boringssl.dylib "$boringssl" "$webrtc" - install_name_tool -id "$framework" "$framework" - install_name_tool -change @rpath/libthird_party_boringssl.dylib "$boringssl" "$framework" ''; passthru.updateScript = writeShellScript "update-livekit-libwebrtc" '' diff --git a/pkgs/by-name/ze/zed-editor/package.nix b/pkgs/by-name/ze/zed-editor/package.nix index 414f93c9e45a..779705053fc7 100644 --- a/pkgs/by-name/ze/zed-editor/package.nix +++ b/pkgs/by-name/ze/zed-editor/package.nix @@ -112,20 +112,11 @@ rustPlatform.buildRustPackage rec { "script/patches/use-cross-platform-livekit.patch" ]; - postPatch = - lib.optionalString stdenv.hostPlatform.isLinux '' - # Dynamically link WebRTC instead of static - substituteInPlace ../${pname}-${version}-vendor/webrtc-sys-*/build.rs \ - --replace-fail "cargo:rustc-link-lib=static=webrtc" "cargo:rustc-link-lib=dylib=webrtc" - '' - + lib.optionalString stdenv.hostPlatform.isDarwin '' - # On Darwin, linking against the dylib results in Rust linker errors, while - # linking against the framework works fine. - substituteInPlace ../${pname}-${version}-vendor/webrtc-sys-*/build.rs \ - --replace-fail "cargo:rustc-link-lib=static=webrtc" "cargo:rustc-link-lib=framework=webrtc" \ - --replace-fail 'println!("cargo:rustc-link-search=native={}", webrtc_lib.to_str().unwrap());' \ - 'println!("cargo:rustc-link-search=framework={}/Library/Frameworks", webrtc_dir.to_str().unwrap());' - ''; + # Dynamically link WebRTC instead of static + postPatch = '' + substituteInPlace ../${pname}-${version}-vendor/webrtc-sys-*/build.rs \ + --replace-fail "cargo:rustc-link-lib=static=webrtc" "cargo:rustc-link-lib=dylib=webrtc" + ''; useFetchCargoVendor = true; cargoHash = "sha256-J5vJ/KV94a+9AqGbNZx6sCzWflOZsyUj3NcqnfaexGE="; From 210c4c2a478e9fffc134e8695dbe6aa8f76a1fde Mon Sep 17 00:00:00 2001 From: Niklas Korz Date: Mon, 30 Dec 2024 12:45:05 +0100 Subject: [PATCH 353/429] zed-editor: strip application binary --- pkgs/by-name/ze/zed-editor/package.nix | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/pkgs/by-name/ze/zed-editor/package.nix b/pkgs/by-name/ze/zed-editor/package.nix index 779705053fc7..1c6d977b7658 100644 --- a/pkgs/by-name/ze/zed-editor/package.nix +++ b/pkgs/by-name/ze/zed-editor/package.nix @@ -288,6 +288,16 @@ rustPlatform.buildRustPackage rec { versionCheckProgramArg = [ "--version" ]; doInstallCheck = true; + # The darwin Applications directory is not stripped by default, see + # https://github.com/NixOS/nixpkgs/issues/367169 + # This setting is not platform-guarded as it doesn't do any harm on Linux, + # where this directory simply does not exist. + stripDebugList = [ + "bin" + "libexec" + "Applications" + ]; + passthru = { updateScript = gitUpdater { rev-prefix = "v"; From e530fcb4c609e8b033828af171d86f68e120f358 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 31 Dec 2024 00:49:48 +0000 Subject: [PATCH 354/429] vscode-extensions.timonwong.shellcheck: 0.37.1 -> 0.37.3 --- .../vscode/extensions/timonwong.shellcheck/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/vscode/extensions/timonwong.shellcheck/default.nix b/pkgs/applications/editors/vscode/extensions/timonwong.shellcheck/default.nix index 469d04dbebb4..a37e7d54c7d2 100644 --- a/pkgs/applications/editors/vscode/extensions/timonwong.shellcheck/default.nix +++ b/pkgs/applications/editors/vscode/extensions/timonwong.shellcheck/default.nix @@ -10,8 +10,8 @@ vscode-utils.buildVscodeMarketplaceExtension { mktplcRef = { name = "shellcheck"; publisher = "timonwong"; - version = "0.37.1"; - sha256 = "sha256-JSS0GY76+C5xmkQ0PNjt2Nu/uTUkfiUqmPL51r64tl0="; + version = "0.37.3"; + sha256 = "sha256-bVddcoj0zO+pWySg7JOGXqLJeJnoet3Lo/I1ctd0znk="; }; nativeBuildInputs = [ jq From 4ba90bd09ac84a034832abeb4e4bcc25dd7f83f8 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 31 Dec 2024 01:03:44 +0000 Subject: [PATCH 355/429] harper: 0.12.0 -> 0.13.0 --- pkgs/by-name/ha/harper/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ha/harper/package.nix b/pkgs/by-name/ha/harper/package.nix index ac067d4369ed..d60c74fedb68 100644 --- a/pkgs/by-name/ha/harper/package.nix +++ b/pkgs/by-name/ha/harper/package.nix @@ -6,16 +6,16 @@ rustPlatform.buildRustPackage rec { pname = "harper"; - version = "0.12.0"; + version = "0.13.0"; src = fetchFromGitHub { owner = "elijah-potter"; repo = "harper"; rev = "v${version}"; - hash = "sha256-2Frt0vpCGnF3pZREY+ynPkdCLf2zsde49cEsNrqFUtY="; + hash = "sha256-X1mTqaqOqeAM7mq3nNrE2ULZ1zaAxZIqp0p1wdlDwgk="; }; - cargoHash = "sha256-S3N9cn8Y4j5epvndvivgKyhjQQ5mNg89iSOlOx1Jmo0="; + cargoHash = "sha256-0RJ0Kpht4gqZTBdjld1Wi5r9FN5RB74KboxODmlHoko="; meta = { description = "Grammar Checker for Developers"; From 70aeff5814a04f7a1a7eec659525cd129f9ada57 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 31 Dec 2024 01:10:29 +0000 Subject: [PATCH 356/429] dnsdbq: 2.6.7 -> 2.6.8 --- pkgs/by-name/dn/dnsdbq/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/dn/dnsdbq/package.nix b/pkgs/by-name/dn/dnsdbq/package.nix index fed65506ec3d..9070dd89767e 100644 --- a/pkgs/by-name/dn/dnsdbq/package.nix +++ b/pkgs/by-name/dn/dnsdbq/package.nix @@ -10,13 +10,13 @@ }: stdenv.mkDerivation rec { pname = "dnsdbq"; - version = "2.6.7"; + version = "2.6.8"; src = fetchFromGitHub { owner = "dnsdb"; repo = "dnsdbq"; rev = "v${version}"; - hash = "sha256-VeoLgDLly5bDIzvcf6Xb+tqCaQxIzeSpoW3ij+Hq4O8="; + hash = "sha256-5Pi8xFZXnU3abIsH9m6xqrQ6NnEtAbhMU6HXsOYP0gg="; }; passthru = { From ad7b4fec433c5c754cb83bd1b5cc1c52c439dc5e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 31 Dec 2024 01:30:26 +0000 Subject: [PATCH 357/429] cpm-cmake: 0.40.3 -> 0.40.5 --- pkgs/by-name/cp/cpm-cmake/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/cp/cpm-cmake/package.nix b/pkgs/by-name/cp/cpm-cmake/package.nix index 3ff17c3ae404..65805f5db4ff 100644 --- a/pkgs/by-name/cp/cpm-cmake/package.nix +++ b/pkgs/by-name/cp/cpm-cmake/package.nix @@ -6,13 +6,13 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "cpm-cmake"; - version = "0.40.3"; + version = "0.40.5"; src = fetchFromGitHub { owner = "cpm-cmake"; repo = "cpm.cmake"; rev = "v${finalAttrs.version}"; - hash = "sha256-3V4XLfhDy6TIOcfSJjkvTRCxo/e5/Kt/+xxAXlZo0XM="; + hash = "sha256-wJsQNLCwWl4RiheDK36m3O8N4fmdmNazEo4gLdbTEzQ="; }; postPatch = '' From 35a4f7eee0a2f27eeeed989b4a492b2281711a2f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 31 Dec 2024 01:41:25 +0000 Subject: [PATCH 358/429] percona-server_8_0: 8.0.39-30 -> 8.0.40-31 --- pkgs/servers/sql/percona-server/8_0.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/sql/percona-server/8_0.nix b/pkgs/servers/sql/percona-server/8_0.nix index e7b948f4e8db..1ff63364c6a0 100644 --- a/pkgs/servers/sql/percona-server/8_0.nix +++ b/pkgs/servers/sql/percona-server/8_0.nix @@ -43,11 +43,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "percona-server"; - version = "8.0.39-30"; + version = "8.0.40-31"; src = fetchurl { url = "https://www.percona.com/downloads/Percona-Server-8.0/Percona-Server-${finalAttrs.version}/source/tarball/percona-server-${finalAttrs.version}.tar.gz"; - hash = "sha256-Ag+9tzmWpdF5vxWOFUsn65oJXIkb0HmoMbif7HcSoP8="; + hash = "sha256-ExhnDY4XbCTfdAGfdI9fIz4nh/hl3T1B1heQq1p3LE4="; }; nativeBuildInputs = [ From 477dff34d5488a17a3cb617f0cd47c198def9200 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 31 Dec 2024 01:43:24 +0000 Subject: [PATCH 359/429] ivyterm: 1.0.0 -> 1.0.4 --- pkgs/by-name/iv/ivyterm/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/iv/ivyterm/package.nix b/pkgs/by-name/iv/ivyterm/package.nix index 56cac36495a3..fc81b227be60 100644 --- a/pkgs/by-name/iv/ivyterm/package.nix +++ b/pkgs/by-name/iv/ivyterm/package.nix @@ -12,17 +12,17 @@ rustPlatform.buildRustPackage rec { pname = "ivyterm"; - version = "1.0.0"; + version = "1.0.4"; src = fetchFromGitHub { owner = "Tomiyou"; repo = "ivyterm"; tag = "v${version}"; - hash = "sha256-2wOTUJRFtT7lJ8Km7J7qT6CIRi7wZmNAp1UHfrksyss="; + hash = "sha256-zp0crxn8dF/6Bxru08qmfjs12VOqKaxDxU3xlD6Gosk="; }; useFetchCargoVendor = true; - cargoHash = "sha256-SyyXpV4BfXFm5SHsrXHVNXFm8xM1gBv9lBRXuHVN+lQ="; + cargoHash = "sha256-Vm6EP/t6y6Ijb6RnHebdf1qMIAwoMjh0RJ77xyYV1ZM="; nativeBuildInputs = [ pkg-config From 58a0309aee0f522306994cd83d882f575018f2d0 Mon Sep 17 00:00:00 2001 From: Andrew Marshall Date: Mon, 30 Dec 2024 20:43:53 -0500 Subject: [PATCH 360/429] blender: use stdenv from cudaPackages when building with CUDA (#368896) Otherwise stdenv may have an incompatible compiler, as is currently the case, so this fixes the build with cudaSupport. --- pkgs/applications/misc/blender/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/misc/blender/default.nix b/pkgs/applications/misc/blender/default.nix index f486a8e6dcff..2df2e3a08805 100644 --- a/pkgs/applications/misc/blender/default.nix +++ b/pkgs/applications/misc/blender/default.nix @@ -88,6 +88,8 @@ }: let + stdenv' = if cudaSupport then cudaPackages.backendStdenv else stdenv; + embreeSupport = (!stdenv.hostPlatform.isAarch64 && stdenv.hostPlatform.isLinux) || stdenv.hostPlatform.isDarwin; openImageDenoiseSupport = @@ -110,7 +112,7 @@ let }; in -stdenv.mkDerivation (finalAttrs: { +stdenv'.mkDerivation (finalAttrs: { pname = "blender"; version = "4.3.2"; From ad8fd7ea806643d5bd0072150f226e4541d53138 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 31 Dec 2024 01:53:21 +0000 Subject: [PATCH 361/429] gh-dash: 4.8.0 -> 4.8.1 --- pkgs/by-name/gh/gh-dash/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/gh/gh-dash/package.nix b/pkgs/by-name/gh/gh-dash/package.nix index 1a267b1ad1bc..4df061439ad3 100644 --- a/pkgs/by-name/gh/gh-dash/package.nix +++ b/pkgs/by-name/gh/gh-dash/package.nix @@ -8,13 +8,13 @@ buildGoModule rec { pname = "gh-dash"; - version = "4.8.0"; + version = "4.8.1"; src = fetchFromGitHub { owner = "dlvhdr"; repo = "gh-dash"; rev = "v${version}"; - hash = "sha256-0LiuEhp1caTdROBvkqEpI80y3s5zW3jIUTEKtY2OD0o="; + hash = "sha256-d6wAyn6Vj4pWnPUmYodSm+SQtBf3EU1vVSCUnfiXRas="; }; vendorHash = "sha256-lqmz+6Cr9U5IBoJ5OeSN6HKY/nKSAmszfvifzbxG7NE="; From 2f40fbd37aa2d1bfb3fa5eb574fe41d0076deb38 Mon Sep 17 00:00:00 2001 From: Reno Dakota Date: Mon, 30 Dec 2024 19:55:30 -0600 Subject: [PATCH 362/429] efitools: fix build GNU_SOURCE required with latest gcc. --- pkgs/by-name/ef/efitools/package.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/by-name/ef/efitools/package.nix b/pkgs/by-name/ef/efitools/package.nix index 8f793128f4be..5248199c6873 100644 --- a/pkgs/by-name/ef/efitools/package.nix +++ b/pkgs/by-name/ef/efitools/package.nix @@ -39,6 +39,7 @@ stdenv.mkDerivation rec { sed -i -e 's#/usr/include/efi#${gnu-efi}/include/efi/#g' Make.rules sed -i -e 's#/usr/lib64/gnuefi#${gnu-efi}/lib/#g' Make.rules sed -i -e 's#$(DESTDIR)/usr#$(out)#g' Make.rules + sed -i '$asign-efi-sig-list.o flash-var.o: CFLAGS += -D_GNU_SOURCE' Makefile substituteInPlace lib/console.c --replace "EFI_WARN_UNKOWN_GLYPH" "EFI_WARN_UNKNOWN_GLYPH" patchShebangs . ''; From 976bfb0801bcc10b113ccd83cb3df070a11e79e3 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 31 Dec 2024 02:23:51 +0000 Subject: [PATCH 363/429] supabase-cli: 2.1.3 -> 2.2.1 --- pkgs/by-name/su/supabase-cli/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/su/supabase-cli/package.nix b/pkgs/by-name/su/supabase-cli/package.nix index ae158afb75c1..4be308889b2e 100644 --- a/pkgs/by-name/su/supabase-cli/package.nix +++ b/pkgs/by-name/su/supabase-cli/package.nix @@ -10,16 +10,16 @@ buildGoModule rec { pname = "supabase-cli"; - version = "2.1.3"; + version = "2.2.1"; src = fetchFromGitHub { owner = "supabase"; repo = "cli"; rev = "v${version}"; - hash = "sha256-z29xiaKd/xyZU9s+QyMrb5+g4zsqJ1QpRYJooCTxFqw="; + hash = "sha256-m7v31fG3ASbOFGv+IsV5IwnKyr+31i4yAAVpawvFHpo="; }; - vendorHash = "sha256-sn8W10HhBLl4MqfnjUZKx6/wlKDBzMNi2EOc+OPtrFo="; + vendorHash = "sha256-QIt7a+NVd3hubxKOA2kGjouBO5ve7qmIRTIVRpsXmdk="; ldflags = [ "-s" From fac6109b1b8074807f488bc3768878c941f0657c Mon Sep 17 00:00:00 2001 From: Reno Dakota Date: Mon, 30 Dec 2024 20:26:45 -0600 Subject: [PATCH 364/429] looking-glass-client: use nanosvg from nixpkgs Issue building vendored nanosvg, just using the version we have. --- .../nanosvg-unvendor.diff | 28 +++++++++++++++++++ .../lo/looking-glass-client/package.nix | 3 ++ 2 files changed, 31 insertions(+) create mode 100644 pkgs/by-name/lo/looking-glass-client/nanosvg-unvendor.diff diff --git a/pkgs/by-name/lo/looking-glass-client/nanosvg-unvendor.diff b/pkgs/by-name/lo/looking-glass-client/nanosvg-unvendor.diff new file mode 100644 index 000000000000..08f7d4ce7d49 --- /dev/null +++ b/pkgs/by-name/lo/looking-glass-client/nanosvg-unvendor.diff @@ -0,0 +1,28 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 3755adc..55e1eb3 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -25,6 +25,7 @@ include(OptimizeForNative) # option(OPTIMIZE_FOR_NATIVE) + include(UninstallTarget) + + find_package(PkgConfig) ++find_package(NanoSVG REQUIRED) + pkg_check_modules(FONTCONFIG REQUIRED IMPORTED_TARGET fontconfig) + + option(ENABLE_OPENGL "Enable the OpenGL renderer" ON) +@@ -106,7 +107,6 @@ include_directories( + ${PROJECT_SOURCE_DIR}/include + ${CMAKE_BINARY_DIR} + ${CMAKE_BINARY_DIR}/include +- ${PROJECT_TOP}/repos/nanosvg/src + ) + + link_libraries( +@@ -161,6 +161,7 @@ target_compile_definitions(looking-glass-client PRIVATE CIMGUI_DEFINE_ENUMS_AND_ + target_link_libraries(looking-glass-client + ${EXE_FLAGS} + PkgConfig::FONTCONFIG ++ NanoSVG::nanosvg + lg_resources + lg_common + displayservers diff --git a/pkgs/by-name/lo/looking-glass-client/package.nix b/pkgs/by-name/lo/looking-glass-client/package.nix index 4f3dac659a38..973ca6ce4a0a 100644 --- a/pkgs/by-name/lo/looking-glass-client/package.nix +++ b/pkgs/by-name/lo/looking-glass-client/package.nix @@ -14,6 +14,7 @@ libffi, expat, libGL, + nanosvg, libX11, libxkbcommon, @@ -69,6 +70,7 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-CqB8AmOZ4YxnEsQkyu/ZEaun6ywpSh4B7PM+MFJF0qU="; stripLen = 1; }) + ./nanosvg-unvendor.diff ]; nativeBuildInputs = [ @@ -88,6 +90,7 @@ stdenv.mkDerivation (finalAttrs: { nettle fontconfig libffi + nanosvg ] ++ lib.optionals xorgSupport [ libxkbcommon From b4ce55dba9bf633ef28bbfd59a4a215515cebfc2 Mon Sep 17 00:00:00 2001 From: Isabel Date: Tue, 31 Dec 2024 02:29:48 +0000 Subject: [PATCH 365/429] forgejo-cli: add BUILD_TYPE env & move to new darwin pattern (#366849) * forgejo-cli: add BUILD_TYPE env * forgejo-cli: move to new darwin pattern --- pkgs/by-name/fo/forgejo-cli/package.nix | 23 +++++++---------------- 1 file changed, 7 insertions(+), 16 deletions(-) diff --git a/pkgs/by-name/fo/forgejo-cli/package.nix b/pkgs/by-name/fo/forgejo-cli/package.nix index aa21a9e937dd..2d9d5c7632a8 100644 --- a/pkgs/by-name/fo/forgejo-cli/package.nix +++ b/pkgs/by-name/fo/forgejo-cli/package.nix @@ -7,8 +7,6 @@ oniguruma, openssl, zlib, - stdenv, - darwin, }: let version = "0.2.0"; @@ -29,23 +27,16 @@ rustPlatform.buildRustPackage { nativeBuildInputs = [ pkg-config ]; - buildInputs = - [ - libgit2 - oniguruma - openssl - zlib - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin ( - with darwin.apple_sdk.frameworks; - [ - Security - SystemConfiguration - ] - ); + buildInputs = [ + libgit2 + oniguruma + openssl + zlib + ]; env = { RUSTONIG_SYSTEM_LIBONIG = true; + BUILD_TYPE = "nixpkgs"; }; meta = { From 0f5701886f993d535df35150d537ea9ca8913932 Mon Sep 17 00:00:00 2001 From: pca006132 Date: Mon, 30 Dec 2024 13:48:33 +0800 Subject: [PATCH 366/429] python312Packages.manifold3d: 3.0.0 -> 3.0.1 --- pkgs/development/python-modules/manifold3d/default.nix | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/manifold3d/default.nix b/pkgs/development/python-modules/manifold3d/default.nix index cb0468c6bff4..d9585ee525b7 100644 --- a/pkgs/development/python-modules/manifold3d/default.nix +++ b/pkgs/development/python-modules/manifold3d/default.nix @@ -17,14 +17,14 @@ buildPythonPackage rec { pname = "manifold3d"; - version = "3.0.0"; + version = "3.0.1"; pyproject = true; src = fetchFromGitHub { owner = "elalish"; repo = "manifold"; rev = "refs/tags/v${version}"; - hash = "sha256-02bZAPA4mnWzS9NYVcSW0JE7BidrwzNKBO2nl7BxiiE="; + hash = "sha256-wbeWxAeKyqjEPemc2e5n357gwq83pQlASOvMd0ZCE7g="; }; dontUseCmakeConfigure = true; @@ -64,6 +64,9 @@ buildPythonPackage rec { homepage = "https://github.com/elalish/manifold"; changelog = "https://github.com/elalish/manifold/releases/tag/v${version}"; license = lib.licenses.asl20; - maintainers = with lib.maintainers; [ pbsds ]; + maintainers = with lib.maintainers; [ + pbsds + pca006132 + ]; }; } From fb4eb8a49b57a345212ae9bb9e2ba8080d6fc741 Mon Sep 17 00:00:00 2001 From: jacobi petrucciani Date: Mon, 30 Dec 2024 21:48:20 -0500 Subject: [PATCH 367/429] genpass: add missing zlib dependency --- pkgs/tools/security/genpass/default.nix | 11 +++-------- pkgs/top-level/all-packages.nix | 4 +--- 2 files changed, 4 insertions(+), 11 deletions(-) diff --git a/pkgs/tools/security/genpass/default.nix b/pkgs/tools/security/genpass/default.nix index 009f59619a34..5fd2fd3b0b72 100644 --- a/pkgs/tools/security/genpass/default.nix +++ b/pkgs/tools/security/genpass/default.nix @@ -1,11 +1,8 @@ { lib, - stdenv, fetchgit, rustPlatform, - CoreFoundation, - libiconv, - Security, + zlib, }: rustPlatform.buildRustPackage rec { pname = "genpass"; @@ -19,10 +16,8 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-ls3tzZ+gtZQlObmbtwJDq6N/f5nY+Ps7RL5R/fR5Vgg="; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ - CoreFoundation - libiconv - Security + buildInputs = [ + zlib ]; meta = with lib; { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 844ba5a100d6..aa543c363350 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1804,9 +1804,7 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Security; }; - genpass = callPackage ../tools/security/genpass { - inherit (darwin.apple_sdk.frameworks) CoreFoundation Security; - }; + genpass = callPackage ../tools/security/genpass { }; gammaray = qt6Packages.callPackage ../development/tools/gammaray { }; From c05c30a34e408c276dd8d74de099ba14578d120e Mon Sep 17 00:00:00 2001 From: jacobi petrucciani Date: Mon, 30 Dec 2024 21:50:53 -0500 Subject: [PATCH 368/429] git-trim: add missing zlib dependency --- .../version-management/git-trim/default.nix | 20 ++++++------------- pkgs/top-level/all-packages.nix | 4 +--- 2 files changed, 7 insertions(+), 17 deletions(-) diff --git a/pkgs/applications/version-management/git-trim/default.nix b/pkgs/applications/version-management/git-trim/default.nix index 1827123ebd7e..1f0171acc674 100644 --- a/pkgs/applications/version-management/git-trim/default.nix +++ b/pkgs/applications/version-management/git-trim/default.nix @@ -1,14 +1,11 @@ { lib, - stdenv, rustPlatform, fetchFromGitHub, pkg-config, openssl, libgit2, - IOKit, - CoreFoundation, - Security, + zlib, fetchpatch, }: @@ -37,16 +34,11 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ pkg-config ]; - buildInputs = - [ - openssl - libgit2 - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - IOKit - CoreFoundation - Security - ]; + buildInputs = [ + openssl + libgit2 + zlib + ]; postInstall = '' install -Dm644 -t $out/share/man/man1/ docs/git-trim.1 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 844ba5a100d6..7511a4048e4a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1261,9 +1261,7 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Security; }; - git-trim = darwin.apple_sdk_11_0.callPackage ../applications/version-management/git-trim { - inherit (darwin.apple_sdk_11_0.frameworks) IOKit CoreFoundation Security; - }; + git-trim = callPackage ../applications/version-management/git-trim { }; git-up = callPackage ../applications/version-management/git-up { pythonPackages = python3Packages; From 047637626d416ae4abaa397764203a8215babd11 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 31 Dec 2024 03:14:30 +0000 Subject: [PATCH 369/429] circt: 1.99.1 -> 1.99.2 --- pkgs/by-name/ci/circt/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ci/circt/package.nix b/pkgs/by-name/ci/circt/package.nix index 712113bdaa3a..fd87023d2bbd 100644 --- a/pkgs/by-name/ci/circt/package.nix +++ b/pkgs/by-name/ci/circt/package.nix @@ -19,12 +19,12 @@ let in stdenv.mkDerivation rec { pname = "circt"; - version = "1.99.1"; + version = "1.99.2"; src = fetchFromGitHub { owner = "llvm"; repo = "circt"; rev = "firtool-${version}"; - hash = "sha256-pnC8BLf2encv7UR10q6rTTpAZ6T0fETwumwTSu+Q8Ro="; + hash = "sha256-zX+mzbfucrXdFN4+j+nAptn3HVLPKVUd55cQRHrpIJg="; fetchSubmodules = true; }; From 427c240f5df6cfd7686ba5993678cc1e9534f8be Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Tue, 31 Dec 2024 04:13:40 +0100 Subject: [PATCH 370/429] gpaste: Fix GNOME Shell extension not finding typelib The extension started failing with: Error: Requiring GPaste, version 2: Typelib file for namespace 'GPaste', version '2' not found Turns out I broke the name of the placeholder variable in e75decf46b045e79e80eed06301fa74ac15c583c. Not sure how this had been working for me until now. --- pkgs/by-name/gp/gpaste/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/gp/gpaste/package.nix b/pkgs/by-name/gp/gpaste/package.nix index 1322bae6269b..7b8259509aa6 100644 --- a/pkgs/by-name/gp/gpaste/package.nix +++ b/pkgs/by-name/gp/gpaste/package.nix @@ -72,10 +72,10 @@ stdenv.mkDerivation (finalAttrs: { mv "$extensionDir/"{prefs,.prefs-wrapped}.js substitute "${./wrapper.js}" "$extensionDir/extension.js" \ --subst-var-by originalName "extension" \ - --subst-var-by typelibPath "${placeholder "out"}/lib/girepository-1.0" + --subst-var-by typelibDir "${placeholder "out"}/lib/girepository-1.0" substitute "${./wrapper.js}" "$extensionDir/prefs.js" \ --subst-var-by originalName "prefs" \ - --subst-var-by typelibPath "${placeholder "out"}/lib/girepository-1.0" + --subst-var-by typelibDir "${placeholder "out"}/lib/girepository-1.0" ''; meta = with lib; { From e1d9c1c2fa68f61761b43ee509d1f424b6073d71 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 31 Dec 2024 03:21:43 +0000 Subject: [PATCH 371/429] slackdump: 2.6.0 -> 2.6.1 --- pkgs/by-name/sl/slackdump/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/sl/slackdump/package.nix b/pkgs/by-name/sl/slackdump/package.nix index 734d8de262b6..7f3fd542ed24 100644 --- a/pkgs/by-name/sl/slackdump/package.nix +++ b/pkgs/by-name/sl/slackdump/package.nix @@ -8,13 +8,13 @@ buildGoModule rec { pname = "slackdump"; - version = "2.6.0"; + version = "2.6.1"; src = fetchFromGitHub { owner = "rusq"; repo = "slackdump"; rev = "refs/tags/v${version}"; - hash = "sha256-hdSsvV1mQet61pWeo5icDhFxAVNP5QU1fdb1YgyXVWU="; + hash = "sha256-szo5n1sVv9PZUW77k/1qLuU0URl0FNB4cO5vqokoZ2c="; }; nativeCheckInputs = lib.optional stdenv.hostPlatform.isDarwin darwin.IOKitTools; @@ -30,7 +30,7 @@ buildGoModule rec { "-skip=^${builtins.concatStringsSep "$|^" skippedTests}$" ]; - vendorHash = "sha256-LjZP00YL0Coc7yY0Bm7AaYoAP37vQVJpVYPxuEnVEp4="; + vendorHash = "sha256-aDLeYi4nsMKxtE59au6I3mSEY0/6Vo0ujWFbLca+0wQ="; meta = { homepage = "https://github.com/rusq/slackdump"; From 263379919fae6281c4ba3842e627237cf847e70a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 31 Dec 2024 01:02:22 +0000 Subject: [PATCH 372/429] gdu: 5.29.0 -> 5.30.1 --- pkgs/by-name/gd/gdu/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/gd/gdu/package.nix b/pkgs/by-name/gd/gdu/package.nix index 4ba04921484f..ce767725e979 100644 --- a/pkgs/by-name/gd/gdu/package.nix +++ b/pkgs/by-name/gd/gdu/package.nix @@ -10,13 +10,13 @@ buildGoModule rec { pname = "gdu"; - version = "5.29.0"; + version = "5.30.1"; src = fetchFromGitHub { owner = "dundee"; repo = "gdu"; rev = "refs/tags/v${version}"; - hash = "sha256-w48I7HU/pA53Pq6ZVwtby+YvFddVUjj8orL40Gifqoo="; + hash = "sha256-3SymmE3J+lphyRKTQ+sLsnXaBvLyjJRlwpy79U4+t5o="; }; vendorHash = "sha256-aKhHC3sPRyi/l9BxeUgx+3TdYulb0cI9WxuPvbLoswg="; From 09c94e9e1afde81af5aad32039de5f20a5538f98 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 31 Dec 2024 05:24:59 +0000 Subject: [PATCH 373/429] mud: 1.0.10 -> 1.0.11 --- pkgs/by-name/mu/mud/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/mu/mud/package.nix b/pkgs/by-name/mu/mud/package.nix index 94b56792d72e..a8109b0208df 100644 --- a/pkgs/by-name/mu/mud/package.nix +++ b/pkgs/by-name/mu/mud/package.nix @@ -6,14 +6,14 @@ python3Packages.buildPythonApplication rec { pname = "mud"; - version = "1.0.10"; + version = "1.0.11"; pyproject = true; src = fetchFromGitHub { owner = "jasursadikov"; repo = "mud"; - rev = "refs/tags/v${version}"; - hash = "sha256-UPlAA63iANuChpqWLUDHQrcRjYkHvLcwXW/lVrAfY20="; + tag = "v${version}"; + hash = "sha256-HnYBHfburJuA/yRV4Nb8HApi7kfkONh5N9t221GOxMw="; }; build-system = with python3Packages; [ From 54412039d5fb353915ee62332f2c50a1d0d29061 Mon Sep 17 00:00:00 2001 From: Ushitora Anqou Date: Tue, 31 Dec 2024 14:44:59 +0900 Subject: [PATCH 374/429] libgda: fix build with GCC 14 --- pkgs/development/libraries/libgda/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/libgda/default.nix b/pkgs/development/libraries/libgda/default.nix index cc0306810d5e..8de4af61686b 100644 --- a/pkgs/development/libraries/libgda/default.nix +++ b/pkgs/development/libraries/libgda/default.nix @@ -86,7 +86,7 @@ stdenv.mkDerivation rec { "--enable-system-sqlite=${if stdenv.hostPlatform.isDarwin then "no" else "yes"}" ]; - env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang "-Wno-error=incompatible-function-pointer-types"; + env.NIX_CFLAGS_COMPILE = "-Wno-error=incompatible-pointer-types"; enableParallelBuilding = true; From 720f3e9804e1ec9b148c7c8a1bd49d6ac600349c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 31 Dec 2024 06:20:34 +0000 Subject: [PATCH 375/429] hareThirdParty.hare-ev: 0-unstable-2024-12-13 -> 0-unstable-2024-12-29 --- pkgs/development/hare-third-party/hare-ev/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/hare-third-party/hare-ev/default.nix b/pkgs/development/hare-third-party/hare-ev/default.nix index 8080794f4398..d7a004954f96 100644 --- a/pkgs/development/hare-third-party/hare-ev/default.nix +++ b/pkgs/development/hare-third-party/hare-ev/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation { pname = "hare-ev"; - version = "0-unstable-2024-12-13"; + version = "0-unstable-2024-12-29"; src = fetchFromSourcehut { owner = "~sircmpwn"; repo = "hare-ev"; - rev = "7f80dcbeb09f4dd743cdccfb2cfed10bfdeb07ab"; - hash = "sha256-cwBmkwQUeOBjTbDor44ZNowZkJ0ifrbr+ST5j5dUJm8="; + rev = "48bf3855a48467579321ba56c3406e574b046638"; + hash = "sha256-fWdmZj8j3CSVsWX7Yxf42iGwSZc0ae5/hTNtdeo9dkw="; }; nativeCheckInputs = [ hareHook ]; From 9f579229fc59199ee742ce8e8bbba32f0210a51e Mon Sep 17 00:00:00 2001 From: Reno Dakota Date: Mon, 30 Dec 2024 20:09:35 -0800 Subject: [PATCH 376/429] lib3mf: 2.2.0 -> 2.3.2 https://github.com/3MFConsortium/lib3mf/releases/tag/v2.3.2 --- pkgs/by-name/li/lib3mf/package.nix | 42 ++++++++++++------- .../by-name/li/lib3mf/upgrade-to-cpp-14.patch | 18 -------- 2 files changed, 28 insertions(+), 32 deletions(-) delete mode 100644 pkgs/by-name/li/lib3mf/upgrade-to-cpp-14.patch diff --git a/pkgs/by-name/li/lib3mf/package.nix b/pkgs/by-name/li/lib3mf/package.nix index c61a747bec0e..c332654c2b15 100644 --- a/pkgs/by-name/li/lib3mf/package.nix +++ b/pkgs/by-name/li/lib3mf/package.nix @@ -6,26 +6,25 @@ ninja, automaticcomponenttoolkit, pkg-config, + fast-float, libzip, gtest, openssl, libuuid, - libossp_uuid, + zlib, }: stdenv.mkDerivation rec { pname = "lib3mf"; - version = "2.2.0"; + version = "2.3.2"; src = fetchFromGitHub { owner = "3MFConsortium"; repo = pname; - rev = "v${version}"; - sha256 = "sha256-WMTTYYgpCIM86a6Jw8iah/YVXN9T5youzEieWL/d+Bc="; + tag = "v${version}"; + hash = "sha256-XEwrJINiNpI2+1wXxczirci8VJsUVs5iDUAMS6jWuNk="; }; - patches = [ ./upgrade-to-cpp-14.patch ]; - nativeBuildInputs = [ cmake ninja @@ -49,22 +48,37 @@ stdenv.mkDerivation rec { libzip gtest openssl - ] ++ (if stdenv.hostPlatform.isDarwin then [ libossp_uuid ] else [ libuuid ]); + zlib + ] ++ lib.optional (!stdenv.hostPlatform.isDarwin) libuuid; postPatch = '' - # This lets us build the tests properly on aarch64-darwin. - substituteInPlace CMakeLists.txt \ - --replace 'SET(CMAKE_OSX_ARCHITECTURES "x86_64")' "" - # fix libdir=''${exec_prefix}/@CMAKE_INSTALL_LIBDIR@ sed -i 's,libdir=''${\(exec_\)\?prefix}/,libdir=,' lib3mf.pc.in # replace bundled binaries - for i in AutomaticComponentToolkit/bin/act.*; do - ln -sf ${automaticcomponenttoolkit}/bin/act $i - done + rm -r AutomaticComponentToolkit + ln -s ${automaticcomponenttoolkit}/bin AutomaticComponentToolkit + + # unvendor Libraries + rm -r Libraries/{fast_float,googletest,libressl,libzip,zlib} + + cat <<"EOF" >> Tests/CPP_Bindings/CMakeLists.txt + find_package(GTest REQUIRED) + target_link_libraries(''${TESTNAME} PRIVATE GTest::gtest) + EOF + + mkdir Libraries/fast_float + ln -s ${lib.getInclude fast-float}/include/fast_float Libraries/fast_float/Include + + # functions are no longer in openssl, remove them from test cleanup function + substituteInPlace Tests/CPP_Bindings/Source/UnitTest_EncryptionUtils.cpp \ + --replace-warn "RAND_cleanup();" "" \ + --replace-warn "EVP_cleanup();" "" \ + --replace-warn "CRYPTO_cleanup_all_ex_data();" "" ''; + doCheck = true; + meta = with lib; { description = "Reference implementation of the 3D Manufacturing Format file standard"; homepage = "https://3mf.io/"; diff --git a/pkgs/by-name/li/lib3mf/upgrade-to-cpp-14.patch b/pkgs/by-name/li/lib3mf/upgrade-to-cpp-14.patch deleted file mode 100644 index a453571838d0..000000000000 --- a/pkgs/by-name/li/lib3mf/upgrade-to-cpp-14.patch +++ /dev/null @@ -1,18 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 9f719beb7..a20f84eb8 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -34,12 +34,12 @@ if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU") - # using GCC - add_definitions(-DBUILD_DLL) - add_compile_options(-Wall) -- SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -O2") -+ SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++14 -O2") - elseif ("${CMAKE_SYSTEM_NAME}" MATCHES "Darwin") - # using GCC - add_definitions(-DBUILD_DLL) - add_compile_options(-Wall) -- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -O2") -+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++14 -O2") - set(CMAKE_MACOSX_RPATH ON) - endif() From c34b1985c78c25cc928ea3f60b1b04e7a7308ef0 Mon Sep 17 00:00:00 2001 From: Reno Dakota Date: Mon, 30 Dec 2024 22:29:03 -0800 Subject: [PATCH 377/429] openscad: unpin cgal_4; fix darwin --- .../graphics/openscad/default.nix | 25 +++++++++++++++++-- 1 file changed, 23 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/graphics/openscad/default.nix b/pkgs/applications/graphics/openscad/default.nix index a3f11641ed4d..008b83ecd099 100644 --- a/pkgs/applications/graphics/openscad/default.nix +++ b/pkgs/applications/graphics/openscad/default.nix @@ -14,7 +14,7 @@ libGL, glew, opencsg, - cgal_4, + cgal, mpfr, gmp, glib, @@ -62,11 +62,32 @@ mkDerivation rec { url = "https://github.com/openscad/openscad/commit/84addf3c1efbd51d8ff424b7da276400bbfa1a4b.patch"; sha256 = "sha256-KNEVu10E2d4G2x+FJcuHo2tjD8ygMRuhUcW9NbN98bM="; }) + (fetchpatch { + # needed for cgal_5 + name = "cgalutils-tess.cc-cgal-5.patch"; + url = "https://github.com/openscad/openscad/commit/3a81c1fb9b663ebbedd6eb044e7276357b1f30a1.patch"; + hash = "sha256-JdBznXkewx5ybY92Ss0h7UnMZ7d3IQbFRaDCDjb1bRA="; + }) + (fetchpatch { + # needed for cgal_5 + name = "cgalutils-tess.cc-cgal-5_4.patch"; + url = "https://github.com/openscad/openscad/commit/71f2831c0484c3f35cbf44e1d1dc2c857384100b.patch"; + hash = "sha256-Fu8dnjNIwZKCI6ukOeHYK8NiJwoA0XtqT8dg8sVevG8="; + }) + (fetchpatch { + # needed for cgal_5. Removes dead code + name = "cgalutils-polyhedron.cc-cgal-5_3.patch"; + url = "https://github.com/openscad/openscad/commit/cc49ad8dac24309f5452d5dea9abd406615a52d9.patch"; + hash = "sha256-B3i+o6lR5osRcVXTimDZUFQmm12JhmbFgG9UwOPebF4="; + }) ]; postPatch = '' substituteInPlace src/FileModule.cc \ --replace-fail 'fs::is_regular' 'fs::is_regular_file' + + substituteInPlace src/openscad.cc \ + --replace-fail 'boost::join' 'boost::algorithm::join' ''; nativeBuildInputs = [ @@ -84,7 +105,7 @@ mkDerivation rec { boost glew opencsg - cgal_4 + cgal mpfr gmp glib From 4add44475ab1077805182a06391f4ed77baf34aa Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 31 Dec 2024 06:45:15 +0000 Subject: [PATCH 378/429] opencomposite: 0-unstable-2024-12-20 -> 0-unstable-2024-12-26 --- pkgs/by-name/op/opencomposite/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/op/opencomposite/package.nix b/pkgs/by-name/op/opencomposite/package.nix index 1ba7112c922b..661b0025359a 100644 --- a/pkgs/by-name/op/opencomposite/package.nix +++ b/pkgs/by-name/op/opencomposite/package.nix @@ -16,14 +16,14 @@ stdenv.mkDerivation { pname = "opencomposite"; - version = "0-unstable-2024-12-20"; + version = "0-unstable-2024-12-26"; src = fetchFromGitLab { owner = "znixian"; repo = "OpenOVR"; - rev = "b9069698f2ed420a5f1ae783c02b88fbde775fc2"; + rev = "effe0a8783937c5a3cfe7a72cf6f81152150b6cb"; fetchSubmodules = true; - hash = "sha256-ow10yTvZyB5fLTwgxspjS/atxK1QTGcLJtkWpQgYaeQ="; + hash = "sha256-SV8E+4qu5J7MueHmdsdTDKNx4CH085fidgIJyewj8RQ="; }; nativeBuildInputs = [ cmake ]; From f8ea8cf3a72ee021681928ab8e49124b80df0c0d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 31 Dec 2024 07:07:18 +0000 Subject: [PATCH 379/429] python312Packages.aiovodafone: 0.8.1 -> 0.8.2 --- pkgs/development/python-modules/aiovodafone/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aiovodafone/default.nix b/pkgs/development/python-modules/aiovodafone/default.nix index 96367e7e109b..ba453a457a85 100644 --- a/pkgs/development/python-modules/aiovodafone/default.nix +++ b/pkgs/development/python-modules/aiovodafone/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "aiovodafone"; - version = "0.8.1"; + version = "0.8.2"; pyproject = true; disabled = pythonOlder "3.11"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "chemelli74"; repo = "aiovodafone"; tag = "v${version}"; - hash = "sha256-JRZEMu5Lv0JQkTM1w3g3yzdaG/FM8xwT1MuEBHAic1Y="; + hash = "sha256-aX5VM4f3lZnFgmdm0syubdo3UtMD9/u40djQTo+jgKs="; }; postPatch = '' From dd18086a20c98a6afe1b8b75aee6ba53c9e596c0 Mon Sep 17 00:00:00 2001 From: Reno Dakota Date: Mon, 30 Dec 2024 23:39:20 -0800 Subject: [PATCH 380/429] manifold: platforms.linux -> platforms.unix builds fine on darwin --- pkgs/by-name/ma/manifold/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/ma/manifold/package.nix b/pkgs/by-name/ma/manifold/package.nix index e4c0a608a05a..0b185bc3b041 100644 --- a/pkgs/by-name/ma/manifold/package.nix +++ b/pkgs/by-name/ma/manifold/package.nix @@ -49,6 +49,6 @@ stdenv.mkDerivation (finalAttrs: { hzeller pca006132 ]; - platforms = lib.platforms.linux; # currently issues with Darwin + platforms = lib.platforms.unix; }; }) From d962b800be2dfed92c65e2c1875b034028c603a7 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Tue, 31 Dec 2024 08:45:02 +0100 Subject: [PATCH 381/429] recutils: fix build --- pkgs/by-name/re/recutils/package.nix | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/pkgs/by-name/re/recutils/package.nix b/pkgs/by-name/re/recutils/package.nix index de1a79649fc1..47760d402025 100644 --- a/pkgs/by-name/re/recutils/package.nix +++ b/pkgs/by-name/re/recutils/package.nix @@ -2,6 +2,7 @@ lib, stdenv, fetchurl, + fetchpatch, bc, check, curl, @@ -26,6 +27,14 @@ stdenv.mkDerivation rec { hash = "sha256-YwFZKwAgwUtFZ1fvXUNNSfYCe45fOkmdEzYvIFxIbg4="; }; + patches = [ + (fetchpatch { + name = "configure-big_sur.diff"; + url = "https://github.com/Homebrew/formula-patches/raw/03cf8088210822aa2c1ab544ed58ea04c897d9c4/libtool/configure-big_sur.diff"; + hash = "sha256-NazWrrwZhD8aKzpj6IC6zrD1J4qxrOZh5XpQLZ14yTw="; + }) + ]; + hardeningDisable = lib.optional stdenv.cc.isClang "format"; configureFlags = lib.optionals withBashBuiltins [ @@ -47,6 +56,16 @@ stdenv.mkDerivation rec { bash.dev ]; + env.NIX_CFLAGS_COMPILE = toString ( + lib.optionals stdenv.cc.isClang [ + "-Wno-error=implicit-function-declaration" + ] + ++ lib.optionals stdenv.cc.isGNU [ + "-Wno-error=implicit-function-declaration" + "-Wno-error=incompatible-pointer-types" + ] + ); + nativeCheckInputs = [ bc check From ed7e2624bf7d03097ea8f97910c0bd0e9af9620a Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Tue, 31 Dec 2024 09:32:24 +0100 Subject: [PATCH 382/429] obs-do: 0.1.5 -> 0.1.6 Diff: https://github.com/jonhoo/obs-do/compare/None...v0.1.6 --- pkgs/by-name/ob/obs-do/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ob/obs-do/package.nix b/pkgs/by-name/ob/obs-do/package.nix index 76fd9266a335..5cee77568677 100644 --- a/pkgs/by-name/ob/obs-do/package.nix +++ b/pkgs/by-name/ob/obs-do/package.nix @@ -7,16 +7,16 @@ }: rustPlatform.buildRustPackage rec { pname = "obs-do"; - version = "0.1.5"; + version = "0.1.6"; src = fetchFromGitHub { owner = "jonhoo"; repo = "obs-do"; tag = "v${version}"; - hash = "sha256-4vL5v2KaE2uZ+7kVQiEivab7VBaCFXGXB+uv+3whm9s="; + hash = "sha256-t6m/PX4GMCFH9wFrOaU/dcrbKitUXQlOcU7aUyJPpxA="; }; - cargoHash = "sha256-dM2IV5dkzz0XHJh3UGvx/3mWfqoDoYqElarD1C1v2Ro="; + cargoHash = "sha256-GZsTDG5lS6XpVT6mobMOCKsJ4iXAVW2NIsm4s+v52SU="; nativeInstallCheckInputs = [ versionCheckHook From d0c04f6481d582254bbc1282bcc72e40518e2804 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Tue, 31 Dec 2024 09:33:50 +0100 Subject: [PATCH 383/429] timetrap: fix build --- pkgs/development/ruby-modules/gem-config/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/ruby-modules/gem-config/default.nix b/pkgs/development/ruby-modules/gem-config/default.nix index b6542ebeccc2..7509d0d45c5f 100644 --- a/pkgs/development/ruby-modules/gem-config/default.nix +++ b/pkgs/development/ruby-modules/gem-config/default.nix @@ -828,6 +828,10 @@ in "--with-sqlite3-include=${sqlite.dev}/include" "--with-sqlite3-lib=${sqlite.out}/lib" ]; + env.NIX_CFLAGS_COMPILE = toString [ + "-Wno-error=incompatible-pointer-types" + "-Wno-error=int-conversion" + ]; }; rb-readline = attrs: { From 5594c47eb25ff63f1619952f45cac27313471fd7 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 31 Dec 2024 08:36:02 +0000 Subject: [PATCH 384/429] stardust-xr-protostar: 0-unstable-2024-07-19 -> 0-unstable-2024-12-29 --- pkgs/by-name/st/stardust-xr-protostar/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/st/stardust-xr-protostar/package.nix b/pkgs/by-name/st/stardust-xr-protostar/package.nix index 237b5c204edc..5f5dc13a71b1 100644 --- a/pkgs/by-name/st/stardust-xr-protostar/package.nix +++ b/pkgs/by-name/st/stardust-xr-protostar/package.nix @@ -7,13 +7,13 @@ rustPlatform.buildRustPackage rec { pname = "stardust-xr-protostar"; - version = "0-unstable-2024-07-19"; + version = "0-unstable-2024-12-29"; src = fetchFromGitHub { owner = "stardustxr"; repo = "protostar"; - rev = "39499a061af74c3a2d5e1e46e4ad21aca5727219"; - hash = "sha256-TPpkjTOZVtyVZdK65C951DpEzfI9aaRMXclZ31dAk9s="; + rev = "9b73eb1e128b49a6d40a27a4cde7715d8cbd2674"; + hash = "sha256-9KJO1Z3Aq0+hh9QqufWBxpMmfFOmdgMUJxfgGZMg2n4="; }; env.STARDUST_RES_PREFIXES = "${src}/res"; From ad981657df8022fc54cebdd795a89b97858d11ab Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 31 Dec 2024 08:37:24 +0000 Subject: [PATCH 385/429] stardust-xr-gravity: 0-unstable-2024-08-21 -> 0-unstable-2024-12-29 --- pkgs/by-name/st/stardust-xr-gravity/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/st/stardust-xr-gravity/package.nix b/pkgs/by-name/st/stardust-xr-gravity/package.nix index 8728f943ce8b..a4b8bb615dc0 100644 --- a/pkgs/by-name/st/stardust-xr-gravity/package.nix +++ b/pkgs/by-name/st/stardust-xr-gravity/package.nix @@ -7,13 +7,13 @@ rustPlatform.buildRustPackage rec { pname = "stardust-xr-gravity"; - version = "0-unstable-2024-08-21"; + version = "0-unstable-2024-12-29"; src = fetchFromGitHub { owner = "stardustxr"; repo = "gravity"; - rev = "96787ed3139717ea6061f6e259e9fed3e483274a"; - hash = "sha256-R87u7CX2n7iOOEEB3cHae2doqCn/skChHgeU+RNsHVk="; + rev = "eca5e835cd3abee69984ce6312610644801457a9"; + hash = "sha256-upw0MjGccSI1B10wabKPMGrEo7ATfg4a7Hzaucbf99w="; }; cargoLock = { From efb58f120074c2fd94dfbc368c55daa5282224e9 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 31 Dec 2024 08:37:26 +0000 Subject: [PATCH 386/429] stardust-xr-magnetar: 0-unstable-2024-08-31 -> 0-unstable-2024-12-29 --- pkgs/by-name/st/stardust-xr-magnetar/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/st/stardust-xr-magnetar/package.nix b/pkgs/by-name/st/stardust-xr-magnetar/package.nix index 5494dd52d49a..e6803e4da4a0 100644 --- a/pkgs/by-name/st/stardust-xr-magnetar/package.nix +++ b/pkgs/by-name/st/stardust-xr-magnetar/package.nix @@ -7,13 +7,13 @@ rustPlatform.buildRustPackage rec { pname = "stardust-xr-magnetar"; - version = "0-unstable-2024-08-31"; + version = "0-unstable-2024-12-29"; src = fetchFromGitHub { owner = "stardustxr"; repo = "magnetar"; - rev = "48064b84b71d27ceea00b5d2f19dcbf21d75f554"; - hash = "sha256-x1yHf5ceCws4C8NuoB/+kHwZK09vnn4IOFgduhjl4O8="; + rev = "d00c5ecf0bcaf2b4382ec3b4f3373ea5b761ee7b"; + hash = "sha256-2I6BRjw5t68OMc93cis4/qnyYT9OBYIr1S+ZF8LmFCc="; }; cargoLock = { From 3f7a10dc747b60dee82e8c1843cc4cb7c0fac63f Mon Sep 17 00:00:00 2001 From: rnhmjoj Date: Tue, 31 Dec 2024 09:37:23 +0100 Subject: [PATCH 387/429] nixos/tests: manualy start networkd-wait-online Fix some tests that broke after 2370696d. --- nixos/tests/kea.nix | 1 + nixos/tests/systemd-bpf.nix | 2 ++ nixos/tests/systemd-networkd-bridge.nix | 1 + nixos/tests/systemd-networkd-dhcpserver-static-leases.nix | 2 ++ nixos/tests/systemd-networkd.nix | 6 ++++-- 5 files changed, 10 insertions(+), 2 deletions(-) diff --git a/nixos/tests/kea.nix b/nixos/tests/kea.nix index 51db35bede69..90b9491039c4 100644 --- a/nixos/tests/kea.nix +++ b/nixos/tests/kea.nix @@ -223,6 +223,7 @@ import ./make-test-python.nix ( '' start_all() router.wait_for_unit("kea-dhcp4-server.service") + client.systemctl("start systemd-networkd-wait-online.service") client.wait_for_unit("systemd-networkd-wait-online.service") client.wait_until_succeeds("ping -c 5 10.0.0.1") router.wait_until_succeeds("ping -c 5 10.0.0.3") diff --git a/nixos/tests/systemd-bpf.nix b/nixos/tests/systemd-bpf.nix index 2820218b2286..bc51d08497de 100644 --- a/nixos/tests/systemd-bpf.nix +++ b/nixos/tests/systemd-bpf.nix @@ -39,7 +39,9 @@ import ./make-test-python.nix ( testScript = '' start_all() + node1.systemctl("start systemd-networkd-wait-online.service") node1.wait_for_unit("systemd-networkd-wait-online.service") + node2.systemctl("start systemd-networkd-wait-online.service") node2.wait_for_unit("systemd-networkd-wait-online.service") with subtest("test RestrictNetworkInterfaces= works"): diff --git a/nixos/tests/systemd-networkd-bridge.nix b/nixos/tests/systemd-networkd-bridge.nix index 1c21cc113167..ec0547ce5cc4 100644 --- a/nixos/tests/systemd-networkd-bridge.nix +++ b/nixos/tests/systemd-networkd-bridge.nix @@ -131,6 +131,7 @@ import ./make-test-python.nix ( start_all() for n in network_nodes + network_switches: + n.systemctl("start systemd-networkd-wait-online.service") n.wait_for_unit("systemd-networkd-wait-online.service") node1.succeed("ping 10.0.0.2 -w 10 -c 1") diff --git a/nixos/tests/systemd-networkd-dhcpserver-static-leases.nix b/nixos/tests/systemd-networkd-dhcpserver-static-leases.nix index 4604b28caf91..512925eb9f5b 100644 --- a/nixos/tests/systemd-networkd-dhcpserver-static-leases.nix +++ b/nixos/tests/systemd-networkd-dhcpserver-static-leases.nix @@ -73,6 +73,7 @@ import ./make-test-python.nix ( start_all() with subtest("check router network configuration"): + router.systemctl("start systemd-networkd-wait-online.service") router.wait_for_unit("systemd-networkd-wait-online.service") eth1_status = router.succeed("networkctl status eth1") assert "Network File: /etc/systemd/network/01-eth1.network" in eth1_status, \ @@ -80,6 +81,7 @@ import ./make-test-python.nix ( assert "10.0.0.1" in eth1_status, "Did not find expected router IPv4" with subtest("check client network configuration"): + client.systemctl("start systemd-networkd-wait-online.service") client.wait_for_unit("systemd-networkd-wait-online.service") eth1_status = client.succeed("networkctl status eth1") assert "Network File: /etc/systemd/network/40-eth1.network" in eth1_status, \ diff --git a/nixos/tests/systemd-networkd.nix b/nixos/tests/systemd-networkd.nix index 2923967cc897..44ea52435c7b 100644 --- a/nixos/tests/systemd-networkd.nix +++ b/nixos/tests/systemd-networkd.nix @@ -96,10 +96,12 @@ in import ./make-test-python.nix ({pkgs, ... }: { }; testScript = '' start_all() - node1.succeed("systemctl start systemd-networkd-wait-online@eth1.service") + node1.systemctl("start systemd-networkd-wait-online@eth1.service") + node1.systemctl("start systemd-networkd-wait-online.service") node1.wait_for_unit("systemd-networkd-wait-online@eth1.service") node1.wait_for_unit("systemd-networkd-wait-online.service") - node2.succeed("systemctl start systemd-networkd-wait-online@eth1.service") + node2.systemctl("start systemd-networkd-wait-online@eth1.service") + node2.systemctl("start systemd-networkd-wait-online.service") node2.wait_for_unit("systemd-networkd-wait-online@eth1.service") node2.wait_for_unit("systemd-networkd-wait-online.service") From 0811b5ef998e74664aed81f9dec9e8c5e0be277e Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 31 Dec 2024 18:45:29 +1000 Subject: [PATCH 388/429] mangojuice: 0.7.8 -> 0.7.9 (#369482) --- pkgs/by-name/ma/mangojuice/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ma/mangojuice/package.nix b/pkgs/by-name/ma/mangojuice/package.nix index f60517cea1f4..071230c1feb1 100644 --- a/pkgs/by-name/ma/mangojuice/package.nix +++ b/pkgs/by-name/ma/mangojuice/package.nix @@ -22,13 +22,13 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "mangojuice"; - version = "0.7.8"; + version = "0.7.9"; src = fetchFromGitHub { owner = "radiolamp"; repo = "mangojuice"; rev = "refs/tags/${finalAttrs.version}"; - hash = "sha256-EWpXikyO7N2NjONqnTx8+9w16Pt5ne7qX67bYirShjc="; + hash = "sha256-L+wxRmpCAfrvLE9IHAT9g+F/clXlQAkLpbnMJwC8RxY="; }; nativeBuildInputs = [ From 15c084508e6b2b2dae714b4b4a09f09bd89ccdb7 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Tue, 31 Dec 2024 09:50:26 +0100 Subject: [PATCH 389/429] comical: move to pkgs/by-name --- .../default.nix => by-name/co/comical/package.nix} | 13 ++++--------- .../graphics => by-name/co}/comical/wxgtk-3.2.patch | 0 pkgs/top-level/all-packages.nix | 4 ---- 3 files changed, 4 insertions(+), 13 deletions(-) rename pkgs/{applications/graphics/comical/default.nix => by-name/co/comical/package.nix} (86%) rename pkgs/{applications/graphics => by-name/co}/comical/wxgtk-3.2.patch (100%) diff --git a/pkgs/applications/graphics/comical/default.nix b/pkgs/by-name/co/comical/package.nix similarity index 86% rename from pkgs/applications/graphics/comical/default.nix rename to pkgs/by-name/co/comical/package.nix index 4fcbd1e98eeb..c008f2ce20bb 100644 --- a/pkgs/applications/graphics/comical/default.nix +++ b/pkgs/by-name/co/comical/package.nix @@ -5,7 +5,6 @@ hexdump, wxGTK32, zlib, - Cocoa, }: stdenv.mkDerivation rec { @@ -25,14 +24,10 @@ stdenv.mkDerivation rec { hexdump ]; - buildInputs = - [ - wxGTK32 - zlib - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - Cocoa - ]; + buildInputs = [ + wxGTK32 + zlib + ]; makeFlags = [ "prefix=${placeholder "out"}" diff --git a/pkgs/applications/graphics/comical/wxgtk-3.2.patch b/pkgs/by-name/co/comical/wxgtk-3.2.patch similarity index 100% rename from pkgs/applications/graphics/comical/wxgtk-3.2.patch rename to pkgs/by-name/co/comical/wxgtk-3.2.patch diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 844ba5a100d6..e8c8b6405561 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13339,10 +13339,6 @@ with pkgs; cudatext-gtk = callPackage ../applications/editors/cudatext { widgetset = "gtk2"; }; cudatext = cudatext-qt; - comical = callPackage ../applications/graphics/comical { - inherit (darwin.apple_sdk.frameworks) Cocoa; - }; - cqrlog = callPackage ../applications/radio/cqrlog { hamlib = hamlib_4; }; From 09095ba1145838518ea6d0d7e667b490b5129395 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Tue, 31 Dec 2024 09:51:50 +0100 Subject: [PATCH 390/429] comical: fix build --- pkgs/by-name/co/comical/package.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/by-name/co/comical/package.nix b/pkgs/by-name/co/comical/package.nix index c008f2ce20bb..5443b5231cfc 100644 --- a/pkgs/by-name/co/comical/package.nix +++ b/pkgs/by-name/co/comical/package.nix @@ -35,6 +35,8 @@ stdenv.mkDerivation rec { "CXX=${stdenv.cc.targetPrefix}c++" ]; + env.NIX_CFLAGS_COMPILE = "-Wno-error=incompatible-pointer-types"; + preInstall = '' mkdir -p $out/bin ''; From e7a93618c96b2aab2c3fbdae967d65ca6125f40c Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Tue, 31 Dec 2024 09:57:16 +0100 Subject: [PATCH 391/429] gtksheet: fix build --- pkgs/by-name/gt/gtksheet/package.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/by-name/gt/gtksheet/package.nix b/pkgs/by-name/gt/gtksheet/package.nix index cf325855cdc6..b4f952077b19 100644 --- a/pkgs/by-name/gt/gtksheet/package.nix +++ b/pkgs/by-name/gt/gtksheet/package.nix @@ -41,6 +41,8 @@ stdenv.mkDerivation (finalAttrs: { pango ]; + env.NIX_CFLAGS_COMPILE = "-Wno-error=incompatible-pointer-types"; + meta = { description = "Spreadsheet widget for GTK+"; homepage = "https://fpaquet.github.io/gtksheet/"; From 7c80e7a012208281f84dbc56e939a825e261dda9 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Tue, 31 Dec 2024 10:03:25 +0100 Subject: [PATCH 392/429] gnufdisk: drop --- pkgs/tools/system/fdisk/default.nix | 58 ----------------------------- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 4 -- 3 files changed, 1 insertion(+), 62 deletions(-) delete mode 100644 pkgs/tools/system/fdisk/default.nix diff --git a/pkgs/tools/system/fdisk/default.nix b/pkgs/tools/system/fdisk/default.nix deleted file mode 100644 index beb4906d0e49..000000000000 --- a/pkgs/tools/system/fdisk/default.nix +++ /dev/null @@ -1,58 +0,0 @@ -{ - lib, - stdenv, - fetchurl, - gettext, - guile, - libuuid, - parted, -}: - -stdenv.mkDerivation rec { - pname = "gnufdisk"; - version = "2.0.0a1"; - - src = fetchurl { - url = "mirror://gnu/fdisk/gnufdisk-${version}.tar.gz"; - hash = "sha256-yWPYTf8RxBIQ//mUdC6fkKct/csEgbzEtTAiPtNRH7U="; - }; - - postPatch = '' - sed -i "s/gnufdisk-common.h .*/\n/g" backend/configure - ''; - - strictDeps = true; - - nativeBuildInputs = [ - gettext - guile - ]; - - buildInputs = [ - guile - libuuid - parted - ]; - - env.NIX_CFLAGS_COMPILE = lib.concatStringsSep " " [ - "-I../common/include" - "-I../debug/include" - "-I../exception/include" - ]; - - doCheck = true; - - meta = { - description = "Command-line disk partitioning tool"; - longDescription = '' - GNU fdisk provides a GNU version of the common disk partitioning tool - fdisk. fdisk is used for the creation and manipulation of disk partition - tables, and it understands a variety of different formats. - ''; - homepage = "https://www.gnu.org/software/fdisk/"; - license = lib.licenses.gpl3Plus; - mainProgram = "gnufdisk"; - maintainers = [ lib.maintainers.wegank ]; - platforms = lib.platforms.linux; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 4dc915cde728..3cc8c91eaf63 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -505,6 +505,7 @@ mapAliases { gmock = throw "'gmock' has been renamed to/replaced by 'gtest'"; # Converted to throw 2024-10-17 gnome3 = throw "'gnome3' has been renamed to/replaced by 'gnome'"; # Converted to throw 2024-10-17 + gnufdisk = throw "'gnufdisk' has been removed due to lack of maintenance upstream"; # Added 2024-12-31 gnuradio3_9 = throw "gnuradio3_9 has been removed because it is not compatible with the latest volk and it had no dependent packages which justified it's distribution"; # Added 2024-07-28 gnuradio3_9Minimal = throw "gnuradio3_9Minimal has been removed because it is not compatible with the latest volk and it had no dependent packages which justified it's distribution"; # Added 2024-07-28 gnuradio3_9Packages = throw "gnuradio3_9Minimal has been removed because it is not compatible with the latest volk and it had no dependent packages which justified it's distribution"; # Added 2024-07-28 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 844ba5a100d6..b415b1c5ee0b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3494,10 +3494,6 @@ with pkgs; gnucap-full = gnucap.withPlugins(p: [ p.verilog ]); - gnufdisk = callPackage ../tools/system/fdisk { - guile = guile_1_8; - }; - gnugrep = callPackage ../tools/text/gnugrep { }; gnupatch = callPackage ../tools/text/gnupatch { }; From 92689fbf85294a46d52379b5566c3f8243256c55 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 31 Dec 2024 09:11:32 +0000 Subject: [PATCH 393/429] exo: 0-unstable-2024-12-15 -> 0-unstable-2024-12-28 --- pkgs/by-name/ex/exo/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ex/exo/package.nix b/pkgs/by-name/ex/exo/package.nix index 1f07ea3bb4ed..97a1de282ea3 100644 --- a/pkgs/by-name/ex/exo/package.nix +++ b/pkgs/by-name/ex/exo/package.nix @@ -7,14 +7,14 @@ }: python3Packages.buildPythonApplication { pname = "exo"; - version = "0-unstable-2024-12-15"; + version = "0-unstable-2024-12-28"; pyproject = true; src = fetchFromGitHub { owner = "exo-explore"; repo = "exo"; - rev = "cfedcec3a651f27085e1913f4bd42a699fa82076"; - hash = "sha256-OPGWmIfIVW/1lJg+4iXRvzN6bY8+LzWx8SOgBUXjPQ0="; + rev = "a174c78004e5fc62220dd4e9734e8ad4eaa75e39"; + hash = "sha256-q68dcAz4QPS5mSuHSlQ3BnXkPzOi+2X2XgKLZs6SKhE="; }; build-system = with python3Packages; [ setuptools ]; From aaffc2cce575f9177394bd12631f2420544daa9c Mon Sep 17 00:00:00 2001 From: Ivan Mincik Date: Mon, 30 Dec 2024 10:36:29 +0100 Subject: [PATCH 394/429] liblas: fix build with boost 1.86 Disable setting of C++98 standard which was dropped in boost 1.84.0. Co-authored-by: Reno Dakota Date: Tue, 31 Dec 2024 10:30:03 +0100 Subject: [PATCH 395/429] performous: fix build --- pkgs/by-name/pe/performous/package.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/by-name/pe/performous/package.nix b/pkgs/by-name/pe/performous/package.nix index f1082473cf98..9395982599c7 100644 --- a/pkgs/by-name/pe/performous/package.nix +++ b/pkgs/by-name/pe/performous/package.nix @@ -50,6 +50,11 @@ stdenv.mkDerivation rec { excludes = [ ".github/workflows/macos.yml" ]; hash = "sha256-cQVelET/g2Kx2PlV3pspjEoNIwwn5Yz6enYl5vCMMKo="; }) + (fetchpatch { + name = "performous-gcc14.patch"; + url = "https://github.com/performous/performous/commit/eb9b97f46b7d064c32ed0f086d89a70427ce1d14.patch"; + hash = "sha256-98pcO/sFQJ+G67ErwlO/aAITNDPuRgPziQiF1cAlc0g="; + }) ]; postPatch = '' From a3d1a8cdc32746f0ed766b453cefc42dcbb7d56b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 31 Dec 2024 09:34:35 +0000 Subject: [PATCH 396/429] lief: 0.16.0 -> 0.16.1 --- pkgs/development/libraries/lief/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/lief/default.nix b/pkgs/development/libraries/lief/default.nix index 3560dc08eb7f..ef7b160cdd1a 100644 --- a/pkgs/development/libraries/lief/default.nix +++ b/pkgs/development/libraries/lief/default.nix @@ -11,13 +11,13 @@ let in stdenv.mkDerivation rec { pname = "lief"; - version = "0.16.0"; + version = "0.16.1"; src = fetchFromGitHub { owner = "lief-project"; repo = "LIEF"; rev = version; - sha256 = "sha256-TwNrwOY8JVQvZ0GJXeW0hr21vCFXQcFj4VnGQQnisNY="; + sha256 = "sha256-Mq3IC1EbJpAwqHpiByFwdWl/rUOvv+oOtLgJ6dx7/P0="; }; outputs = [ "out" "py" ]; From b3b8557fa095ae9007a9796513ddb35e7902177a Mon Sep 17 00:00:00 2001 From: nartsisss Date: Fri, 27 Dec 2024 17:54:33 +0300 Subject: [PATCH 397/429] hexyl: 0.15.0 -> 0.16.0 --- pkgs/by-name/he/hexyl/package.nix | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/he/hexyl/package.nix b/pkgs/by-name/he/hexyl/package.nix index 715d8ba6f238..5b5b080415f6 100644 --- a/pkgs/by-name/he/hexyl/package.nix +++ b/pkgs/by-name/he/hexyl/package.nix @@ -2,20 +2,28 @@ lib, rustPlatform, fetchFromGitHub, + versionCheckHook, + nix-update-script, }: rustPlatform.buildRustPackage rec { pname = "hexyl"; - version = "0.15.0"; + version = "0.16.0"; src = fetchFromGitHub { owner = "sharkdp"; repo = "hexyl"; - rev = "refs/tags/v${version}"; - hash = "sha256-v/mB0W/AyoJSoK00pqxpfMGZR/4DkkTCnPU6eorl/GI="; + tag = "v${version}"; + hash = "sha256-TmFvv+jzOSM8kKCxBbUoDsUjKRPTplhWheVfIjS5nsY="; }; - cargoHash = "sha256-QaOp7dCXfkIpxAJ+J+Pt9op3uj+LYoYvR78BmHBgnqE="; + cargoHash = "sha256-nfz5tpqJSPJvYDvzsl0tQHv0olLOi1d1PTo3lFDmIkI="; + + nativeInstallCheckInputs = [ versionCheckHook ]; + doInstallCheck = true; + versionCheckProgramArg = [ "--version" ]; + + passthru.updateScript = nix-update-script { }; meta = { description = "Command-line hex viewer"; From aed1103e1ae4f3266eb44390a6769ff48f43c3b5 Mon Sep 17 00:00:00 2001 From: ZHAO Jin-Xiang Date: Mon, 30 Dec 2024 21:27:06 +0800 Subject: [PATCH 398/429] pixi-pack: init at 0.3.1 --- pkgs/by-name/pi/pixi-pack/package.nix | 52 +++++++++++++++++++++++++++ 1 file changed, 52 insertions(+) create mode 100644 pkgs/by-name/pi/pixi-pack/package.nix diff --git a/pkgs/by-name/pi/pixi-pack/package.nix b/pkgs/by-name/pi/pixi-pack/package.nix new file mode 100644 index 000000000000..ce217df96ebc --- /dev/null +++ b/pkgs/by-name/pi/pixi-pack/package.nix @@ -0,0 +1,52 @@ +{ + lib, + rustPlatform, + fetchFromGitHub, + openssl, + pkg-config, + versionCheckHook, + nix-update-script, +}: + +rustPlatform.buildRustPackage rec { + pname = "pixi-pack"; + version = "0.3.1"; + + src = fetchFromGitHub { + owner = "Quantco"; + repo = "pixi-pack"; + tag = "v${version}"; + hash = "sha256-gzP/01pck14cMN0PopoCO27dxncWz4yIZFAzXU+4IQ0="; + }; + + cargoHash = "sha256-2kr4mFqG8IuRR3XiiGFlEX70c4NIcdF0NICwyrdjhcs="; + + buildInputs = [ openssl ]; + + nativeBuildInputs = [ pkg-config ]; + + # Needed to get openssl-sys to use pkgconfig. + OPENSSL_NO_VENDOR = 1; + + # Tests require downloading artifacts from conda. + doCheck = false; + + nativeInstallCheckInputs = [ + versionCheckHook + ]; + versionCheckProgramArg = [ "--version" ]; + doInstallCheck = true; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Pack and unpack conda environments created with pixi"; + homepage = "https://github.com/Quantco/pixi-pack"; + changelog = "https://github.com/Quantco/pixi-pack/releases/tag/v${version}"; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ + xiaoxiangmoe + ]; + mainProgram = "pixi-pack"; + }; +} From 03d33b719b001972265f552c31ac38334cf2f601 Mon Sep 17 00:00:00 2001 From: antipatico Date: Sat, 31 Aug 2024 14:00:53 +0200 Subject: [PATCH 399/429] maintainers: add antipatico --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 22c5f4804ab2..6fb85cb7ffed 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -1632,6 +1632,12 @@ matrix = "@anthonyrsl:matrix.org"; keys = [ { fingerprint = "472D 368A F107 F443 F3A5 C712 9DC4 987B 1A55 E75E"; } ]; }; + antipatico = { + email = "code@bootkit.dev"; + github = "antipatico"; + githubId = 14838767; + name = "Jacopo Scannella"; + }; antoinerg = { email = "roygobeil.antoine@gmail.com"; github = "antoinerg"; From cb31bc8b795444324cac889a5627a5058086d449 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tim=20H=C3=A4ring?= Date: Mon, 30 Dec 2024 11:30:56 +0100 Subject: [PATCH 400/429] goocanvas2: fix gcc14 compilation --- pkgs/development/libraries/goocanvas/2.x.nix | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/pkgs/development/libraries/goocanvas/2.x.nix b/pkgs/development/libraries/goocanvas/2.x.nix index 9d0007b1ff28..0491a02ab860 100644 --- a/pkgs/development/libraries/goocanvas/2.x.nix +++ b/pkgs/development/libraries/goocanvas/2.x.nix @@ -2,6 +2,7 @@ lib, stdenv, fetchurl, + fetchpatch, pkg-config, gettext, gtk-doc, @@ -41,6 +42,16 @@ stdenv.mkDerivation rec { glib ]; + # add fedora patch to fix gcc-14 build + # https://src.fedoraproject.org/rpms/goocanvas2/tree/main + patches = [ + (fetchpatch { + name = "goocanvas-2.0.4-Fix-building-with-GCC-14.patch"; + hash = "sha256-9uqqC1uKZF9TDz5dfDTKSRCmjEiuvqkLnZ9w6U+q2TI="; + url = "https://src.fedoraproject.org/rpms/goocanvas2/raw/e799612a277262a0c6bd03db10a6ee9ca7871b9c/f/goocanvas-2.0.4-Fix-building-with-GCC-14.patch"; + }) + ]; + configureFlags = [ "--disable-python" ]; From e898d774401882fbaf2f0c006873510de4e5752b Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 31 Dec 2024 12:37:59 +0100 Subject: [PATCH 401/429] python312Packages.ollama: move pydantic toi run-time deps --- pkgs/development/python-modules/ollama/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/ollama/default.nix b/pkgs/development/python-modules/ollama/default.nix index be11a601cc26..5d9867a9d718 100644 --- a/pkgs/development/python-modules/ollama/default.nix +++ b/pkgs/development/python-modules/ollama/default.nix @@ -35,11 +35,13 @@ buildPythonPackage rec { build-system = [ poetry-core ]; - dependencies = [ httpx ]; + dependencies = [ + httpx + pydantic + ]; nativeCheckInputs = [ pillow - pydantic pytest-asyncio pytest-httpserver pytestCheckHook From cb48707630dd99cf830f3a2a2a6975ea4a2f5a82 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 31 Dec 2024 12:38:55 +0100 Subject: [PATCH 402/429] python312Packages.ollama: 0.4.4 -> 0.4.5 Diff: https://github.com/ollama/ollama-python/compare/refs/tags/v0.4.4...v0.4.5 Changelog: https://github.com/ollama/ollama-python/releases/tag/v0.4.5 --- pkgs/development/python-modules/ollama/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/ollama/default.nix b/pkgs/development/python-modules/ollama/default.nix index 5d9867a9d718..cd0c6c5c66d4 100644 --- a/pkgs/development/python-modules/ollama/default.nix +++ b/pkgs/development/python-modules/ollama/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "ollama"; - version = "0.4.4"; + version = "0.4.5"; pyproject = true; disabled = pythonOlder "3.8"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "ollama"; repo = "ollama-python"; rev = "refs/tags/v${version}"; - hash = "sha256-GW/4adrU6/4cM96U6A8Btgv7Qt1jtSFJr9F8+zwTEpk="; + hash = "sha256-8Y3CRd+VXABuMpaqfJ5mYQhQ+U4Qk7EcjSnPd/hsebY="; }; postPatch = '' From 65c8af3bb29962f65b05c8faeb74fb787f42e13d Mon Sep 17 00:00:00 2001 From: RatCornu Date: Tue, 31 Dec 2024 12:45:36 +0100 Subject: [PATCH 403/429] hexpatch: init at 1.9.4 --- pkgs/by-name/he/hexpatch/package.nix | 57 ++++++++++++++++++++++++++++ 1 file changed, 57 insertions(+) create mode 100644 pkgs/by-name/he/hexpatch/package.nix diff --git a/pkgs/by-name/he/hexpatch/package.nix b/pkgs/by-name/he/hexpatch/package.nix new file mode 100644 index 000000000000..973d44fa9364 --- /dev/null +++ b/pkgs/by-name/he/hexpatch/package.nix @@ -0,0 +1,57 @@ +{ + lib, + fetchFromGitHub, + rustPlatform, + cmake, + python3, + versionCheckHook, + nix-update-script, +}: + +rustPlatform.buildRustPackage rec { + pname = "hexpatch"; + version = "1.9.4"; + + src = fetchFromGitHub { + owner = "Etto48"; + repo = "HexPatch"; + tag = "v${version}"; + hash = "sha256-tVJp8ZFHaHM6Yhty0n5W4ZDKG/L5+8ZcbbTnw2yLEOI="; + }; + + cargoHash = "sha256-oKZjLS4+blGMt3K6in4i7JLqKZ8uWAv/uBFU9VT0Ha8="; + + nativeBuildInputs = [ + cmake + python3 + ]; + + postFixup = '' + ln -s $out/bin/hex-patch $out/bin/hexpatch + ''; + + nativeInstallCheckInputs = [ + versionCheckHook + ]; + versionCheckProgramArg = [ "--version" ]; + doInstallCheck = true; + + passthru = { + upateScript = nix-update-script { }; + }; + + meta = { + description = "Binary patcher and editor written in Rust with a terminal user interface"; + longDescription = '' + HexPatch is a binary patcher and editor with a terminal user interface (TUI), + capable of disassembling instructions and assembling patches. It supports a + variety of architectures and file formats, and can edit remote files + via SSH. + ''; + homepage = "https://etto48.github.io/HexPatch/"; + changelog = "https://github.com/Etto48/HexPatch/releases/tag/v${version}"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ ratcornu ]; + mainProgram = "hexpatch"; + }; +} From 0dcdae9d406614801d0cb8687c1bc5e71fb7a4a5 Mon Sep 17 00:00:00 2001 From: V3RM1N Date: Tue, 31 Dec 2024 13:09:58 +0100 Subject: [PATCH 404/429] linuxPackages.nvidiaPackages.stable: use 'production' (#365711) update nvidia-x11 default.nix to use 'production' for stable version on non-i686-linux systems --- pkgs/os-specific/linux/nvidia-x11/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/nvidia-x11/default.nix b/pkgs/os-specific/linux/nvidia-x11/default.nix index 5232106bf7b6..cabb72ff1096 100644 --- a/pkgs/os-specific/linux/nvidia-x11/default.nix +++ b/pkgs/os-specific/linux/nvidia-x11/default.nix @@ -54,7 +54,7 @@ rec { # Branch/Maturity data - http://people.freedesktop.org/~aplattner/nvidia-versions.txt # Policy: use the highest stable version as the default (on our master). - stable = if stdenv.hostPlatform.system == "i686-linux" then legacy_390 else latest; + stable = if stdenv.hostPlatform.system == "i686-linux" then legacy_390 else production; production = generic { version = "550.142"; From ec8ab9d7715482cf333fe5c38c08ff5e5540d995 Mon Sep 17 00:00:00 2001 From: lucasew Date: Sun, 29 Dec 2024 22:30:54 -0300 Subject: [PATCH 405/429] pam_ldap: src from GitHub, fix license, add changelog, finalAttrs Signed-off-by: lucasew --- pkgs/by-name/pa/pam_ldap/package.nix | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/pkgs/by-name/pa/pam_ldap/package.nix b/pkgs/by-name/pa/pam_ldap/package.nix index 98f0c1b493f5..7da79331c360 100644 --- a/pkgs/by-name/pa/pam_ldap/package.nix +++ b/pkgs/by-name/pa/pam_ldap/package.nix @@ -1,18 +1,21 @@ { + lib, stdenv, - fetchurl, + fetchFromGitHub, pam, openldap, perl, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "pam_ldap"; version = "186"; - src = fetchurl { - url = "https://www.padl.com/download/pam_ldap-${version}.tar.gz"; - sha256 = "0lv4f7hc02jrd2l3gqxd247qq62z11sp3fafn8lgb8ymb7aj5zn8"; + src = fetchFromGitHub { + owner = "PADL"; + repo = "pam_ldap"; + rev = "d1c2e08e4b023708648e2d720add19da6caf77d0"; + hash = "sha256-W0n01HqWZaEoVShXJyND3xGe+snClGm+GZRw7P4fX10="; }; postPatch = '' @@ -33,11 +36,12 @@ stdenv.mkDerivation rec { meta = { homepage = "https://www.padl.com/OSS/pam_ldap.html"; description = "LDAP backend for PAM"; + changelog = "https://github.com/PADL/pam_ldap/blob/master/ChangeLog"; longDescription = '' The pam_ldap module provides the means for Solaris and Linux servers and workstations to authenticate against LDAP directories, and to change their passwords in the directory.''; - license = "LGPL"; + license = lib.licenses.gpl2; inherit (pam.meta) platforms; }; -} +}) From c596b4c6ee07e407611434e47152837a63ef05c0 Mon Sep 17 00:00:00 2001 From: Robert Helgesson Date: Tue, 31 Dec 2024 08:49:29 +0100 Subject: [PATCH 406/429] phpExtensions.yaml: 2.2.3 -> 2.2.4 --- pkgs/development/php-packages/yaml/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/php-packages/yaml/default.nix b/pkgs/development/php-packages/yaml/default.nix index bb890a7fd350..fecc29777ad7 100644 --- a/pkgs/development/php-packages/yaml/default.nix +++ b/pkgs/development/php-packages/yaml/default.nix @@ -7,8 +7,8 @@ buildPecl { pname = "yaml"; - version = "2.2.3"; - sha256 = "sha256-WTfrlyLd9tZGJnmc+gJFmP8kUuoVeZLk5nMxolP5AjY="; + version = "2.2.4"; + sha256 = "sha256-jrNTuvh/FbG2Ksbrcci1iWhZWKH+iw49IqxZVg0OiRM="; configureFlags = [ "--with-yaml=${libyaml.dev}" ]; From 125226c402b4c5e5624820ce3598937b0f35c5a8 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 31 Dec 2024 12:55:51 +0000 Subject: [PATCH 407/429] svdtools: 0.3.20 -> 0.3.21 --- pkgs/by-name/sv/svdtools/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/sv/svdtools/package.nix b/pkgs/by-name/sv/svdtools/package.nix index 909a54ae12fd..73d04f6f8f31 100644 --- a/pkgs/by-name/sv/svdtools/package.nix +++ b/pkgs/by-name/sv/svdtools/package.nix @@ -6,14 +6,14 @@ rustPlatform.buildRustPackage rec { pname = "svdtools"; - version = "0.3.20"; + version = "0.3.21"; src = fetchCrate { inherit version pname; - hash = "sha256-Sh3VnitkR72009kcD9u42UrDB1FKbHYllHGzM07eUTU="; + hash = "sha256-0ciEhtCJEerzyAcB/3xXnaStXBTi5SWcMplGlft9eeY="; }; - cargoHash = "sha256-9QiDbJMWf4OWEVOVrz4uiyjmLHNhZg0VbM1/VKTjO9M="; + cargoHash = "sha256-+YBFjsPY3w+zjLtIB9GQXkuGy1ZHNT86clsQYiXeTJU="; meta = with lib; { description = "Tools to handle vendor-supplied, often buggy SVD files"; From ea0737c3e7beba4924e4209c1998679055f31c85 Mon Sep 17 00:00:00 2001 From: Pim Kunis Date: Tue, 31 Dec 2024 14:04:56 +0100 Subject: [PATCH 408/429] prowlarr: add pizzapim to maintainers --- pkgs/servers/prowlarr/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/servers/prowlarr/default.nix b/pkgs/servers/prowlarr/default.nix index b248f7749160..2439ee91e2cb 100644 --- a/pkgs/servers/prowlarr/default.nix +++ b/pkgs/servers/prowlarr/default.nix @@ -62,7 +62,7 @@ in stdenv.mkDerivation rec { homepage = "https://wiki.servarr.com/prowlarr"; changelog = "https://github.com/Prowlarr/Prowlarr/releases/tag/v${version}"; license = licenses.gpl3Only; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ pizzapim ]; mainProgram = "Prowlarr"; platforms = [ "aarch64-darwin" From 3548c24dce87d41aa423014b40914924385246ea Mon Sep 17 00:00:00 2001 From: lucasew Date: Tue, 31 Dec 2024 10:10:50 -0300 Subject: [PATCH 409/429] pam_ldap: add update script Signed-off-by: lucasew --- pkgs/by-name/pa/pam_ldap/package.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/by-name/pa/pam_ldap/package.nix b/pkgs/by-name/pa/pam_ldap/package.nix index 7da79331c360..78238155c7ae 100644 --- a/pkgs/by-name/pa/pam_ldap/package.nix +++ b/pkgs/by-name/pa/pam_ldap/package.nix @@ -5,6 +5,7 @@ pam, openldap, perl, + unstableGitUpdater, }: stdenv.mkDerivation (finalAttrs: { @@ -33,6 +34,8 @@ stdenv.mkDerivation (finalAttrs: { openldap ]; + passthru.updateScript = unstableGitUpdater { }; + meta = { homepage = "https://www.padl.com/OSS/pam_ldap.html"; description = "LDAP backend for PAM"; From e26e47eb81aa6b4495936cbb1b63c728be4df9f7 Mon Sep 17 00:00:00 2001 From: lucasew Date: Tue, 31 Dec 2024 10:11:53 -0300 Subject: [PATCH 410/429] pam_ldap: 186 -> 0-unstable-2024-02-22 Signed-off-by: lucasew --- pkgs/by-name/pa/pam_ldap/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/pa/pam_ldap/package.nix b/pkgs/by-name/pa/pam_ldap/package.nix index 78238155c7ae..6bd6d4b72822 100644 --- a/pkgs/by-name/pa/pam_ldap/package.nix +++ b/pkgs/by-name/pa/pam_ldap/package.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "pam_ldap"; - version = "186"; + version = "0-unstable-2024-02-22"; src = fetchFromGitHub { owner = "PADL"; repo = "pam_ldap"; - rev = "d1c2e08e4b023708648e2d720add19da6caf77d0"; - hash = "sha256-W0n01HqWZaEoVShXJyND3xGe+snClGm+GZRw7P4fX10="; + rev = "656448f091cbeb9efb3ece08e6868e40b8e7b6f8"; + hash = "sha256-o2RBewxhaXcMW9KIRwlxFv6YaWxaBngafvjEYxFchX4="; }; postPatch = '' From 4cb18b646a48cef8df60bd16fd1c5478d1c16886 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Tue, 31 Dec 2024 14:02:36 +0100 Subject: [PATCH 411/429] python312Packages.ansible-compat: 24.9.1 -> 24.10.0 Changelog: https://github.com/ansible/ansible-compat/releases/tag/v24.10.0 --- .../python-modules/ansible-compat/default.nix | 55 ++++++++++--------- 1 file changed, 30 insertions(+), 25 deletions(-) diff --git a/pkgs/development/python-modules/ansible-compat/default.nix b/pkgs/development/python-modules/ansible-compat/default.nix index 68eb5fb6a75e..b31b55082467 100644 --- a/pkgs/development/python-modules/ansible-compat/default.nix +++ b/pkgs/development/python-modules/ansible-compat/default.nix @@ -1,33 +1,38 @@ { lib, buildPythonPackage, - fetchPypi, - ansible-core, - coreutils, - flaky, - pytest-mock, - pytestCheckHook, - pyyaml, + fetchFromGitHub, + + # build-system setuptools, setuptools-scm, + + # dependencies + pyyaml, subprocess-tee, - pythonOlder, + + # tests + coreutils, + ansible-core, + flaky, + git, + pytest-mock, + pytestCheckHook, }: buildPythonPackage rec { pname = "ansible-compat"; - version = "24.9.1"; + version = "24.10.0"; pyproject = true; - disabled = pythonOlder "3.10"; - - src = fetchPypi { - pname = "ansible_compat"; - inherit version; - hash = "sha256-n/ICReG9nemyOjZ5AlJKsOEfvPt0GDGZbaXaW2Crld8="; + src = fetchFromGitHub { + owner = "ansible"; + repo = "ansible-compat"; + tag = "v${version}"; + hash = "sha256-cc97ENpoRoaYaGbnGeHU5z+ijCS8PLWtgXpQ0F3b5rk="; }; - nativeBuildInputs = [ + build-system = [ setuptools setuptools-scm ]; @@ -40,26 +45,26 @@ buildPythonPackage rec { preCheck = '' export HOME=$(mktemp -d) substituteInPlace test/test_runtime.py \ - --replace-fail "printenv" "${coreutils}/bin/printenv" + --replace-fail "printenv" "${lib.getExe' coreutils "printenv"}" ''; nativeCheckInputs = [ ansible-core flaky + git pytest-mock pytestCheckHook ]; disabledTests = [ # require network + "test_install_collection_from_disk" + "test_install_collection_git" + "test_load_plugins" "test_prepare_environment_with_collections" "test_prerun_reqs_v1" "test_prerun_reqs_v2" - "test_require_collection_wrong_version" - "test_require_collection" - "test_install_collection" - "test_install_collection_dest" - "test_upgrade_collection" + "test_require_collection_install" "test_require_collection_no_cache_dir" "test_runtime_has_playbook" "test_runtime_plugins" @@ -68,11 +73,11 @@ buildPythonPackage rec { pythonImportsCheck = [ "ansible_compat" ]; - meta = with lib; { + meta = { description = "Function collection that help interacting with various versions of Ansible"; homepage = "https://github.com/ansible/ansible-compat"; changelog = "https://github.com/ansible/ansible-compat/releases/tag/v${version}"; - license = licenses.mit; - maintainers = with maintainers; [ dawidd6 ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ dawidd6 ]; }; } From f3f3f7bae6c47c8cc251ef49938f7cb1e067ef20 Mon Sep 17 00:00:00 2001 From: 7c6f434c <7c6f434c@mail.ru> Date: Tue, 31 Dec 2024 14:31:32 +0100 Subject: [PATCH 412/429] xpilot-ng: fix build --- pkgs/games/xpilot/default.nix | 3 + pkgs/games/xpilot/xpilot-ng-gcc-14-fix.patch | 168 +++++++++++++++++++ 2 files changed, 171 insertions(+) create mode 100644 pkgs/games/xpilot/xpilot-ng-gcc-14-fix.patch diff --git a/pkgs/games/xpilot/default.nix b/pkgs/games/xpilot/default.nix index bdc41a27de8a..8e011af62f29 100644 --- a/pkgs/games/xpilot/default.nix +++ b/pkgs/games/xpilot/default.nix @@ -32,6 +32,9 @@ stdenv.mkDerivation rec { zlib libXxf86misc ]; + + patches = [ ./xpilot-ng-gcc-14-fix.patch ]; + meta = with lib; { description = "Multiplayer X11 space combat game"; homepage = "http://xpilot.sf.net/"; diff --git a/pkgs/games/xpilot/xpilot-ng-gcc-14-fix.patch b/pkgs/games/xpilot/xpilot-ng-gcc-14-fix.patch new file mode 100644 index 000000000000..e66ed96971fe --- /dev/null +++ b/pkgs/games/xpilot/xpilot-ng-gcc-14-fix.patch @@ -0,0 +1,168 @@ +diff -r -U3 -x '.*.sw?' xpilot-ng-4.7.3/src/mapedit/proto.h xpilot-ng-4.7.3-fixed/src/mapedit/proto.h +--- xpilot-ng-4.7.3/src/mapedit/proto.h 2010-03-05 02:03:49.000000000 +0100 ++++ xpilot-ng-4.7.3-fixed/src/mapedit/proto.h 2024-12-31 14:25:55.790083767 +0100 +@@ -73,15 +73,15 @@ + int ResizeWidth(HandlerInfo_t info); + int ResizeHeight(HandlerInfo_t info); + int OpenPreferencesPopup(HandlerInfo_t info); +-int OpenMapInfoPopup(void); +-int OpenRobotsPopup(void); +-int OpenVisibilityPopup(void); +-int OpenCannonsPopup(void); +-int OpenRoundsPopup(void); +-int OpenInitItemsPopup(void); +-int OpenMaxItemsPopup(void); +-int OpenProbsPopup(void); +-int OpenScoringPopup(void); ++int OpenMapInfoPopup(HandlerInfo_t info); ++int OpenRobotsPopup(HandlerInfo_t info); ++int OpenVisibilityPopup(HandlerInfo_t info); ++int OpenCannonsPopup(HandlerInfo_t info); ++int OpenRoundsPopup(HandlerInfo_t info); ++int OpenInitItemsPopup(HandlerInfo_t info); ++int OpenMaxItemsPopup(HandlerInfo_t info); ++int OpenProbsPopup(HandlerInfo_t info); ++int OpenScoringPopup(HandlerInfo_t info); + int ValidateCoordHandler(HandlerInfo_t info); + int ShowHoles(HandlerInfo_t info); + char MapData(int x, int y); +diff -r -U3 -x '.*.sw?' xpilot-ng-4.7.3/src/mapedit/tools.c xpilot-ng-4.7.3-fixed/src/mapedit/tools.c +--- xpilot-ng-4.7.3/src/mapedit/tools.c 2010-03-05 02:03:49.000000000 +0100 ++++ xpilot-ng-4.7.3-fixed/src/mapedit/tools.c 2024-12-31 14:26:29.168082279 +0100 +@@ -747,7 +747,7 @@ + /* Arguments : */ + /* Purpose : */ + /***************************************************************************/ +-int OpenMapInfoPopup() ++int OpenMapInfoPopup(HandlerInfo_t info) + { + Window *temp; + +@@ -790,7 +790,7 @@ + /* Arguments : */ + /* Purpose : */ + /***************************************************************************/ +-int OpenRobotsPopup() ++int OpenRobotsPopup(HandlerInfo_t info) + { + XMapWindow(display, robots); + return 0; +@@ -801,7 +801,7 @@ + /* Arguments : */ + /* Purpose : */ + /***************************************************************************/ +-int OpenVisibilityPopup() ++int OpenVisibilityPopup(HandlerInfo_t info) + { + XMapWindow(display, visibility); + return 0; +@@ -812,7 +812,7 @@ + /* Arguments : */ + /* Purpose : */ + /***************************************************************************/ +-int OpenCannonsPopup() ++int OpenCannonsPopup(HandlerInfo_t info) + { + XMapWindow(display, cannons); + return 0; +@@ -823,7 +823,7 @@ + /* Arguments : */ + /* Purpose : */ + /***************************************************************************/ +-int OpenRoundsPopup() ++int OpenRoundsPopup(HandlerInfo_t info) + { + XMapWindow(display, rounds); + return 0; +@@ -834,7 +834,7 @@ + /* Arguments : */ + /* Purpose : */ + /***************************************************************************/ +-int OpenInitItemsPopup() ++int OpenInitItemsPopup(HandlerInfo_t info) + { + XMapWindow(display, inititems); + return 0; +@@ -845,7 +845,7 @@ + /* Arguments : */ + /* Purpose : */ + /***************************************************************************/ +-int OpenMaxItemsPopup() ++int OpenMaxItemsPopup(HandlerInfo_t info) + { + XMapWindow(display, maxitems); + return 0; +@@ -856,7 +856,7 @@ + /* Arguments : */ + /* Purpose : */ + /***************************************************************************/ +-int OpenProbsPopup() ++int OpenProbsPopup(HandlerInfo_t info) + { + XMapWindow(display, probs); + return 0; +@@ -867,7 +867,7 @@ + /* Arguments : */ + /* Purpose : */ + /***************************************************************************/ +-int OpenScoringPopup() ++int OpenScoringPopup(HandlerInfo_t info) + { + XMapWindow(display, scoring); + return 0; +diff -r -U3 -x '.*.sw?' xpilot-ng-4.7.3/src/server/suibotdef.c xpilot-ng-4.7.3-fixed/src/server/suibotdef.c +--- xpilot-ng-4.7.3/src/server/suibotdef.c 2010-03-05 02:03:49.000000000 +0100 ++++ xpilot-ng-4.7.3-fixed/src/server/suibotdef.c 2024-12-31 14:07:28.316133143 +0100 +@@ -338,12 +338,6 @@ + + /* } */ + +-struct collans { +- int line; +- int point; +- clvec_t moved; +-}; +- + static bool Wall_in_between_points(int cx1, int cy1, int cx2, int cy2); + static bool Wall_in_between_points(int cx1, int cy1, int cx2, int cy2){ /* Wall between two given points?*/ + +@@ -405,7 +399,7 @@ + /* ignore if there is enough time to deal with this object later */ + if((time_until_closest < 0) || (time_until_closest > maxtime)) + /*option instead of fixed value: options.dodgetime))*/ +- return; ++ return false; + + /* get the square of the distance */ + sqdistance = +diff -r -U3 -x '.*.sw?' xpilot-ng-4.7.3/src/server/walls.c xpilot-ng-4.7.3-fixed/src/server/walls.c +--- xpilot-ng-4.7.3/src/server/walls.c 2010-03-05 02:03:49.000000000 +0100 ++++ xpilot-ng-4.7.3-fixed/src/server/walls.c 2024-12-31 14:09:46.086127001 +0100 +@@ -54,12 +54,6 @@ + #error "This code assumes that negative numbers round upwards." + #endif + +-struct collans { +- int line; +- int point; +- clvec_t moved; +-}; +- + struct tl2 { + int base; + int x; +diff -r -U3 -x '.*.sw?' xpilot-ng-4.7.3/src/server/walls.h xpilot-ng-4.7.3-fixed/src/server/walls.h +--- xpilot-ng-4.7.3/src/server/walls.h 2010-03-05 02:03:49.000000000 +0100 ++++ xpilot-ng-4.7.3-fixed/src/server/walls.h 2024-12-31 14:04:50.198140193 +0100 +@@ -187,4 +187,11 @@ + + extern int num_polys, num_pstyles, num_estyles, num_bstyles; + ++struct collans { ++ int line; ++ int point; ++ clvec_t moved; ++}; ++ ++extern void Move_point(const move_t *move, struct collans *answer); + #endif From 740ec536a957b302ceedce84d7a9db6cc23f7b8e Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Tue, 31 Dec 2024 14:36:51 +0100 Subject: [PATCH 413/429] python312Packages.ansible-runner: fix --- .../python-modules/ansible-runner/default.nix | 54 +++++++++++-------- 1 file changed, 32 insertions(+), 22 deletions(-) diff --git a/pkgs/development/python-modules/ansible-runner/default.nix b/pkgs/development/python-modules/ansible-runner/default.nix index 11d0f37773e4..d4f047917fb6 100644 --- a/pkgs/development/python-modules/ansible-runner/default.nix +++ b/pkgs/development/python-modules/ansible-runner/default.nix @@ -1,24 +1,31 @@ { lib, stdenv, - ansible-core, buildPythonPackage, - fetchPypi, - glibcLocales, - importlib-metadata, - mock, - openssh, + fetchFromGitHub, + + # build-system + setuptools, + setuptools-scm, + + # dependencies packaging, pexpect, + python-daemon, + pyyaml, + pythonOlder, + importlib-metadata, + + # tests + ansible-core, + glibcLocales, + mock, + openssh, pytest-mock, pytest-timeout, pytest-xdist, pytestCheckHook, - pythonOlder, - python-daemon, - pyyaml, - setuptools, - setuptools-scm, + versionCheckHook, }: buildPythonPackage rec { @@ -26,11 +33,11 @@ buildPythonPackage rec { version = "2.4.0"; pyproject = true; - disabled = pythonOlder "3.9"; - - src = fetchPypi { - inherit pname version; - hash = "sha256-gtArJUiDDzelNRe2XII8SvNxBpQGx9ITtckEHUXgxbY="; + src = fetchFromGitHub { + owner = "ansible"; + repo = "ansible-runner"; + tag = version; + hash = "sha256-lmaYTdJ7NlaCJ5/CVds6Xzwbe45QXbtS3h8gi5xqvUc="; }; postPatch = '' @@ -53,13 +60,15 @@ buildPythonPackage rec { nativeCheckInputs = [ ansible-core # required to place ansible CLI onto the PATH in tests glibcLocales - pytestCheckHook + mock + openssh pytest-mock pytest-timeout pytest-xdist - mock - openssh + pytestCheckHook + versionCheckHook ]; + versionCheckProgramArg = [ "--version" ]; preCheck = '' export HOME=$(mktemp -d) @@ -77,10 +86,11 @@ buildPythonPackage rec { # Failed: DID NOT RAISE "test_validate_pattern" # Assertion error + "test_callback_plugin_censoring_does_not_overwrite" "test_get_role_list" "test_include_role_from_collection_events" + "test_module_level_no_log" "test_resolved_actions" - "test_callback_plugin_censoring_does_not_overwrite" ]; disabledTestPaths = @@ -98,11 +108,11 @@ buildPythonPackage rec { pythonImportsCheck = [ "ansible_runner" ]; - meta = with lib; { + meta = { description = "Helps when interfacing with Ansible"; homepage = "https://github.com/ansible/ansible-runner"; changelog = "https://github.com/ansible/ansible-runner/releases/tag/${version}"; - license = licenses.asl20; + license = lib.licenses.asl20; maintainers = [ ]; mainProgram = "ansible-runner"; }; From f669cc12bdee81ef986864602b766084943694e7 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Tue, 31 Dec 2024 14:37:12 +0100 Subject: [PATCH 414/429] python312Packages.ansible-runner: add GaetanLepage as maintainer --- pkgs/development/python-modules/ansible-runner/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/ansible-runner/default.nix b/pkgs/development/python-modules/ansible-runner/default.nix index d4f047917fb6..073ca70b75ee 100644 --- a/pkgs/development/python-modules/ansible-runner/default.nix +++ b/pkgs/development/python-modules/ansible-runner/default.nix @@ -113,7 +113,7 @@ buildPythonPackage rec { homepage = "https://github.com/ansible/ansible-runner"; changelog = "https://github.com/ansible/ansible-runner/releases/tag/${version}"; license = lib.licenses.asl20; - maintainers = [ ]; + maintainers = with lib.maintainers; [ GaetanLepage ]; mainProgram = "ansible-runner"; }; } From 6ae1d01bcd55a739f3593e28dd8d2bf7dbd8fd69 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Tue, 31 Dec 2024 14:41:39 +0100 Subject: [PATCH 415/429] cppcheck: improve and skip failing tests on darwin --- pkgs/by-name/cp/cppcheck/package.nix | 41 ++++++++++++++++++++++++---- 1 file changed, 35 insertions(+), 6 deletions(-) diff --git a/pkgs/by-name/cp/cppcheck/package.nix b/pkgs/by-name/cp/cppcheck/package.nix index 2f355e33d958..7e57a23270e8 100644 --- a/pkgs/by-name/cp/cppcheck/package.nix +++ b/pkgs/by-name/cp/cppcheck/package.nix @@ -3,14 +3,20 @@ stdenv, fetchFromGitHub, + # nativeBuildInputs docbook_xml_dtd_45, docbook_xsl, installShellFiles, libxslt, - pcre, pkg-config, python3, which, + + # buildInputs + pcre, + + versionCheckHook, + gitUpdater, }: stdenv.mkDerivation (finalAttrs: { @@ -25,7 +31,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchFromGitHub { owner = "danmar"; repo = "cppcheck"; - rev = finalAttrs.version; + tag = finalAttrs.version; hash = "sha256-awmWfVl7gMLROEkjYdSpbXnFaWQwEX9Ah8B9E0OOFm0="; }; @@ -58,10 +64,25 @@ stdenv.mkDerivation (finalAttrs: { doCheck = !(stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64); doInstallCheck = true; - postPatch = '' - substituteInPlace Makefile \ - --replace 'PCRE_CONFIG = $(shell which pcre-config)' 'PCRE_CONFIG = $(PKG_CONFIG) libpcre' - ''; + postPatch = + '' + substituteInPlace Makefile \ + --replace-fail 'PCRE_CONFIG = $(shell which pcre-config)' 'PCRE_CONFIG = $(PKG_CONFIG) libpcre' + '' + # Expected: + # Internal Error. MathLib::toDoubleNumber: conversion failed: 1invalid + # + # Actual: + # Internal Error. MathLib::toDoubleNumber: input was not completely consumed: 1invalid + + lib.optionalString stdenv.hostPlatform.isDarwin '' + substituteInPlace test/testmathlib.cpp \ + --replace-fail \ + 'ASSERT_THROW_INTERNAL_EQUALS(MathLib::toDoubleNumber("1invalid"), INTERNAL, "Internal Error. MathLib::toDoubleNumber: conversion failed: 1invalid");' \ + "" \ + --replace-fail \ + 'ASSERT_THROW_INTERNAL_EQUALS(MathLib::toDoubleNumber("1.1invalid"), INTERNAL, "Internal Error. MathLib::toDoubleNumber: conversion failed: 1.1invalid");' \ + "" + ''; postBuild = '' make DB2MAN=${docbook_xsl}/xml/xsl/docbook/manpages/docbook.xsl man @@ -71,6 +92,10 @@ stdenv.mkDerivation (finalAttrs: { installManPage cppcheck.1 ''; + nativeInstallCheckInputs = [ + versionCheckHook + ]; + versionCheckProgramArg = [ "--version" ]; installCheckPhase = '' runHook preInstallCheck @@ -80,6 +105,10 @@ stdenv.mkDerivation (finalAttrs: { runHook postInstallCheck ''; + passthru = { + updateScript = gitUpdater { }; + }; + meta = { description = "Static analysis tool for C/C++ code"; longDescription = '' From ca4582d41ffb3a635900be6d4c2a27cfb6858df3 Mon Sep 17 00:00:00 2001 From: pwnwriter Date: Tue, 31 Dec 2024 09:03:08 -0500 Subject: [PATCH 416/429] rwalk: remove lockfile, fixed package with correct hash --- pkgs/by-name/rw/rwalk/Cargo.lock | 3263 ----------------------------- pkgs/by-name/rw/rwalk/package.nix | 15 +- 2 files changed, 10 insertions(+), 3268 deletions(-) delete mode 100644 pkgs/by-name/rw/rwalk/Cargo.lock diff --git a/pkgs/by-name/rw/rwalk/Cargo.lock b/pkgs/by-name/rw/rwalk/Cargo.lock deleted file mode 100644 index 5dd721af76dd..000000000000 --- a/pkgs/by-name/rw/rwalk/Cargo.lock +++ /dev/null @@ -1,3263 +0,0 @@ -# This file is automatically @generated by Cargo. -# It is not intended for manual editing. -version = 3 - -[[package]] -name = "addr2line" -version = "0.21.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a30b2e23b9e17a9f90641c7ab1549cd9b44f296d3ccbf309d2863cfe398a0cb" -dependencies = [ - "gimli", -] - -[[package]] -name = "adler" -version = "1.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" - -[[package]] -name = "ahash" -version = "0.8.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e89da841a80418a9b391ebaea17f5c112ffaaa96f621d2c285b5174da76b9011" -dependencies = [ - "cfg-if", - "const-random", - "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 = "ansi-str" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1cf4578926a981ab0ca955dc023541d19de37112bc24c1a197bd806d3d86ad1d" -dependencies = [ - "ansitok", -] - -[[package]] -name = "ansi_term" -version = "0.12.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d52a9bb7ec0cf484c551830a7ce27bd20d67eac647e1befb56b0be4ee39a55d2" -dependencies = [ - "winapi", -] - -[[package]] -name = "ansitok" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "220044e6a1bb31ddee4e3db724d29767f352de47445a6cd75e1a173142136c83" -dependencies = [ - "nom 7.1.3", - "vte 0.10.1", -] - -[[package]] -name = "anstream" -version = "0.6.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8acc5369981196006228e28809f761875c0327210a891e941f4c683b3a99529b" -dependencies = [ - "anstyle", - "anstyle-parse", - "anstyle-query", - "anstyle-wincon", - "colorchoice", - "is_terminal_polyfill", - "utf8parse", -] - -[[package]] -name = "anstyle" -version = "1.0.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "55cc3b69f167a1ef2e161439aa98aed94e6028e5f9a59be9a6ffb47aef1651f9" - -[[package]] -name = "anstyle-parse" -version = "0.2.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b2d16507662817a6a20a9ea92df6652ee4f94f914589377d69f3b21bc5798a9" -dependencies = [ - "utf8parse", -] - -[[package]] -name = "anstyle-query" -version = "1.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "79947af37f4177cfead1110013d678905c37501914fba0efea834c3fe9a8d60c" -dependencies = [ - "windows-sys 0.59.0", -] - -[[package]] -name = "anstyle-wincon" -version = "3.0.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2109dbce0e72be3ec00bed26e6a7479ca384ad226efdd66db8fa2e3a38c83125" -dependencies = [ - "anstyle", - "windows-sys 0.59.0", -] - -[[package]] -name = "arrayvec" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23b62fc65de8e4e7f52534fb52b0f3ed04746ae267519eef2a83941e8085068b" - -[[package]] -name = "async-trait" -version = "0.1.83" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "721cae7de5c34fbb2acd27e21e6d2cf7b886dce0c27388d46c4e6c47ea4318dd" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.90", -] - -[[package]] -name = "atty" -version = "0.2.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8" -dependencies = [ - "hermit-abi 0.1.19", - "libc", - "winapi", -] - -[[package]] -name = "autocfg" -version = "1.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26" - -[[package]] -name = "backtrace" -version = "0.3.71" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26b05800d2e817c8b3b4b54abd461726265fa9789ae34330622f2db9ee696f9d" -dependencies = [ - "addr2line", - "cc", - "cfg-if", - "libc", - "miniz_oxide", - "object", - "rustc-demangle", -] - -[[package]] -name = "base64" -version = "0.22.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6" - -[[package]] -name = "better-panic" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6fa9e1d11a268684cbd90ed36370d7577afb6c62d912ddff5c15fc34343e5036" -dependencies = [ - "backtrace", - "console", -] - -[[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 = "bytecount" -version = "0.6.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ce89b21cab1437276d2650d57e971f9d548a2d9037cc231abdc0562b97498ce" - -[[package]] -name = "byteorder" -version = "1.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" - -[[package]] -name = "bytes" -version = "1.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "325918d6fe32f23b19878fe4b34794ae41fc19ddbe53b10571a4874d44ffd39b" - -[[package]] -name = "cc" -version = "1.2.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c31a0499c1dc64f458ad13872de75c0eb7e3fdb0e67964610c914b034fc5956e" -dependencies = [ - "shlex", -] - -[[package]] -name = "cfg-if" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" - -[[package]] -name = "clap" -version = "4.5.23" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3135e7ec2ef7b10c6ed8950f0f792ed96ee093fa088608f1c76e569722700c84" -dependencies = [ - "clap_builder", - "clap_derive", -] - -[[package]] -name = "clap-markdown" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ebc67e6266e14f8b31541c2f204724fa2ac7ad5c17d6f5908fbb92a60f42cff" -dependencies = [ - "clap", -] - -[[package]] -name = "clap_builder" -version = "4.5.23" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30582fc632330df2bd26877bde0c1f4470d57c582bbc070376afcd04d8cb4838" -dependencies = [ - "anstream", - "anstyle", - "clap_lex", - "strsim", - "terminal_size", -] - -[[package]] -name = "clap_complete" -version = "4.5.40" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac2e663e3e3bed2d32d065a8404024dad306e699a04263ec59919529f803aee9" -dependencies = [ - "clap", -] - -[[package]] -name = "clap_complete_nushell" -version = "4.5.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "315902e790cc6e5ddd20cbd313c1d0d49db77f191e149f96397230fb82a17677" -dependencies = [ - "clap", - "clap_complete", -] - -[[package]] -name = "clap_derive" -version = "4.5.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ac6a0c7b1a9e9a5186361f67dfa1b88213572f427fb9ab038efb2bd8c582dab" -dependencies = [ - "heck 0.5.0", - "proc-macro2", - "quote", - "syn 2.0.90", -] - -[[package]] -name = "clap_lex" -version = "0.7.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f46ad14479a25103f283c0f10005961cf086d8dc42205bb44c46ac563475dca6" - -[[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 = "color-eyre" -version = "0.6.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "55146f5e46f237f7423d74111267d4597b59b0dad0ffaf7303bce9945d843ad5" -dependencies = [ - "backtrace", - "color-spantrace", - "eyre", - "indenter", - "once_cell", - "owo-colors", - "tracing-error", -] - -[[package]] -name = "color-spantrace" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd6be1b2a7e382e2b98b43b2adcca6bb0e465af0bdd38123873ae61eb17a72c2" -dependencies = [ - "once_cell", - "owo-colors", - "tracing-core", - "tracing-error", -] - -[[package]] -name = "colorchoice" -version = "1.0.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b63caa9aa9397e2d9480a9b13673856c78d8ac123288526c37d7839f2a86990" - -[[package]] -name = "colored" -version = "2.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "117725a109d387c937a1533ce01b450cbde6b88abceea8473c4d7a85853cda3c" -dependencies = [ - "lazy_static 1.5.0", - "windows-sys 0.59.0", -] - -[[package]] -name = "config" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b1b9d958c2b1368a663f05538fc1b5975adce1e19f435acceae987aceeeb369" -dependencies = [ - "lazy_static 1.5.0", - "nom 5.1.3", - "rust-ini", - "serde 1.0.216", - "serde-hjson", - "serde_json", - "toml 0.5.11", - "yaml-rust", -] - -[[package]] -name = "console" -version = "0.15.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea3c6ecd8059b57859df5c69830340ed3c41d30e3da0c1cbed90a96ac853041b" -dependencies = [ - "encode_unicode", - "libc", - "once_cell", - "unicode-width 0.2.0", - "windows-sys 0.59.0", -] - -[[package]] -name = "const-random" -version = "0.1.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87e00182fe74b066627d63b85fd550ac2998d4b0bd86bfed477a0ae4c7c71359" -dependencies = [ - "const-random-macro", -] - -[[package]] -name = "const-random-macro" -version = "0.1.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9d839f2a20b0aee515dc581a6172f2321f96cab76c1a38a4c584a194955390e" -dependencies = [ - "getrandom", - "once_cell", - "tiny-keccak", -] - -[[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 = "crunchy" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7" - -[[package]] -name = "cssparser" -version = "0.31.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b3df4f93e5fbbe73ec01ec8d3f68bba73107993a5b1e7519273c32db9b0d5be" -dependencies = [ - "cssparser-macros", - "dtoa-short", - "itoa", - "phf 0.11.2", - "smallvec", -] - -[[package]] -name = "cssparser-macros" -version = "0.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "13b588ba4ac1a99f7f2964d24b3d896ddc6bf847ee3855dbd4366f058cfcd331" -dependencies = [ - "quote", - "syn 2.0.90", -] - -[[package]] -name = "csv" -version = "1.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "acdc4883a9c96732e4733212c01447ebd805833b7275a73ca3ee080fd77afdaf" -dependencies = [ - "csv-core", - "itoa", - "ryu", - "serde 1.0.216", -] - -[[package]] -name = "csv-core" -version = "0.1.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5efa2b3d7902f4b634a20cae3c9c4e6209dc4779feb6863329607560143efa70" -dependencies = [ - "memchr", -] - -[[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 2.0.90", -] - -[[package]] -name = "directories" -version = "4.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f51c5d4ddabd36886dd3e1438cb358cdcb0d7c499cb99cb4ac2e38e18b5cb210" -dependencies = [ - "dirs-sys 0.3.7", -] - -[[package]] -name = "dirs" -version = "5.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44c45a9d03d6676652bcb5e724c7e988de1acad23a711b5217ab9cbecbec2225" -dependencies = [ - "dirs-sys 0.4.1", -] - -[[package]] -name = "dirs-sys" -version = "0.3.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b1d1d91c932ef41c0f2663aa8b0ca0342d444d842c06914aa0a7e352d0bada6" -dependencies = [ - "libc", - "redox_users", - "winapi", -] - -[[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 = "displaydoc" -version = "0.2.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.90", -] - -[[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 = "ego-tree" -version = "0.6.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12a0bb14ac04a9fcf170d0bbbef949b44cc492f4452bd20c095636956f653642" - -[[package]] -name = "either" -version = "1.13.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "60b1af1c220855b6ceac025d3f6ecdd2b7c4894bfe9cd9bda4fbb4bc7c0d4cf0" - -[[package]] -name = "encode_unicode" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "34aa73646ffb006b8f5147f3dc182bd4bcb190227ce861fc4a4844bf8e3cb2c0" - -[[package]] -name = "endian-type" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c34f04666d835ff5d62e058c3995147c06f42fe86ff053337632bca83e42702d" - -[[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 = "equivalent" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" - -[[package]] -name = "errno" -version = "0.3.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "33d852cb9b869c2a9b3df2f71a3074817f01e1844f839a144f5fcef059a4eb5d" -dependencies = [ - "libc", - "windows-sys 0.59.0", -] - -[[package]] -name = "error-code" -version = "3.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a5d9305ccc6942a704f4335694ecd3de2ea531b114ac2d51f5f843750787a92f" - -[[package]] -name = "eyre" -version = "0.6.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7cd915d99f24784cdc19fd37ef22b97e3ff0ae756c7e492e9fbfe897d61e2aec" -dependencies = [ - "indenter", - "once_cell", -] - -[[package]] -name = "fastrand" -version = "2.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "37909eebbb50d72f9059c3b6d82c0463f2ff062c9e95845c43a6c9c0355411be" - -[[package]] -name = "fd-lock" -version = "4.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e5768da2206272c81ef0b5e951a41862938a6070da63bcea197899942d3b947" -dependencies = [ - "cfg-if", - "rustix", - "windows-sys 0.52.0", -] - -[[package]] -name = "fixedbitset" -version = "0.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80" - -[[package]] -name = "fnv" -version = "1.0.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" - -[[package]] -name = "foreign-types" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1" -dependencies = [ - "foreign-types-shared", -] - -[[package]] -name = "foreign-types-shared" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" - -[[package]] -name = "form_urlencoded" -version = "1.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e13624c2627564efccf4934284bdd98cbaa14e79b0b5a141218e507b3a823456" -dependencies = [ - "percent-encoding", -] - -[[package]] -name = "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.3.31" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "65bc07b1a8bc7c85c5f2e110c476c7389b4554ba72af57d8445ea63a576b0876" -dependencies = [ - "futures-channel", - "futures-core", - "futures-executor", - "futures-io", - "futures-sink", - "futures-task", - "futures-util", -] - -[[package]] -name = "futures-channel" -version = "0.3.31" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2dff15bf788c671c1934e366d07e30c1814a8ef514e1af724a602e8a2fbe1b10" -dependencies = [ - "futures-core", - "futures-sink", -] - -[[package]] -name = "futures-core" -version = "0.3.31" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05f29059c0c2090612e8d742178b0580d2dc940c837851ad723096f87af6663e" - -[[package]] -name = "futures-executor" -version = "0.3.31" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e28d1d997f585e54aebc3f97d39e72338912123a67330d723fdbb564d646c9f" -dependencies = [ - "futures-core", - "futures-task", - "futures-util", -] - -[[package]] -name = "futures-io" -version = "0.3.31" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e5c1b78ca4aae1ac06c48a526a655760685149f0d465d21f37abfe57ce075c6" - -[[package]] -name = "futures-macro" -version = "0.3.31" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "162ee34ebcb7c64a8abebc059ce0fee27c2262618d7b60ed8faf72fef13c3650" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.90", -] - -[[package]] -name = "futures-sink" -version = "0.3.31" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e575fab7d1e0dcb8d0c7bcf9a63ee213816ab51902e6d244a95819acacf1d4f7" - -[[package]] -name = "futures-task" -version = "0.3.31" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f90f7dce0722e95104fcb095585910c0977252f286e354b5e3bd38902cd99988" - -[[package]] -name = "futures-util" -version = "0.3.31" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9fa08315bb612088cc391249efdc3bc77536f16c91f6cf495e6fbe85b20a4a81" -dependencies = [ - "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 = "getopts" -version = "0.2.21" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14dbbfd5c71d70241ecf9e6f13737f7b5ce823821063188d7e46c41d371eebd5" -dependencies = [ - "unicode-width 0.1.14", -] - -[[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 = "gimli" -version = "0.28.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4271d37baee1b8c7e4b708028c57d816cf9d2434acb33a549475f78c181f6253" - -[[package]] -name = "hashbrown" -version = "0.15.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf151400ff0baff5465007dd2f3e717f3fe502074ca563069ce3a6629d07b289" - -[[package]] -name = "heck" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" - -[[package]] -name = "heck" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea" - -[[package]] -name = "hermit-abi" -version = "0.1.19" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33" -dependencies = [ - "libc", -] - -[[package]] -name = "hermit-abi" -version = "0.3.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024" - -[[package]] -name = "hermit-abi" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fbf6a919d6cf397374f7dfeeea91d974c7c0a7221d0d0f4f20d859d329e53fcc" - -[[package]] -name = "home" -version = "0.5.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "589533453244b0995c858700322199b2becb13b627df2851f64a2775d024abcf" -dependencies = [ - "windows-sys 0.59.0", -] - -[[package]] -name = "html5ever" -version = "0.27.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c13771afe0e6e846f1e67d038d4cb29998a6779f93c809212e4e9c32efd244d4" -dependencies = [ - "log", - "mac", - "markup5ever", - "proc-macro2", - "quote", - "syn 2.0.90", -] - -[[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" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f16ca2af56261c99fba8bac40a10251ce8188205a4c448fbb745a2e4daa76fea" -dependencies = [ - "bytes", - "fnv", - "itoa", -] - -[[package]] -name = "http-body" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1efedce1fb8e6913f23e0c92de8e62cd5b772a67e7b3946df930a62566c93184" -dependencies = [ - "bytes", - "http 1.2.0", -] - -[[package]] -name = "http-body-util" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "793429d76616a256bcb62c2a2ec2bed781c8307e797e2598c50010f2bee2544f" -dependencies = [ - "bytes", - "futures-util", - "http 1.2.0", - "http-body", - "pin-project-lite", -] - -[[package]] -name = "http-rest-file" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "92d2f9d7798b724494ce3c33694afb86fb67bc33bcd03877c6f38953a180c05f" -dependencies = [ - "http 0.2.12", - "regex", - "serde 1.0.216", - "serde_json", - "thiserror", - "url", -] - -[[package]] -name = "httparse" -version = "1.9.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d71d3574edd2771538b901e6549113b4006ece66150fb69c0fb6d9a2adae946" - -[[package]] -name = "human-panic" -version = "2.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "80b84a66a325082740043a6c28bbea400c129eac0d3a27673a1de971e44bf1f7" -dependencies = [ - "anstream", - "anstyle", - "backtrace", - "os_info", - "serde 1.0.216", - "serde_derive", - "toml 0.8.19", - "uuid", -] - -[[package]] -name = "humantime" -version = "2.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" - -[[package]] -name = "hyper" -version = "1.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "256fb8d4bd6413123cc9d91832d78325c48ff41677595be797d90f42969beae0" -dependencies = [ - "bytes", - "futures-channel", - "futures-util", - "http 1.2.0", - "http-body", - "httparse", - "itoa", - "pin-project-lite", - "smallvec", - "tokio", - "want", -] - -[[package]] -name = "hyper-tls" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70206fc6890eaca9fde8a0bf71caa2ddfc9fe045ac9e5c70df101a7dbde866e0" -dependencies = [ - "bytes", - "http-body-util", - "hyper", - "hyper-util", - "native-tls", - "tokio", - "tokio-native-tls", - "tower-service", -] - -[[package]] -name = "hyper-util" -version = "0.1.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "df2dcfbe0677734ab2f3ffa7fa7bfd4706bfdc1ef393f2ee30184aed67e631b4" -dependencies = [ - "bytes", - "futures-channel", - "futures-util", - "http 1.2.0", - "http-body", - "hyper", - "pin-project-lite", - "socket2", - "tokio", - "tower-service", - "tracing", -] - -[[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_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_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", - "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", - "stable_deref_trait", - "tinystr", - "writeable", - "yoke", - "zerofrom", - "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 2.0.90", -] - -[[package]] -name = "idna" -version = "1.0.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "686f825264d630750a544639377bae737628043f20d38bbc029e8f29ea968a7e" -dependencies = [ - "idna_adapter", - "smallvec", - "utf8_iter", -] - -[[package]] -name = "idna_adapter" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "daca1df1c957320b2cf139ac61e7bd64fed304c5040df000a745aa1de3b4ef71" -dependencies = [ - "icu_normalizer", - "icu_properties", -] - -[[package]] -name = "indenter" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce23b50ad8242c51a442f3ff322d56b02f08852c77e4c0b4d3fd684abc89c683" - -[[package]] -name = "indexmap" -version = "2.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62f822373a4fe84d4bb149bf54e584a7f4abec90e072ed49cda0edea5b95471f" -dependencies = [ - "equivalent", - "hashbrown", -] - -[[package]] -name = "indicatif" -version = "0.17.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cbf675b85ed934d3c67b5c5469701eec7db22689d0a2139d856e0925fa28b281" -dependencies = [ - "console", - "number_prefix", - "portable-atomic", - "unicode-segmentation", - "unicode-width 0.2.0", - "web-time", -] - -[[package]] -name = "instant" -version = "0.1.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e0242819d153cba4b4b05a5a8f2a7e9bbf97b6055b2a002b395c96b5ff3c0222" -dependencies = [ - "cfg-if", -] - -[[package]] -name = "ipnet" -version = "2.10.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ddc24109865250148c2e0f3d25d4f0f479571723792d3802153c60922a4fb708" - -[[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 = "is_terminal_polyfill" -version = "1.70.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7943c866cc5cd64cbc25b2e01621d07fa8eb2a1a23160ee81ce38704e97b8ecf" - -[[package]] -name = "itertools" -version = "0.12.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba291022dbbd398a455acf126c1e341954079855bc60dfdda641363bd6922569" -dependencies = [ - "either", -] - -[[package]] -name = "itoa" -version = "1.0.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d75a2a4b1b190afb6f5425f10f6a8f959d2ea0b9c2b1d79553551850539e4674" - -[[package]] -name = "js-sys" -version = "0.3.76" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6717b6b5b077764fb5966237269cb3c64edddde4b14ce42647430a78ced9e7b7" -dependencies = [ - "once_cell", - "wasm-bindgen", -] - -[[package]] -name = "lazy_static" -version = "0.2.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76f033c7ad61445c5b347c7382dd1237847eb1bce590fe50365dcb33d546be73" - -[[package]] -name = "lazy_static" -version = "1.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe" - -[[package]] -name = "lexical-core" -version = "0.7.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6607c62aa161d23d17a9072cc5da0be67cdfc89d3afb1e8d9c842bebc2525ffe" -dependencies = [ - "arrayvec", - "bitflags 1.3.2", - "cfg-if", - "ryu", - "static_assertions", -] - -[[package]] -name = "libc" -version = "0.2.169" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5aba8db14291edd000dfcc4d620c7ebfb122c613afb886ca8803fa4e128a20a" - -[[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 = "linked-hash-map" -version = "0.5.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0717cef1bc8b636c6e1c1bbdefc09e6322da8a9321966e8928ef80d20f7f770f" - -[[package]] -name = "linux-raw-sys" -version = "0.4.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89" - -[[package]] -name = "litemap" -version = "0.7.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ee93343901ab17bd981295f2cf0026d4ad018c7c31ba84549a4ddbb47a45104" - -[[package]] -name = "lock_api" -version = "0.4.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "07af8b9cdd281b7915f413fa73f29ebd5d55d0d3f0155584dade1ff18cea1b17" -dependencies = [ - "autocfg", - "scopeguard", - "serde 1.0.216", -] - -[[package]] -name = "log" -version = "0.4.22" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24" - -[[package]] -name = "mac" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c41e0c4fef86961ac6d6f8a82609f55f31b05e4fce149ac5710e439df7619ba4" - -[[package]] -name = "markup5ever" -version = "0.12.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "16ce3abbeba692c8b8441d036ef91aea6df8da2c6b6e21c7e14d3c18e526be45" -dependencies = [ - "log", - "phf 0.11.2", - "phf_codegen 0.11.2", - "string_cache", - "string_cache_codegen", - "tendril", -] - -[[package]] -name = "md5" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "490cc448043f947bae3cbee9c203358d62dbee0db12107a74be5c30ccfd09771" - -[[package]] -name = "memchr" -version = "2.7.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3" - -[[package]] -name = "merge" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "10bbef93abb1da61525bbc45eeaff6473a41907d19f8f9aa5168d214e10693e9" -dependencies = [ - "merge_derive", - "num-traits 0.2.19", -] - -[[package]] -name = "merge_derive" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "209d075476da2e63b4b29e72a2ef627b840589588e71400a25e3565c4f849d07" -dependencies = [ - "proc-macro-error", - "proc-macro2", - "quote", - "syn 1.0.109", -] - -[[package]] -name = "mime" -version = "0.3.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a" - -[[package]] -name = "minimal-lexical" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" - -[[package]] -name = "miniz_oxide" -version = "0.7.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b8a240ddb74feaf34a79a7add65a741f3167852fba007066dcac1ca548d89c08" -dependencies = [ - "adler", -] - -[[package]] -name = "mio" -version = "1.0.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2886843bf800fba2e3377cff24abf6379b4c4d5c6681eaf9ea5b0d15090450bd" -dependencies = [ - "libc", - "wasi", - "windows-sys 0.52.0", -] - -[[package]] -name = "native-tls" -version = "0.2.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8614eb2c83d59d1c8cc974dd3f920198647674a0a035e1af1fa58707e317466" -dependencies = [ - "libc", - "log", - "openssl", - "openssl-probe", - "openssl-sys", - "schannel", - "security-framework", - "security-framework-sys", - "tempfile", -] - -[[package]] -name = "new_debug_unreachable" -version = "1.0.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "650eef8c711430f1a879fdd01d4745a7deea475becfb90269c06775983bbf086" - -[[package]] -name = "nibble_vec" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77a5d83df9f36fe23f0c3648c6bbb8b0298bb5f1939c8f2704431371f4b84d43" -dependencies = [ - "smallvec", -] - -[[package]] -name = "nix" -version = "0.27.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2eb04e9c688eff1c89d72b407f168cf79bb9e867a9d3323ed6c01519eb9cc053" -dependencies = [ - "bitflags 2.6.0", - "cfg-if", - "libc", -] - -[[package]] -name = "no-std-compat" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b93853da6d84c2e3c7d730d6473e8817692dd89be387eb01b94d7f108ecb5b8c" -dependencies = [ - "spin", -] - -[[package]] -name = "nom" -version = "5.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08959a387a676302eebf4ddbcbc611da04285579f76f88ee0506c63b1a61dd4b" -dependencies = [ - "lexical-core", - "memchr", - "version_check", -] - -[[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 = "num-traits" -version = "0.1.43" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "92e5113e9fd4cc14ded8e499429f396a20f98c772a47cc8622a736e1ec843c31" -dependencies = [ - "num-traits 0.2.19", -] - -[[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 0.3.9", - "libc", -] - -[[package]] -name = "number_prefix" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "830b246a0e5f20af87141b25c173cd1b609bd7779a4617d6ec582abaf90870f3" - -[[package]] -name = "object" -version = "0.32.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a6a622008b6e321afc04970976f62ee297fdbaa6f95318ca343e3eebb9648441" -dependencies = [ - "memchr", -] - -[[package]] -name = "once_cell" -version = "1.20.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1261fe7e33c73b354eab43b1273a57c8f967d0391e80353e51f764ac02cf6775" -dependencies = [ - "portable-atomic", -] - -[[package]] -name = "openssl" -version = "0.10.68" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6174bc48f102d208783c2c84bf931bb75927a617866870de8a4ea85597f871f5" -dependencies = [ - "bitflags 2.6.0", - "cfg-if", - "foreign-types", - "libc", - "once_cell", - "openssl-macros", - "openssl-sys", -] - -[[package]] -name = "openssl-macros" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.90", -] - -[[package]] -name = "openssl-probe" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" - -[[package]] -name = "openssl-src" -version = "300.4.1+3.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "faa4eac4138c62414b5622d1b31c5c304f34b406b013c079c2bbc652fdd6678c" -dependencies = [ - "cc", -] - -[[package]] -name = "openssl-sys" -version = "0.9.104" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "45abf306cbf99debc8195b66b7346498d7b10c210de50418b5ccd7ceba08c741" -dependencies = [ - "cc", - "libc", - "openssl-src", - "pkg-config", - "vcpkg", -] - -[[package]] -name = "option-ext" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "04744f49eae99ab78e0d5c0b603ab218f515ea8cfe5a456d7629ad883a3b6e7d" - -[[package]] -name = "ordered-float" -version = "2.10.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68f19d67e5a2795c94e73e0bb1cc1a7edeb2e28efd39e2e1c9b7a40c1108b11c" -dependencies = [ - "num-traits 0.2.19", -] - -[[package]] -name = "os_info" -version = "3.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5ca711d8b83edbb00b44d504503cd247c9c0bd8b0fa2694f2a1a3d8165379ce" -dependencies = [ - "log", - "serde 1.0.216", - "windows-sys 0.52.0", -] - -[[package]] -name = "owo-colors" -version = "3.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1b04fb49957986fdce4d6ee7a65027d55d4b6d2265e5848bbb507b58ccfdb6f" - -[[package]] -name = "papergrid" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ad43c07024ef767f9160710b3a6773976194758c7919b17e63b863db0bdf7fb" -dependencies = [ - "ansi-str", - "ansitok", - "bytecount", - "fnv", - "unicode-width 0.1.14", -] - -[[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", - "smallvec", - "windows-targets 0.52.6", -] - -[[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.6.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4c5cc86750666a3ed20bdaf5ca2a0344f9c67674cae0515bec2da16fbaa47db" -dependencies = [ - "fixedbitset", - "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.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4fb1c3a8bc4dd4e5cfce29b44ffc14bedd2ee294559a294e2a4d4c9e9a6a13cd" -dependencies = [ - "phf_generator 0.10.0", - "phf_shared 0.10.0", -] - -[[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 2.0.90", -] - -[[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-lite" -version = "0.2.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "915a1e146535de9163f3987b8944ed8cf49a18bb0056bcebcdcece385cece4ff" - -[[package]] -name = "pin-utils" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" - -[[package]] -name = "pkg-config" -version = "0.3.31" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "953ec861398dccce10c670dfeaf3ec4911ca479e9c02154b3a215178c5f566f2" - -[[package]] -name = "portable-atomic" -version = "1.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "280dc24453071f1b63954171985a0b0d30058d287960968b9b2aca264c8d4ee6" - -[[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 = "proc-macro-error" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c" -dependencies = [ - "proc-macro-error-attr", - "proc-macro2", - "quote", - "syn 1.0.109", - "version_check", -] - -[[package]] -name = "proc-macro-error-attr" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869" -dependencies = [ - "proc-macro2", - "quote", - "version_check", -] - -[[package]] -name = "proc-macro2" -version = "1.0.92" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "37d3544b3f2748c54e147655edb5025752e2303145b5aefb3c3ea2c78b973bb0" -dependencies = [ - "unicode-ident", -] - -[[package]] -name = "ptree" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a0de80796b316aec75344095a6d2ef68ec9b8f573b9e7adc821149ba3598e270" -dependencies = [ - "ansi_term", - "atty", - "config", - "directories", - "petgraph", - "serde 1.0.216", - "serde-value", - "tint", -] - -[[package]] -name = "quote" -version = "1.0.37" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af" -dependencies = [ - "proc-macro2", -] - -[[package]] -name = "radix_trie" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c069c179fcdc6a2fe24d8d18305cf085fdbd4f922c041943e203685d6a1c58fd" -dependencies = [ - "endian-type", - "nibble_vec", -] - -[[package]] -name = "rand" -version = "0.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_syscall" -version = "0.5.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "03a862b389f93e68874fbf580b9de08dd02facb9a788ebadaf4a3fd33cf58834" -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", - "thiserror", -] - -[[package]] -name = "regex" -version = "1.11.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b544ef1b4eac5dc2db33ea63606ae9ffcfac26c1416a2806ae0bf5f56b201191" -dependencies = [ - "aho-corasick", - "memchr", - "regex-automata", - "regex-syntax", -] - -[[package]] -name = "regex-automata" -version = "0.4.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "809e8dc61f6de73b46c85f4c96486310fe304c434cfa43669d7b40f711150908" -dependencies = [ - "aho-corasick", - "memchr", - "regex-syntax", -] - -[[package]] -name = "regex-syntax" -version = "0.8.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b15c43186be67a4fd63bee50d0303afffcef381492ebe2c5d87f324e1b8815c" - -[[package]] -name = "reqwest" -version = "0.12.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a77c62af46e79de0a562e1a9849205ffcb7fc1238876e9bd743357570e04046f" -dependencies = [ - "base64", - "bytes", - "futures-core", - "futures-util", - "http 1.2.0", - "http-body", - "http-body-util", - "hyper", - "hyper-tls", - "hyper-util", - "ipnet", - "js-sys", - "log", - "mime", - "native-tls", - "once_cell", - "percent-encoding", - "pin-project-lite", - "rustls-pemfile", - "serde 1.0.216", - "serde_json", - "serde_urlencoded", - "sync_wrapper", - "tokio", - "tokio-native-tls", - "tower-service", - "url", - "wasm-bindgen", - "wasm-bindgen-futures", - "web-sys", - "windows-registry", -] - -[[package]] -name = "rhai" -version = "1.20.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d0277a46f29fe3b3eb10821ca2c65a4751b686b6c84422aae31695ba167b0fbc" -dependencies = [ - "ahash", - "bitflags 2.6.0", - "instant", - "no-std-compat", - "num-traits 0.2.19", - "once_cell", - "rhai_codegen", - "serde 1.0.216", - "smallvec", - "smartstring", - "thin-vec", -] - -[[package]] -name = "rhai_codegen" -version = "2.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a5a11a05ee1ce44058fa3d5961d05194fdbe3ad6b40f904af764d81b86450e6b" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.90", -] - -[[package]] -name = "rust-ini" -version = "0.13.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3e52c148ef37f8c375d49d5a73aa70713125b7f19095948a923f80afdeb22ec2" - -[[package]] -name = "rustc-demangle" -version = "0.1.24" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "719b953e2095829ee67db738b3bfa9fa368c94900df327b3f07fe6e794d2fe1f" - -[[package]] -name = "rustix" -version = "0.38.42" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f93dc38ecbab2eb790ff964bb77fa94faf256fd3e73285fd7ba0903b76bedb85" -dependencies = [ - "bitflags 2.6.0", - "errno", - "libc", - "linux-raw-sys", - "windows-sys 0.59.0", -] - -[[package]] -name = "rustls-pemfile" -version = "2.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dce314e5fee3f39953d46bb63bb8a46d40c2f8fb7cc5a3b6cab2bde9721d6e50" -dependencies = [ - "rustls-pki-types", -] - -[[package]] -name = "rustls-pki-types" -version = "1.10.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2bf47e6ff922db3825eb750c4e2ff784c6ff8fb9e13046ef6a1d1c5401b0b37" - -[[package]] -name = "rustyline" -version = "13.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "02a2d683a4ac90aeef5b1013933f6d977bd37d51ff3f4dad829d4931a7e6be86" -dependencies = [ - "bitflags 2.6.0", - "cfg-if", - "clipboard-win", - "fd-lock", - "home", - "libc", - "log", - "memchr", - "nix", - "radix_trie", - "unicode-segmentation", - "unicode-width 0.1.14", - "utf8parse", - "winapi", -] - -[[package]] -name = "rwalk" -version = "0.8.7" -dependencies = [ - "async-trait", - "better-panic", - "clap", - "clap-markdown", - "clap_complete", - "clap_complete_nushell", - "color-eyre", - "colored", - "csv", - "dirs", - "env_logger", - "futures", - "http-rest-file", - "human-panic", - "indicatif", - "itertools", - "lazy_static 1.5.0", - "log", - "md5", - "merge", - "num_cpus", - "parking_lot", - "ptree", - "regex", - "reqwest", - "rhai", - "rustyline", - "scraper", - "serde 1.0.216", - "serde_json", - "strip-ansi-escapes", - "strsim", - "tabled", - "tokio", - "toml 0.8.19", - "url", -] - -[[package]] -name = "ryu" -version = "1.0.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f" - -[[package]] -name = "schannel" -version = "0.1.27" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f29ebaa345f945cec9fbbc532eb307f0fdad8161f281b6369539c8d84876b3d" -dependencies = [ - "windows-sys 0.59.0", -] - -[[package]] -name = "scopeguard" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" - -[[package]] -name = "scraper" -version = "0.19.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "761fb705fdf625482d2ed91d3f0559dcfeab2798fe2771c69560a774865d0802" -dependencies = [ - "ahash", - "cssparser", - "ego-tree", - "getopts", - "html5ever", - "once_cell", - "selectors", - "tendril", -] - -[[package]] -name = "security-framework" -version = "2.11.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "897b2245f0b511c87893af39b033e5ca9cce68824c4d7e7630b5a1d339658d02" -dependencies = [ - "bitflags 2.6.0", - "core-foundation", - "core-foundation-sys", - "libc", - "security-framework-sys", -] - -[[package]] -name = "security-framework-sys" -version = "2.13.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1863fd3768cd83c56a7f60faa4dc0d403f1b6df0a38c3c25f44b7894e45370d5" -dependencies = [ - "core-foundation-sys", - "libc", -] - -[[package]] -name = "selectors" -version = "0.25.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4eb30575f3638fc8f6815f448d50cb1a2e255b0897985c8c59f4d37b72a07b06" -dependencies = [ - "bitflags 2.6.0", - "cssparser", - "derive_more", - "fxhash", - "log", - "new_debug_unreachable", - "phf 0.10.1", - "phf_codegen 0.10.0", - "precomputed-hash", - "servo_arc", - "smallvec", -] - -[[package]] -name = "serde" -version = "0.8.23" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9dad3f759919b92c3068c696c15c3d17238234498bbdcc80f2c469606f948ac8" - -[[package]] -name = "serde" -version = "1.0.216" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b9781016e935a97e8beecf0c933758c97a5520d32930e460142b4cd80c6338e" -dependencies = [ - "serde_derive", -] - -[[package]] -name = "serde-hjson" -version = "0.9.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a3a4e0ea8a88553209f6cc6cfe8724ecad22e1acf372793c27d995290fe74f8" -dependencies = [ - "lazy_static 1.5.0", - "num-traits 0.1.43", - "regex", - "serde 0.8.23", -] - -[[package]] -name = "serde-value" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f3a1a3341211875ef120e117ea7fd5228530ae7e7036a779fdc9117be6b3282c" -dependencies = [ - "ordered-float", - "serde 1.0.216", -] - -[[package]] -name = "serde_derive" -version = "1.0.216" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46f859dbbf73865c6627ed570e78961cd3ac92407a2d117204c49232485da55e" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.90", -] - -[[package]] -name = "serde_json" -version = "1.0.133" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c7fceb2473b9166b2294ef05efcb65a3db80803f0b03ef86a5fc88a2b85ee377" -dependencies = [ - "itoa", - "memchr", - "ryu", - "serde 1.0.216", -] - -[[package]] -name = "serde_spanned" -version = "0.6.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87607cb1398ed59d48732e575a4c28a7a8ebf2454b964fe3f224f2afc07909e1" -dependencies = [ - "serde 1.0.216", -] - -[[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 1.0.216", -] - -[[package]] -name = "servo_arc" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d036d71a959e00c77a63538b90a6c2390969f9772b096ea837205c6bd0491a44" -dependencies = [ - "stable_deref_trait", -] - -[[package]] -name = "sharded-slab" -version = "0.1.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f40ca3c46823713e0d4209592e8d6e826aa57e928f09752619fc696c499637f6" -dependencies = [ - "lazy_static 1.5.0", -] - -[[package]] -name = "shlex" -version = "1.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64" - -[[package]] -name = "signal-hook-registry" -version = "1.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a9e9e0b4211b72e7b8b6e85c807d36c212bdb33ea8587f7569562a84df5465b1" -dependencies = [ - "libc", -] - -[[package]] -name = "siphasher" -version = "0.3.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38b58827f4464d87d377d175e90bf58eb00fd8716ff0a62f80356b5e61555d0d" - -[[package]] -name = "slab" -version = "0.4.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f92a496fb766b417c996b9c5e57daf2f7ad3b0bebe1ccfca4856390e3d3bb67" -dependencies = [ - "autocfg", -] - -[[package]] -name = "smallvec" -version = "1.13.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67" -dependencies = [ - "serde 1.0.216", -] - -[[package]] -name = "smartstring" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fb72c633efbaa2dd666986505016c32c3044395ceaf881518399d2f4127ee29" -dependencies = [ - "autocfg", - "serde 1.0.216", - "static_assertions", - "version_check", -] - -[[package]] -name = "socket2" -version = "0.5.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c970269d99b64e60ec3bd6ad27270092a5394c4e309314b18ae3fe575695fbe8" -dependencies = [ - "libc", - "windows-sys 0.52.0", -] - -[[package]] -name = "spin" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d" - -[[package]] -name = "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 = "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 1.0.216", -] - -[[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 = "strip-ansi-escapes" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "55ff8ef943b384c414f54aefa961dd2bd853add74ec75e7ac74cf91dba62bcfa" -dependencies = [ - "vte 0.11.1", -] - -[[package]] -name = "strsim" -version = "0.11.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f" - -[[package]] -name = "syn" -version = "1.0.109" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" -dependencies = [ - "proc-macro2", - "quote", - "unicode-ident", -] - -[[package]] -name = "syn" -version = "2.0.90" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "919d3b74a5dd0ccd15aeb8f93e7006bd9e14c295087c9896a110f490752bcf31" -dependencies = [ - "proc-macro2", - "quote", - "unicode-ident", -] - -[[package]] -name = "sync_wrapper" -version = "1.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0bf256ce5efdfa370213c1dabab5935a12e49f2c58d15e9eac2870d3b4f27263" -dependencies = [ - "futures-core", -] - -[[package]] -name = "synstructure" -version = "0.13.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c8af7666ab7b6390ab78131fb5b0fce11d6b7a6951602017c35fa82800708971" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.90", -] - -[[package]] -name = "tabled" -version = "0.15.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c998b0c8b921495196a48aabaf1901ff28be0760136e31604f7967b0792050e" -dependencies = [ - "ansi-str", - "ansitok", - "papergrid", - "tabled_derive", - "unicode-width 0.1.14", -] - -[[package]] -name = "tabled_derive" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c138f99377e5d653a371cdad263615634cfc8467685dfe8e73e2b8e98f44b17" -dependencies = [ - "heck 0.4.1", - "proc-macro-error", - "proc-macro2", - "quote", - "syn 1.0.109", -] - -[[package]] -name = "tempfile" -version = "3.14.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "28cce251fcbc87fac86a866eeb0d6c2d536fc16d06f184bb61aeae11aa4cee0c" -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 = [ - "futf", - "mac", - "utf-8", -] - -[[package]] -name = "termcolor" -version = "1.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06794f8f6c5c898b3275aebefa6b8a1cb24cd2c6c79397ab15774837a0bc5755" -dependencies = [ - "winapi-util", -] - -[[package]] -name = "terminal_size" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5352447f921fda68cf61b4101566c0bdb5104eff6804d0678e5227580ab6a4e9" -dependencies = [ - "rustix", - "windows-sys 0.59.0", -] - -[[package]] -name = "thin-vec" -version = "0.2.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a38c90d48152c236a3ab59271da4f4ae63d678c5d7ad6b7714d7cb9760be5e4b" -dependencies = [ - "serde 1.0.216", -] - -[[package]] -name = "thiserror" -version = "1.0.69" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6aaf5339b578ea85b50e080feb250a3e8ae8cfcdff9a461c9ec2904bc923f52" -dependencies = [ - "thiserror-impl", -] - -[[package]] -name = "thiserror-impl" -version = "1.0.69" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4fee6c4efc90059e10f81e6d42c60a18f76588c3d74cb83a0b242a2b6c7504c1" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.90", -] - -[[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 = "tint" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7af24570664a3074673dbbf69a65bdae0ae0b72f2949b1adfbacb736ee4d6896" -dependencies = [ - "lazy_static 0.2.11", -] - -[[package]] -name = "tiny-keccak" -version = "2.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c9d3793400a45f954c52e73d068316d76b6f4e36977e3fcebb13a2721e80237" -dependencies = [ - "crunchy", -] - -[[package]] -name = "tinystr" -version = "0.7.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9117f5d4db391c1cf6927e7bea3db74b9a1c1add8f7eda9ffd5364f40f57b82f" -dependencies = [ - "displaydoc", - "zerovec", -] - -[[package]] -name = "tokio" -version = "1.42.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5cec9b21b0450273377fc97bd4c33a8acffc8c996c987a7c5b319a0083707551" -dependencies = [ - "backtrace", - "bytes", - "libc", - "mio", - "pin-project-lite", - "signal-hook-registry", - "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 2.0.90", -] - -[[package]] -name = "tokio-native-tls" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbae76ab933c85776efabc971569dd6119c580d8f5d448769dec1764bf796ef2" -dependencies = [ - "native-tls", - "tokio", -] - -[[package]] -name = "toml" -version = "0.5.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4f7f0dd8d50a853a531c426359045b1998f04219d88799810762cd4ad314234" -dependencies = [ - "serde 1.0.216", -] - -[[package]] -name = "toml" -version = "0.8.19" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1ed1f98e3fdc28d6d910e6737ae6ab1a93bf1985935a1193e68f93eeb68d24e" -dependencies = [ - "serde 1.0.216", - "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 1.0.216", -] - -[[package]] -name = "toml_edit" -version = "0.22.22" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ae48d6208a266e853d946088ed816055e556cc6028c5e8e2b84d9fa5dd7c7f5" -dependencies = [ - "indexmap", - "serde 1.0.216", - "serde_spanned", - "toml_datetime", - "winnow", -] - -[[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.41" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "784e0ac535deb450455cbfa28a6f0df145ea1bb7ae51b821cf5e7927fdcfbdd0" -dependencies = [ - "pin-project-lite", - "tracing-core", -] - -[[package]] -name = "tracing-core" -version = "0.1.33" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e672c95779cf947c5311f83787af4fa8fffd12fb27e4993211a84bdfd9610f9c" -dependencies = [ - "once_cell", - "valuable", -] - -[[package]] -name = "tracing-error" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b1581020d7a273442f5b45074a6a57d5757ad0a47dac0e9f0bd57b81936f3db" -dependencies = [ - "tracing", - "tracing-subscriber", -] - -[[package]] -name = "tracing-subscriber" -version = "0.3.19" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8189decb5ac0fa7bc8b96b7cb9b2701d60d48805aca84a238004d665fcc4008" -dependencies = [ - "sharded-slab", - "thread_local", - "tracing-core", -] - -[[package]] -name = "try-lock" -version = "0.2.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b" - -[[package]] -name = "unicode-ident" -version = "1.0.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "adb9e6ca4f869e1180728b7950e35922a7fc6397f7b641499e8f3ef06e50dc83" - -[[package]] -name = "unicode-segmentation" -version = "1.12.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f6ccf251212114b54433ec949fd6a7841275f9ada20dddd2f29e9ceea4501493" - -[[package]] -name = "unicode-width" -version = "0.1.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7dd6e30e90baa6f72411720665d41d89b9a3d039dc45b8faea1ddd07f617f6af" - -[[package]] -name = "unicode-width" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1fc81956842c57dac11422a97c3b8195a1ff727f06e85c84ed2e8aa277c9a0fd" - -[[package]] -name = "url" -version = "2.5.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32f8b686cadd1473f4bd0117a5d28d36b1ade384ea9b5069a1c40aefed7fda60" -dependencies = [ - "form_urlencoded", - "idna", - "percent-encoding", -] - -[[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 = "utf8parse" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821" - -[[package]] -name = "uuid" -version = "1.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8c5f0a0af699448548ad1a2fbf920fb4bee257eae39953ba95cb84891a0446a" -dependencies = [ - "getrandom", -] - -[[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 = "version_check" -version = "0.9.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a" - -[[package]] -name = "vte" -version = "0.10.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6cbce692ab4ca2f1f3047fcf732430249c0e971bfdd2b234cf2c47ad93af5983" -dependencies = [ - "arrayvec", - "utf8parse", - "vte_generate_state_changes", -] - -[[package]] -name = "vte" -version = "0.11.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f5022b5fbf9407086c180e9557be968742d839e68346af7792b8592489732197" -dependencies = [ - "utf8parse", - "vte_generate_state_changes", -] - -[[package]] -name = "vte_generate_state_changes" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2e369bee1b05d510a7b4ed645f5faa90619e05437111783ea5848f28d97d3c2e" -dependencies = [ - "proc-macro2", - "quote", -] - -[[package]] -name = "want" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bfa7760aed19e106de2c7c0b581b509f2f25d3dacaf737cb82ac61bc6d760b0e" -dependencies = [ - "try-lock", -] - -[[package]] -name = "wasi" -version = "0.11.0+wasi-snapshot-preview1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" - -[[package]] -name = "wasm-bindgen" -version = "0.2.99" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a474f6281d1d70c17ae7aa6a613c87fce69a127e2624002df63dcb39d6cf6396" -dependencies = [ - "cfg-if", - "once_cell", - "wasm-bindgen-macro", -] - -[[package]] -name = "wasm-bindgen-backend" -version = "0.2.99" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f89bb38646b4f81674e8f5c3fb81b562be1fd936d84320f3264486418519c79" -dependencies = [ - "bumpalo", - "log", - "proc-macro2", - "quote", - "syn 2.0.90", - "wasm-bindgen-shared", -] - -[[package]] -name = "wasm-bindgen-futures" -version = "0.4.49" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38176d9b44ea84e9184eff0bc34cc167ed044f816accfe5922e54d84cf48eca2" -dependencies = [ - "cfg-if", - "js-sys", - "once_cell", - "wasm-bindgen", - "web-sys", -] - -[[package]] -name = "wasm-bindgen-macro" -version = "0.2.99" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2cc6181fd9a7492eef6fef1f33961e3695e4579b9872a6f7c83aee556666d4fe" -dependencies = [ - "quote", - "wasm-bindgen-macro-support", -] - -[[package]] -name = "wasm-bindgen-macro-support" -version = "0.2.99" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30d7a95b763d3c45903ed6c81f156801839e5ee968bb07e534c44df0fcd330c2" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.90", - "wasm-bindgen-backend", - "wasm-bindgen-shared", -] - -[[package]] -name = "wasm-bindgen-shared" -version = "0.2.99" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "943aab3fdaaa029a6e0271b35ea10b72b943135afe9bffca82384098ad0e06a6" - -[[package]] -name = "web-sys" -version = "0.3.76" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "04dd7223427d52553d3702c004d3b2fe07c148165faa56313cb00211e31c12bc" -dependencies = [ - "js-sys", - "wasm-bindgen", -] - -[[package]] -name = "web-time" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a6580f308b1fad9207618087a65c04e7a10bc77e02c8e84e9b00dd4b12fa0bb" -dependencies = [ - "js-sys", - "wasm-bindgen", -] - -[[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-registry" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e400001bb720a623c1c69032f8e3e4cf09984deec740f007dd2b03ec864804b0" -dependencies = [ - "windows-result", - "windows-strings", - "windows-targets 0.52.6", -] - -[[package]] -name = "windows-result" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d1043d8214f791817bab27572aaa8af63732e11bf84aa21a45a78d6c317ae0e" -dependencies = [ - "windows-targets 0.52.6", -] - -[[package]] -name = "windows-strings" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4cd9b125c486025df0eabcb585e62173c6c9eddcec5d117d3b6e8c30e2ee4d10" -dependencies = [ - "windows-result", - "windows-targets 0.52.6", -] - -[[package]] -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 = "winnow" -version = "0.6.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "36c1fec1a2bb5866f07c25f68c26e565c4c200aebb96d7e55710c19d3e8ac49b" -dependencies = [ - "memchr", -] - -[[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" - -[[package]] -name = "yaml-rust" -version = "0.4.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56c1936c4cc7a1c9ab21a1ebb602eb942ba868cbd44a99cb7cdc5892335e1c85" -dependencies = [ - "linked-hash-map", -] - -[[package]] -name = "yoke" -version = "0.7.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "120e6aef9aa629e3d4f52dc8cc43a015c7724194c97dfaf45180d2daf2b77f40" -dependencies = [ - "serde 1.0.216", - "stable_deref_trait", - "yoke-derive", - "zerofrom", -] - -[[package]] -name = "yoke-derive" -version = "0.7.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2380878cad4ac9aac1e2435f3eb4020e8374b5f13c296cb75b4620ff8e229154" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.90", - "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 2.0.90", -] - -[[package]] -name = "zerofrom" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cff3ee08c995dee1859d998dea82f7374f2826091dd9cd47def953cae446cd2e" -dependencies = [ - "zerofrom-derive", -] - -[[package]] -name = "zerofrom-derive" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "595eed982f7d355beb85837f651fa22e90b3c044842dc7f2c2842c086f295808" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.90", - "synstructure", -] - -[[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 2.0.90", -] diff --git a/pkgs/by-name/rw/rwalk/package.nix b/pkgs/by-name/rw/rwalk/package.nix index 3a6f657f94ea..8413f3cdc1c8 100644 --- a/pkgs/by-name/rw/rwalk/package.nix +++ b/pkgs/by-name/rw/rwalk/package.nix @@ -4,22 +4,22 @@ fetchFromGitHub, pkg-config, openssl, - stdenv, - darwin, + versionCheckHook, + nix-update-script, }: rustPlatform.buildRustPackage rec { pname = "rwalk"; - version = "0.8.7"; + version = "0.9.0"; src = fetchFromGitHub { owner = "cestef"; repo = "rwalk"; tag = "v${version}"; - hash = "sha256-rEecl8KdPqPreCRq8CZCBfpedInYD7+gfCwCst+VS90="; + hash = "sha256-W42b3fUezMpOPaNmTogUbgn67nCiKteCkkYUAux9Ng4="; }; - cargoHash = "..."; + cargoHash = "sha256-R5L19GMOjbXMVfjCuergxVZvAHCTLVkf3rmdvYJCMLU="; nativeBuildInputs = [ pkg-config @@ -36,9 +36,14 @@ rustPlatform.buildRustPackage rec { nativeInstallCheckInputs = [ versionCheckHook ]; + versionCheckProgramArg = [ "--version" ]; doInstallCheck = true; + passthru = { + updateScript = nix-update-script { }; + }; + meta = { description = "Blazingly fast web directory scanner written in Rust"; homepage = "https://github.com/cestef/rwalk"; From 0e7e95ea80a3b058646d482987f3b52dd319be5e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 31 Dec 2024 14:14:38 +0000 Subject: [PATCH 417/429] emacsPackages.lsp-bridge: 0-unstable-2024-12-20 -> 0-unstable-2024-12-27 --- .../elisp-packages/manual-packages/lsp-bridge/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/lsp-bridge/default.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/lsp-bridge/default.nix index 119a7467a3ce..d78656572273 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/lsp-bridge/default.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/lsp-bridge/default.nix @@ -31,13 +31,13 @@ let in melpaBuild { pname = "lsp-bridge"; - version = "0-unstable-2024-12-20"; + version = "0-unstable-2024-12-27"; src = fetchFromGitHub { owner = "manateelazycat"; repo = "lsp-bridge"; - rev = "acebc35d9fed200bfb8237087074a50fcb0d71d2"; - hash = "sha256-PwielZ2uTW+snP2D0p1pwSCTRQ83EO1sU90lMrd0pvE="; + rev = "402e65f372bb4268c0cd0514a12f0b0e9649c4af"; + hash = "sha256-iUOjc/iEJMsR87Kk96729luQx34b924zlZejA2oPNZ0="; }; patches = [ From 15332b265d59a2517d63528d88a399f0b777775e Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Tue, 31 Dec 2024 15:08:44 +0100 Subject: [PATCH 418/429] clazy: 1.12 -> 1.13 Diff: https://github.com/KDE/clazy/compare/v1.12...1.13 Changelog: https://github.com/KDE/clazy/blob/1.13/Changelog --- .../tools/analysis/clazy/default.nix | 24 ++++++++++++++----- 1 file changed, 18 insertions(+), 6 deletions(-) diff --git a/pkgs/development/tools/analysis/clazy/default.nix b/pkgs/development/tools/analysis/clazy/default.nix index b1578dc3f860..ceaa4a8ea65a 100644 --- a/pkgs/development/tools/analysis/clazy/default.nix +++ b/pkgs/development/tools/analysis/clazy/default.nix @@ -5,17 +5,19 @@ llvmPackages, cmake, makeWrapper, + versionCheckHook, + gitUpdater, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "clazy"; - version = "1.12"; + version = "1.13"; src = fetchFromGitHub { owner = "KDE"; repo = "clazy"; - rev = "v${version}"; - sha256 = "sha256-Fex0BAmCZUYcNJriHHt/QPi5IgSH/yhnpGCFFZMMD/g="; + tag = finalAttrs.version; + hash = "sha256-cNckRQ3+9HjJ1xYIDkosEP7K66+G0J3K9wt4OWLokLs="; }; buildInputs = [ @@ -45,12 +47,22 @@ stdenv.mkDerivation rec { --suffix CPLUS_INCLUDE_PATH : "${llvmPackages.clang}/resource-root/include" ''; + nativeInstallCheckInputs = [ + versionCheckHook + ]; + versionCheckProgramArg = [ "--version" ]; + doInstallCheck = true; + + passthru = { + updateScript = gitUpdater { }; + }; + meta = { description = "Qt-oriented static code analyzer based on the Clang framework"; homepage = "https://github.com/KDE/clazy"; + changelog = "https://github.com/KDE/clazy/blob/${finalAttrs.version}/Changelog"; license = lib.licenses.lgpl2Plus; maintainers = [ lib.maintainers.cadkin ]; platforms = lib.platforms.linux; }; - -} +}) From bc269b93b00e6c576da545bbfca431c37afd9401 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Tue, 31 Dec 2024 15:30:53 +0100 Subject: [PATCH 419/429] python312Packages.ansible-compat: remove unneeded git from nativeCheckInputs --- pkgs/development/python-modules/ansible-compat/default.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/development/python-modules/ansible-compat/default.nix b/pkgs/development/python-modules/ansible-compat/default.nix index b31b55082467..16e9924ef09f 100644 --- a/pkgs/development/python-modules/ansible-compat/default.nix +++ b/pkgs/development/python-modules/ansible-compat/default.nix @@ -15,7 +15,6 @@ coreutils, ansible-core, flaky, - git, pytest-mock, pytestCheckHook, }: @@ -51,7 +50,6 @@ buildPythonPackage rec { nativeCheckInputs = [ ansible-core flaky - git pytest-mock pytestCheckHook ]; From df28e19d177abd14270df1e8c88378d2fe410c00 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Tue, 31 Dec 2024 11:55:06 +0100 Subject: [PATCH 420/429] solc: 0.8.21 -> 0.8.28 Diff: https://github.com/ethereum/solidity/compare/v0.8.21...v0.8.28 Changelog: https://github.com/ethereum/solidity/releases/tag/v0.8.28 --- pkgs/by-name/so/solc/package.nix | 77 ++++++++++++++++---------------- 1 file changed, 38 insertions(+), 39 deletions(-) diff --git a/pkgs/by-name/so/solc/package.nix b/pkgs/by-name/so/solc/package.nix index db9dada8db20..d36dc55bb69d 100644 --- a/pkgs/by-name/so/solc/package.nix +++ b/pkgs/by-name/so/solc/package.nix @@ -9,6 +9,7 @@ jq, ncurses, python3, + versionCheckHook, z3Support ? true, z3_4_11 ? null, cvc4Support ? gccStdenv.hostPlatform.isLinux, @@ -27,34 +28,24 @@ assert z3Support -> z3 != null && lib.versionAtLeast z3.version "4.11.0"; assert cvc4Support -> cvc4 != null && cln != null && gmp != null; let - jsoncppVersion = "1.9.3"; - jsoncppUrl = "https://github.com/open-source-parsers/jsoncpp/archive/${jsoncppVersion}.tar.gz"; - jsoncpp = fetchzip { - url = jsoncppUrl; - sha256 = "1vbhi503rgwarf275ajfdb8vpdcbn1f7917wjkf8jghqwb1c24lq"; - }; - - range3Version = "0.12.0"; - range3Url = "https://github.com/ericniebler/range-v3/archive/${range3Version}.tar.gz"; - range3 = fetchzip { - url = range3Url; - sha256 = "sha256-bRSX91+ROqG1C3nB9HSQaKgLzOHEFy9mrD2WW3PRBWU="; - }; - - fmtlibVersion = "8.0.1"; - fmtlibUrl = "https://github.com/fmtlib/fmt/archive/${fmtlibVersion}.tar.gz"; - fmtlib = fetchzip { - url = fmtlibUrl; - sha256 = "1mnvxqsan034d2jiqnw2yvkljl7lwvhakmj5bscwp1fpkn655bbw"; - }; - pname = "solc"; - version = "0.8.21"; - meta = with lib; { + + version = "0.8.28"; + linuxHash = "sha256-kosJ10stylGK5NUtsnMM7I+OfhR40TXPQDvnggOFLLc="; + darwinHash = "sha256-gVFbDlPeqiZtVJVFzKrApalubU6CAcd/ZzsscQl22eo="; + + nativeInstallCheckInputs = [ + versionCheckHook + ]; + versionCheckProgramArg = [ "--version" ]; + doInstallCheck = true; + + meta = { description = "Compiler for Ethereum smart contract language Solidity"; homepage = "https://github.com/ethereum/solidity"; - license = licenses.gpl3; - maintainers = with maintainers; [ + changelog = "https://github.com/ethereum/solidity/releases/tag/v${version}"; + license = lib.licenses.gpl3; + maintainers = with lib.maintainers; [ dbrock akru lionello @@ -65,23 +56,21 @@ let solc = if gccStdenv.hostPlatform.isLinux then gccStdenv.mkDerivation rec { - inherit pname version meta; + inherit + pname + version + nativeInstallCheckInputs + versionCheckProgramArg + doInstallCheck + meta + ; # upstream suggests avoid using archive generated by github src = fetchzip { url = "https://github.com/ethereum/solidity/releases/download/v${version}/solidity_${version}.tar.gz"; - sha256 = "sha256-6EeRmxAmb1nCQ2FTNtWfQ7HCH0g9nJXC3jnhV0KEOwk="; + hash = linuxHash; }; - postPatch = '' - substituteInPlace cmake/jsoncpp.cmake \ - --replace "${jsoncppUrl}" ${jsoncpp} - substituteInPlace cmake/range-v3.cmake \ - --replace "${range3Url}" ${range3} - substituteInPlace cmake/fmtlib.cmake \ - --replace "${fmtlibUrl}" ${fmtlib} - ''; - cmakeFlags = [ "-DBoost_USE_STATIC_LIBS=OFF" @@ -143,9 +132,12 @@ let popd ''; - doInstallCheck = true; installCheckPhase = '' + runHook preInstallCheck + $out/bin/solc --version > /dev/null + + runHook postInstallCheck ''; passthru.tests = { @@ -156,11 +148,18 @@ let } else gccStdenv.mkDerivation rec { - inherit pname version meta; + inherit + pname + version + nativeInstallCheckInputs + versionCheckProgramArg + doInstallCheck + meta + ; src = pkgs.fetchurl { url = "https://github.com/ethereum/solidity/releases/download/v${version}/solc-macos"; - sha256 = "sha256-GdBldJ+wjL/097RShKxVhTBjhl9q6GIeTe+l2Ti5pQI="; + hash = darwinHash; }; dontUnpack = true; From 3b085fd66da985920f650ddb625497620cfc8748 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Tue, 31 Dec 2024 13:06:12 +0100 Subject: [PATCH 421/429] solc: fix build on GCC 14 --- pkgs/by-name/so/solc/package.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pkgs/by-name/so/solc/package.nix b/pkgs/by-name/so/solc/package.nix index d36dc55bb69d..b104d8130f37 100644 --- a/pkgs/by-name/so/solc/package.nix +++ b/pkgs/by-name/so/solc/package.nix @@ -71,6 +71,15 @@ let hash = linuxHash; }; + # Fix build with GCC 14 + # Submitted upstream: https://github.com/ethereum/solidity/pull/15685 + postPatch = '' + substituteInPlace test/yulPhaser/Chromosome.cpp \ + --replace-fail \ + "BOOST_TEST(abs" \ + "BOOST_TEST(fabs" + ''; + cmakeFlags = [ "-DBoost_USE_STATIC_LIBS=OFF" From 96f930534f59ec54a2c76391a9cbc4ec80a9a44e Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 31 Dec 2024 16:02:46 +0100 Subject: [PATCH 422/429] buildHomeAssistantComponent: fix output dirname with manifest in repo root --- pkgs/servers/home-assistant/build-custom-component/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/servers/home-assistant/build-custom-component/default.nix b/pkgs/servers/home-assistant/build-custom-component/default.nix index 02f1d01a1170..a3b5b5d5e834 100644 --- a/pkgs/servers/home-assistant/build-custom-component/default.nix +++ b/pkgs/servers/home-assistant/build-custom-component/default.nix @@ -32,7 +32,7 @@ home-assistant.python.pkgs.buildPythonPackage ( mkdir $out if [[ -f ./manifest.json ]]; then mkdir $out/custom_components - cp -R $(realpath .) $out/custom_components/ + cp -R "$(realpath .)" "$out/custom_components/${domain}" else cp -r ./custom_components/ $out/ fi From d8df2a77ec0b564bcc409bf1b7218e6e7a5e43f4 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 31 Dec 2024 15:29:03 +0000 Subject: [PATCH 423/429] pdfium-binaries: 6899 -> 6927 --- pkgs/by-name/pd/pdfium-binaries/package.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/pd/pdfium-binaries/package.nix b/pkgs/by-name/pd/pdfium-binaries/package.nix index 5cff417d0494..872ecb73e9a7 100644 --- a/pkgs/by-name/pd/pdfium-binaries/package.nix +++ b/pkgs/by-name/pd/pdfium-binaries/package.nix @@ -4,7 +4,7 @@ stdenv, }: let - version = "6899"; + version = "6927"; src = let inherit (stdenv.hostPlatform) system; @@ -16,10 +16,10 @@ let aarch64-darwin = "mac-arm64"; }; hash = selectSystem { - x86_64-linux = "sha256-JPXgjdGfQK1BztK3opqKfg5P2lAnmkcVj3qk2Ck8vHg="; - aarch64-linux = "sha256-za1d1jKM3LdeBFttBBHQ+Nx1O4KC6FFwotuRHTj8tFk="; - x86_64-darwin = "sha256-K2Sr4z4+WWmK9OxvkZB0k9LQDxCNnUvL0RArG5v2aYs="; - aarch64-darwin = "sha256-wLa61Af4G47AE99M+uPlBjR2rdP5yUenoW9gsrOmZpw="; + x86_64-linux = "sha256-hx9+3/CD2xdsu/jm3St3UPXpAzySrgtC14UTQ5pkHPg="; + aarch64-linux = "sha256-CEtviohWUR2/gUBGFq6dkMb0U68CVaTopcI5Xgv7Bks="; + x86_64-darwin = "sha256-H4fVtDUuqJxeh37oMXcVuCpGth/WLXk8p8/3PfjWYgM="; + aarch64-darwin = "sha256-FlyG1Qcl4G3ZVZoVJE3U2CNJoXKr8+1O747XjDq/Eog="; }; in fetchzip { From a2c878df507a14a866923dece6043bcb591ae3d1 Mon Sep 17 00:00:00 2001 From: toinux <26522723+itzwam@users.noreply.github.com> Date: Tue, 31 Dec 2024 17:28:57 +0100 Subject: [PATCH 424/429] nixos/keepalived: add package option (#346462) KeepAlived: Support pkg override without overlaying Co-authored-by: Antoine 'Toinux' Lesieur Co-authored-by: Arne Keller --- nixos/modules/services/networking/keepalived/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/nixos/modules/services/networking/keepalived/default.nix b/nixos/modules/services/networking/keepalived/default.nix index 01cb8817a94d..109633280d1e 100644 --- a/nixos/modules/services/networking/keepalived/default.nix +++ b/nixos/modules/services/networking/keepalived/default.nix @@ -153,6 +153,8 @@ in ''; }; + package = lib.mkPackageOption pkgs "keepalived" { }; + openFirewall = mkOption { type = types.bool; default = false; @@ -334,7 +336,7 @@ in umask 077 ${pkgs.envsubst}/bin/envsubst -i "${keepalivedConf}" > ${finalConfigFile} ''); - ExecStart = "${pkgs.keepalived}/sbin/keepalived" + ExecStart = "${lib.getExe cfg.package}" + " -f ${finalConfigFile}" + " -p ${pidFile}" + optionalString cfg.snmp.enable " --snmp"; From 1f9c0c6655afb5a170b856ea09ef22da0119aea4 Mon Sep 17 00:00:00 2001 From: antipatico Date: Sat, 31 Aug 2024 14:37:14 +0200 Subject: [PATCH 425/429] lovely-injector: init at 0.6.0 --- pkgs/by-name/lo/lovely-injector/package.nix | 39 +++++++++++++++++++++ 1 file changed, 39 insertions(+) create mode 100644 pkgs/by-name/lo/lovely-injector/package.nix diff --git a/pkgs/by-name/lo/lovely-injector/package.nix b/pkgs/by-name/lo/lovely-injector/package.nix new file mode 100644 index 000000000000..e680cb7e25b0 --- /dev/null +++ b/pkgs/by-name/lo/lovely-injector/package.nix @@ -0,0 +1,39 @@ +{ + fetchFromGitHub, + rustPlatform, + lib, +}: +let + version = "0.6.0"; + lovelyInjector = fetchFromGitHub { + owner = "vgskye"; + repo = "lovely-injector"; + rev = "3224915f4d47b557c34b5012797cf92d4cc629af"; + hash = "sha256-fzkuuu6pmvqeJa7qlX8jhtCLC4oYRLUm1hqHTRiYEX8="; + }; +in +rustPlatform.buildRustPackage rec { + pname = "lovely-injector"; + inherit version; + src = lovelyInjector; + useFetchCargoVendor = true; + cargoHash = "sha256-Mkmj+ENdUge1V1cVAQOV2K01sYKEyhxTse0f5o6H6Xc="; + # no tests + doCheck = false; + # lovely-injector depends on nightly rust features + env.RUSTC_BOOTSTRAP = 1; + + meta = { + description = "Runtime lua injector for games built with LÖVE"; + longDescription = '' + Lovely is a lua injector which embeds code into a LÖVE 2d game at runtime. + Unlike executable patchers, mods can be installed, updated, and removed over and over again without requiring a partial or total game reinstallation. + This is accomplished through in-process lua API detouring and an easy to use (and distribute) patch system. + ''; + license = lib.licenses.mit; + homepage = "https://github.com/ethangreen-dev/lovely-injector"; + downloadPage = "https://github.com/ethangreen-dev/lovely-injector/releases"; + maintainers = [ lib.maintainers.antipatico ]; + platforms = lib.platforms.linux ++ lib.platforms.darwin; + }; +} From 24c766e018f1ae89ff264491b94101caa9bb5450 Mon Sep 17 00:00:00 2001 From: antipatico Date: Tue, 31 Dec 2024 11:41:28 +0100 Subject: [PATCH 426/429] balatro: init at 1.0.1n --- pkgs/by-name/ba/balatro/globals.patch | 15 +++++ pkgs/by-name/ba/balatro/package.nix | 79 +++++++++++++++++++++++++++ 2 files changed, 94 insertions(+) create mode 100644 pkgs/by-name/ba/balatro/globals.patch create mode 100644 pkgs/by-name/ba/balatro/package.nix diff --git a/pkgs/by-name/ba/balatro/globals.patch b/pkgs/by-name/ba/balatro/globals.patch new file mode 100644 index 000000000000..b896a1deb61a --- /dev/null +++ b/pkgs/by-name/ba/balatro/globals.patch @@ -0,0 +1,15 @@ +--- result/share/balatro/globals.lua 1970-01-01 01:00:01.000000000 +0100 ++++ result/share/balatro/globals.lua 1970-01-01 01:00:01.000000000 +0100 +@@ -56,6 +56,12 @@ function Game:set_globals() + self.F_CRASH_REPORTS = false + end + ++ if love.system.getOS() == 'Linux' then ++ self.F_SAVE_TIMER = 5 ++ self.F_DISCORD = true ++ self.F_ENGLISH_ONLY = false ++ end ++ + if love.system.getOS() == 'Nintendo Switch' then + self.F_HIDE_BETA_LANGS = true + self.F_BASIC_CREDITS = true diff --git a/pkgs/by-name/ba/balatro/package.nix b/pkgs/by-name/ba/balatro/package.nix new file mode 100644 index 000000000000..181cd305411b --- /dev/null +++ b/pkgs/by-name/ba/balatro/package.nix @@ -0,0 +1,79 @@ +{ + stdenv, + lib, + love, + lovely-injector, + p7zip, + copyDesktopItems, + makeWrapper, + makeDesktopItem, + requireFile, + withMods ? true, + withLinuxPatch ? true, +}: +let + version = "1.0.1n"; + balatroExe = requireFile { + name = "Balatro-${version}.exe"; + url = "https://store.steampowered.com/app/2379780/Balatro/"; + # Use `nix hash file --sri --type sha256` to get the correct hash + hash = "sha256-mJ5pL+Qj3+ldOLFcQc64dM0edTeQSePIYpp5EuwxKXo="; + }; +in +stdenv.mkDerivation { + pname = "balatro"; + inherit version; + nativeBuildInputs = [ + p7zip + copyDesktopItems + makeWrapper + ]; + buildInputs = [ love ] ++ lib.optional withMods lovely-injector; + dontUnpack = true; + desktopItems = [ + (makeDesktopItem { + name = "balatro"; + desktopName = "Balatro"; + exec = "balatro"; + keywords = [ "Game" ]; + categories = [ "Game" ]; + icon = "balatro"; + }) + ]; + buildPhase = '' + runHook preBuild + tmpdir=$(mktemp -d) + 7z x ${balatroExe} -o$tmpdir -y + ${if withLinuxPatch then "patch $tmpdir/globals.lua -i ${./globals.patch}" else ""} + patchedExe=$(mktemp -u).zip + 7z a $patchedExe $tmpdir/* + runHook postBuild + ''; + + # The `cat` bit is a hack suggested by whitelje (https://github.com/ethangreen-dev/lovely-injector/pull/66#issuecomment-2319615509) + # to make it so that lovely will pick up Balatro as the game name. The `LD_PRELOAD` bit is used to load lovely and it is the + # 'official' way of doing it. + installPhase = '' + runHook preInstall + install -Dm444 $tmpdir/resources/textures/2x/balatro.png -t $out/share/icons/ + + cat ${lib.getExe love} $patchedExe > $out/share/Balatro + chmod +x $out/share/Balatro + + makeWrapper $out/share/Balatro $out/bin/balatro ${lib.optionalString withMods "--prefix LD_PRELOAD : '${lovely-injector}/lib/liblovely.so'"} + runHook postInstall + ''; + + meta = { + description = "Poker roguelike"; + longDescription = '' + Balatro is a hypnotically satisfying deckbuilder where you play illegal poker hands, + discover game-changing jokers, and trigger adrenaline-pumping, outrageous combos. + ''; + license = lib.licenses.unfree; + homepage = "https://store.steampowered.com/app/2379780/Balatro/"; + maintainers = [ lib.maintainers.antipatico ]; + platforms = love.meta.platforms; + mainProgram = "balatro"; + }; +} From 948991e084f3ada450fc693350d8a2d0b590117e Mon Sep 17 00:00:00 2001 From: Ngoc Nguyen Date: Wed, 1 Jan 2025 01:48:05 +0900 Subject: [PATCH 427/429] maccy: add myself as maintainer --- pkgs/by-name/ma/maccy/package.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/ma/maccy/package.nix b/pkgs/by-name/ma/maccy/package.nix index acb9d4ff260c..feee61c5220a 100644 --- a/pkgs/by-name/ma/maccy/package.nix +++ b/pkgs/by-name/ma/maccy/package.nix @@ -32,7 +32,10 @@ stdenvNoCC.mkDerivation (finalAttrs: { homepage = "https://maccy.app"; license = licenses.mit; sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; - maintainers = with maintainers; [ emilytrau ]; + maintainers = with maintainers; [ + emilytrau + baongoc124 + ]; platforms = platforms.darwin; }; }) From 7d16d84fbc59ca385702bb7b416c20b0e9e974f4 Mon Sep 17 00:00:00 2001 From: Ngoc Nguyen Date: Wed, 1 Jan 2025 01:48:43 +0900 Subject: [PATCH 428/429] maccy: 0.31.0 -> 2.3.0 --- pkgs/by-name/ma/maccy/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ma/maccy/package.nix b/pkgs/by-name/ma/maccy/package.nix index feee61c5220a..f651c2f9d4ce 100644 --- a/pkgs/by-name/ma/maccy/package.nix +++ b/pkgs/by-name/ma/maccy/package.nix @@ -7,11 +7,11 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "maccy"; - version = "0.31.0"; + version = "2.3.0"; src = fetchurl { url = "https://github.com/p0deje/Maccy/releases/download/${finalAttrs.version}/Maccy.app.zip"; - hash = "sha256-vjfFtlX0b3howUc2bTR/pqXwnzjXpK6qPR8+81sANTs="; + hash = "sha256-Prr0t3OvPWUnUQ3cTE3D+jj1ASKKmDvGZInKlT1WsJ0="; }; dontUnpack = true; From 09f55c6a81f425473cc9f0560dd16f129ae40110 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Mon, 30 Dec 2024 14:21:55 +0100 Subject: [PATCH 429/429] transmission_3-gtk: Fix build with GCC 14 --- pkgs/by-name/tr/transmission_3/package.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/by-name/tr/transmission_3/package.nix b/pkgs/by-name/tr/transmission_3/package.nix index bfe4b98aa2f1..96530f98f980 100644 --- a/pkgs/by-name/tr/transmission_3/package.nix +++ b/pkgs/by-name/tr/transmission_3/package.nix @@ -138,6 +138,11 @@ stdenv.mkDerivation (finalAttrs: { EOF ''; + env = { + # Fix GCC 14 build + NIX_CFLAGS_COMPILE = "-Wno-error=incompatible-pointer-types"; + }; + passthru.tests = { apparmor = nixosTests.transmission_3; # starts the service with apparmor enabled smoke-test = nixosTests.bittorrent;