diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 65f863a17051..e7b2f6df34fe 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -25089,6 +25089,12 @@ githubId = 2049686; name = "Sebastián Estrella"; }; + seudonym = { + name = "Wahid Khan"; + email = "wk170179+nixpkgs@gmail.com"; + github = "seudonym"; + githubId = 80459261; + }; seven_bear = { name = "Edmond Freeman"; email = "edmondfreeman7@gmail.com"; diff --git a/pkgs/applications/emulators/libretro/cores/fbneo.nix b/pkgs/applications/emulators/libretro/cores/fbneo.nix index 4b7600339804..0002e31fe4af 100644 --- a/pkgs/applications/emulators/libretro/cores/fbneo.nix +++ b/pkgs/applications/emulators/libretro/cores/fbneo.nix @@ -5,13 +5,13 @@ }: mkLibretroCore { core = "fbneo"; - version = "0-unstable-2026-05-18"; + version = "0-unstable-2026-06-04"; src = fetchFromGitHub { owner = "libretro"; repo = "fbneo"; - rev = "1a2d079aac28c540c20a9e4cac87bb02021c3eec"; - hash = "sha256-4q1q20Us7HVZr2CWsqujQWiqryc/xS9/bVBt/x7Y5H8="; + rev = "298f913aeb781908c7f6a568a2ede3940a98738d"; + hash = "sha256-UP0jNsqXMzrO+EQY8Gbkl2lIizfsAKoKiGaXGp7Nok8="; }; makefile = "Makefile"; diff --git a/pkgs/applications/emulators/libretro/cores/mame.nix b/pkgs/applications/emulators/libretro/cores/mame.nix index 99538b682af0..7d30ae2ed015 100644 --- a/pkgs/applications/emulators/libretro/cores/mame.nix +++ b/pkgs/applications/emulators/libretro/cores/mame.nix @@ -9,13 +9,13 @@ }: mkLibretroCore { core = "mame"; - version = "0-unstable-2026-04-23"; + version = "0-unstable-2026-05-31"; src = fetchFromGitHub { owner = "libretro"; repo = "mame"; - rev = "da690d2f5393a45e20ef941980e7d940fb9d2f19"; - hash = "sha256-7OGD/OEAwVwT0Svepf1XtCqtWbLFXyFL8YTFqOOhVPc="; + rev = "2ffec28bcf65eceb395722c9d721e7d4523fbb56"; + hash = "sha256-37SD78rFYgIoI7FDsgHhupYse8QbzwVRrJCXSVjpLCc="; fetchSubmodules = true; }; diff --git a/pkgs/applications/networking/p2p/transmission/4.nix b/pkgs/applications/networking/p2p/transmission/4.nix index c1adb44edcc2..1b55b65e01b3 100644 --- a/pkgs/applications/networking/p2p/transmission/4.nix +++ b/pkgs/applications/networking/p2p/transmission/4.nix @@ -248,6 +248,7 @@ stdenv.mkDerivation (finalAttrs: { * Full encryption, DHT, and PEX support ''; homepage = "https://www.transmissionbt.com/"; + maintainers = with lib.maintainers; [ nyanloutre ]; license = with lib.licenses; [ gpl2Plus mit diff --git a/pkgs/by-name/bp/bpftrace/package.nix b/pkgs/by-name/bp/bpftrace/package.nix index 6aa70674c9b9..431991c2e6ae 100644 --- a/pkgs/by-name/bp/bpftrace/package.nix +++ b/pkgs/by-name/bp/bpftrace/package.nix @@ -23,13 +23,13 @@ stdenv.mkDerivation rec { pname = "bpftrace"; - version = "0.26.0"; + version = "0.26.1"; src = fetchFromGitHub { owner = "bpftrace"; repo = "bpftrace"; rev = "v${version}"; - hash = "sha256-NYMMQKOWCLbECQX1FPYaLcQyO3H+LHCw02bF1sWsMuY="; + hash = "sha256-h3gFnQq48oM5uK07xrykOCSJxhr6dqcyVUDoIKIRREY="; }; buildInputs = with llvmPackages; [ diff --git a/pkgs/by-name/ch/cherry-studio/package.nix b/pkgs/by-name/ch/cherry-studio/package.nix index 01dfd735a3ae..4c824f3544b7 100644 --- a/pkgs/by-name/ch/cherry-studio/package.nix +++ b/pkgs/by-name/ch/cherry-studio/package.nix @@ -31,13 +31,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "cherry-studio"; - version = "1.9.4"; + version = "1.9.9"; src = fetchFromGitHub { owner = "CherryHQ"; repo = "cherry-studio"; tag = "v${finalAttrs.version}"; - hash = "sha256-+mfetkw5SibvUky/QoUE4+5SL+v8S4JGq9ZlS9q6Uk0="; + hash = "sha256-TFmzQmZlRFTJa7KaHVj370n2YZuwXy8mCRFrKsf0w24="; }; postPatch = '' @@ -54,7 +54,7 @@ stdenv.mkDerivation (finalAttrs: { inherit (finalAttrs) pname version src; inherit pnpm; fetcherVersion = 3; - hash = "sha256-6zbnWaeSzvK1NDCXIySS54Pq6siBCuBRJkMa7/NAt1k="; + hash = "sha256-wJPiEjIOReB/JCer6pdODnDfQ12zm9vPv79iaiyTp3I="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/de/deck/package.nix b/pkgs/by-name/de/deck/package.nix index aef439d2f520..fa168150fb57 100644 --- a/pkgs/by-name/de/deck/package.nix +++ b/pkgs/by-name/de/deck/package.nix @@ -9,13 +9,13 @@ buildGoModule (finalAttrs: { pname = "deck"; - version = "1.62.0"; + version = "1.62.1"; src = fetchFromGitHub { owner = "Kong"; repo = "deck"; tag = "v${finalAttrs.version}"; - hash = "sha256-0XluNSLZ1yly/hfBvV9xOVROyS7dtK348fFdT2Iplsg="; + hash = "sha256-14M0MTfELHvCmkGhzghXTSg1n2gl7S6a4yoGgjLfHzI="; }; nativeBuildInputs = [ installShellFiles ]; @@ -28,7 +28,7 @@ buildGoModule (finalAttrs: { ]; proxyVendor = true; # darwin/linux hash mismatch - vendorHash = "sha256-77fkJJB/aHdxX2NItiwMAyVyH/OPE7N00PSTYHG0szA="; + vendorHash = "sha256-pUA8GhDX6oQ1z1VvuAZyRf0trDFip5BfqnNcc37tAng="; postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' installShellCompletion --cmd deck \ diff --git a/pkgs/by-name/fe/fetchtastic/package.nix b/pkgs/by-name/fe/fetchtastic/package.nix index fc7e867ec9c8..bbc80f11b9cc 100644 --- a/pkgs/by-name/fe/fetchtastic/package.nix +++ b/pkgs/by-name/fe/fetchtastic/package.nix @@ -7,14 +7,14 @@ python3.pkgs.buildPythonApplication (finalAttrs: { pname = "fetchtastic"; - version = "0.10.9"; + version = "0.10.10"; pyproject = true; src = fetchFromGitHub { owner = "jeremiah-k"; repo = "fetchtastic"; tag = finalAttrs.version; - hash = "sha256-eFDj3qv3cYt/7tf+v93QwqoVLEEfpt21g4l0MrLTaLc="; + hash = "sha256-ImXBH1mvJE+Ae7fUqR/Z381TKGt6hq0BRHhdtOz3YO4="; }; pythonRelaxDeps = [ "platformdirs" ]; diff --git a/pkgs/by-name/go/google-cloud-sdk/components.json b/pkgs/by-name/go/google-cloud-sdk/components.json index acc4d7db6250..3b9e9a7fe1a7 100644 --- a/pkgs/by-name/go/google-cloud-sdk/components.json +++ b/pkgs/by-name/go/google-cloud-sdk/components.json @@ -1575,169 +1575,6 @@ "version_string": "2.1.31" } }, - { - "dependencies": [ - "bundled-python3-windows-x86", - "bundled-python3-windows-x86_64", - "core" - ], - "details": { - "description": "Provides stand-alone Python 3.14 install.", - "display_name": "Bundled Python 3.14" - }, - "gdu_only": false, - "id": "bundled-python3", - "is_configuration": false, - "is_hidden": true, - "is_required": false, - "platform": { - "architectures": [ - "x86", - "x86_64" - ], - "operating_systems": [ - "WINDOWS" - ] - }, - "platform_required": false, - "version": { - "build_number": 0, - "version_string": "3.14.4" - } - }, - { - "dependencies": [ - "bundled-python3-unix-linux-x86_64", - "core" - ], - "details": { - "description": "Provides stand-alone Python 3.14.5 installation for UNIX.", - "display_name": "Bundled Python 3.14" - }, - "gdu_only": false, - "id": "bundled-python3-unix", - "is_configuration": false, - "is_hidden": false, - "is_required": false, - "platform": { - "architectures": [ - "x86_64" - ], - "operating_systems": [ - "LINUX" - ] - }, - "platform_required": false, - "version": { - "build_number": 0, - "version_string": "3.14.5" - } - }, - { - "data": { - "checksum": "5c4ce4eb75b99cd5e06fae99f6e45c42b88df3225699629715dba64a85a7fd39", - "contents_checksum": "f23b948b0e0ed0d93d7e3e51375347b1f72212ce6b5d70b4e8729e404e415b8f", - "size": 27198113, - "source": "components/google-cloud-sdk-bundled-python3-unix-linux-x86_64-20260522195849.tar.gz", - "type": "tar" - }, - "dependencies": [ - "bundled-python3-unix", - "core" - ], - "details": { - "description": "Provides stand-alone Python 3.14.5 installation for UNIX.", - "display_name": "Bundled Python 3.14 (Platform Specific)" - }, - "gdu_only": false, - "id": "bundled-python3-unix-linux-x86_64", - "is_configuration": false, - "is_hidden": true, - "is_required": false, - "platform": { - "architectures": [ - "x86_64" - ], - "operating_systems": [ - "LINUX" - ] - }, - "platform_required": false, - "version": { - "build_number": 20260522195849, - "version_string": "3.14.5" - } - }, - { - "data": { - "checksum": "393967c25a467c4faaadda895810a1f725d1c2416fc29e1a4f3c08c57e0c6949", - "contents_checksum": "78156598f73fc69a32f30a5efac14c526cf8f44ccf2a7e0ef2db75b915331772", - "size": 21432688, - "source": "components/google-cloud-sdk-bundled-python3-windows-x86-20260522195849.tar.gz", - "type": "tar" - }, - "dependencies": [ - "bundled-python3", - "core" - ], - "details": { - "description": "Provides stand-alone Python 3.14 install.", - "display_name": "Bundled Python 3.14 (Platform Specific)" - }, - "gdu_only": false, - "id": "bundled-python3-windows-x86", - "is_configuration": false, - "is_hidden": true, - "is_required": false, - "platform": { - "architectures": [ - "x86" - ], - "operating_systems": [ - "WINDOWS" - ] - }, - "platform_required": false, - "version": { - "build_number": 20260522195849, - "version_string": "3.14.4" - } - }, - { - "data": { - "checksum": "dbe1d783730a03c1fe04b47a1e8611754ee021433e2dbbaf8194fc958355f148", - "contents_checksum": "0b369522fe69d7c12f178e1ed3b15f6dd15e8fa94d05f1be10c96e75930f81f4", - "size": 23967274, - "source": "components/google-cloud-sdk-bundled-python3-windows-x86_64-20260522195849.tar.gz", - "type": "tar" - }, - "dependencies": [ - "bundled-python3", - "core" - ], - "details": { - "description": "Provides stand-alone Python 3.14 install.", - "display_name": "Bundled Python 3.14 (Platform Specific)" - }, - "gdu_only": false, - "id": "bundled-python3-windows-x86_64", - "is_configuration": false, - "is_hidden": true, - "is_required": false, - "platform": { - "architectures": [ - "x86_64" - ], - "operating_systems": [ - "WINDOWS" - ] - }, - "platform_required": false, - "version": { - "build_number": 20260522195849, - "version_string": "3.14.4" - } - }, { "dependencies": [ "cbt-darwin-arm", @@ -3265,7 +3102,6 @@ "type": "tar" }, "dependencies": [ - "bundled-python3-unix", "core-nix", "core-win", "gcloud-deps", @@ -3296,7 +3132,6 @@ "type": "tar" }, "dependencies": [ - "bundled-python3-unix", "core", "gcloud-deps", "ssh-tools" @@ -3333,7 +3168,6 @@ "type": "tar" }, "dependencies": [ - "bundled-python3-unix", "core", "gcloud-deps", "ssh-tools" diff --git a/pkgs/by-name/go/google-cloud-sdk/components.nix b/pkgs/by-name/go/google-cloud-sdk/components.nix index 45a2e619cb7f..636f94918a82 100644 --- a/pkgs/by-name/go/google-cloud-sdk/components.nix +++ b/pkgs/by-name/go/google-cloud-sdk/components.nix @@ -6,8 +6,6 @@ autoPatchelfHook, python3, libxcrypt-legacy, - tcl-8_6, - tclPackages, }: let @@ -179,8 +177,6 @@ let ]; buildInputs = [ libxcrypt-legacy - tcl-8_6 - tclPackages.tk ]; passthru = { dependencies = filterForSystem dependencies; diff --git a/pkgs/by-name/go/google-cloud-sdk/package.nix b/pkgs/by-name/go/google-cloud-sdk/package.nix index bc652693d570..e63b94324735 100644 --- a/pkgs/by-name/go/google-cloud-sdk/package.nix +++ b/pkgs/by-name/go/google-cloud-sdk/package.nix @@ -79,6 +79,7 @@ stdenv.mkDerivation rec { if [ -d platform/bundledpythonunix ]; then rm -r platform/bundledpythonunix fi + rm -f .install/bundled-python* cp -R * .install $out/google-cloud-sdk/ # Resolve readlink noise in shell initialization @@ -199,6 +200,9 @@ stdenv.mkDerivation rec { passthru = { inherit components withExtraComponents; + tests.gke-gcloud-auth-plugin = withExtraComponents [ + components.gke-gcloud-auth-plugin + ]; updateScript = ./update.sh; }; diff --git a/pkgs/by-name/go/google-cloud-sdk/update.sh b/pkgs/by-name/go/google-cloud-sdk/update.sh index 8ad4f2b6202b..e8f3caf832f8 100755 --- a/pkgs/by-name/go/google-cloud-sdk/update.sh +++ b/pkgs/by-name/go/google-cloud-sdk/update.sh @@ -47,4 +47,10 @@ EOF } > "${PACKAGE_DIR}/data.nix" -curl "${CHANNEL_URL}/components-v${VERSION}.json" -w "\n" > "${PACKAGE_DIR}/components.json" +# nixpkgs uses its own Python wrapper; do not generate bundled Python components. +curl -s "${CHANNEL_URL}/components-v${VERSION}.json" | jq ' + .components |= map( + select(.id | startswith("bundled-python3") | not) + | .dependencies = ((.dependencies // []) | map(select(startswith("bundled-python3") | not))) + ) +' > "${PACKAGE_DIR}/components.json" diff --git a/pkgs/by-name/hc/hcdiag/package.nix b/pkgs/by-name/hc/hcdiag/package.nix index c9c4925dfdb6..606bd9080e7c 100644 --- a/pkgs/by-name/hc/hcdiag/package.nix +++ b/pkgs/by-name/hc/hcdiag/package.nix @@ -8,16 +8,16 @@ buildGoModule (finalAttrs: { pname = "hcdiag"; - version = "0.5.12"; + version = "0.5.13"; src = fetchFromGitHub { owner = "hashicorp"; repo = "hcdiag"; tag = "v${finalAttrs.version}"; - hash = "sha256-SXP5Poa4mjlvp4AQzSekHBCc07+a3bWVOPJWxfOuB/Q="; + hash = "sha256-OHCxyBA4kCeCwvl8ZM33gLGc19wl7DtZ2gHveNCSAc0="; }; - vendorHash = "sha256-mUqXnUAnN052RMsMtiUpOTlDVb59Xh3+++E/BtEEQGk="; + vendorHash = "sha256-otBZVOc0lS9IFk0w8A4gD+0MVEn35h0uk5Ul9eH9lFw="; nativeInstallCheckHooks = [ versionCheckHook diff --git a/pkgs/by-name/ma/manifold/package.nix b/pkgs/by-name/ma/manifold/package.nix index eb7176d107fe..80557bb78436 100644 --- a/pkgs/by-name/ma/manifold/package.nix +++ b/pkgs/by-name/ma/manifold/package.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "manifold"; - version = "3.5.0"; + version = "3.5.1"; src = fetchFromGitHub { owner = "elalish"; repo = "manifold"; tag = "v${finalAttrs.version}"; - hash = "sha256-4TFS4toHzZsNO/vf3r2dW9QCpnHi2p0BAGSCZVswlYk="; + hash = "sha256-ZsTGokNpWDT0EgA3VaU/aMh8WtUygIqcSxzLikeyQ9c="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/by-name/ml/mlt/package.nix b/pkgs/by-name/ml/mlt/package.nix index aba7a2d56717..99c8b2f995f6 100644 --- a/pkgs/by-name/ml/mlt/package.nix +++ b/pkgs/by-name/ml/mlt/package.nix @@ -32,7 +32,10 @@ enablePython ? false, python3, swig, - qt ? null, + qtbase ? null, + wrapQtAppsHook ? null, + qtsvg ? null, + qt5compat ? null, enableSDL2 ? true, SDL2, gitUpdater, @@ -59,6 +62,7 @@ stdenv.mkDerivation (finalAttrs: { pkg-config which makeWrapper + wrapQtAppsHook ] ++ lib.optionals cudaSupport [ cudaPackages.cuda_nvcc @@ -66,9 +70,6 @@ stdenv.mkDerivation (finalAttrs: { ++ lib.optionals enablePython [ python3 swig - ] - ++ lib.optionals (qt != null) [ - qt.wrapQtAppsHook ]; buildInputs = [ @@ -96,10 +97,10 @@ stdenv.mkDerivation (finalAttrs: { ladspa-sdk ladspaPlugins ] - ++ lib.optionals (qt != null) [ - qt.qtbase - qt.qtsvg - (qt.qt5compat or null) + ++ lib.optionals (qtbase != null) [ + qtbase + qtsvg + qt5compat libarchive ] ++ lib.optionals enableSDL2 [ @@ -114,31 +115,20 @@ stdenv.mkDerivation (finalAttrs: { cmakeFlags = [ # RPATH of binary /nix/store/.../bin/... contains a forbidden reference to /build/ - "-DCMAKE_SKIP_BUILD_RPATH=ON" - "-DMOD_OPENCV=ON" + (lib.cmakeBool "CMAKE_SKIP_BUILD_RPATH" true) + (lib.cmakeBool "MOD_OPENCV" true) + (lib.cmakeBool "MOD_QT6" (qtbase != null && lib.versions.major qtbase.version == "6")) + (lib.cmakeBool "MOD_GLAXNIMATE_QT6" (qtbase != null && lib.versions.major qtbase.version == "6")) ] ++ lib.optionals enablePython [ - "-DSWIG_PYTHON=ON" - ] - ++ lib.optionals (qt == null) [ - "-DMOD_QT6=OFF" - ] - ++ lib.optionals (qt != null && lib.versions.major qt.qtbase.version == "5") [ - "-DMOD_QT=ON" - "-DMOD_QT6=OFF" - "-DMOD_GLAXNIMATE=ON" - ] - ++ lib.optionals (qt != null && lib.versions.major qt.qtbase.version == "6") [ - "-DMOD_QT6=ON" - "-DMOD_QT=OFF" - "-DMOD_GLAXNIMATE_QT6=ON" + (lib.cmakeBool "SWIG_PYTHON" true) ]; preFixup = '' wrapProgram $out/bin/melt \ --prefix FREI0R_PATH : ${frei0r}/lib/frei0r-1 \ ${lib.optionalString enableJackrack "--prefix LADSPA_PATH : ${ladspaPlugins}/lib/ladspa"} \ - ${lib.optionalString (qt != null) "\${qtWrapperArgs[@]}"} + ${lib.optionalString (qtbase != null) "\${qtWrapperArgs[@]}"} ''; diff --git a/pkgs/by-name/ok/okolors/package.nix b/pkgs/by-name/ok/okolors/package.nix index bfc88abaad6e..a7021e50cea0 100644 --- a/pkgs/by-name/ok/okolors/package.nix +++ b/pkgs/by-name/ok/okolors/package.nix @@ -2,6 +2,7 @@ lib, rustPlatform, fetchFromGitHub, + nix-update-script, }: rustPlatform.buildRustPackage (finalAttrs: { @@ -9,19 +10,28 @@ rustPlatform.buildRustPackage (finalAttrs: { version = "0.9.0"; src = fetchFromGitHub { - owner = "Ivordir"; + owner = "IanManske"; repo = "Okolors"; - rev = "v${finalAttrs.version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-RSkZUkwCn9uvvT2dIqM2Q4+mRqjUegVuXCms5DBugbk="; }; cargoHash = "sha256-ceFyFbNmC7PoleTejymQw9Ii9rxx2qJmFifNAQjLVUM="; + passthru = { + updateScript = nix-update-script { }; + }; + + __structuredAttrs = true; + meta = { description = "Generate a color palette from an image using k-means clustering in the Oklab color space"; - homepage = "https://github.com/Ivordir/Okolors"; + homepage = "https://github.com/IanManske/Okolors"; license = lib.licenses.mit; - maintainers = [ ]; + maintainers = with lib.maintainers; [ + sandarukasa + ]; + changelog = "https://github.com/IanManske/Okolors/releases/tag/v${finalAttrs.version}"; mainProgram = "okolors"; }; }) diff --git a/pkgs/by-name/ph/phpstan/package.nix b/pkgs/by-name/ph/phpstan/package.nix index 582ee0d32906..4cad12cd2031 100644 --- a/pkgs/by-name/ph/phpstan/package.nix +++ b/pkgs/by-name/ph/phpstan/package.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "phpstan"; - version = "2.1.56"; + version = "2.2.1"; src = fetchFromGitHub { owner = "phpstan"; repo = "phpstan"; tag = finalAttrs.version; - hash = "sha256-Ffn6rJhTKjXEjwWZ1tnSaUBsmLyLeIp5EQnGZcvxba8="; + hash = "sha256-oZ4ph5pQimUuJVjIRhGDgFg4rbrMwVGxdXC71zVh6Lc="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/pr/proxmox-auto-install-assistant/Cargo.lock b/pkgs/by-name/pr/proxmox-auto-install-assistant/Cargo.lock index 909cb230ddfb..5d8ef188decc 100644 --- a/pkgs/by-name/pr/proxmox-auto-install-assistant/Cargo.lock +++ b/pkgs/by-name/pr/proxmox-auto-install-assistant/Cargo.lock @@ -31,22 +31,31 @@ dependencies = [ ] [[package]] -name = "anyhow" -version = "1.0.100" +name = "android_system_properties" +version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a23eb6b1614318a8071c9b2521f36b424b2c83db5eb3a0fead4a6c0809af6e61" +checksum = "819e7219dbd41043ac279b19830f2efc897156490d7fd6ea916720117ee66311" +dependencies = [ + "libc", +] + +[[package]] +name = "anyhow" +version = "1.0.102" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f202df86484c868dbad7eaa557ef785d5c66295e41b460ef922eca0723b842c" [[package]] name = "autocfg" -version = "1.5.0" +version = "1.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c08606f8c3cbf4ce6ec8e28fb0014a2c086708fe954eaa885384a6165172e7e8" +checksum = "f2032f911046de80f0a198e0901378627c33f59ea0ac00e363d481118bd70a53" [[package]] name = "aws-lc-rs" -version = "1.15.1" +version = "1.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b5ce75405893cd713f9ab8e297d8e438f624dde7d706108285f7e17a25a180f" +checksum = "5ec2f1fc3ec205783a5da9a7e6c1509cc69dedf09a1949e412c1e18469326d00" dependencies = [ "aws-lc-sys", "zeroize", @@ -54,9 +63,9 @@ dependencies = [ [[package]] name = "aws-lc-sys" -version = "0.34.0" +version = "0.41.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "179c3777a8b5e70e90ea426114ffc565b2c1a9f82f6c4a0c5a34aa6ef5e781b6" +checksum = "1a2f9779ce85b93ab6170dd940ad0169b5766ff848247aff13bb788b832fe3f4" dependencies = [ "cc", "cmake", @@ -78,9 +87,9 @@ checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6" [[package]] name = "bitflags" -version = "2.10.0" +version = "2.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "812e12b5285cc515a9c72a5c1d3b6d46a19dac5acfef5265968c166106e31dd3" +checksum = "c4512299f36f043ab09a583e57bceb5a5aab7a73db1805848e8fef3c9e8c78b3" [[package]] name = "block-buffer" @@ -92,10 +101,25 @@ dependencies = [ ] [[package]] -name = "bytes" -version = "1.11.0" +name = "bs58" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b35204fbdc0b3f4446b89fc1ac2cf84a8a68971995d0bf2e925ec7cd960f9cb3" +checksum = "bf88ba1141d185c399bee5288d850d63b8369520c1eafc32a0430b5b6c287bf4" +dependencies = [ + "tinyvec", +] + +[[package]] +name = "bumpalo" +version = "3.20.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "72f5acc6cb2ba439de613abc23857ec3d78374d8ed5ac84e9d11336e87da8649" + +[[package]] +name = "bytes" +version = "1.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e748733b7cbc798e1434b6ac524f0c1ff2ab456fe201501e6497c8417a4fc33" [[package]] name = "castaway" @@ -108,9 +132,9 @@ dependencies = [ [[package]] name = "cc" -version = "1.2.48" +version = "1.2.62" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c481bdbf0ed3b892f6f806287d72acd515b352a4ec27a208489b8c1bc839633a" +checksum = "a1dce859f0832a7d088c4f1119888ab94ef4b5d6795d1ce05afb7fe159d79f98" dependencies = [ "find-msvc-tools", "jobserver", @@ -137,10 +161,22 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "613afe47fcd5fac7ccf1db93babcb082c5994d996f20b8b159f2ad1658eb5724" [[package]] -name = "cmake" -version = "0.1.54" +name = "chrono" +version = "0.4.44" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7caa3f9de89ddbe2c607f4101924c5abec803763ae9534e4f4d7d8f84aa81f0" +checksum = "c673075a2e0e5f4a1dde27ce9dee1ea4558c7ffe648f576438a20ca1d2acc4b0" +dependencies = [ + "iana-time-zone", + "num-traits", + "serde", + "windows-link", +] + +[[package]] +name = "cmake" +version = "0.1.58" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c0f78a02292a74a88ac736019ab962ece0bc380e3f977bf72e376c5d78ff0678" dependencies = [ "cc", ] @@ -157,9 +193,9 @@ dependencies = [ [[package]] name = "compact_str" -version = "0.8.1" +version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b79c4069c6cad78e2e0cdfcbd26275770669fb39fd308a752dc110e83b9af32" +checksum = "7fd622ebbb56a5b2ccb651b32b911cdeb2a9b4b11776b2473bf26a26a286244e" dependencies = [ "castaway", "cfg-if", @@ -169,6 +205,27 @@ dependencies = [ "static_assertions", ] +[[package]] +name = "const_format" +version = "0.2.36" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4481a617ad9a412be3b97c5d403fef8ed023103368908b9c50af598ff467cc1e" +dependencies = [ + "const_format_proc_macros", + "konst", +] + +[[package]] +name = "const_format_proc_macros" +version = "0.2.34" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1d57c2eccfb16dbac1f4e61e206105db5820c9d26c3c472bc17c774259ef7744" +dependencies = [ + "proc-macro2 1.0.106", + "quote 1.0.45", + "unicode-xid 0.2.6", +] + [[package]] name = "core-foundation" version = "0.9.4" @@ -279,7 +336,7 @@ dependencies = [ "log", "signal-hook", "unicode-segmentation", - "unicode-width", + "unicode-width 0.1.14", ] [[package]] @@ -288,7 +345,7 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ac7ac0eb0cede3dfdfebf4d5f22354e05a730b79c25fd03481fc69fcfba0a73e" dependencies = [ - "proc-macro2 1.0.103", + "proc-macro2 1.0.106", ] [[package]] @@ -310,7 +367,7 @@ dependencies = [ "serde_json", "time", "unicode-segmentation", - "unicode-width", + "unicode-width 0.1.14", "xi-unicode", ] @@ -320,8 +377,18 @@ version = "0.21.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9cdf337090841a411e2a7f3deb9187445851f91b309c0c0a29e05f74a00a48c0" dependencies = [ - "darling_core", - "darling_macro", + "darling_core 0.21.3", + "darling_macro 0.21.3", +] + +[[package]] +name = "darling" +version = "0.23.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "25ae13da2f202d56bd7f91c25fba009e7717a1e4a1cc98a76d844b65ae912e9d" +dependencies = [ + "darling_core 0.23.0", + "darling_macro 0.23.0", ] [[package]] @@ -332,9 +399,22 @@ checksum = "1247195ecd7e3c85f83c8d2a366e4210d588e802133e1e355180a9870b517ea4" dependencies = [ "fnv", "ident_case", - "proc-macro2 1.0.103", - "quote 1.0.42", - "syn 2.0.111", + "proc-macro2 1.0.106", + "quote 1.0.45", + "syn 2.0.117", +] + +[[package]] +name = "darling_core" +version = "0.23.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9865a50f7c335f53564bb694ef660825eb8610e0a53d3e11bf1b0d3df31e03b0" +dependencies = [ + "ident_case", + "proc-macro2 1.0.106", + "quote 1.0.45", + "strsim", + "syn 2.0.117", ] [[package]] @@ -343,18 +423,30 @@ version = "0.21.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d38308df82d1080de0afee5d069fa14b0326a88c14f15c5ccda35b4a6c414c81" dependencies = [ - "darling_core", - "quote 1.0.42", - "syn 2.0.111", + "darling_core 0.21.3", + "quote 1.0.45", + "syn 2.0.117", +] + +[[package]] +name = "darling_macro" +version = "0.23.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ac3984ec7bd6cfa798e62b4a642426a5be0e68f9401cfc2a01e3fa9ea2fcdb8d" +dependencies = [ + "darling_core 0.23.0", + "quote 1.0.45", + "syn 2.0.117", ] [[package]] name = "deranged" -version = "0.5.5" +version = "0.5.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ececcb659e7ba858fb4f10388c250a7252eb0a27373f1a72b8748afdd248e587" +checksum = "7cd812cc2bc1d69d4764bd80df88b4317eaef9e773c75226407d9bc0876b211c" dependencies = [ "powerfmt", + "serde_core", ] [[package]] @@ -379,6 +471,12 @@ version = "1.0.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "92773504d58c093f6de2459af4af33faa518c13451eb8f2b5698ed3d36e7c813" +[[package]] +name = "dyn-clone" +version = "1.0.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d0881ea181b1df73ff77ffaaf9c7544ecc11e82fba9b5f27b262a3c73a332555" + [[package]] name = "endian_trait" version = "0.6.0" @@ -413,30 +511,30 @@ version = "0.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f282cfdfe92516eb26c2af8589c274c7c17681f5ecc03c18255fe741c6aa64eb" dependencies = [ - "proc-macro2 1.0.103", - "quote 1.0.42", - "syn 2.0.111", + "proc-macro2 1.0.106", + "quote 1.0.45", + "syn 2.0.117", ] [[package]] name = "enumset" -version = "1.1.10" +version = "1.1.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "25b07a8dfbbbfc0064c0a6bdf9edcf966de6b1c33ce344bdeca3b41615452634" +checksum = "839c4174b41e75c8f7306110b2c51996a293b8d1d850edd529011841d9fede7d" dependencies = [ "enumset_derive", ] [[package]] name = "enumset_derive" -version = "0.14.0" +version = "0.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f43e744e4ea338060faee68ed933e46e722fb7f3617e722a5772d7e856d8b3ce" +checksum = "4bd536557b58c682b217b8fb199afdff47cd3eff260623f19e77074eb073d63a" dependencies = [ - "darling", - "proc-macro2 1.0.103", - "quote 1.0.42", - "syn 2.0.111", + "darling 0.21.3", + "proc-macro2 1.0.106", + "quote 1.0.45", + "syn 2.0.117", ] [[package]] @@ -457,21 +555,21 @@ dependencies = [ [[package]] name = "fastrand" -version = "2.3.0" +version = "2.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "37909eebbb50d72f9059c3b6d82c0463f2ff062c9e95845c43a6c9c0355411be" +checksum = "9f1f227452a390804cdb637b74a86990f2a7d7ba4b7d5693aac9b4dd6defd8d6" [[package]] name = "find-msvc-tools" -version = "0.1.5" +version = "0.1.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3a3076410a55c90011c298b04d0cfa770b00fa04e1e3c97d3f6c9de105a03844" +checksum = "5baebc0774151f905a1a2cc41989300b1e6fbb29aff0ceffa1064fdd3088d582" [[package]] name = "flate2" -version = "1.1.5" +version = "1.1.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bfe33edd8e85a12a67454e37f8c75e730830d83e313556ab9ebf9ee7fbeb3bfb" +checksum = "843fba2746e448b37e26a819579957415c8cef339bf08564fe8b7ddbd959573c" dependencies = [ "crc32fast", "miniz_oxide", @@ -483,6 +581,12 @@ version = "1.0.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" +[[package]] +name = "foldhash" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d9c4f5dac5e15c24eb999c26181a6ca40b39fe946cbe4c263c7209467bc83af2" + [[package]] name = "foreign-types" version = "0.3.2" @@ -504,6 +608,30 @@ version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "42703706b716c37f96a77aea830392ad231f44c9e9a67872fa5548707e11b11c" +[[package]] +name = "futures-core" +version = "0.3.32" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7e3450815272ef58cec6d564423f6e755e25379b217b0bc688e295ba24df6b1d" + +[[package]] +name = "futures-task" +version = "0.3.32" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "037711b3d59c33004d3856fbdc83b99d4ff37a24768fa1be9ce3538a1cde4393" + +[[package]] +name = "futures-util" +version = "0.3.32" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "389ca41296e6190b48053de0321d02a77f32f8a5d2461dd38762c0593805c6d6" +dependencies = [ + "futures-core", + "futures-task", + "pin-project-lite", + "slab", +] + [[package]] name = "generic-array" version = "0.14.7" @@ -516,9 +644,9 @@ dependencies = [ [[package]] name = "getrandom" -version = "0.2.16" +version = "0.2.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "335ff9f135e4384c8150d6f27c6daed433577f86b4750418338c01a1a2528592" +checksum = "ff2abc00be7fca6ebc474524697ae276ad847ad0a6b3faa4bcb027e9a4614ad0" dependencies = [ "cfg-if", "libc", @@ -533,10 +661,23 @@ checksum = "899def5c37c4fd7b2664648c28120ecec138e4d395b459e5ca34f9cce2dd77fd" dependencies = [ "cfg-if", "libc", - "r-efi", + "r-efi 5.3.0", "wasip2", ] +[[package]] +name = "getrandom" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0de51e6874e94e7bf76d726fc5d13ba782deca734ff60d5bb2fb2607c7406555" +dependencies = [ + "cfg-if", + "libc", + "r-efi 6.0.0", + "wasip2", + "wasip3", +] + [[package]] name = "glob" version = "0.3.3" @@ -545,9 +686,30 @@ checksum = "0cc23270f6e1808e30a928bdc84dea0b9b4136a8bc82338574f23baf47bbd280" [[package]] name = "hashbrown" -version = "0.16.1" +version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "841d1cc9bed7f9236f321df977030373f4a4163ae1a7dbfe1a51a2c1a51d9100" +checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" + +[[package]] +name = "hashbrown" +version = "0.15.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9229cfe53dfd69f0609a49f65461bd93001ea1ef889cd5529dd176593f5338a1" +dependencies = [ + "foldhash", +] + +[[package]] +name = "hashbrown" +version = "0.17.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ed5909b6e89a2db4456e54cd5f673791d7eca6732202bbf2a9cc504fe2f9b84a" + +[[package]] +name = "heck" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea" [[package]] name = "hex" @@ -557,9 +719,9 @@ checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" [[package]] name = "http" -version = "1.4.0" +version = "1.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3ba2a386d7f85a81f119ad7498ebe444d2e22c2af0b86b069416ace48b3311a" +checksum = "8be7462df143984c4598a256ef469b251d7d7f9e271135073e78fc535414f3d0" dependencies = [ "bytes", "itoa", @@ -571,6 +733,36 @@ version = "1.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6dbf3de79e51f3d586ab4cb9d5c3e2c14aa28ed23d180cf89b4df0454a69cc87" +[[package]] +name = "iana-time-zone" +version = "0.1.65" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e31bc9ad994ba00e440a8aa5c9ef0ec67d5cb5e5cb0cc7f8b744a35b389cc470" +dependencies = [ + "android_system_properties", + "core-foundation-sys", + "iana-time-zone-haiku", + "js-sys", + "log", + "wasm-bindgen", + "windows-core", +] + +[[package]] +name = "iana-time-zone-haiku" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f31827a206f56af32e590ba56d5d2d085f558508192593743f16b2306495269f" +dependencies = [ + "cc", +] + +[[package]] +name = "id-arena" +version = "2.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3d3067d79b975e8844ca9eb072e16b31c3c1c36928edf9c6789548c524d0d954" + [[package]] name = "ident_case" version = "1.0.1" @@ -579,19 +771,32 @@ checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39" [[package]] name = "indexmap" -version = "2.12.1" +version = "1.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ad4bb2b565bca0645f4d68c5c9af97fba094e9791da685bf83cb5f3ce74acf2" +checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99" +dependencies = [ + "autocfg", + "hashbrown 0.12.3", + "serde", +] + +[[package]] +name = "indexmap" +version = "2.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d466e9454f08e4a911e14806c24e16fba1b4c121d1ea474396f396069cf949d9" dependencies = [ "equivalent", - "hashbrown", + "hashbrown 0.17.1", + "serde", + "serde_core", ] [[package]] name = "itoa" -version = "1.0.15" +version = "1.0.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4a5f13b858c8d314ee3e8f639011f7ccefe71f97f96e50151fb991f267928e2c" +checksum = "8f42a60cbdf9a97f5d2305f08a87dc4e09308d1276d28c869c684d7777685682" [[package]] name = "jni" @@ -602,18 +807,40 @@ dependencies = [ "cesu8", "cfg-if", "combine", - "jni-sys", + "jni-sys 0.3.1", "log", - "thiserror", + "thiserror 1.0.69", "walkdir", "windows-sys 0.45.0", ] [[package]] name = "jni-sys" -version = "0.3.0" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8eaf4bc02d17cbdd7ff4c7438cafcdf7fb9a4613313ad11b4f8fefe7d3fa0130" +checksum = "41a652e1f9b6e0275df1f15b32661cf0d4b78d4d87ddec5e0c3c20f097433258" +dependencies = [ + "jni-sys 0.4.1", +] + +[[package]] +name = "jni-sys" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c6377a88cb3910bee9b0fa88d4f42e1d2da8e79915598f65fb0c7ee14c878af2" +dependencies = [ + "jni-sys-macros", +] + +[[package]] +name = "jni-sys-macros" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "38c0b942f458fe50cdac086d2f946512305e5631e720728f2a61aabcd47a6264" +dependencies = [ + "quote 1.0.45", + "syn 2.0.117", +] [[package]] name = "jobserver" @@ -625,6 +852,33 @@ dependencies = [ "libc", ] +[[package]] +name = "js-sys" +version = "0.3.99" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "142bc4740e452c1e57ade0cbc129f139c9093e354346f0872ef985f4f5cf5f11" +dependencies = [ + "cfg-if", + "futures-util", + "once_cell", + "wasm-bindgen", +] + +[[package]] +name = "konst" +version = "0.2.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "128133ed7824fcd73d6e7b17957c5eb7bacb885649bd8c69708b2331a10bcefb" +dependencies = [ + "konst_macro_rules", +] + +[[package]] +name = "konst_macro_rules" +version = "0.2.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a4933f3f57a8e9d9da04db23fb153356ecaf00cbd14aee46279c33dc80925c37" + [[package]] name = "lazy_static" version = "1.5.0" @@ -632,10 +886,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe" [[package]] -name = "libc" -version = "0.2.177" +name = "leb128fmt" +version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2874a2af47a2325c2001a6e6fad9b16a53b802102b528163885171cf92b15976" +checksum = "09edd9e8b54e49e587e4f6295a7d29c3ea94d469cb40ab8ca70b288248a81db2" + +[[package]] +name = "libc" +version = "0.2.186" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "68ab91017fe16c622486840e4c83c9a37afeff978bd239b5293d61ece587de66" [[package]] name = "linux-raw-sys" @@ -645,9 +905,9 @@ checksum = "d26c52dbd32dccf2d10cac7725f8eae5296885fb5703b261f7d0a0739ec807ab" [[package]] name = "linux-raw-sys" -version = "0.11.0" +version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "df1d3c3b53da64cf5760482273a98e575c651a67eec7f77df96b5b642de8f039" +checksum = "32a66949e030da00e8c7d4434b251670a91556f4144941d37452769c25d58a53" [[package]] name = "lock_api" @@ -660,15 +920,15 @@ dependencies = [ [[package]] name = "log" -version = "0.4.28" +version = "0.4.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "34080505efa8e45a4b816c349525ebe327ceaa8559756f0356cba97ef3bf7432" +checksum = "616ec5685824bcc94416c6d4a7a446eea774a31efd7062c8480ba6fd06d7a6e5" [[package]] name = "memchr" -version = "2.7.6" +version = "2.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f52b00d39961fc5b2736ea853c9cc86238e165017a493d1d5c8eac6bdc4cc273" +checksum = "6b947ae49db0d222b1dbc6b113ce7248a3fc3a6ca21b696717bfc000ba4484d8" [[package]] name = "memoffset" @@ -691,9 +951,9 @@ dependencies = [ [[package]] name = "mio" -version = "1.1.0" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "69d83b0086dc8ecf3ce9ae2874b2d1290252e2a30720bea58a5c6639b0092873" +checksum = "50b7e5b27aa02a74bac8c3f23f448f8d87ff11f92d3aac1a6ed369ee08cc56c1" dependencies = [ "libc", "log", @@ -703,17 +963,17 @@ dependencies = [ [[package]] name = "native-tls" -version = "0.2.14" +version = "0.2.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87de3442987e9dbec73158d5c715e7ad9072fda936bb03d19d7fa10e00520f0e" +checksum = "465500e14ea162429d264d44189adc38b199b62b1c21eea9f69e4b73cb03bbf2" dependencies = [ "libc", "log", "openssl", - "openssl-probe", + "openssl-probe 0.2.1", "openssl-sys", "schannel", - "security-framework 2.11.1", + "security-framework 3.7.0", "security-framework-sys", "tempfile", ] @@ -755,9 +1015,9 @@ dependencies = [ [[package]] name = "num-conv" -version = "0.1.0" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9" +checksum = "521739c6d2bac4aa25192232afe6841231376b2b26d4d9fae5ecf8ca5772e441" [[package]] name = "num-integer" @@ -809,21 +1069,20 @@ dependencies = [ [[package]] name = "once_cell" -version = "1.21.3" +version = "1.21.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "42f5e15c9953c5e4ccceeb2e7382a716482c34515315f7b03532b8b4e8393d2d" +checksum = "9f7c3e4beb33f85d45ae3e3a1792185706c8e16d043238c593331cc7cd313b50" [[package]] name = "openssl" -version = "0.10.75" +version = "0.10.80" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08838db121398ad17ab8531ce9de97b244589089e290a384c900cb9ff7434328" +checksum = "a45fa2aa886c42762255da344f0a0d313e254066c46aad76f300c3d3da62d967" dependencies = [ "bitflags", "cfg-if", "foreign-types", "libc", - "once_cell", "openssl-macros", "openssl-sys", ] @@ -834,9 +1093,9 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" dependencies = [ - "proc-macro2 1.0.103", - "quote 1.0.42", - "syn 2.0.111", + "proc-macro2 1.0.106", + "quote 1.0.45", + "syn 2.0.117", ] [[package]] @@ -846,10 +1105,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d05e27ee213611ffe7d6348b942e8f942b37114c00cc03cec254295a4a17852e" [[package]] -name = "openssl-sys" -version = "0.9.111" +name = "openssl-probe" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "82cab2d520aa75e3c58898289429321eb788c3106963d0dc886ec7a5f4adc321" +checksum = "7c87def4c32ab89d880effc9e097653c8da5d6ef28e6b539d313baaacfbafcbe" + +[[package]] +name = "openssl-sys" +version = "0.9.116" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f28a22dc7140cda5f096e5e7724a6962ca81a7f8bfd2979f9b18c11af56318c4" dependencies = [ "cc", "libc", @@ -893,10 +1158,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5be167a7af36ee22fe3115051bc51f6e6c7054c9348e28deb4f49bd6f705a315" [[package]] -name = "pkg-config" -version = "0.3.32" +name = "pin-project-lite" +version = "0.2.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7edddbd0b52d732b21ad9a5fab5c704c14cd949e5e9a1ec5929a24fded1b904c" +checksum = "a89322df9ebe1c1578d689c92318e070967d1042b512afbe49518723f4e6d5cd" + +[[package]] +name = "pkg-config" +version = "0.3.33" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "19f132c84eca552bf34cab8ec81f1c1dcc229b811638f9d283dceabe58c5569e" [[package]] name = "powerfmt" @@ -914,46 +1185,72 @@ dependencies = [ "yansi", ] +[[package]] +name = "prettyplease" +version = "0.2.37" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "479ca8adacdd7ce8f1fb39ce9ecccbfe93a3f1344b3d0d97f20bc0196208f62b" +dependencies = [ + "proc-macro2 1.0.106", + "syn 2.0.117", +] + [[package]] name = "proc-macro2" version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cd07deb3c6d1d9ff827999c7f9b04cdfd66b1b17ae508e14fe47b620f2282ae0" dependencies = [ - "unicode-xid", + "unicode-xid 0.1.0", ] [[package]] name = "proc-macro2" -version = "1.0.103" +version = "1.0.106" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ee95bc4ef87b8d5ba32e8b7714ccc834865276eab0aed5c9958d00ec45f49e8" +checksum = "8fd00f0bb2e90d81d1044c2b32617f68fcb9fa3bb7640c23e9c748e53fb30934" dependencies = [ "unicode-ident", ] [[package]] -name = "proxmox-auto-install-assistant" -version = "9.1.6" +name = "proxmox-api-macro" +version = "1.5.0" dependencies = [ "anyhow", + "proc-macro2 1.0.106", + "quote 1.0.45", + "syn 2.0.117", +] + +[[package]] +name = "proxmox-auto-install-assistant" +version = "9.2.5" +dependencies = [ + "anyhow", + "flate2", "glob", "proxmox-auto-installer", "proxmox-installer-common", + "proxmox-installer-types", "proxmox-sys", "serde_json", + "tempfile", "toml", + "zstd", ] [[package]] name = "proxmox-auto-installer" -version = "9.1.6" +version = "9.2.5" dependencies = [ "anyhow", "glob", "log", "pretty_assertions", "proxmox-installer-common", + "proxmox-installer-types", + "proxmox-network-types", "serde", "serde_json", "serde_plain", @@ -962,36 +1259,39 @@ dependencies = [ [[package]] name = "proxmox-chroot" -version = "9.1.6" +version = "9.2.5" dependencies = [ "anyhow", "proxmox-installer-common", + "proxmox-installer-types", "serde", "serde_json", ] [[package]] name = "proxmox-fetch-answer" -version = "9.1.6" +version = "9.2.5" dependencies = [ "anyhow", "log", "proxmox-auto-installer", "proxmox-installer-common", - "serde", + "proxmox-installer-types", "serde_json", "toml", ] [[package]] name = "proxmox-installer-common" -version = "9.1.6" +version = "9.2.5" dependencies = [ "anyhow", "hex", "native-tls", "pico-args", "pretty_assertions", + "proxmox-installer-types", + "proxmox-network-types", "regex", "rustls", "rustls-native-certs 0.6.3", @@ -1002,10 +1302,22 @@ dependencies = [ "ureq", ] +[[package]] +name = "proxmox-installer-types" +version = "0.1.0" +dependencies = [ + "anyhow", + "proxmox-network-types", + "proxmox-node-status", + "proxmox-schema", + "regex", + "serde", + "serde_plain", +] + [[package]] name = "proxmox-io" version = "1.2.1" -source = "git+https://github.com/proxmox/proxmox-rs?rev=b4aade2a20e12326d2a239279cbc12d12cc50a43#b4aade2a20e12326d2a239279cbc12d12cc50a43" dependencies = [ "endian_trait", ] @@ -1013,23 +1325,55 @@ dependencies = [ [[package]] name = "proxmox-lang" version = "1.5.0" -source = "git+https://github.com/proxmox/proxmox-rs?rev=b4aade2a20e12326d2a239279cbc12d12cc50a43#b4aade2a20e12326d2a239279cbc12d12cc50a43" [[package]] -name = "proxmox-post-hook" -version = "9.1.6" +name = "proxmox-network-types" +version = "1.1.3" dependencies = [ - "anyhow", - "proxmox-auto-installer", - "proxmox-installer-common", + "serde", + "serde_plain", + "serde_with", + "thiserror 2.0.18", +] + +[[package]] +name = "proxmox-node-status" +version = "1.0.1" +dependencies = [ + "proxmox-schema", "serde", "serde_json", ] +[[package]] +name = "proxmox-post-hook" +version = "9.2.5" +dependencies = [ + "anyhow", + "proxmox-installer-common", + "proxmox-installer-types", + "proxmox-network-types", + "serde", + "serde_json", + "toml", +] + +[[package]] +name = "proxmox-schema" +version = "5.2.0" +dependencies = [ + "anyhow", + "const_format", + "proxmox-api-macro", + "regex", + "serde", + "serde_json", + "textwrap", +] + [[package]] name = "proxmox-sys" -version = "1.0.0" -source = "git+https://github.com/proxmox/proxmox-rs?rev=b4aade2a20e12326d2a239279cbc12d12cc50a43#b4aade2a20e12326d2a239279cbc12d12cc50a43" +version = "1.0.1" dependencies = [ "anyhow", "libc", @@ -1045,11 +1389,13 @@ dependencies = [ [[package]] name = "proxmox-tui-installer" -version = "9.1.6" +version = "9.2.5" dependencies = [ "anyhow", "cursive", "proxmox-installer-common", + "proxmox-installer-types", + "proxmox-network-types", "serde_json", ] @@ -1064,11 +1410,11 @@ dependencies = [ [[package]] name = "quote" -version = "1.0.42" +version = "1.0.45" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a338cc41d27e6cc6dce6cefc13a0729dfbb81c262b1f519331575dd80ef3067f" +checksum = "41f2619966050689382d2b44f664f4bc593e129785a36d6ee376ddf37259b924" dependencies = [ - "proc-macro2 1.0.103", + "proc-macro2 1.0.106", ] [[package]] @@ -1077,6 +1423,12 @@ version = "5.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "69cdb34c158ceb288df11e18b4bd39de994f6657d83847bdffdbd7f346754b0f" +[[package]] +name = "r-efi" +version = "6.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f8dcc9c7d52a811697d2151c701e0d08956f92b0e24136cf4cf27b57a6a0d9bf" + [[package]] name = "redox_syscall" version = "0.5.18" @@ -1087,10 +1439,30 @@ dependencies = [ ] [[package]] -name = "regex" -version = "1.12.2" +name = "ref-cast" +version = "1.0.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "843bc0191f75f3e22651ae5f1e72939ab2f72a4bc30fa80a066bd66edefc24d4" +checksum = "f354300ae66f76f1c85c5f84693f0ce81d747e2c3f21a45fef496d89c960bf7d" +dependencies = [ + "ref-cast-impl", +] + +[[package]] +name = "ref-cast-impl" +version = "1.0.25" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b7186006dcb21920990093f30e3dea63b7d6e977bf1256be20c3563a5db070da" +dependencies = [ + "proc-macro2 1.0.106", + "quote 1.0.45", + "syn 2.0.117", +] + +[[package]] +name = "regex" +version = "1.12.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e10754a14b9137dd7b1e3e5b0493cc9171fdd105e0ab477f51b72e7f3ac0e276" dependencies = [ "aho-corasick", "memchr", @@ -1100,9 +1472,9 @@ dependencies = [ [[package]] name = "regex-automata" -version = "0.4.13" +version = "0.4.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5276caf25ac86c8d810222b3dbb938e512c55c6831a10f3e6ed1c93b84041f1c" +checksum = "6e1dd4122fc1595e8162618945476892eefca7b88c52820e74af6262213cae8f" dependencies = [ "aho-corasick", "memchr", @@ -1111,9 +1483,9 @@ dependencies = [ [[package]] name = "regex-syntax" -version = "0.8.8" +version = "0.8.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a2d987857b319362043e95f5353c0535c1f58eec5336fdfcf626430af7def58" +checksum = "dc897dd8d9e8bd1ed8cdad82b5966c3e0ecae09fb1907d58efaa013543185d0a" [[package]] name = "ring" @@ -1123,7 +1495,7 @@ checksum = "a4689e6c2294d81e88dc6261c768b63bc4fcdb852be6d1352498b114f61383b7" dependencies = [ "cc", "cfg-if", - "getrandom 0.2.16", + "getrandom 0.2.17", "libc", "untrusted", "windows-sys 0.52.0", @@ -1144,22 +1516,22 @@ dependencies = [ [[package]] name = "rustix" -version = "1.1.2" +version = "1.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd15f8a2c5551a84d56efdc1cd049089e409ac19a3072d5037a17fd70719ff3e" +checksum = "b6fe4565b9518b83ef4f91bb47ce29620ca828bd32cb7e408f0062e9930ba190" dependencies = [ "bitflags", "errno", "libc", - "linux-raw-sys 0.11.0", + "linux-raw-sys 0.12.1", "windows-sys 0.61.2", ] [[package]] name = "rustls" -version = "0.23.35" +version = "0.23.40" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "533f54bc6a7d4f647e46ad909549eda97bf5afc1585190ef692b4286b198bd8f" +checksum = "ef86cd5876211988985292b91c96a8f2d298df24e75989a43a3c73f2d4d8168b" dependencies = [ "aws-lc-rs", "log", @@ -1177,7 +1549,7 @@ version = "0.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a9aace74cb666635c918e9c12bc0d348266037aa8eb599b5cba565709a8dff00" dependencies = [ - "openssl-probe", + "openssl-probe 0.1.6", "rustls-pemfile", "schannel", "security-framework 2.11.1", @@ -1185,14 +1557,14 @@ dependencies = [ [[package]] name = "rustls-native-certs" -version = "0.8.2" +version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9980d917ebb0c0536119ba501e90834767bffc3d60641457fd84a1f3fd337923" +checksum = "612460d5f7bea540c490b2b6395d8e34a953e52b491accd6c86c8164c5932a63" dependencies = [ - "openssl-probe", + "openssl-probe 0.2.1", "rustls-pki-types", "schannel", - "security-framework 3.5.1", + "security-framework 3.7.0", ] [[package]] @@ -1206,9 +1578,9 @@ dependencies = [ [[package]] name = "rustls-pki-types" -version = "1.13.1" +version = "1.14.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "708c0f9d5f54ba0272468c1d306a52c495b31fa155e91bc25371e6df7996908c" +checksum = "30a7197ae7eb376e574fe940d068c30fe0462554a3ddbe4eca7838e049c937a9" dependencies = [ "zeroize", ] @@ -1225,10 +1597,10 @@ dependencies = [ "log", "once_cell", "rustls", - "rustls-native-certs 0.8.2", + "rustls-native-certs 0.8.3", "rustls-platform-verifier-android", "rustls-webpki", - "security-framework 3.5.1", + "security-framework 3.7.0", "security-framework-sys", "webpki-root-certs", "windows-sys 0.61.2", @@ -1242,9 +1614,9 @@ checksum = "f87165f0995f63a9fbeea62b64d10b4d9d8e78ec6d7d51fb2125fda7bb36788f" [[package]] name = "rustls-webpki" -version = "0.103.8" +version = "0.103.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2ffdfa2f5286e2247234e03f680868ac2815974dc39e00ea15adc445d0aafe52" +checksum = "61c429a8649f110dddef65e2a5ad240f747e85f7758a6bccc7e5777bd33f756e" dependencies = [ "aws-lc-rs", "ring", @@ -1260,9 +1632,9 @@ checksum = "b39cdef0fa800fc44525c84ccb54a029961a8215f9619753635a9c0d2538d46d" [[package]] name = "ryu" -version = "1.0.20" +version = "1.0.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "28d3b2b1366ec20994f1fd18c3c594f05c5dd4bc44d8bb0c1c632c8d6829481f" +checksum = "9774ba4a74de5f7b1c1451ed6cd5285a32eddb5cccb8cc655a4e50009e06477f" [[package]] name = "same-file" @@ -1275,13 +1647,37 @@ dependencies = [ [[package]] name = "schannel" -version = "0.1.28" +version = "0.1.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "891d81b926048e76efe18581bf793546b4c0eaf8448d72be8de2bbee5fd166e1" +checksum = "91c1b7e4904c873ef0710c1f407dde2e6287de2bebc1bbbf7d430bb7cbffd939" dependencies = [ "windows-sys 0.61.2", ] +[[package]] +name = "schemars" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4cd191f9397d57d581cddd31014772520aa448f65ef991055d7f61582c65165f" +dependencies = [ + "dyn-clone", + "ref-cast", + "serde", + "serde_json", +] + +[[package]] +name = "schemars" +version = "1.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a2b42f36aa1cd011945615b92222f6bf73c599a102a300334cd7f8dbeec726cc" +dependencies = [ + "dyn-clone", + "ref-cast", + "serde", + "serde_json", +] + [[package]] name = "scopeguard" version = "1.2.0" @@ -1303,9 +1699,9 @@ dependencies = [ [[package]] name = "security-framework" -version = "3.5.1" +version = "3.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b3297343eaf830f66ede390ea39da1d462b6b0c1b000f420d0a83f898bbbe6ef" +checksum = "b7f4bc775c73d9a02cde8bf7b2ec4c9d12743edf609006c7facc23998404cd1d" dependencies = [ "bitflags", "core-foundation 0.10.1", @@ -1316,14 +1712,20 @@ dependencies = [ [[package]] name = "security-framework-sys" -version = "2.15.0" +version = "2.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc1f0cbffaac4852523ce30d8bd3c5cdc873501d96ff467ca09b6767bb8cd5c0" +checksum = "6ce2691df843ecc5d231c0b14ece2acc3efb62c0a398c7e1d875f3983ce020e3" dependencies = [ "core-foundation-sys", "libc", ] +[[package]] +name = "semver" +version = "1.0.28" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8a7852d02fc848982e0c167ef163aaff9cd91dc640ba85e263cb1ce46fae51cd" + [[package]] name = "serde" version = "1.0.228" @@ -1349,22 +1751,22 @@ version = "1.0.228" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d540f220d3187173da220f885ab66608367b6574e925011a9353e4badda91d79" dependencies = [ - "proc-macro2 1.0.103", - "quote 1.0.42", - "syn 2.0.111", + "proc-macro2 1.0.106", + "quote 1.0.45", + "syn 2.0.117", ] [[package]] name = "serde_json" -version = "1.0.145" +version = "1.0.150" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "402a6f66d8c709116cf22f558eab210f5a50187f702eb4d7e5ef38d9a7f1c79c" +checksum = "e8014e44b4736ed0538adeecded0fce2a272f22dc9578a7eb6b2d9993c74cfb9" dependencies = [ "itoa", "memchr", - "ryu", "serde", "serde_core", + "zmij", ] [[package]] @@ -1385,6 +1787,38 @@ dependencies = [ "serde", ] +[[package]] +name = "serde_with" +version = "3.20.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e72c1c2cb7b223fafb600a619537a871c2818583d619401b785e7c0b746ccde2" +dependencies = [ + "base64 0.22.1", + "bs58", + "chrono", + "hex", + "indexmap 1.9.3", + "indexmap 2.14.0", + "schemars 0.9.0", + "schemars 1.2.1", + "serde_core", + "serde_json", + "serde_with_macros", + "time", +] + +[[package]] +name = "serde_with_macros" +version = "3.20.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b90c488738ecb4fb0262f41f43bc40efc5868d9fb744319ddf5f5317f417bfac" +dependencies = [ + "darling 0.23.0", + "proc-macro2 1.0.106", + "quote 1.0.45", + "syn 2.0.117", +] + [[package]] name = "sha2" version = "0.10.9" @@ -1425,18 +1859,25 @@ dependencies = [ [[package]] name = "signal-hook-registry" -version = "1.4.7" +version = "1.4.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7664a098b8e616bdfcc2dc0e9ac44eb231eedf41db4e9fe95d8d32ec728dedad" +checksum = "c4db69cba1110affc0e9f7bcd48bbf87b3f4fc7c61fc9155afd4c469eb3d6c1b" dependencies = [ + "errno", "libc", ] [[package]] name = "simd-adler32" -version = "0.3.7" +version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d66dc143e6b11c1eddc06d5c423cfc97062865baf299914ab64caa38182078fe" +checksum = "703d5c7ef118737c72f1af64ad2f6f8c5e1921f818cdcb97b8fe6fc69bf66214" + +[[package]] +name = "slab" +version = "0.4.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0c790de23124f9ab44544d7ac05d60440adc586479ce501c1d6d7da3cd8c9cf5" [[package]] name = "smallvec" @@ -1444,12 +1885,24 @@ version = "1.15.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "67b1b7a3b5fe4f1376887184045fcf45c69e92af734b7aaddc05fb777b6fbd03" +[[package]] +name = "smawk" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b7c388c1b5e93756d0c740965c41e8822f866621d41acbdf6336a6a168f8840c" + [[package]] name = "static_assertions" version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" +[[package]] +name = "strsim" +version = "0.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f" + [[package]] name = "subtle" version = "2.6.1" @@ -1464,40 +1917,60 @@ checksum = "c97c05b8ebc34ddd6b967994d5c6e9852fa92f8b82b3858c39451f97346dcce5" dependencies = [ "proc-macro2 0.2.3", "quote 0.4.2", - "unicode-xid", + "unicode-xid 0.1.0", ] [[package]] name = "syn" -version = "2.0.111" +version = "2.0.117" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "390cc9a294ab71bdb1aa2e99d13be9c753cd2d7bd6560c77118597410c4d2e87" +checksum = "e665b8803e7b1d2a727f4023456bbbbe74da67099c585258af0ad9c5013b9b99" dependencies = [ - "proc-macro2 1.0.103", - "quote 1.0.42", + "proc-macro2 1.0.106", + "quote 1.0.45", "unicode-ident", ] [[package]] name = "tempfile" -version = "3.23.0" +version = "3.27.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2d31c77bdf42a745371d260a26ca7163f1e0924b64afa0b688e61b5a9fa02f16" +checksum = "32497e9a4c7b38532efcdebeef879707aa9f794296a4f0244f6f69e9bc8574bd" dependencies = [ "fastrand", - "getrandom 0.3.4", + "getrandom 0.4.2", "once_cell", - "rustix 1.1.2", + "rustix 1.1.4", "windows-sys 0.61.2", ] +[[package]] +name = "textwrap" +version = "0.16.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c13547615a44dc9c452a8a534638acdf07120d4b6847c8178705da06306a3057" +dependencies = [ + "smawk", + "unicode-linebreak", + "unicode-width 0.2.2", +] + [[package]] name = "thiserror" version = "1.0.69" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b6aaf5339b578ea85b50e080feb250a3e8ae8cfcdff9a461c9ec2904bc923f52" dependencies = [ - "thiserror-impl", + "thiserror-impl 1.0.69", +] + +[[package]] +name = "thiserror" +version = "2.0.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4288b5bcbc7920c07a1149a35cf9590a2aa808e0bc1eafaade0b80947865fbc4" +dependencies = [ + "thiserror-impl 2.0.18", ] [[package]] @@ -1506,16 +1979,27 @@ version = "1.0.69" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4fee6c4efc90059e10f81e6d42c60a18f76588c3d74cb83a0b242a2b6c7504c1" dependencies = [ - "proc-macro2 1.0.103", - "quote 1.0.42", - "syn 2.0.111", + "proc-macro2 1.0.106", + "quote 1.0.45", + "syn 2.0.117", +] + +[[package]] +name = "thiserror-impl" +version = "2.0.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ebc4ee7f67670e9b64d05fa4253e753e016c6c95ff35b89b7941d6b856dec1d5" +dependencies = [ + "proc-macro2 1.0.106", + "quote 1.0.45", + "syn 2.0.117", ] [[package]] name = "time" -version = "0.3.44" +version = "0.3.47" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91e7d9e3bb61134e77bde20dd4825b97c010155709965fedf0f49bb138e52a9d" +checksum = "743bd48c283afc0388f9b8827b976905fb217ad9e647fae3a379a9283c4def2c" dependencies = [ "deranged", "itoa", @@ -1523,27 +2007,42 @@ dependencies = [ "num-conv", "num_threads", "powerfmt", - "serde", + "serde_core", "time-core", "time-macros", ] [[package]] name = "time-core" -version = "0.1.6" +version = "0.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "40868e7c1d2f0b8d73e4a8c7f0ff63af4f6d19be117e90bd73eb1d62cf831c6b" +checksum = "7694e1cfe791f8d31026952abf09c69ca6f6fa4e1a1229e18988f06a04a12dca" [[package]] name = "time-macros" -version = "0.2.24" +version = "0.2.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30cfb0125f12d9c277f35663a0a33f8c30190f4e4574868a330595412d34ebf3" +checksum = "2e70e4c5a0e0a8a4823ad65dfe1a6930e4f4d756dcd9dd7939022b5e8c501215" dependencies = [ "num-conv", "time-core", ] +[[package]] +name = "tinyvec" +version = "1.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3e61e67053d25a4e82c844e8424039d9745781b3fc4f32b8d55ed50f5f667ef3" +dependencies = [ + "tinyvec_macros", +] + +[[package]] +name = "tinyvec_macros" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" + [[package]] name = "toml" version = "0.8.23" @@ -1571,7 +2070,7 @@ version = "0.22.27" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "41fe8c660ae4257887cf66394862d21dbca4a6ddd26f04a3560410406a2f819a" dependencies = [ - "indexmap", + "indexmap 2.14.0", "serde", "serde_spanned", "toml_datetime", @@ -1587,21 +2086,27 @@ checksum = "5d99f8c9a7727884afe522e9bd5edbfc91a3312b36a77b5fb8926e4c31a41801" [[package]] name = "typenum" -version = "1.19.0" +version = "1.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "562d481066bde0658276a35467c4af00bdc6ee726305698a55b86e61d7ad82bb" +checksum = "40ce102ab67701b8526c123c1bab5cbe42d7040ccfd0f64af1a385808d2f43de" [[package]] name = "unicode-ident" -version = "1.0.22" +version = "1.0.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9312f7c4f6ff9069b165498234ce8be658059c6728633667c526e27dc2cf1df5" +checksum = "e6e4313cd5fcd3dad5cafa179702e2b244f760991f45397d14d4ebf38247da75" + +[[package]] +name = "unicode-linebreak" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3b09c83c3c29d37506a3e260c08c03743a6bb66a9cd432c6934ab501a190571f" [[package]] name = "unicode-segmentation" -version = "1.12.0" +version = "1.13.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f6ccf251212114b54433ec949fd6a7841275f9ada20dddd2f29e9ceea4501493" +checksum = "9629274872b2bfaf8d66f5f15725007f635594914870f65218920345aa11aa8c" [[package]] name = "unicode-width" @@ -1609,12 +2114,24 @@ version = "0.1.14" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7dd6e30e90baa6f72411720665d41d89b9a3d039dc45b8faea1ddd07f617f6af" +[[package]] +name = "unicode-width" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b4ac048d71ede7ee76d585517add45da530660ef4390e49b098733c6e897f254" + [[package]] name = "unicode-xid" version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fc72304796d0818e357ead4e000d19c9c174ab23dc11093ac919054d20a6a7fc" +[[package]] +name = "unicode-xid" +version = "0.2.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ebc1c04c71510c7f702b52b7c350734c9ff1295c464a03335b00bb84fc54f853" + [[package]] name = "untrusted" version = "0.9.0" @@ -1623,9 +2140,9 @@ checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1" [[package]] name = "ureq" -version = "3.1.4" +version = "3.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d39cb1dbab692d82a977c0392ffac19e188bd9186a9f32806f0aaa859d75585a" +checksum = "dea7109cdcd5864d4eeb1b58a1648dc9bf520360d7af16ec26d0a9354bafcfc0" dependencies = [ "base64 0.22.1", "flate2", @@ -1635,15 +2152,15 @@ dependencies = [ "rustls-pki-types", "rustls-platform-verifier", "ureq-proto", - "utf-8", + "utf8-zero", "webpki-roots", ] [[package]] name = "ureq-proto" -version = "0.5.3" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d81f9efa9df032be5934a46a068815a10a042b494b6a58cb0a1a97bb5467ed6f" +checksum = "e994ba84b0bd1b1b0cf92878b7ef898a5c1760108fe7b6010327e274917a808c" dependencies = [ "base64 0.22.1", "http", @@ -1652,10 +2169,10 @@ dependencies = [ ] [[package]] -name = "utf-8" -version = "0.7.6" +name = "utf8-zero" +version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09cc8ee72d2a9becf2f2febe0205bbed8fc6615b7cb429ad062dc7b7ddd036a9" +checksum = "b8c0a043c9540bae7c578c88f91dda8bd82e59ae27c21baca69c8b191aaf5a6e" [[package]] name = "vcpkg" @@ -1687,27 +2204,115 @@ checksum = "ccf3ec651a847eb01de73ccad15eb7d99f80485de043efb2f370cd654f4ea44b" [[package]] name = "wasip2" -version = "1.0.1+wasi-0.2.4" +version = "1.0.3+wasi-0.2.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0562428422c63773dad2c345a1882263bbf4d65cf3f42e90921f787ef5ad58e7" +checksum = "20064672db26d7cdc89c7798c48a0fdfac8213434a1186e5ef29fd560ae223d6" dependencies = [ - "wit-bindgen", + "wit-bindgen 0.57.1", +] + +[[package]] +name = "wasip3" +version = "0.4.0+wasi-0.3.0-rc-2026-01-06" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5428f8bf88ea5ddc08faddef2ac4a67e390b88186c703ce6dbd955e1c145aca5" +dependencies = [ + "wit-bindgen 0.51.0", +] + +[[package]] +name = "wasm-bindgen" +version = "0.2.122" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3ed04576f974d2b2fba0f38c51dbc5518011e38c36bf1143164be765528fd409" +dependencies = [ + "cfg-if", + "once_cell", + "rustversion", + "wasm-bindgen-macro", + "wasm-bindgen-shared", +] + +[[package]] +name = "wasm-bindgen-macro" +version = "0.2.122" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "916151b09da36bd82f6615cbf3a419e2f0ba23a03c6160e8e92eb6bd4aa1dec6" +dependencies = [ + "quote 1.0.45", + "wasm-bindgen-macro-support", +] + +[[package]] +name = "wasm-bindgen-macro-support" +version = "0.2.122" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "299047362ccbfce148b67ab7e73349f77748e00c8296f9542adfad2ad82c5c5e" +dependencies = [ + "bumpalo", + "proc-macro2 1.0.106", + "quote 1.0.45", + "syn 2.0.117", + "wasm-bindgen-shared", +] + +[[package]] +name = "wasm-bindgen-shared" +version = "0.2.122" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9a929b2c61f11ba3e9bc35b50c1f25cb38e0e892c0c231ae2b8cf78d5dad4437" +dependencies = [ + "unicode-ident", +] + +[[package]] +name = "wasm-encoder" +version = "0.244.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "990065f2fe63003fe337b932cfb5e3b80e0b4d0f5ff650e6985b1048f62c8319" +dependencies = [ + "leb128fmt", + "wasmparser", +] + +[[package]] +name = "wasm-metadata" +version = "0.244.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bb0e353e6a2fbdc176932bbaab493762eb1255a7900fe0fea1a2f96c296cc909" +dependencies = [ + "anyhow", + "indexmap 2.14.0", + "wasm-encoder", + "wasmparser", +] + +[[package]] +name = "wasmparser" +version = "0.244.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "47b807c72e1bac69382b3a6fb3dbe8ea4c0ed87ff5629b8685ae6b9a611028fe" +dependencies = [ + "bitflags", + "hashbrown 0.15.5", + "indexmap 2.14.0", + "semver", ] [[package]] name = "webpki-root-certs" -version = "1.0.4" +version = "1.0.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee3e3b5f5e80bc89f30ce8d0343bf4e5f12341c51f3e26cbeecbc7c85443e85b" +checksum = "f31141ce3fc3e300ae89b78c0dd67f9708061d1d2eda54b8209346fd6be9a92c" dependencies = [ "rustls-pki-types", ] [[package]] name = "webpki-roots" -version = "1.0.4" +version = "1.0.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2878ef029c47c6e8cf779119f20fcf52bde7ad42a731b2a304bc221df17571e" +checksum = "52f5ee44c96cf55f1b349600768e3ece3a8f26010c05265ab73f945bb1a2eb9d" dependencies = [ "rustls-pki-types", ] @@ -1743,12 +2348,65 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" +[[package]] +name = "windows-core" +version = "0.62.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b8e83a14d34d0623b51dce9581199302a221863196a1dde71a7663a4c2be9deb" +dependencies = [ + "windows-implement", + "windows-interface", + "windows-link", + "windows-result", + "windows-strings", +] + +[[package]] +name = "windows-implement" +version = "0.60.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "053e2e040ab57b9dc951b72c264860db7eb3b0200ba345b4e4c3b14f67855ddf" +dependencies = [ + "proc-macro2 1.0.106", + "quote 1.0.45", + "syn 2.0.117", +] + +[[package]] +name = "windows-interface" +version = "0.59.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3f316c4a2570ba26bbec722032c4099d8c8bc095efccdc15688708623367e358" +dependencies = [ + "proc-macro2 1.0.106", + "quote 1.0.45", + "syn 2.0.117", +] + [[package]] name = "windows-link" version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f0805222e57f7521d6a62e36fa9163bc891acd422f971defe97d64e70d0a4fe5" +[[package]] +name = "windows-result" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7781fa89eaf60850ac3d2da7af8e5242a5ea78d1a11c49bf2910bb5a73853eb5" +dependencies = [ + "windows-link", +] + +[[package]] +name = "windows-strings" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7837d08f69c77cf6b07689544538e017c1bfcf57e34b4c0ff58e6c2cd3b37091" +dependencies = [ + "windows-link", +] + [[package]] name = "windows-sys" version = "0.45.0" @@ -1908,18 +2566,106 @@ checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" [[package]] name = "winnow" -version = "0.7.14" +version = "0.7.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a5364e9d77fcdeeaa6062ced926ee3381faa2ee02d3eb83a5c27a8825540829" +checksum = "df79d97927682d2fd8adb29682d1140b343be4ac0f08fd68b7765d9c059d3945" dependencies = [ "memchr", ] [[package]] name = "wit-bindgen" -version = "0.46.0" +version = "0.51.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f17a85883d4e6d00e8a97c586de764dabcc06133f7f1d55dce5cdc070ad7fe59" +checksum = "d7249219f66ced02969388cf2bb044a09756a083d0fab1e566056b04d9fbcaa5" +dependencies = [ + "wit-bindgen-rust-macro", +] + +[[package]] +name = "wit-bindgen" +version = "0.57.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1ebf944e87a7c253233ad6766e082e3cd714b5d03812acc24c318f549614536e" + +[[package]] +name = "wit-bindgen-core" +version = "0.51.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ea61de684c3ea68cb082b7a88508a8b27fcc8b797d738bfc99a82facf1d752dc" +dependencies = [ + "anyhow", + "heck", + "wit-parser", +] + +[[package]] +name = "wit-bindgen-rust" +version = "0.51.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b7c566e0f4b284dd6561c786d9cb0142da491f46a9fbed79ea69cdad5db17f21" +dependencies = [ + "anyhow", + "heck", + "indexmap 2.14.0", + "prettyplease", + "syn 2.0.117", + "wasm-metadata", + "wit-bindgen-core", + "wit-component", +] + +[[package]] +name = "wit-bindgen-rust-macro" +version = "0.51.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0c0f9bfd77e6a48eccf51359e3ae77140a7f50b1e2ebfe62422d8afdaffab17a" +dependencies = [ + "anyhow", + "prettyplease", + "proc-macro2 1.0.106", + "quote 1.0.45", + "syn 2.0.117", + "wit-bindgen-core", + "wit-bindgen-rust", +] + +[[package]] +name = "wit-component" +version = "0.244.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9d66ea20e9553b30172b5e831994e35fbde2d165325bec84fc43dbf6f4eb9cb2" +dependencies = [ + "anyhow", + "bitflags", + "indexmap 2.14.0", + "log", + "serde", + "serde_derive", + "serde_json", + "wasm-encoder", + "wasm-metadata", + "wasmparser", + "wit-parser", +] + +[[package]] +name = "wit-parser" +version = "0.244.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ecc8ac4bc1dc3381b7f59c34f00b67e18f910c2c0f50015669dde7def656a736" +dependencies = [ + "anyhow", + "id-arena", + "indexmap 2.14.0", + "log", + "semver", + "serde", + "serde_derive", + "serde_json", + "unicode-xid 0.2.6", + "wasmparser", +] [[package]] name = "xi-unicode" @@ -1935,22 +2681,22 @@ checksum = "cfe53a6657fd280eaa890a3bc59152892ffa3e30101319d168b781ed6529b049" [[package]] name = "zerocopy" -version = "0.8.31" +version = "0.8.49" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd74ec98b9250adb3ca554bdde269adf631549f51d8a8f8f0a10b50f1cb298c3" +checksum = "bce33a6288fa3f072a8c2c7d0f2fdbb90e28298f0135c1f99b96c3db2efcc60b" dependencies = [ "zerocopy-derive", ] [[package]] name = "zerocopy-derive" -version = "0.8.31" +version = "0.8.49" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d8a8d209fdf45cf5138cbb5a506f6b52522a25afccc534d1475dad8e31105c6a" +checksum = "8fd425244944f4ab65ccff928e7323354c5a018c75838362fdce749dfad2ee1e" dependencies = [ - "proc-macro2 1.0.103", - "quote 1.0.42", - "syn 2.0.111", + "proc-macro2 1.0.106", + "quote 1.0.45", + "syn 2.0.117", ] [[package]] @@ -1958,3 +2704,37 @@ name = "zeroize" version = "1.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b97154e67e32c85465826e8bcc1c59429aaaf107c1e4a9e53c8d8ccd5eff88d0" + +[[package]] +name = "zmij" +version = "1.0.21" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b8848ee67ecc8aedbaf3e4122217aff892639231befc6a1b58d29fff4c2cabaa" + +[[package]] +name = "zstd" +version = "0.13.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e91ee311a569c327171651566e07972200e76fcfe2242a4fa446149a3881c08a" +dependencies = [ + "zstd-safe", +] + +[[package]] +name = "zstd-safe" +version = "7.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f49c4d5f0abb602a93fb8736af2a4f4dd9512e36f7f570d66e65ff867ed3b9d" +dependencies = [ + "zstd-sys", +] + +[[package]] +name = "zstd-sys" +version = "2.0.16+zstd.1.5.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "91e19ebc2adc8f83e43039e79776e3fda8ca919132d68a1fed6a5faca2683748" +dependencies = [ + "cc", + "pkg-config", +] diff --git a/pkgs/by-name/pr/proxmox-auto-install-assistant/locale-info.json b/pkgs/by-name/pr/proxmox-auto-install-assistant/locale-info.json index c594cf592767..e1cc1e96b7e9 100644 --- a/pkgs/by-name/pr/proxmox-auto-install-assistant/locale-info.json +++ b/pkgs/by-name/pr/proxmox-auto-install-assistant/locale-info.json @@ -1 +1 @@ -{"cczones":{"ad":{"Europe/Andorra":1},"ae":{"Asia/Dubai":1},"af":{"Asia/Kabul":1},"ag":{"America/Antigua":1},"ai":{"America/Anguilla":1},"al":{"Europe/Tirane":1},"am":{"Asia/Yerevan":1},"ao":{"Africa/Luanda":1},"aq":{"Antarctica/Casey":1,"Antarctica/Davis":1,"Antarctica/DumontDUrville":1,"Antarctica/Mawson":1,"Antarctica/McMurdo":1,"Antarctica/Palmer":1,"Antarctica/Rothera":1,"Antarctica/Syowa":1,"Antarctica/Troll":1,"Antarctica/Vostok":1},"ar":{"America/Argentina/Buenos_Aires":1,"America/Argentina/Catamarca":1,"America/Argentina/Cordoba":1,"America/Argentina/Jujuy":1,"America/Argentina/La_Rioja":1,"America/Argentina/Mendoza":1,"America/Argentina/Rio_Gallegos":1,"America/Argentina/Salta":1,"America/Argentina/San_Juan":1,"America/Argentina/San_Luis":1,"America/Argentina/Tucuman":1,"America/Argentina/Ushuaia":1},"as":{"Pacific/Pago_Pago":1},"at":{"Europe/Vienna":1},"au":{"Antarctica/Macquarie":1,"Australia/Adelaide":1,"Australia/Brisbane":1,"Australia/Broken_Hill":1,"Australia/Darwin":1,"Australia/Eucla":1,"Australia/Hobart":1,"Australia/Lindeman":1,"Australia/Lord_Howe":1,"Australia/Melbourne":1,"Australia/Perth":1,"Australia/Sydney":1},"aw":{"America/Aruba":1},"ax":{"Europe/Mariehamn":1},"az":{"Asia/Baku":1},"ba":{"Europe/Sarajevo":1},"bb":{"America/Barbados":1},"bd":{"Asia/Dhaka":1},"be":{"Europe/Brussels":1},"bf":{"Africa/Ouagadougou":1},"bg":{"Europe/Sofia":1},"bh":{"Asia/Bahrain":1},"bi":{"Africa/Bujumbura":1},"bj":{"Africa/Porto-Novo":1},"bl":{"America/St_Barthelemy":1},"bm":{"Atlantic/Bermuda":1},"bn":{"Asia/Brunei":1},"bo":{"America/La_Paz":1},"bq":{"America/Kralendijk":1},"br":{"America/Araguaina":1,"America/Bahia":1,"America/Belem":1,"America/Boa_Vista":1,"America/Campo_Grande":1,"America/Cuiaba":1,"America/Eirunepe":1,"America/Fortaleza":1,"America/Maceio":1,"America/Manaus":1,"America/Noronha":1,"America/Porto_Velho":1,"America/Recife":1,"America/Rio_Branco":1,"America/Santarem":1,"America/Sao_Paulo":1},"bs":{"America/Nassau":1},"bt":{"Asia/Thimphu":1},"bw":{"Africa/Gaborone":1},"by":{"Europe/Minsk":1},"bz":{"America/Belize":1},"ca":{"America/Atikokan":1,"America/Blanc-Sablon":1,"America/Cambridge_Bay":1,"America/Creston":1,"America/Dawson":1,"America/Dawson_Creek":1,"America/Edmonton":1,"America/Fort_Nelson":1,"America/Glace_Bay":1,"America/Goose_Bay":1,"America/Halifax":1,"America/Inuvik":1,"America/Iqaluit":1,"America/Moncton":1,"America/Rankin_Inlet":1,"America/Regina":1,"America/Resolute":1,"America/St_Johns":1,"America/Swift_Current":1,"America/Toronto":1,"America/Vancouver":1,"America/Whitehorse":1,"America/Winnipeg":1},"cc":{"Indian/Cocos":1},"cd":{"Africa/Kinshasa":1,"Africa/Lubumbashi":1},"cf":{"Africa/Bangui":1},"cg":{"Africa/Brazzaville":1},"ch":{"Europe/Zurich":1},"ci":{"Africa/Abidjan":1},"ck":{"Pacific/Rarotonga":1},"cl":{"America/Coyhaique":1,"America/Punta_Arenas":1,"America/Santiago":1,"Pacific/Easter":1},"cm":{"Africa/Douala":1},"cn":{"Asia/Shanghai":1,"Asia/Urumqi":1},"co":{"America/Bogota":1},"cr":{"America/Costa_Rica":1},"cu":{"America/Havana":1},"cv":{"Atlantic/Cape_Verde":1},"cw":{"America/Curacao":1},"cx":{"Indian/Christmas":1},"cy":{"Asia/Famagusta":1,"Asia/Nicosia":1},"cz":{"Europe/Prague":1},"de":{"Europe/Berlin":1,"Europe/Busingen":1},"dj":{"Africa/Djibouti":1},"dk":{"Europe/Copenhagen":1},"dm":{"America/Dominica":1},"do":{"America/Santo_Domingo":1},"dz":{"Africa/Algiers":1},"ec":{"America/Guayaquil":1,"Pacific/Galapagos":1},"ee":{"Europe/Tallinn":1},"eg":{"Africa/Cairo":1},"eh":{"Africa/El_Aaiun":1},"er":{"Africa/Asmara":1},"es":{"Africa/Ceuta":1,"Atlantic/Canary":1,"Europe/Madrid":1},"et":{"Africa/Addis_Ababa":1},"fi":{"Europe/Helsinki":1},"fj":{"Pacific/Fiji":1},"fk":{"Atlantic/Stanley":1},"fm":{"Pacific/Chuuk":1,"Pacific/Kosrae":1,"Pacific/Pohnpei":1},"fo":{"Atlantic/Faroe":1},"fr":{"Europe/Paris":1},"ga":{"Africa/Libreville":1},"gb":{"Europe/London":1},"gd":{"America/Grenada":1},"ge":{"Asia/Tbilisi":1},"gf":{"America/Cayenne":1},"gg":{"Europe/Guernsey":1},"gh":{"Africa/Accra":1},"gi":{"Europe/Gibraltar":1},"gl":{"America/Danmarkshavn":1,"America/Nuuk":1,"America/Scoresbysund":1,"America/Thule":1},"gm":{"Africa/Banjul":1},"gn":{"Africa/Conakry":1},"gp":{"America/Guadeloupe":1},"gq":{"Africa/Malabo":1},"gr":{"Europe/Athens":1},"gs":{"Atlantic/South_Georgia":1},"gt":{"America/Guatemala":1},"gu":{"Pacific/Guam":1},"gw":{"Africa/Bissau":1},"gy":{"America/Guyana":1},"hk":{"Asia/Hong_Kong":1},"hn":{"America/Tegucigalpa":1},"hr":{"Europe/Zagreb":1},"ht":{"America/Port-au-Prince":1},"hu":{"Europe/Budapest":1},"id":{"Asia/Jakarta":1,"Asia/Jayapura":1,"Asia/Makassar":1,"Asia/Pontianak":1},"ie":{"Europe/Dublin":1},"il":{"Asia/Jerusalem":1},"im":{"Europe/Isle_of_Man":1},"in":{"Asia/Kolkata":1},"io":{"Indian/Chagos":1},"iq":{"Asia/Baghdad":1},"ir":{"Asia/Tehran":1},"is":{"Atlantic/Reykjavik":1},"it":{"Europe/Rome":1},"je":{"Europe/Jersey":1},"jm":{"America/Jamaica":1},"jo":{"Asia/Amman":1},"jp":{"Asia/Tokyo":1},"ke":{"Africa/Nairobi":1},"kg":{"Asia/Bishkek":1},"kh":{"Asia/Phnom_Penh":1},"ki":{"Pacific/Kanton":1,"Pacific/Kiritimati":1,"Pacific/Tarawa":1},"km":{"Indian/Comoro":1},"kn":{"America/St_Kitts":1},"kp":{"Asia/Pyongyang":1},"kr":{"Asia/Seoul":1},"kw":{"Asia/Kuwait":1},"ky":{"America/Cayman":1},"kz":{"Asia/Almaty":1,"Asia/Aqtau":1,"Asia/Aqtobe":1,"Asia/Atyrau":1,"Asia/Oral":1,"Asia/Qostanay":1,"Asia/Qyzylorda":1},"la":{"Asia/Vientiane":1},"lb":{"Asia/Beirut":1},"lc":{"America/St_Lucia":1},"li":{"Europe/Vaduz":1},"lk":{"Asia/Colombo":1},"lr":{"Africa/Monrovia":1},"ls":{"Africa/Maseru":1},"lt":{"Europe/Vilnius":1},"lu":{"Europe/Luxembourg":1},"lv":{"Europe/Riga":1},"ly":{"Africa/Tripoli":1},"ma":{"Africa/Casablanca":1},"mc":{"Europe/Monaco":1},"md":{"Europe/Chisinau":1},"me":{"Europe/Podgorica":1},"mf":{"America/Marigot":1},"mg":{"Indian/Antananarivo":1},"mh":{"Pacific/Kwajalein":1,"Pacific/Majuro":1},"mk":{"Europe/Skopje":1},"ml":{"Africa/Bamako":1},"mm":{"Asia/Yangon":1},"mn":{"Asia/Hovd":1,"Asia/Ulaanbaatar":1},"mo":{"Asia/Macau":1},"mp":{"Pacific/Saipan":1},"mq":{"America/Martinique":1},"mr":{"Africa/Nouakchott":1},"ms":{"America/Montserrat":1},"mt":{"Europe/Malta":1},"mu":{"Indian/Mauritius":1},"mv":{"Indian/Maldives":1},"mw":{"Africa/Blantyre":1},"mx":{"America/Bahia_Banderas":1,"America/Cancun":1,"America/Chihuahua":1,"America/Ciudad_Juarez":1,"America/Hermosillo":1,"America/Matamoros":1,"America/Mazatlan":1,"America/Merida":1,"America/Mexico_City":1,"America/Monterrey":1,"America/Ojinaga":1,"America/Tijuana":1},"my":{"Asia/Kuala_Lumpur":1,"Asia/Kuching":1},"mz":{"Africa/Maputo":1},"na":{"Africa/Windhoek":1},"nc":{"Pacific/Noumea":1},"ne":{"Africa/Niamey":1},"nf":{"Pacific/Norfolk":1},"ng":{"Africa/Lagos":1},"ni":{"America/Managua":1},"nl":{"Europe/Amsterdam":1},"no":{"Europe/Oslo":1},"np":{"Asia/Kathmandu":1},"nr":{"Pacific/Nauru":1},"nu":{"Pacific/Niue":1},"nz":{"Pacific/Auckland":1,"Pacific/Chatham":1},"om":{"Asia/Muscat":1},"pa":{"America/Panama":1},"pe":{"America/Lima":1},"pf":{"Pacific/Gambier":1,"Pacific/Marquesas":1,"Pacific/Tahiti":1},"pg":{"Pacific/Bougainville":1,"Pacific/Port_Moresby":1},"ph":{"Asia/Manila":1},"pk":{"Asia/Karachi":1},"pl":{"Europe/Warsaw":1},"pm":{"America/Miquelon":1},"pn":{"Pacific/Pitcairn":1},"pr":{"America/Puerto_Rico":1},"ps":{"Asia/Gaza":1,"Asia/Hebron":1},"pt":{"Atlantic/Azores":1,"Atlantic/Madeira":1,"Europe/Lisbon":1},"pw":{"Pacific/Palau":1},"py":{"America/Asuncion":1},"qa":{"Asia/Qatar":1},"re":{"Indian/Reunion":1},"ro":{"Europe/Bucharest":1},"rs":{"Europe/Belgrade":1},"ru":{"Asia/Anadyr":1,"Asia/Barnaul":1,"Asia/Chita":1,"Asia/Irkutsk":1,"Asia/Kamchatka":1,"Asia/Khandyga":1,"Asia/Krasnoyarsk":1,"Asia/Magadan":1,"Asia/Novokuznetsk":1,"Asia/Novosibirsk":1,"Asia/Omsk":1,"Asia/Sakhalin":1,"Asia/Srednekolymsk":1,"Asia/Tomsk":1,"Asia/Ust-Nera":1,"Asia/Vladivostok":1,"Asia/Yakutsk":1,"Asia/Yekaterinburg":1,"Europe/Astrakhan":1,"Europe/Kaliningrad":1,"Europe/Kirov":1,"Europe/Moscow":1,"Europe/Samara":1,"Europe/Saratov":1,"Europe/Ulyanovsk":1,"Europe/Volgograd":1},"rw":{"Africa/Kigali":1},"sa":{"Asia/Riyadh":1},"sb":{"Pacific/Guadalcanal":1},"sc":{"Indian/Mahe":1},"sd":{"Africa/Khartoum":1},"se":{"Europe/Stockholm":1},"sg":{"Asia/Singapore":1},"sh":{"Atlantic/St_Helena":1},"si":{"Europe/Ljubljana":1},"sj":{"Arctic/Longyearbyen":1},"sk":{"Europe/Bratislava":1},"sl":{"Africa/Freetown":1},"sm":{"Europe/San_Marino":1},"sn":{"Africa/Dakar":1},"so":{"Africa/Mogadishu":1},"sr":{"America/Paramaribo":1},"ss":{"Africa/Juba":1},"st":{"Africa/Sao_Tome":1},"sv":{"America/El_Salvador":1},"sx":{"America/Lower_Princes":1},"sy":{"Asia/Damascus":1},"sz":{"Africa/Mbabane":1},"tc":{"America/Grand_Turk":1},"td":{"Africa/Ndjamena":1},"tf":{"Indian/Kerguelen":1},"tg":{"Africa/Lome":1},"th":{"Asia/Bangkok":1},"tj":{"Asia/Dushanbe":1},"tk":{"Pacific/Fakaofo":1},"tl":{"Asia/Dili":1},"tm":{"Asia/Ashgabat":1},"tn":{"Africa/Tunis":1},"to":{"Pacific/Tongatapu":1},"tr":{"Europe/Istanbul":1},"tt":{"America/Port_of_Spain":1},"tv":{"Pacific/Funafuti":1},"tw":{"Asia/Taipei":1},"tz":{"Africa/Dar_es_Salaam":1},"ua":{"Europe/Kyiv":1,"Europe/Simferopol":1},"ug":{"Africa/Kampala":1},"um":{"Pacific/Midway":1,"Pacific/Wake":1},"us":{"America/Adak":1,"America/Anchorage":1,"America/Boise":1,"America/Chicago":1,"America/Denver":1,"America/Detroit":1,"America/Indiana/Indianapolis":1,"America/Indiana/Knox":1,"America/Indiana/Marengo":1,"America/Indiana/Petersburg":1,"America/Indiana/Tell_City":1,"America/Indiana/Vevay":1,"America/Indiana/Vincennes":1,"America/Indiana/Winamac":1,"America/Juneau":1,"America/Kentucky/Louisville":1,"America/Kentucky/Monticello":1,"America/Los_Angeles":1,"America/Menominee":1,"America/Metlakatla":1,"America/New_York":1,"America/Nome":1,"America/North_Dakota/Beulah":1,"America/North_Dakota/Center":1,"America/North_Dakota/New_Salem":1,"America/Phoenix":1,"America/Sitka":1,"America/Yakutat":1,"Pacific/Honolulu":1},"uy":{"America/Montevideo":1},"uz":{"Asia/Samarkand":1,"Asia/Tashkent":1},"va":{"Europe/Vatican":1},"vc":{"America/St_Vincent":1},"ve":{"America/Caracas":1},"vg":{"America/Tortola":1},"vi":{"America/St_Thomas":1},"vn":{"Asia/Ho_Chi_Minh":1},"vu":{"Pacific/Efate":1},"wf":{"Pacific/Wallis":1},"ws":{"Pacific/Apia":1},"ye":{"Asia/Aden":1},"yt":{"Indian/Mayotte":1},"za":{"Africa/Johannesburg":1},"zm":{"Africa/Lusaka":1},"zw":{"Africa/Harare":1}},"country":{"ad":{"kmap":"","name":"Andorra","zone":"Europe/Andorra"},"ae":{"kmap":"","name":"United Arab Emirates","zone":"Asia/Dubai"},"af":{"kmap":"","name":"Afghanistan","zone":"Asia/Kabul"},"ag":{"kmap":"","name":"Antigua and Barbuda","zone":"America/Antigua"},"ai":{"kmap":"","name":"Anguilla","zone":"America/Anguilla"},"al":{"kmap":"","name":"Albania","zone":"Europe/Tirane"},"am":{"kmap":"","name":"Armenia","zone":"Asia/Yerevan"},"ao":{"kmap":"","name":"Angola","zone":"Africa/Luanda"},"aq":{"kmap":"","name":"Antarctica","zone":"Antarctica/McMurdo"},"ar":{"kmap":"","name":"Argentina","zone":"America/Argentina/Buenos_Aires"},"as":{"kmap":"","name":"American Samoa","zone":"Pacific/Pago_Pago"},"at":{"kmap":"de","name":"Austria","zone":"Europe/Vienna"},"au":{"kmap":"","name":"Australia","zone":"Australia/Lord_Howe"},"aw":{"kmap":"","name":"Aruba","zone":"America/Aruba"},"ax":{"kmap":"","name":"Åland Islands","zone":"Europe/Mariehamn"},"az":{"kmap":"","name":"Azerbaijan","zone":"Asia/Baku"},"ba":{"kmap":"","name":"Bosnia and Herzegovina","zone":"Europe/Sarajevo"},"bb":{"kmap":"","name":"Barbados","zone":"America/Barbados"},"bd":{"kmap":"","name":"Bangladesh","zone":"Asia/Dhaka"},"be":{"kmap":"fr-be","name":"Belgium","zone":"Europe/Brussels"},"bf":{"kmap":"","name":"Burkina Faso","zone":"Africa/Ouagadougou"},"bg":{"kmap":"","name":"Bulgaria","zone":"Europe/Sofia"},"bh":{"kmap":"","name":"Bahrain","zone":"Asia/Bahrain"},"bi":{"kmap":"","name":"Burundi","zone":"Africa/Bujumbura"},"bj":{"kmap":"","name":"Benin","zone":"Africa/Porto-Novo"},"bl":{"kmap":"","name":"Saint Barthélemy","zone":"America/St_Barthelemy"},"bm":{"kmap":"","name":"Bermuda","zone":"Atlantic/Bermuda"},"bn":{"kmap":"","name":"Brunei Darussalam","zone":"Asia/Brunei"},"bo":{"kmap":"","name":"Bolivia","zone":"America/La_Paz"},"bq":{"kmap":"","name":"Bonaire, Sint Eustatius and Saba","zone":"America/Kralendijk"},"br":{"kmap":"pt-br","name":"Brazil","zone":"America/Noronha"},"bs":{"kmap":"","name":"Bahamas","zone":"America/Nassau"},"bt":{"kmap":"","name":"Bhutan","zone":"Asia/Thimphu"},"bv":{"kmap":"","name":"Bouvet Island"},"bw":{"kmap":"","name":"Botswana","zone":"Africa/Gaborone"},"by":{"kmap":"","name":"Belarus","zone":"Europe/Minsk"},"bz":{"kmap":"","name":"Belize","zone":"America/Belize"},"ca":{"kmap":"en-us","name":"Canada","zone":"America/St_Johns"},"cc":{"kmap":"","name":"Cocos (Keeling) Islands","zone":"Indian/Cocos"},"cd":{"kmap":"","name":"Congo, The Democratic Republic of the","zone":"Africa/Kinshasa"},"cf":{"kmap":"","name":"Central African Republic","zone":"Africa/Bangui"},"cg":{"kmap":"","name":"Congo","zone":"Africa/Brazzaville"},"ch":{"kmap":"de-ch","name":"Switzerland","zone":"Europe/Zurich"},"ci":{"kmap":"","name":"Côte d'Ivoire","zone":"Africa/Abidjan"},"ck":{"kmap":"","name":"Cook Islands","zone":"Pacific/Rarotonga"},"cl":{"kmap":"","name":"Chile","zone":"America/Santiago"},"cm":{"kmap":"","name":"Cameroon","zone":"Africa/Douala"},"cn":{"kmap":"","name":"China","zone":"Asia/Shanghai"},"co":{"kmap":"","name":"Colombia","zone":"America/Bogota"},"cr":{"kmap":"","name":"Costa Rica","zone":"America/Costa_Rica"},"cu":{"kmap":"","name":"Cuba","zone":"America/Havana"},"cv":{"kmap":"","name":"Cabo Verde","zone":"Atlantic/Cape_Verde"},"cw":{"kmap":"","name":"Curaçao","zone":"America/Curacao"},"cx":{"kmap":"","name":"Christmas Island","zone":"Indian/Christmas"},"cy":{"kmap":"","name":"Cyprus","zone":"Asia/Nicosia"},"cz":{"kmap":"","name":"Czechia","zone":"Europe/Prague"},"de":{"kmap":"de","name":"Germany","zone":"Europe/Berlin"},"dj":{"kmap":"","name":"Djibouti","zone":"Africa/Djibouti"},"dk":{"kmap":"dk","name":"Denmark","zone":"Europe/Copenhagen"},"dm":{"kmap":"","name":"Dominica","zone":"America/Dominica"},"do":{"kmap":"","name":"Dominican Republic","zone":"America/Santo_Domingo"},"dz":{"kmap":"","name":"Algeria","zone":"Africa/Algiers"},"ec":{"kmap":"","name":"Ecuador","zone":"America/Guayaquil"},"ee":{"kmap":"","name":"Estonia","zone":"Europe/Tallinn"},"eg":{"kmap":"","name":"Egypt","zone":"Africa/Cairo"},"eh":{"kmap":"","name":"Western Sahara","zone":"Africa/El_Aaiun"},"er":{"kmap":"","name":"Eritrea","zone":"Africa/Asmara"},"es":{"kmap":"es","name":"Spain","zone":"Europe/Madrid"},"et":{"kmap":"","name":"Ethiopia","zone":"Africa/Addis_Ababa"},"fi":{"kmap":"fi","name":"Finland","zone":"Europe/Helsinki"},"fj":{"kmap":"","name":"Fiji","zone":"Pacific/Fiji"},"fk":{"kmap":"","name":"Falkland Islands (Malvinas)","zone":"Atlantic/Stanley"},"fm":{"kmap":"","name":"Micronesia, Federated States of","zone":"Pacific/Chuuk"},"fo":{"kmap":"","name":"Faroe Islands","zone":"Atlantic/Faroe"},"fr":{"kmap":"fr","name":"France","zone":"Europe/Paris"},"ga":{"kmap":"","name":"Gabon","zone":"Africa/Libreville"},"gb":{"kmap":"en-gb","name":"United Kingdom","zone":"Europe/London"},"gd":{"kmap":"","name":"Grenada","zone":"America/Grenada"},"ge":{"kmap":"","name":"Georgia","zone":"Asia/Tbilisi"},"gf":{"kmap":"","name":"French Guiana","zone":"America/Cayenne"},"gg":{"kmap":"","name":"Guernsey","zone":"Europe/Guernsey"},"gh":{"kmap":"","name":"Ghana","zone":"Africa/Accra"},"gi":{"kmap":"es","name":"Gibraltar","zone":"Europe/Gibraltar"},"gl":{"kmap":"","name":"Greenland","zone":"America/Nuuk"},"gm":{"kmap":"","name":"Gambia","zone":"Africa/Banjul"},"gn":{"kmap":"","name":"Guinea","zone":"Africa/Conakry"},"gp":{"kmap":"","name":"Guadeloupe","zone":"America/Guadeloupe"},"gq":{"kmap":"","name":"Equatorial Guinea","zone":"Africa/Malabo"},"gr":{"kmap":"","name":"Greece","zone":"Europe/Athens"},"gs":{"kmap":"","name":"South Georgia and the South Sandwich Islands","zone":"Atlantic/South_Georgia"},"gt":{"kmap":"","name":"Guatemala","zone":"America/Guatemala"},"gu":{"kmap":"","name":"Guam","zone":"Pacific/Guam"},"gw":{"kmap":"","name":"Guinea-Bissau","zone":"Africa/Bissau"},"gy":{"kmap":"","name":"Guyana","zone":"America/Guyana"},"hk":{"kmap":"","name":"Hong Kong","zone":"Asia/Hong_Kong"},"hm":{"kmap":"","name":"Heard Island and McDonald Islands"},"hn":{"kmap":"","name":"Honduras","zone":"America/Tegucigalpa"},"hr":{"kmap":"","name":"Croatia","zone":"Europe/Zagreb"},"ht":{"kmap":"","name":"Haiti","zone":"America/Port-au-Prince"},"hu":{"kmap":"hu","name":"Hungary","zone":"Europe/Budapest"},"id":{"kmap":"","name":"Indonesia","zone":"Asia/Jakarta"},"ie":{"kmap":"","name":"Ireland","zone":"Europe/Dublin"},"il":{"kmap":"","name":"Israel","zone":"Asia/Jerusalem"},"im":{"kmap":"","name":"Isle of Man","zone":"Europe/Isle_of_Man"},"in":{"kmap":"","name":"India","zone":"Asia/Kolkata"},"io":{"kmap":"","name":"British Indian Ocean Territory","zone":"Indian/Chagos"},"iq":{"kmap":"","name":"Iraq","zone":"Asia/Baghdad"},"ir":{"kmap":"","name":"Iran","zone":"Asia/Tehran"},"is":{"kmap":"is","name":"Iceland","zone":"Atlantic/Reykjavik"},"it":{"kmap":"it","name":"Italy","zone":"Europe/Rome"},"je":{"kmap":"","name":"Jersey","zone":"Europe/Jersey"},"jm":{"kmap":"","name":"Jamaica","zone":"America/Jamaica"},"jo":{"kmap":"","name":"Jordan","zone":"Asia/Amman"},"jp":{"kmap":"jp","name":"Japan","zone":"Asia/Tokyo"},"ke":{"kmap":"","name":"Kenya","zone":"Africa/Nairobi"},"kg":{"kmap":"","name":"Kyrgyzstan","zone":"Asia/Bishkek"},"kh":{"kmap":"","name":"Cambodia","zone":"Asia/Phnom_Penh"},"ki":{"kmap":"","name":"Kiribati","zone":"Pacific/Tarawa"},"km":{"kmap":"","name":"Comoros","zone":"Indian/Comoro"},"kn":{"kmap":"","name":"Saint Kitts and Nevis","zone":"America/St_Kitts"},"kp":{"kmap":"","name":"North Korea","zone":"Asia/Pyongyang"},"kr":{"kmap":"","name":"South Korea","zone":"Asia/Seoul"},"kw":{"kmap":"","name":"Kuwait","zone":"Asia/Kuwait"},"ky":{"kmap":"","name":"Cayman Islands","zone":"America/Cayman"},"kz":{"kmap":"","name":"Kazakhstan","zone":"Asia/Almaty"},"la":{"kmap":"","name":"Laos","zone":"Asia/Vientiane"},"lb":{"kmap":"","name":"Lebanon","zone":"Asia/Beirut"},"lc":{"kmap":"","name":"Saint Lucia","zone":"America/St_Lucia"},"li":{"kmap":"de-ch","name":"Liechtenstein","zone":"Europe/Vaduz"},"lk":{"kmap":"","name":"Sri Lanka","zone":"Asia/Colombo"},"lr":{"kmap":"","name":"Liberia","zone":"Africa/Monrovia"},"ls":{"kmap":"","name":"Lesotho","zone":"Africa/Maseru"},"lt":{"kmap":"lt","name":"Lithuania","zone":"Europe/Vilnius"},"lu":{"kmap":"fr-ch","name":"Luxembourg","zone":"Europe/Luxembourg"},"lv":{"kmap":"","name":"Latvia","zone":"Europe/Riga"},"ly":{"kmap":"","name":"Libya","zone":"Africa/Tripoli"},"ma":{"kmap":"","name":"Morocco","zone":"Africa/Casablanca"},"mc":{"kmap":"","name":"Monaco","zone":"Europe/Monaco"},"md":{"kmap":"","name":"Moldova","zone":"Europe/Chisinau"},"me":{"kmap":"","name":"Montenegro","zone":"Europe/Podgorica"},"mf":{"kmap":"","name":"Saint Martin (French part)","zone":"America/Marigot"},"mg":{"kmap":"","name":"Madagascar","zone":"Indian/Antananarivo"},"mh":{"kmap":"","name":"Marshall Islands","zone":"Pacific/Majuro"},"mk":{"kmap":"mk","name":"North Macedonia","zone":"Europe/Skopje"},"ml":{"kmap":"","name":"Mali","zone":"Africa/Bamako"},"mm":{"kmap":"","name":"Myanmar","zone":"Asia/Yangon"},"mn":{"kmap":"","name":"Mongolia","zone":"Asia/Ulaanbaatar"},"mo":{"kmap":"","name":"Macao","zone":"Asia/Macau"},"mp":{"kmap":"","name":"Northern Mariana Islands","zone":"Pacific/Saipan"},"mq":{"kmap":"","name":"Martinique","zone":"America/Martinique"},"mr":{"kmap":"","name":"Mauritania","zone":"Africa/Nouakchott"},"ms":{"kmap":"","name":"Montserrat","zone":"America/Montserrat"},"mt":{"kmap":"","name":"Malta","zone":"Europe/Malta"},"mu":{"kmap":"","name":"Mauritius","zone":"Indian/Mauritius"},"mv":{"kmap":"","name":"Maldives","zone":"Indian/Maldives"},"mw":{"kmap":"","name":"Malawi","zone":"Africa/Blantyre"},"mx":{"kmap":"","name":"Mexico","zone":"America/Mexico_City"},"my":{"kmap":"","name":"Malaysia","zone":"Asia/Kuala_Lumpur"},"mz":{"kmap":"","name":"Mozambique","zone":"Africa/Maputo"},"na":{"kmap":"","name":"Namibia","zone":"Africa/Windhoek"},"nc":{"kmap":"","name":"New Caledonia","zone":"Pacific/Noumea"},"ne":{"kmap":"","name":"Niger","zone":"Africa/Niamey"},"nf":{"kmap":"","name":"Norfolk Island","zone":"Pacific/Norfolk"},"ng":{"kmap":"","name":"Nigeria","zone":"Africa/Lagos"},"ni":{"kmap":"","name":"Nicaragua","zone":"America/Managua"},"nl":{"kmap":"en-us","name":"Netherlands","zone":"Europe/Amsterdam"},"no":{"kmap":"no","name":"Norway","zone":"Europe/Oslo"},"np":{"kmap":"","name":"Nepal","zone":"Asia/Kathmandu"},"nr":{"kmap":"","name":"Nauru","zone":"Pacific/Nauru"},"nu":{"kmap":"","name":"Niue","zone":"Pacific/Niue"},"nz":{"kmap":"","name":"New Zealand","zone":"Pacific/Auckland"},"om":{"kmap":"","name":"Oman","zone":"Asia/Muscat"},"pa":{"kmap":"","name":"Panama","zone":"America/Panama"},"pe":{"kmap":"","name":"Peru","zone":"America/Lima"},"pf":{"kmap":"","name":"French Polynesia","zone":"Pacific/Tahiti"},"pg":{"kmap":"","name":"Papua New Guinea","zone":"Pacific/Port_Moresby"},"ph":{"kmap":"","name":"Philippines","zone":"Asia/Manila"},"pk":{"kmap":"","name":"Pakistan","zone":"Asia/Karachi"},"pl":{"kmap":"pl","name":"Poland","zone":"Europe/Warsaw"},"pm":{"kmap":"","name":"Saint Pierre and Miquelon","zone":"America/Miquelon"},"pn":{"kmap":"","name":"Pitcairn","zone":"Pacific/Pitcairn"},"pr":{"kmap":"","name":"Puerto Rico","zone":"America/Puerto_Rico"},"ps":{"kmap":"","name":"Palestine, State of","zone":"Asia/Gaza"},"pt":{"kmap":"pt","name":"Portugal","zone":"Europe/Lisbon"},"pw":{"kmap":"","name":"Palau","zone":"Pacific/Palau"},"py":{"kmap":"","name":"Paraguay","zone":"America/Asuncion"},"qa":{"kmap":"","name":"Qatar","zone":"Asia/Qatar"},"re":{"kmap":"","name":"Réunion","zone":"Indian/Reunion"},"ro":{"kmap":"","name":"Romania","zone":"Europe/Bucharest"},"rs":{"kmap":"","name":"Serbia","zone":"Europe/Belgrade"},"ru":{"kmap":"","name":"Russian Federation","zone":"Europe/Kaliningrad"},"rw":{"kmap":"","name":"Rwanda","zone":"Africa/Kigali"},"sa":{"kmap":"","name":"Saudi Arabia","zone":"Asia/Riyadh"},"sb":{"kmap":"","name":"Solomon Islands","zone":"Pacific/Guadalcanal"},"sc":{"kmap":"","name":"Seychelles","zone":"Indian/Mahe"},"sd":{"kmap":"","name":"Sudan","zone":"Africa/Khartoum"},"se":{"kmap":"","name":"Sweden","zone":"Europe/Stockholm"},"sg":{"kmap":"","name":"Singapore","zone":"Asia/Singapore"},"sh":{"kmap":"","name":"Saint Helena, Ascension and Tristan da Cunha","zone":"Atlantic/St_Helena"},"si":{"kmap":"si","name":"Slovenia","zone":"Europe/Ljubljana"},"sj":{"kmap":"","name":"Svalbard and Jan Mayen","zone":"Arctic/Longyearbyen"},"sk":{"kmap":"","name":"Slovakia","zone":"Europe/Bratislava"},"sl":{"kmap":"","name":"Sierra Leone","zone":"Africa/Freetown"},"sm":{"kmap":"","name":"San Marino","zone":"Europe/San_Marino"},"sn":{"kmap":"","name":"Senegal","zone":"Africa/Dakar"},"so":{"kmap":"","name":"Somalia","zone":"Africa/Mogadishu"},"sr":{"kmap":"","name":"Suriname","zone":"America/Paramaribo"},"ss":{"kmap":"","name":"South Sudan","zone":"Africa/Juba"},"st":{"kmap":"","name":"Sao Tome and Principe","zone":"Africa/Sao_Tome"},"sv":{"kmap":"","name":"El Salvador","zone":"America/El_Salvador"},"sx":{"kmap":"","name":"Sint Maarten (Dutch part)","zone":"America/Lower_Princes"},"sy":{"kmap":"","name":"Syria","zone":"Asia/Damascus"},"sz":{"kmap":"","name":"Eswatini","zone":"Africa/Mbabane"},"tc":{"kmap":"","name":"Turks and Caicos Islands","zone":"America/Grand_Turk"},"td":{"kmap":"","name":"Chad","zone":"Africa/Ndjamena"},"tf":{"kmap":"","name":"French Southern Territories","zone":"Indian/Kerguelen"},"tg":{"kmap":"","name":"Togo","zone":"Africa/Lome"},"th":{"kmap":"","name":"Thailand","zone":"Asia/Bangkok"},"tj":{"kmap":"","name":"Tajikistan","zone":"Asia/Dushanbe"},"tk":{"kmap":"","name":"Tokelau","zone":"Pacific/Fakaofo"},"tl":{"kmap":"","name":"Timor-Leste","zone":"Asia/Dili"},"tm":{"kmap":"","name":"Turkmenistan","zone":"Asia/Ashgabat"},"tn":{"kmap":"","name":"Tunisia","zone":"Africa/Tunis"},"to":{"kmap":"","name":"Tonga","zone":"Pacific/Tongatapu"},"tr":{"kmap":"","name":"Türkiye","zone":"Europe/Istanbul"},"tt":{"kmap":"","name":"Trinidad and Tobago","zone":"America/Port_of_Spain"},"tv":{"kmap":"","name":"Tuvalu","zone":"Pacific/Funafuti"},"tw":{"kmap":"","name":"Taiwan","zone":"Asia/Taipei"},"tz":{"kmap":"","name":"Tanzania","zone":"Africa/Dar_es_Salaam"},"ua":{"kmap":"","name":"Ukraine","zone":"Europe/Simferopol"},"ug":{"kmap":"","name":"Uganda","zone":"Africa/Kampala"},"um":{"kmap":"","name":"United States Minor Outlying Islands","zone":"Pacific/Midway"},"us":{"kmap":"en-us","name":"United States","zone":"America/New_York"},"uy":{"kmap":"","name":"Uruguay","zone":"America/Montevideo"},"uz":{"kmap":"","name":"Uzbekistan","zone":"Asia/Samarkand"},"va":{"kmap":"it","name":"Holy See (Vatican City State)","zone":"Europe/Vatican"},"vc":{"kmap":"","name":"Saint Vincent and the Grenadines","zone":"America/St_Vincent"},"ve":{"kmap":"","name":"Venezuela","zone":"America/Caracas"},"vg":{"kmap":"","name":"Virgin Islands, British","zone":"America/Tortola"},"vi":{"kmap":"","name":"Virgin Islands, U.S.","zone":"America/St_Thomas"},"vn":{"kmap":"","name":"Vietnam","zone":"Asia/Ho_Chi_Minh"},"vu":{"kmap":"","name":"Vanuatu","zone":"Pacific/Efate"},"wf":{"kmap":"","name":"Wallis and Futuna","zone":"Pacific/Wallis"},"ws":{"kmap":"","name":"Samoa","zone":"Pacific/Apia"},"ye":{"kmap":"","name":"Yemen","zone":"Asia/Aden"},"yt":{"kmap":"","name":"Mayotte","zone":"Indian/Mayotte"},"za":{"kmap":"","name":"South Africa","zone":"Africa/Johannesburg"},"zm":{"kmap":"","name":"Zambia","zone":"Africa/Lusaka"},"zw":{"kmap":"","name":"Zimbabwe","zone":"Africa/Harare"}},"countryhash":{"afghanistan":"af","albania":"al","algeria":"dz","american samoa":"as","andorra":"ad","angola":"ao","anguilla":"ai","antarctica":"aq","antigua and barbuda":"ag","argentina":"ar","armenia":"am","aruba":"aw","australia":"au","austria":"at","azerbaijan":"az","bahamas":"bs","bahrain":"bh","bangladesh":"bd","barbados":"bb","belarus":"by","belgium":"be","belize":"bz","benin":"bj","bermuda":"bm","bhutan":"bt","bolivia":"bo","bonaire, sint eustatius and saba":"bq","bosnia and herzegovina":"ba","botswana":"bw","bouvet island":"bv","brazil":"br","british indian ocean territory":"io","brunei darussalam":"bn","bulgaria":"bg","burkina faso":"bf","burundi":"bi","cabo verde":"cv","cambodia":"kh","cameroon":"cm","canada":"ca","cayman islands":"ky","central african republic":"cf","chad":"td","chile":"cl","china":"cn","christmas island":"cx","cocos (keeling) islands":"cc","colombia":"co","comoros":"km","congo":"cg","congo, the democratic republic of the":"cd","cook islands":"ck","costa rica":"cr","croatia":"hr","cuba":"cu","curaçao":"cw","cyprus":"cy","czechia":"cz","côte d'ivoire":"ci","denmark":"dk","djibouti":"dj","dominica":"dm","dominican republic":"do","ecuador":"ec","egypt":"eg","el salvador":"sv","equatorial guinea":"gq","eritrea":"er","estonia":"ee","eswatini":"sz","ethiopia":"et","falkland islands (malvinas)":"fk","faroe islands":"fo","fiji":"fj","finland":"fi","france":"fr","french guiana":"gf","french polynesia":"pf","french southern territories":"tf","gabon":"ga","gambia":"gm","georgia":"ge","germany":"de","ghana":"gh","gibraltar":"gi","greece":"gr","greenland":"gl","grenada":"gd","guadeloupe":"gp","guam":"gu","guatemala":"gt","guernsey":"gg","guinea":"gn","guinea-bissau":"gw","guyana":"gy","haiti":"ht","heard island and mcdonald islands":"hm","holy see (vatican city state)":"va","honduras":"hn","hong kong":"hk","hungary":"hu","iceland":"is","india":"in","indonesia":"id","iran":"ir","iraq":"iq","ireland":"ie","isle of man":"im","israel":"il","italy":"it","jamaica":"jm","japan":"jp","jersey":"je","jordan":"jo","kazakhstan":"kz","kenya":"ke","kiribati":"ki","kuwait":"kw","kyrgyzstan":"kg","laos":"la","latvia":"lv","lebanon":"lb","lesotho":"ls","liberia":"lr","libya":"ly","liechtenstein":"li","lithuania":"lt","luxembourg":"lu","macao":"mo","madagascar":"mg","malawi":"mw","malaysia":"my","maldives":"mv","mali":"ml","malta":"mt","marshall islands":"mh","martinique":"mq","mauritania":"mr","mauritius":"mu","mayotte":"yt","mexico":"mx","micronesia, federated states of":"fm","moldova":"md","monaco":"mc","mongolia":"mn","montenegro":"me","montserrat":"ms","morocco":"ma","mozambique":"mz","myanmar":"mm","namibia":"na","nauru":"nr","nepal":"np","netherlands":"nl","new caledonia":"nc","new zealand":"nz","nicaragua":"ni","niger":"ne","nigeria":"ng","niue":"nu","norfolk island":"nf","north korea":"kp","north macedonia":"mk","northern mariana islands":"mp","norway":"no","oman":"om","pakistan":"pk","palau":"pw","palestine, state of":"ps","panama":"pa","papua new guinea":"pg","paraguay":"py","peru":"pe","philippines":"ph","pitcairn":"pn","poland":"pl","portugal":"pt","puerto rico":"pr","qatar":"qa","romania":"ro","russian federation":"ru","rwanda":"rw","réunion":"re","saint barthélemy":"bl","saint helena, ascension and tristan da cunha":"sh","saint kitts and nevis":"kn","saint lucia":"lc","saint martin (french part)":"mf","saint pierre and miquelon":"pm","saint vincent and the grenadines":"vc","samoa":"ws","san marino":"sm","sao tome and principe":"st","saudi arabia":"sa","senegal":"sn","serbia":"rs","seychelles":"sc","sierra leone":"sl","singapore":"sg","sint maarten (dutch part)":"sx","slovakia":"sk","slovenia":"si","solomon islands":"sb","somalia":"so","south africa":"za","south georgia and the south sandwich islands":"gs","south korea":"kr","south sudan":"ss","spain":"es","sri lanka":"lk","sudan":"sd","suriname":"sr","svalbard and jan mayen":"sj","sweden":"se","switzerland":"ch","syria":"sy","taiwan":"tw","tajikistan":"tj","tanzania":"tz","thailand":"th","timor-leste":"tl","togo":"tg","tokelau":"tk","tonga":"to","trinidad and tobago":"tt","tunisia":"tn","turkmenistan":"tm","turks and caicos islands":"tc","tuvalu":"tv","türkiye":"tr","uganda":"ug","ukraine":"ua","united arab emirates":"ae","united kingdom":"gb","united states":"us","united states minor outlying islands":"um","uruguay":"uy","uzbekistan":"uz","vanuatu":"vu","venezuela":"ve","vietnam":"vn","virgin islands, british":"vg","virgin islands, u.s.":"vi","wallis and futuna":"wf","western sahara":"eh","yemen":"ye","zambia":"zm","zimbabwe":"zw","åland islands":"ax"},"kmap":{"de":{"console":"qwertz/de-latin1-nodeadkeys.kmap.gz","kvm":"de","name":"German","x11":"de","x11var":"nodeadkeys"},"de-ch":{"console":"qwertz/sg-latin1.kmap.gz","kvm":"de-ch","name":"Swiss-German","x11":"ch","x11var":"de_nodeadkeys"},"dk":{"console":"qwerty/dk-latin1.kmap.gz","kvm":"da","name":"Danish","x11":"dk","x11var":"nodeadkeys"},"en-gb":{"console":"qwerty/uk.kmap.gz","kvm":"en-gb","name":"United Kingdom","x11":"gb","x11var":""},"en-us":{"console":"qwerty/us-latin1.kmap.gz","kvm":"en-us","name":"U.S. English","x11":"us","x11var":""},"es":{"console":"qwerty/es.kmap.gz","kvm":"es","name":"Spanish","x11":"es","x11var":"nodeadkeys"},"fi":{"console":"qwerty/fi-latin1.kmap.gz","kvm":"fi","name":"Finnish","x11":"fi","x11var":"nodeadkeys"},"fr":{"console":"azerty/fr-latin1.kmap.gz","kvm":"fr","name":"French","x11":"fr","x11var":"nodeadkeys"},"fr-be":{"console":"azerty/be2-latin1.kmap.gz","kvm":"fr-be","name":"Belgium-French","x11":"be","x11var":"nodeadkeys"},"fr-ca":{"console":"qwerty/cf.kmap.gz","kvm":"fr-ca","name":"Canada-French","x11":"ca","x11var":"fr-legacy"},"fr-ch":{"console":"qwertz/fr_CH-latin1.kmap.gz","kvm":"fr-ch","name":"Swiss-French","x11":"ch","x11var":"fr_nodeadkeys"},"hu":{"console":"qwertz/hu.kmap.gz","kvm":"hu","name":"Hungarian","x11":"hu","x11var":""},"is":{"console":"qwerty/is-latin1.kmap.gz","kvm":"is","name":"Icelandic","x11":"is","x11var":"nodeadkeys"},"it":{"console":"qwerty/it2.kmap.gz","kvm":"it","name":"Italian","x11":"it","x11var":"nodeadkeys"},"jp":{"console":"qwerty/jp106.kmap.gz","kvm":"ja","name":"Japanese","x11":"jp","x11var":""},"lt":{"console":"qwerty/lt.kmap.gz","kvm":"lt","name":"Lithuanian","x11":"lt","x11var":"std"},"mk":{"console":"qwerty/mk.kmap.gz","kvm":"mk","name":"Macedonian","x11":"mk","x11var":"nodeadkeys"},"nl":{"console":"qwerty/nl.kmap.gz","kvm":"nl","name":"Dutch","x11":"nl","x11var":""},"no":{"console":"qwerty/no-latin1.kmap.gz","kvm":"no","name":"Norwegian","x11":"no","x11var":"nodeadkeys"},"pl":{"console":"qwerty/pl.kmap.gz","kvm":"pl","name":"Polish","x11":"pl","x11var":""},"pt":{"console":"qwerty/pt-latin1.kmap.gz","kvm":"pt","name":"Portuguese","x11":"pt","x11var":"nodeadkeys"},"pt-br":{"console":"qwerty/br-latin1.kmap.gz","kvm":"pt-br","name":"Brazil-Portuguese","x11":"br","x11var":"nodeadkeys"},"se":{"console":"qwerty/se-latin1.kmap.gz","kvm":"sv","name":"Swedish","x11":"se","x11var":"nodeadkeys"},"si":{"console":"qwertz/slovene.kmap.gz","kvm":"sl","name":"Slovenian","x11":"si","x11var":""},"tr":{"console":"qwerty/trq.kmap.gz","kvm":"tr","name":"Turkish","x11":"tr","x11var":""}},"kmaphash":{"Belgium-French":"fr-be","Brazil-Portuguese":"pt-br","Canada-French":"fr-ca","Danish":"dk","Dutch":"nl","Finnish":"fi","French":"fr","German":"de","Hungarian":"hu","Icelandic":"is","Italian":"it","Japanese":"jp","Lithuanian":"lt","Macedonian":"mk","Norwegian":"no","Polish":"pl","Portuguese":"pt","Slovenian":"si","Spanish":"es","Swedish":"se","Swiss-French":"fr-ch","Swiss-German":"de-ch","Turkish":"tr","U.S. English":"en-us","United Kingdom":"en-gb"},"zones":{"Africa/Abidjan":1,"Africa/Accra":1,"Africa/Addis_Ababa":1,"Africa/Algiers":1,"Africa/Asmara":1,"Africa/Bamako":1,"Africa/Bangui":1,"Africa/Banjul":1,"Africa/Bissau":1,"Africa/Blantyre":1,"Africa/Brazzaville":1,"Africa/Bujumbura":1,"Africa/Cairo":1,"Africa/Casablanca":1,"Africa/Ceuta":1,"Africa/Conakry":1,"Africa/Dakar":1,"Africa/Dar_es_Salaam":1,"Africa/Djibouti":1,"Africa/Douala":1,"Africa/El_Aaiun":1,"Africa/Freetown":1,"Africa/Gaborone":1,"Africa/Harare":1,"Africa/Johannesburg":1,"Africa/Juba":1,"Africa/Kampala":1,"Africa/Khartoum":1,"Africa/Kigali":1,"Africa/Kinshasa":1,"Africa/Lagos":1,"Africa/Libreville":1,"Africa/Lome":1,"Africa/Luanda":1,"Africa/Lubumbashi":1,"Africa/Lusaka":1,"Africa/Malabo":1,"Africa/Maputo":1,"Africa/Maseru":1,"Africa/Mbabane":1,"Africa/Mogadishu":1,"Africa/Monrovia":1,"Africa/Nairobi":1,"Africa/Ndjamena":1,"Africa/Niamey":1,"Africa/Nouakchott":1,"Africa/Ouagadougou":1,"Africa/Porto-Novo":1,"Africa/Sao_Tome":1,"Africa/Tripoli":1,"Africa/Tunis":1,"Africa/Windhoek":1,"America/Adak":1,"America/Anchorage":1,"America/Anguilla":1,"America/Antigua":1,"America/Araguaina":1,"America/Argentina/Buenos_Aires":1,"America/Argentina/Catamarca":1,"America/Argentina/Cordoba":1,"America/Argentina/Jujuy":1,"America/Argentina/La_Rioja":1,"America/Argentina/Mendoza":1,"America/Argentina/Rio_Gallegos":1,"America/Argentina/Salta":1,"America/Argentina/San_Juan":1,"America/Argentina/San_Luis":1,"America/Argentina/Tucuman":1,"America/Argentina/Ushuaia":1,"America/Aruba":1,"America/Asuncion":1,"America/Atikokan":1,"America/Bahia":1,"America/Bahia_Banderas":1,"America/Barbados":1,"America/Belem":1,"America/Belize":1,"America/Blanc-Sablon":1,"America/Boa_Vista":1,"America/Bogota":1,"America/Boise":1,"America/Cambridge_Bay":1,"America/Campo_Grande":1,"America/Cancun":1,"America/Caracas":1,"America/Cayenne":1,"America/Cayman":1,"America/Chicago":1,"America/Chihuahua":1,"America/Ciudad_Juarez":1,"America/Costa_Rica":1,"America/Coyhaique":1,"America/Creston":1,"America/Cuiaba":1,"America/Curacao":1,"America/Danmarkshavn":1,"America/Dawson":1,"America/Dawson_Creek":1,"America/Denver":1,"America/Detroit":1,"America/Dominica":1,"America/Edmonton":1,"America/Eirunepe":1,"America/El_Salvador":1,"America/Fort_Nelson":1,"America/Fortaleza":1,"America/Glace_Bay":1,"America/Goose_Bay":1,"America/Grand_Turk":1,"America/Grenada":1,"America/Guadeloupe":1,"America/Guatemala":1,"America/Guayaquil":1,"America/Guyana":1,"America/Halifax":1,"America/Havana":1,"America/Hermosillo":1,"America/Indiana/Indianapolis":1,"America/Indiana/Knox":1,"America/Indiana/Marengo":1,"America/Indiana/Petersburg":1,"America/Indiana/Tell_City":1,"America/Indiana/Vevay":1,"America/Indiana/Vincennes":1,"America/Indiana/Winamac":1,"America/Inuvik":1,"America/Iqaluit":1,"America/Jamaica":1,"America/Juneau":1,"America/Kentucky/Louisville":1,"America/Kentucky/Monticello":1,"America/Kralendijk":1,"America/La_Paz":1,"America/Lima":1,"America/Los_Angeles":1,"America/Lower_Princes":1,"America/Maceio":1,"America/Managua":1,"America/Manaus":1,"America/Marigot":1,"America/Martinique":1,"America/Matamoros":1,"America/Mazatlan":1,"America/Menominee":1,"America/Merida":1,"America/Metlakatla":1,"America/Mexico_City":1,"America/Miquelon":1,"America/Moncton":1,"America/Monterrey":1,"America/Montevideo":1,"America/Montserrat":1,"America/Nassau":1,"America/New_York":1,"America/Nome":1,"America/Noronha":1,"America/North_Dakota/Beulah":1,"America/North_Dakota/Center":1,"America/North_Dakota/New_Salem":1,"America/Nuuk":1,"America/Ojinaga":1,"America/Panama":1,"America/Paramaribo":1,"America/Phoenix":1,"America/Port-au-Prince":1,"America/Port_of_Spain":1,"America/Porto_Velho":1,"America/Puerto_Rico":1,"America/Punta_Arenas":1,"America/Rankin_Inlet":1,"America/Recife":1,"America/Regina":1,"America/Resolute":1,"America/Rio_Branco":1,"America/Santarem":1,"America/Santiago":1,"America/Santo_Domingo":1,"America/Sao_Paulo":1,"America/Scoresbysund":1,"America/Sitka":1,"America/St_Barthelemy":1,"America/St_Johns":1,"America/St_Kitts":1,"America/St_Lucia":1,"America/St_Thomas":1,"America/St_Vincent":1,"America/Swift_Current":1,"America/Tegucigalpa":1,"America/Thule":1,"America/Tijuana":1,"America/Toronto":1,"America/Tortola":1,"America/Vancouver":1,"America/Whitehorse":1,"America/Winnipeg":1,"America/Yakutat":1,"Antarctica/Casey":1,"Antarctica/Davis":1,"Antarctica/DumontDUrville":1,"Antarctica/Macquarie":1,"Antarctica/Mawson":1,"Antarctica/McMurdo":1,"Antarctica/Palmer":1,"Antarctica/Rothera":1,"Antarctica/Syowa":1,"Antarctica/Troll":1,"Antarctica/Vostok":1,"Arctic/Longyearbyen":1,"Asia/Aden":1,"Asia/Almaty":1,"Asia/Amman":1,"Asia/Anadyr":1,"Asia/Aqtau":1,"Asia/Aqtobe":1,"Asia/Ashgabat":1,"Asia/Atyrau":1,"Asia/Baghdad":1,"Asia/Bahrain":1,"Asia/Baku":1,"Asia/Bangkok":1,"Asia/Barnaul":1,"Asia/Beirut":1,"Asia/Bishkek":1,"Asia/Brunei":1,"Asia/Chita":1,"Asia/Colombo":1,"Asia/Damascus":1,"Asia/Dhaka":1,"Asia/Dili":1,"Asia/Dubai":1,"Asia/Dushanbe":1,"Asia/Famagusta":1,"Asia/Gaza":1,"Asia/Hebron":1,"Asia/Ho_Chi_Minh":1,"Asia/Hong_Kong":1,"Asia/Hovd":1,"Asia/Irkutsk":1,"Asia/Jakarta":1,"Asia/Jayapura":1,"Asia/Jerusalem":1,"Asia/Kabul":1,"Asia/Kamchatka":1,"Asia/Karachi":1,"Asia/Kathmandu":1,"Asia/Khandyga":1,"Asia/Kolkata":1,"Asia/Krasnoyarsk":1,"Asia/Kuala_Lumpur":1,"Asia/Kuching":1,"Asia/Kuwait":1,"Asia/Macau":1,"Asia/Magadan":1,"Asia/Makassar":1,"Asia/Manila":1,"Asia/Muscat":1,"Asia/Nicosia":1,"Asia/Novokuznetsk":1,"Asia/Novosibirsk":1,"Asia/Omsk":1,"Asia/Oral":1,"Asia/Phnom_Penh":1,"Asia/Pontianak":1,"Asia/Pyongyang":1,"Asia/Qatar":1,"Asia/Qostanay":1,"Asia/Qyzylorda":1,"Asia/Riyadh":1,"Asia/Sakhalin":1,"Asia/Samarkand":1,"Asia/Seoul":1,"Asia/Shanghai":1,"Asia/Singapore":1,"Asia/Srednekolymsk":1,"Asia/Taipei":1,"Asia/Tashkent":1,"Asia/Tbilisi":1,"Asia/Tehran":1,"Asia/Thimphu":1,"Asia/Tokyo":1,"Asia/Tomsk":1,"Asia/Ulaanbaatar":1,"Asia/Urumqi":1,"Asia/Ust-Nera":1,"Asia/Vientiane":1,"Asia/Vladivostok":1,"Asia/Yakutsk":1,"Asia/Yangon":1,"Asia/Yekaterinburg":1,"Asia/Yerevan":1,"Atlantic/Azores":1,"Atlantic/Bermuda":1,"Atlantic/Canary":1,"Atlantic/Cape_Verde":1,"Atlantic/Faroe":1,"Atlantic/Madeira":1,"Atlantic/Reykjavik":1,"Atlantic/South_Georgia":1,"Atlantic/St_Helena":1,"Atlantic/Stanley":1,"Australia/Adelaide":1,"Australia/Brisbane":1,"Australia/Broken_Hill":1,"Australia/Darwin":1,"Australia/Eucla":1,"Australia/Hobart":1,"Australia/Lindeman":1,"Australia/Lord_Howe":1,"Australia/Melbourne":1,"Australia/Perth":1,"Australia/Sydney":1,"Europe/Amsterdam":1,"Europe/Andorra":1,"Europe/Astrakhan":1,"Europe/Athens":1,"Europe/Belgrade":1,"Europe/Berlin":1,"Europe/Bratislava":1,"Europe/Brussels":1,"Europe/Bucharest":1,"Europe/Budapest":1,"Europe/Busingen":1,"Europe/Chisinau":1,"Europe/Copenhagen":1,"Europe/Dublin":1,"Europe/Gibraltar":1,"Europe/Guernsey":1,"Europe/Helsinki":1,"Europe/Isle_of_Man":1,"Europe/Istanbul":1,"Europe/Jersey":1,"Europe/Kaliningrad":1,"Europe/Kirov":1,"Europe/Kyiv":1,"Europe/Lisbon":1,"Europe/Ljubljana":1,"Europe/London":1,"Europe/Luxembourg":1,"Europe/Madrid":1,"Europe/Malta":1,"Europe/Mariehamn":1,"Europe/Minsk":1,"Europe/Monaco":1,"Europe/Moscow":1,"Europe/Oslo":1,"Europe/Paris":1,"Europe/Podgorica":1,"Europe/Prague":1,"Europe/Riga":1,"Europe/Rome":1,"Europe/Samara":1,"Europe/San_Marino":1,"Europe/Sarajevo":1,"Europe/Saratov":1,"Europe/Simferopol":1,"Europe/Skopje":1,"Europe/Sofia":1,"Europe/Stockholm":1,"Europe/Tallinn":1,"Europe/Tirane":1,"Europe/Ulyanovsk":1,"Europe/Vaduz":1,"Europe/Vatican":1,"Europe/Vienna":1,"Europe/Vilnius":1,"Europe/Volgograd":1,"Europe/Warsaw":1,"Europe/Zagreb":1,"Europe/Zurich":1,"Indian/Antananarivo":1,"Indian/Chagos":1,"Indian/Christmas":1,"Indian/Cocos":1,"Indian/Comoro":1,"Indian/Kerguelen":1,"Indian/Mahe":1,"Indian/Maldives":1,"Indian/Mauritius":1,"Indian/Mayotte":1,"Indian/Reunion":1,"Pacific/Apia":1,"Pacific/Auckland":1,"Pacific/Bougainville":1,"Pacific/Chatham":1,"Pacific/Chuuk":1,"Pacific/Easter":1,"Pacific/Efate":1,"Pacific/Fakaofo":1,"Pacific/Fiji":1,"Pacific/Funafuti":1,"Pacific/Galapagos":1,"Pacific/Gambier":1,"Pacific/Guadalcanal":1,"Pacific/Guam":1,"Pacific/Honolulu":1,"Pacific/Kanton":1,"Pacific/Kiritimati":1,"Pacific/Kosrae":1,"Pacific/Kwajalein":1,"Pacific/Majuro":1,"Pacific/Marquesas":1,"Pacific/Midway":1,"Pacific/Nauru":1,"Pacific/Niue":1,"Pacific/Norfolk":1,"Pacific/Noumea":1,"Pacific/Pago_Pago":1,"Pacific/Palau":1,"Pacific/Pitcairn":1,"Pacific/Pohnpei":1,"Pacific/Port_Moresby":1,"Pacific/Rarotonga":1,"Pacific/Saipan":1,"Pacific/Tahiti":1,"Pacific/Tarawa":1,"Pacific/Tongatapu":1,"Pacific/Wake":1,"Pacific/Wallis":1}} +{"cczones":{"ad":{"Europe/Andorra":1},"ae":{"Asia/Dubai":1},"af":{"Asia/Kabul":1},"ag":{"America/Antigua":1},"ai":{"America/Anguilla":1},"al":{"Europe/Tirane":1},"am":{"Asia/Yerevan":1},"ao":{"Africa/Luanda":1},"aq":{"Antarctica/Casey":1,"Antarctica/Davis":1,"Antarctica/DumontDUrville":1,"Antarctica/Mawson":1,"Antarctica/McMurdo":1,"Antarctica/Palmer":1,"Antarctica/Rothera":1,"Antarctica/Syowa":1,"Antarctica/Troll":1,"Antarctica/Vostok":1},"ar":{"America/Argentina/Buenos_Aires":1,"America/Argentina/Catamarca":1,"America/Argentina/Cordoba":1,"America/Argentina/Jujuy":1,"America/Argentina/La_Rioja":1,"America/Argentina/Mendoza":1,"America/Argentina/Rio_Gallegos":1,"America/Argentina/Salta":1,"America/Argentina/San_Juan":1,"America/Argentina/San_Luis":1,"America/Argentina/Tucuman":1,"America/Argentina/Ushuaia":1},"as":{"Pacific/Pago_Pago":1},"at":{"Europe/Vienna":1},"au":{"Antarctica/Macquarie":1,"Australia/Adelaide":1,"Australia/Brisbane":1,"Australia/Broken_Hill":1,"Australia/Darwin":1,"Australia/Eucla":1,"Australia/Hobart":1,"Australia/Lindeman":1,"Australia/Lord_Howe":1,"Australia/Melbourne":1,"Australia/Perth":1,"Australia/Sydney":1},"aw":{"America/Aruba":1},"ax":{"Europe/Mariehamn":1},"az":{"Asia/Baku":1},"ba":{"Europe/Sarajevo":1},"bb":{"America/Barbados":1},"bd":{"Asia/Dhaka":1},"be":{"Europe/Brussels":1},"bf":{"Africa/Ouagadougou":1},"bg":{"Europe/Sofia":1},"bh":{"Asia/Bahrain":1},"bi":{"Africa/Bujumbura":1},"bj":{"Africa/Porto-Novo":1},"bl":{"America/St_Barthelemy":1},"bm":{"Atlantic/Bermuda":1},"bn":{"Asia/Brunei":1},"bo":{"America/La_Paz":1},"bq":{"America/Kralendijk":1},"br":{"America/Araguaina":1,"America/Bahia":1,"America/Belem":1,"America/Boa_Vista":1,"America/Campo_Grande":1,"America/Cuiaba":1,"America/Eirunepe":1,"America/Fortaleza":1,"America/Maceio":1,"America/Manaus":1,"America/Noronha":1,"America/Porto_Velho":1,"America/Recife":1,"America/Rio_Branco":1,"America/Santarem":1,"America/Sao_Paulo":1},"bs":{"America/Nassau":1},"bt":{"Asia/Thimphu":1},"bw":{"Africa/Gaborone":1},"by":{"Europe/Minsk":1},"bz":{"America/Belize":1},"ca":{"America/Atikokan":1,"America/Blanc-Sablon":1,"America/Cambridge_Bay":1,"America/Creston":1,"America/Dawson":1,"America/Dawson_Creek":1,"America/Edmonton":1,"America/Fort_Nelson":1,"America/Glace_Bay":1,"America/Goose_Bay":1,"America/Halifax":1,"America/Inuvik":1,"America/Iqaluit":1,"America/Moncton":1,"America/Rankin_Inlet":1,"America/Regina":1,"America/Resolute":1,"America/St_Johns":1,"America/Swift_Current":1,"America/Toronto":1,"America/Vancouver":1,"America/Whitehorse":1,"America/Winnipeg":1},"cc":{"Indian/Cocos":1},"cd":{"Africa/Kinshasa":1,"Africa/Lubumbashi":1},"cf":{"Africa/Bangui":1},"cg":{"Africa/Brazzaville":1},"ch":{"Europe/Zurich":1},"ci":{"Africa/Abidjan":1},"ck":{"Pacific/Rarotonga":1},"cl":{"America/Coyhaique":1,"America/Punta_Arenas":1,"America/Santiago":1,"Pacific/Easter":1},"cm":{"Africa/Douala":1},"cn":{"Asia/Shanghai":1,"Asia/Urumqi":1},"co":{"America/Bogota":1},"cr":{"America/Costa_Rica":1},"cu":{"America/Havana":1},"cv":{"Atlantic/Cape_Verde":1},"cw":{"America/Curacao":1},"cx":{"Indian/Christmas":1},"cy":{"Asia/Famagusta":1,"Asia/Nicosia":1},"cz":{"Europe/Prague":1},"de":{"Europe/Berlin":1,"Europe/Busingen":1},"dj":{"Africa/Djibouti":1},"dk":{"Europe/Copenhagen":1},"dm":{"America/Dominica":1},"do":{"America/Santo_Domingo":1},"dz":{"Africa/Algiers":1},"ec":{"America/Guayaquil":1,"Pacific/Galapagos":1},"ee":{"Europe/Tallinn":1},"eg":{"Africa/Cairo":1},"eh":{"Africa/El_Aaiun":1},"er":{"Africa/Asmara":1},"es":{"Africa/Ceuta":1,"Atlantic/Canary":1,"Europe/Madrid":1},"et":{"Africa/Addis_Ababa":1},"fi":{"Europe/Helsinki":1},"fj":{"Pacific/Fiji":1},"fk":{"Atlantic/Stanley":1},"fm":{"Pacific/Chuuk":1,"Pacific/Kosrae":1,"Pacific/Pohnpei":1},"fo":{"Atlantic/Faroe":1},"fr":{"Europe/Paris":1},"ga":{"Africa/Libreville":1},"gb":{"Europe/London":1},"gd":{"America/Grenada":1},"ge":{"Asia/Tbilisi":1},"gf":{"America/Cayenne":1},"gg":{"Europe/Guernsey":1},"gh":{"Africa/Accra":1},"gi":{"Europe/Gibraltar":1},"gl":{"America/Danmarkshavn":1,"America/Nuuk":1,"America/Scoresbysund":1,"America/Thule":1},"gm":{"Africa/Banjul":1},"gn":{"Africa/Conakry":1},"gp":{"America/Guadeloupe":1},"gq":{"Africa/Malabo":1},"gr":{"Europe/Athens":1},"gs":{"Atlantic/South_Georgia":1},"gt":{"America/Guatemala":1},"gu":{"Pacific/Guam":1},"gw":{"Africa/Bissau":1},"gy":{"America/Guyana":1},"hk":{"Asia/Hong_Kong":1},"hn":{"America/Tegucigalpa":1},"hr":{"Europe/Zagreb":1},"ht":{"America/Port-au-Prince":1},"hu":{"Europe/Budapest":1},"id":{"Asia/Jakarta":1,"Asia/Jayapura":1,"Asia/Makassar":1,"Asia/Pontianak":1},"ie":{"Europe/Dublin":1},"il":{"Asia/Jerusalem":1},"im":{"Europe/Isle_of_Man":1},"in":{"Asia/Kolkata":1},"io":{"Indian/Chagos":1},"iq":{"Asia/Baghdad":1},"ir":{"Asia/Tehran":1},"is":{"Atlantic/Reykjavik":1},"it":{"Europe/Rome":1},"je":{"Europe/Jersey":1},"jm":{"America/Jamaica":1},"jo":{"Asia/Amman":1},"jp":{"Asia/Tokyo":1},"ke":{"Africa/Nairobi":1},"kg":{"Asia/Bishkek":1},"kh":{"Asia/Phnom_Penh":1},"ki":{"Pacific/Kanton":1,"Pacific/Kiritimati":1,"Pacific/Tarawa":1},"km":{"Indian/Comoro":1},"kn":{"America/St_Kitts":1},"kp":{"Asia/Pyongyang":1},"kr":{"Asia/Seoul":1},"kw":{"Asia/Kuwait":1},"ky":{"America/Cayman":1},"kz":{"Asia/Almaty":1,"Asia/Aqtau":1,"Asia/Aqtobe":1,"Asia/Atyrau":1,"Asia/Oral":1,"Asia/Qostanay":1,"Asia/Qyzylorda":1},"la":{"Asia/Vientiane":1},"lb":{"Asia/Beirut":1},"lc":{"America/St_Lucia":1},"li":{"Europe/Vaduz":1},"lk":{"Asia/Colombo":1},"lr":{"Africa/Monrovia":1},"ls":{"Africa/Maseru":1},"lt":{"Europe/Vilnius":1},"lu":{"Europe/Luxembourg":1},"lv":{"Europe/Riga":1},"ly":{"Africa/Tripoli":1},"ma":{"Africa/Casablanca":1},"mc":{"Europe/Monaco":1},"md":{"Europe/Chisinau":1},"me":{"Europe/Podgorica":1},"mf":{"America/Marigot":1},"mg":{"Indian/Antananarivo":1},"mh":{"Pacific/Kwajalein":1,"Pacific/Majuro":1},"mk":{"Europe/Skopje":1},"ml":{"Africa/Bamako":1},"mm":{"Asia/Yangon":1},"mn":{"Asia/Hovd":1,"Asia/Ulaanbaatar":1},"mo":{"Asia/Macau":1},"mp":{"Pacific/Saipan":1},"mq":{"America/Martinique":1},"mr":{"Africa/Nouakchott":1},"ms":{"America/Montserrat":1},"mt":{"Europe/Malta":1},"mu":{"Indian/Mauritius":1},"mv":{"Indian/Maldives":1},"mw":{"Africa/Blantyre":1},"mx":{"America/Bahia_Banderas":1,"America/Cancun":1,"America/Chihuahua":1,"America/Ciudad_Juarez":1,"America/Hermosillo":1,"America/Matamoros":1,"America/Mazatlan":1,"America/Merida":1,"America/Mexico_City":1,"America/Monterrey":1,"America/Ojinaga":1,"America/Tijuana":1},"my":{"Asia/Kuala_Lumpur":1,"Asia/Kuching":1},"mz":{"Africa/Maputo":1},"na":{"Africa/Windhoek":1},"nc":{"Pacific/Noumea":1},"ne":{"Africa/Niamey":1},"nf":{"Pacific/Norfolk":1},"ng":{"Africa/Lagos":1},"ni":{"America/Managua":1},"nl":{"Europe/Amsterdam":1},"no":{"Europe/Oslo":1},"np":{"Asia/Kathmandu":1},"nr":{"Pacific/Nauru":1},"nu":{"Pacific/Niue":1},"nz":{"Pacific/Auckland":1,"Pacific/Chatham":1},"om":{"Asia/Muscat":1},"pa":{"America/Panama":1},"pe":{"America/Lima":1},"pf":{"Pacific/Gambier":1,"Pacific/Marquesas":1,"Pacific/Tahiti":1},"pg":{"Pacific/Bougainville":1,"Pacific/Port_Moresby":1},"ph":{"Asia/Manila":1},"pk":{"Asia/Karachi":1},"pl":{"Europe/Warsaw":1},"pm":{"America/Miquelon":1},"pn":{"Pacific/Pitcairn":1},"pr":{"America/Puerto_Rico":1},"ps":{"Asia/Gaza":1,"Asia/Hebron":1},"pt":{"Atlantic/Azores":1,"Atlantic/Madeira":1,"Europe/Lisbon":1},"pw":{"Pacific/Palau":1},"py":{"America/Asuncion":1},"qa":{"Asia/Qatar":1},"re":{"Indian/Reunion":1},"ro":{"Europe/Bucharest":1},"rs":{"Europe/Belgrade":1},"ru":{"Asia/Anadyr":1,"Asia/Barnaul":1,"Asia/Chita":1,"Asia/Irkutsk":1,"Asia/Kamchatka":1,"Asia/Khandyga":1,"Asia/Krasnoyarsk":1,"Asia/Magadan":1,"Asia/Novokuznetsk":1,"Asia/Novosibirsk":1,"Asia/Omsk":1,"Asia/Sakhalin":1,"Asia/Srednekolymsk":1,"Asia/Tomsk":1,"Asia/Ust-Nera":1,"Asia/Vladivostok":1,"Asia/Yakutsk":1,"Asia/Yekaterinburg":1,"Europe/Astrakhan":1,"Europe/Kaliningrad":1,"Europe/Kirov":1,"Europe/Moscow":1,"Europe/Samara":1,"Europe/Saratov":1,"Europe/Ulyanovsk":1,"Europe/Volgograd":1},"rw":{"Africa/Kigali":1},"sa":{"Asia/Riyadh":1},"sb":{"Pacific/Guadalcanal":1},"sc":{"Indian/Mahe":1},"sd":{"Africa/Khartoum":1},"se":{"Europe/Stockholm":1},"sg":{"Asia/Singapore":1},"sh":{"Atlantic/St_Helena":1},"si":{"Europe/Ljubljana":1},"sj":{"Arctic/Longyearbyen":1},"sk":{"Europe/Bratislava":1},"sl":{"Africa/Freetown":1},"sm":{"Europe/San_Marino":1},"sn":{"Africa/Dakar":1},"so":{"Africa/Mogadishu":1},"sr":{"America/Paramaribo":1},"ss":{"Africa/Juba":1},"st":{"Africa/Sao_Tome":1},"sv":{"America/El_Salvador":1},"sx":{"America/Lower_Princes":1},"sy":{"Asia/Damascus":1},"sz":{"Africa/Mbabane":1},"tc":{"America/Grand_Turk":1},"td":{"Africa/Ndjamena":1},"tf":{"Indian/Kerguelen":1},"tg":{"Africa/Lome":1},"th":{"Asia/Bangkok":1},"tj":{"Asia/Dushanbe":1},"tk":{"Pacific/Fakaofo":1},"tl":{"Asia/Dili":1},"tm":{"Asia/Ashgabat":1},"tn":{"Africa/Tunis":1},"to":{"Pacific/Tongatapu":1},"tr":{"Europe/Istanbul":1},"tt":{"America/Port_of_Spain":1},"tv":{"Pacific/Funafuti":1},"tw":{"Asia/Taipei":1},"tz":{"Africa/Dar_es_Salaam":1},"ua":{"Europe/Kyiv":1,"Europe/Simferopol":1},"ug":{"Africa/Kampala":1},"um":{"Pacific/Midway":1,"Pacific/Wake":1},"us":{"America/Adak":1,"America/Anchorage":1,"America/Boise":1,"America/Chicago":1,"America/Denver":1,"America/Detroit":1,"America/Indiana/Indianapolis":1,"America/Indiana/Knox":1,"America/Indiana/Marengo":1,"America/Indiana/Petersburg":1,"America/Indiana/Tell_City":1,"America/Indiana/Vevay":1,"America/Indiana/Vincennes":1,"America/Indiana/Winamac":1,"America/Juneau":1,"America/Kentucky/Louisville":1,"America/Kentucky/Monticello":1,"America/Los_Angeles":1,"America/Menominee":1,"America/Metlakatla":1,"America/New_York":1,"America/Nome":1,"America/North_Dakota/Beulah":1,"America/North_Dakota/Center":1,"America/North_Dakota/New_Salem":1,"America/Phoenix":1,"America/Sitka":1,"America/Yakutat":1,"Pacific/Honolulu":1},"uy":{"America/Montevideo":1},"uz":{"Asia/Samarkand":1,"Asia/Tashkent":1},"va":{"Europe/Vatican":1},"vc":{"America/St_Vincent":1},"ve":{"America/Caracas":1},"vg":{"America/Tortola":1},"vi":{"America/St_Thomas":1},"vn":{"Asia/Ho_Chi_Minh":1},"vu":{"Pacific/Efate":1},"wf":{"Pacific/Wallis":1},"ws":{"Pacific/Apia":1},"ye":{"Asia/Aden":1},"yt":{"Indian/Mayotte":1},"za":{"Africa/Johannesburg":1},"zm":{"Africa/Lusaka":1},"zw":{"Africa/Harare":1}},"country":{"ad":{"kmap":"","name":"Andorra","zone":"Europe/Andorra"},"ae":{"kmap":"","name":"United Arab Emirates","zone":"Asia/Dubai"},"af":{"kmap":"","name":"Afghanistan","zone":"Asia/Kabul"},"ag":{"kmap":"","name":"Antigua and Barbuda","zone":"America/Antigua"},"ai":{"kmap":"","name":"Anguilla","zone":"America/Anguilla"},"al":{"kmap":"","name":"Albania","zone":"Europe/Tirane"},"am":{"kmap":"","name":"Armenia","zone":"Asia/Yerevan"},"ao":{"kmap":"","name":"Angola","zone":"Africa/Luanda"},"aq":{"kmap":"","name":"Antarctica","zone":"Antarctica/McMurdo"},"ar":{"kmap":"","name":"Argentina","zone":"America/Argentina/Buenos_Aires"},"as":{"kmap":"","name":"American Samoa","zone":"Pacific/Pago_Pago"},"at":{"kmap":"de","name":"Austria","zone":"Europe/Vienna"},"au":{"kmap":"","name":"Australia","zone":"Australia/Lord_Howe"},"aw":{"kmap":"","name":"Aruba","zone":"America/Aruba"},"ax":{"kmap":"","name":"Åland Islands","zone":"Europe/Mariehamn"},"az":{"kmap":"","name":"Azerbaijan","zone":"Asia/Baku"},"ba":{"kmap":"","name":"Bosnia and Herzegovina","zone":"Europe/Sarajevo"},"bb":{"kmap":"","name":"Barbados","zone":"America/Barbados"},"bd":{"kmap":"","name":"Bangladesh","zone":"Asia/Dhaka"},"be":{"kmap":"fr-be","name":"Belgium","zone":"Europe/Brussels"},"bf":{"kmap":"","name":"Burkina Faso","zone":"Africa/Ouagadougou"},"bg":{"kmap":"","name":"Bulgaria","zone":"Europe/Sofia"},"bh":{"kmap":"","name":"Bahrain","zone":"Asia/Bahrain"},"bi":{"kmap":"","name":"Burundi","zone":"Africa/Bujumbura"},"bj":{"kmap":"","name":"Benin","zone":"Africa/Porto-Novo"},"bl":{"kmap":"","name":"Saint Barthélemy","zone":"America/St_Barthelemy"},"bm":{"kmap":"","name":"Bermuda","zone":"Atlantic/Bermuda"},"bn":{"kmap":"","name":"Brunei Darussalam","zone":"Asia/Brunei"},"bo":{"kmap":"","name":"Bolivia","zone":"America/La_Paz"},"bq":{"kmap":"","name":"Bonaire, Sint Eustatius and Saba","zone":"America/Kralendijk"},"br":{"kmap":"pt-br","name":"Brazil","zone":"America/Noronha"},"bs":{"kmap":"","name":"Bahamas","zone":"America/Nassau"},"bt":{"kmap":"","name":"Bhutan","zone":"Asia/Thimphu"},"bv":{"kmap":"","name":"Bouvet Island"},"bw":{"kmap":"","name":"Botswana","zone":"Africa/Gaborone"},"by":{"kmap":"","name":"Belarus","zone":"Europe/Minsk"},"bz":{"kmap":"","name":"Belize","zone":"America/Belize"},"ca":{"kmap":"en-us","name":"Canada","zone":"America/St_Johns"},"cc":{"kmap":"","name":"Cocos (Keeling) Islands","zone":"Indian/Cocos"},"cd":{"kmap":"","name":"Congo, The Democratic Republic of the","zone":"Africa/Kinshasa"},"cf":{"kmap":"","name":"Central African Republic","zone":"Africa/Bangui"},"cg":{"kmap":"","name":"Congo","zone":"Africa/Brazzaville"},"ch":{"kmap":"de-ch","name":"Switzerland","zone":"Europe/Zurich"},"ci":{"kmap":"","name":"Côte d'Ivoire","zone":"Africa/Abidjan"},"ck":{"kmap":"","name":"Cook Islands","zone":"Pacific/Rarotonga"},"cl":{"kmap":"","name":"Chile","zone":"America/Santiago"},"cm":{"kmap":"","name":"Cameroon","zone":"Africa/Douala"},"cn":{"kmap":"","name":"China","zone":"Asia/Shanghai"},"co":{"kmap":"","name":"Colombia","zone":"America/Bogota"},"cr":{"kmap":"","name":"Costa Rica","zone":"America/Costa_Rica"},"cu":{"kmap":"","name":"Cuba","zone":"America/Havana"},"cv":{"kmap":"","name":"Cabo Verde","zone":"Atlantic/Cape_Verde"},"cw":{"kmap":"","name":"Curaçao","zone":"America/Curacao"},"cx":{"kmap":"","name":"Christmas Island","zone":"Indian/Christmas"},"cy":{"kmap":"","name":"Cyprus","zone":"Asia/Nicosia"},"cz":{"kmap":"","name":"Czechia","zone":"Europe/Prague"},"de":{"kmap":"de","name":"Germany","zone":"Europe/Berlin"},"dj":{"kmap":"","name":"Djibouti","zone":"Africa/Djibouti"},"dk":{"kmap":"dk","name":"Denmark","zone":"Europe/Copenhagen"},"dm":{"kmap":"","name":"Dominica","zone":"America/Dominica"},"do":{"kmap":"","name":"Dominican Republic","zone":"America/Santo_Domingo"},"dz":{"kmap":"","name":"Algeria","zone":"Africa/Algiers"},"ec":{"kmap":"","name":"Ecuador","zone":"America/Guayaquil"},"ee":{"kmap":"","name":"Estonia","zone":"Europe/Tallinn"},"eg":{"kmap":"","name":"Egypt","zone":"Africa/Cairo"},"eh":{"kmap":"","name":"Western Sahara","zone":"Africa/El_Aaiun"},"er":{"kmap":"","name":"Eritrea","zone":"Africa/Asmara"},"es":{"kmap":"es","name":"Spain","zone":"Europe/Madrid"},"et":{"kmap":"","name":"Ethiopia","zone":"Africa/Addis_Ababa"},"fi":{"kmap":"fi","name":"Finland","zone":"Europe/Helsinki"},"fj":{"kmap":"","name":"Fiji","zone":"Pacific/Fiji"},"fk":{"kmap":"","name":"Falkland Islands (Malvinas)","zone":"Atlantic/Stanley"},"fm":{"kmap":"","name":"Micronesia, Federated States of","zone":"Pacific/Chuuk"},"fo":{"kmap":"","name":"Faroe Islands","zone":"Atlantic/Faroe"},"fr":{"kmap":"fr","name":"France","zone":"Europe/Paris"},"ga":{"kmap":"","name":"Gabon","zone":"Africa/Libreville"},"gb":{"kmap":"en-gb","name":"United Kingdom","zone":"Europe/London"},"gd":{"kmap":"","name":"Grenada","zone":"America/Grenada"},"ge":{"kmap":"","name":"Georgia","zone":"Asia/Tbilisi"},"gf":{"kmap":"","name":"French Guiana","zone":"America/Cayenne"},"gg":{"kmap":"","name":"Guernsey","zone":"Europe/Guernsey"},"gh":{"kmap":"","name":"Ghana","zone":"Africa/Accra"},"gi":{"kmap":"es","name":"Gibraltar","zone":"Europe/Gibraltar"},"gl":{"kmap":"","name":"Greenland","zone":"America/Nuuk"},"gm":{"kmap":"","name":"Gambia","zone":"Africa/Banjul"},"gn":{"kmap":"","name":"Guinea","zone":"Africa/Conakry"},"gp":{"kmap":"","name":"Guadeloupe","zone":"America/Guadeloupe"},"gq":{"kmap":"","name":"Equatorial Guinea","zone":"Africa/Malabo"},"gr":{"kmap":"","name":"Greece","zone":"Europe/Athens"},"gs":{"kmap":"","name":"South Georgia and the South Sandwich Islands","zone":"Atlantic/South_Georgia"},"gt":{"kmap":"","name":"Guatemala","zone":"America/Guatemala"},"gu":{"kmap":"","name":"Guam","zone":"Pacific/Guam"},"gw":{"kmap":"","name":"Guinea-Bissau","zone":"Africa/Bissau"},"gy":{"kmap":"","name":"Guyana","zone":"America/Guyana"},"hk":{"kmap":"","name":"Hong Kong","zone":"Asia/Hong_Kong"},"hm":{"kmap":"","name":"Heard Island and McDonald Islands"},"hn":{"kmap":"","name":"Honduras","zone":"America/Tegucigalpa"},"hr":{"kmap":"","name":"Croatia","zone":"Europe/Zagreb"},"ht":{"kmap":"","name":"Haiti","zone":"America/Port-au-Prince"},"hu":{"kmap":"hu","name":"Hungary","zone":"Europe/Budapest"},"id":{"kmap":"","name":"Indonesia","zone":"Asia/Jakarta"},"ie":{"kmap":"","name":"Ireland","zone":"Europe/Dublin"},"il":{"kmap":"","name":"Israel","zone":"Asia/Jerusalem"},"im":{"kmap":"","name":"Isle of Man","zone":"Europe/Isle_of_Man"},"in":{"kmap":"","name":"India","zone":"Asia/Kolkata"},"io":{"kmap":"","name":"British Indian Ocean Territory","zone":"Indian/Chagos"},"iq":{"kmap":"","name":"Iraq","zone":"Asia/Baghdad"},"ir":{"kmap":"","name":"Iran","zone":"Asia/Tehran"},"is":{"kmap":"is","name":"Iceland","zone":"Atlantic/Reykjavik"},"it":{"kmap":"it","name":"Italy","zone":"Europe/Rome"},"je":{"kmap":"","name":"Jersey","zone":"Europe/Jersey"},"jm":{"kmap":"","name":"Jamaica","zone":"America/Jamaica"},"jo":{"kmap":"","name":"Jordan","zone":"Asia/Amman"},"jp":{"kmap":"jp","name":"Japan","zone":"Asia/Tokyo"},"ke":{"kmap":"","name":"Kenya","zone":"Africa/Nairobi"},"kg":{"kmap":"","name":"Kyrgyzstan","zone":"Asia/Bishkek"},"kh":{"kmap":"","name":"Cambodia","zone":"Asia/Phnom_Penh"},"ki":{"kmap":"","name":"Kiribati","zone":"Pacific/Tarawa"},"km":{"kmap":"","name":"Comoros","zone":"Indian/Comoro"},"kn":{"kmap":"","name":"Saint Kitts and Nevis","zone":"America/St_Kitts"},"kp":{"kmap":"","name":"North Korea","zone":"Asia/Pyongyang"},"kr":{"kmap":"","name":"South Korea","zone":"Asia/Seoul"},"kw":{"kmap":"","name":"Kuwait","zone":"Asia/Kuwait"},"ky":{"kmap":"","name":"Cayman Islands","zone":"America/Cayman"},"kz":{"kmap":"","name":"Kazakhstan","zone":"Asia/Almaty"},"la":{"kmap":"","name":"Laos","zone":"Asia/Vientiane"},"lb":{"kmap":"","name":"Lebanon","zone":"Asia/Beirut"},"lc":{"kmap":"","name":"Saint Lucia","zone":"America/St_Lucia"},"li":{"kmap":"de-ch","name":"Liechtenstein","zone":"Europe/Vaduz"},"lk":{"kmap":"","name":"Sri Lanka","zone":"Asia/Colombo"},"lr":{"kmap":"","name":"Liberia","zone":"Africa/Monrovia"},"ls":{"kmap":"","name":"Lesotho","zone":"Africa/Maseru"},"lt":{"kmap":"lt","name":"Lithuania","zone":"Europe/Vilnius"},"lu":{"kmap":"fr-ch","name":"Luxembourg","zone":"Europe/Luxembourg"},"lv":{"kmap":"","name":"Latvia","zone":"Europe/Riga"},"ly":{"kmap":"","name":"Libya","zone":"Africa/Tripoli"},"ma":{"kmap":"","name":"Morocco","zone":"Africa/Casablanca"},"mc":{"kmap":"","name":"Monaco","zone":"Europe/Monaco"},"md":{"kmap":"","name":"Moldova","zone":"Europe/Chisinau"},"me":{"kmap":"","name":"Montenegro","zone":"Europe/Podgorica"},"mf":{"kmap":"","name":"Saint Martin (French part)","zone":"America/Marigot"},"mg":{"kmap":"","name":"Madagascar","zone":"Indian/Antananarivo"},"mh":{"kmap":"","name":"Marshall Islands","zone":"Pacific/Majuro"},"mk":{"kmap":"mk","name":"North Macedonia","zone":"Europe/Skopje"},"ml":{"kmap":"","name":"Mali","zone":"Africa/Bamako"},"mm":{"kmap":"","name":"Myanmar","zone":"Asia/Yangon"},"mn":{"kmap":"","name":"Mongolia","zone":"Asia/Ulaanbaatar"},"mo":{"kmap":"","name":"Macao","zone":"Asia/Macau"},"mp":{"kmap":"","name":"Northern Mariana Islands","zone":"Pacific/Saipan"},"mq":{"kmap":"","name":"Martinique","zone":"America/Martinique"},"mr":{"kmap":"","name":"Mauritania","zone":"Africa/Nouakchott"},"ms":{"kmap":"","name":"Montserrat","zone":"America/Montserrat"},"mt":{"kmap":"","name":"Malta","zone":"Europe/Malta"},"mu":{"kmap":"","name":"Mauritius","zone":"Indian/Mauritius"},"mv":{"kmap":"","name":"Maldives","zone":"Indian/Maldives"},"mw":{"kmap":"","name":"Malawi","zone":"Africa/Blantyre"},"mx":{"kmap":"","name":"Mexico","zone":"America/Mexico_City"},"my":{"kmap":"","name":"Malaysia","zone":"Asia/Kuala_Lumpur"},"mz":{"kmap":"","name":"Mozambique","zone":"Africa/Maputo"},"na":{"kmap":"","name":"Namibia","zone":"Africa/Windhoek"},"nc":{"kmap":"","name":"New Caledonia","zone":"Pacific/Noumea"},"ne":{"kmap":"","name":"Niger","zone":"Africa/Niamey"},"nf":{"kmap":"","name":"Norfolk Island","zone":"Pacific/Norfolk"},"ng":{"kmap":"","name":"Nigeria","zone":"Africa/Lagos"},"ni":{"kmap":"","name":"Nicaragua","zone":"America/Managua"},"nl":{"kmap":"en-us","name":"Netherlands","zone":"Europe/Amsterdam"},"no":{"kmap":"no","name":"Norway","zone":"Europe/Oslo"},"np":{"kmap":"","name":"Nepal","zone":"Asia/Kathmandu"},"nr":{"kmap":"","name":"Nauru","zone":"Pacific/Nauru"},"nu":{"kmap":"","name":"Niue","zone":"Pacific/Niue"},"nz":{"kmap":"","name":"New Zealand","zone":"Pacific/Auckland"},"om":{"kmap":"","name":"Oman","zone":"Asia/Muscat"},"pa":{"kmap":"","name":"Panama","zone":"America/Panama"},"pe":{"kmap":"","name":"Peru","zone":"America/Lima"},"pf":{"kmap":"","name":"French Polynesia","zone":"Pacific/Tahiti"},"pg":{"kmap":"","name":"Papua New Guinea","zone":"Pacific/Port_Moresby"},"ph":{"kmap":"","name":"Philippines","zone":"Asia/Manila"},"pk":{"kmap":"","name":"Pakistan","zone":"Asia/Karachi"},"pl":{"kmap":"pl","name":"Poland","zone":"Europe/Warsaw"},"pm":{"kmap":"","name":"Saint Pierre and Miquelon","zone":"America/Miquelon"},"pn":{"kmap":"","name":"Pitcairn","zone":"Pacific/Pitcairn"},"pr":{"kmap":"","name":"Puerto Rico","zone":"America/Puerto_Rico"},"ps":{"kmap":"","name":"Palestine, State of","zone":"Asia/Gaza"},"pt":{"kmap":"pt","name":"Portugal","zone":"Europe/Lisbon"},"pw":{"kmap":"","name":"Palau","zone":"Pacific/Palau"},"py":{"kmap":"","name":"Paraguay","zone":"America/Asuncion"},"qa":{"kmap":"","name":"Qatar","zone":"Asia/Qatar"},"re":{"kmap":"","name":"Réunion","zone":"Indian/Reunion"},"ro":{"kmap":"","name":"Romania","zone":"Europe/Bucharest"},"rs":{"kmap":"","name":"Serbia","zone":"Europe/Belgrade"},"ru":{"kmap":"","name":"Russian Federation","zone":"Europe/Kaliningrad"},"rw":{"kmap":"","name":"Rwanda","zone":"Africa/Kigali"},"sa":{"kmap":"","name":"Saudi Arabia","zone":"Asia/Riyadh"},"sb":{"kmap":"","name":"Solomon Islands","zone":"Pacific/Guadalcanal"},"sc":{"kmap":"","name":"Seychelles","zone":"Indian/Mahe"},"sd":{"kmap":"","name":"Sudan","zone":"Africa/Khartoum"},"se":{"kmap":"","name":"Sweden","zone":"Europe/Stockholm"},"sg":{"kmap":"","name":"Singapore","zone":"Asia/Singapore"},"sh":{"kmap":"","name":"Saint Helena, Ascension and Tristan da Cunha","zone":"Atlantic/St_Helena"},"si":{"kmap":"si","name":"Slovenia","zone":"Europe/Ljubljana"},"sj":{"kmap":"","name":"Svalbard and Jan Mayen","zone":"Arctic/Longyearbyen"},"sk":{"kmap":"","name":"Slovakia","zone":"Europe/Bratislava"},"sl":{"kmap":"","name":"Sierra Leone","zone":"Africa/Freetown"},"sm":{"kmap":"","name":"San Marino","zone":"Europe/San_Marino"},"sn":{"kmap":"","name":"Senegal","zone":"Africa/Dakar"},"so":{"kmap":"","name":"Somalia","zone":"Africa/Mogadishu"},"sr":{"kmap":"","name":"Suriname","zone":"America/Paramaribo"},"ss":{"kmap":"","name":"South Sudan","zone":"Africa/Juba"},"st":{"kmap":"","name":"Sao Tome and Principe","zone":"Africa/Sao_Tome"},"sv":{"kmap":"","name":"El Salvador","zone":"America/El_Salvador"},"sx":{"kmap":"","name":"Sint Maarten (Dutch part)","zone":"America/Lower_Princes"},"sy":{"kmap":"","name":"Syria","zone":"Asia/Damascus"},"sz":{"kmap":"","name":"Eswatini","zone":"Africa/Mbabane"},"tc":{"kmap":"","name":"Turks and Caicos Islands","zone":"America/Grand_Turk"},"td":{"kmap":"","name":"Chad","zone":"Africa/Ndjamena"},"tf":{"kmap":"","name":"French Southern Territories","zone":"Indian/Kerguelen"},"tg":{"kmap":"","name":"Togo","zone":"Africa/Lome"},"th":{"kmap":"","name":"Thailand","zone":"Asia/Bangkok"},"tj":{"kmap":"","name":"Tajikistan","zone":"Asia/Dushanbe"},"tk":{"kmap":"","name":"Tokelau","zone":"Pacific/Fakaofo"},"tl":{"kmap":"","name":"Timor-Leste","zone":"Asia/Dili"},"tm":{"kmap":"","name":"Turkmenistan","zone":"Asia/Ashgabat"},"tn":{"kmap":"","name":"Tunisia","zone":"Africa/Tunis"},"to":{"kmap":"","name":"Tonga","zone":"Pacific/Tongatapu"},"tr":{"kmap":"","name":"Türkiye","zone":"Europe/Istanbul"},"tt":{"kmap":"","name":"Trinidad and Tobago","zone":"America/Port_of_Spain"},"tv":{"kmap":"","name":"Tuvalu","zone":"Pacific/Funafuti"},"tw":{"kmap":"","name":"Taiwan","zone":"Asia/Taipei"},"tz":{"kmap":"","name":"Tanzania","zone":"Africa/Dar_es_Salaam"},"ua":{"kmap":"","name":"Ukraine","zone":"Europe/Simferopol"},"ug":{"kmap":"","name":"Uganda","zone":"Africa/Kampala"},"um":{"kmap":"","name":"United States Minor Outlying Islands","zone":"Pacific/Midway"},"us":{"kmap":"en-us","name":"United States","zone":"America/New_York"},"uy":{"kmap":"","name":"Uruguay","zone":"America/Montevideo"},"uz":{"kmap":"","name":"Uzbekistan","zone":"Asia/Samarkand"},"va":{"kmap":"it","name":"Holy See (Vatican City State)","zone":"Europe/Vatican"},"vc":{"kmap":"","name":"Saint Vincent and the Grenadines","zone":"America/St_Vincent"},"ve":{"kmap":"","name":"Venezuela","zone":"America/Caracas"},"vg":{"kmap":"","name":"Virgin Islands, British","zone":"America/Tortola"},"vi":{"kmap":"","name":"Virgin Islands, U.S.","zone":"America/St_Thomas"},"vn":{"kmap":"","name":"Vietnam","zone":"Asia/Ho_Chi_Minh"},"vu":{"kmap":"","name":"Vanuatu","zone":"Pacific/Efate"},"wf":{"kmap":"","name":"Wallis and Futuna","zone":"Pacific/Wallis"},"ws":{"kmap":"","name":"Samoa","zone":"Pacific/Apia"},"ye":{"kmap":"","name":"Yemen","zone":"Asia/Aden"},"yt":{"kmap":"","name":"Mayotte","zone":"Indian/Mayotte"},"za":{"kmap":"","name":"South Africa","zone":"Africa/Johannesburg"},"zm":{"kmap":"","name":"Zambia","zone":"Africa/Lusaka"},"zw":{"kmap":"","name":"Zimbabwe","zone":"Africa/Harare"}},"countryhash":{"afghanistan":"af","albania":"al","algeria":"dz","american samoa":"as","andorra":"ad","angola":"ao","anguilla":"ai","antarctica":"aq","antigua and barbuda":"ag","argentina":"ar","armenia":"am","aruba":"aw","australia":"au","austria":"at","azerbaijan":"az","bahamas":"bs","bahrain":"bh","bangladesh":"bd","barbados":"bb","belarus":"by","belgium":"be","belize":"bz","benin":"bj","bermuda":"bm","bhutan":"bt","bolivia":"bo","bonaire, sint eustatius and saba":"bq","bosnia and herzegovina":"ba","botswana":"bw","bouvet island":"bv","brazil":"br","british indian ocean territory":"io","brunei darussalam":"bn","bulgaria":"bg","burkina faso":"bf","burundi":"bi","cabo verde":"cv","cambodia":"kh","cameroon":"cm","canada":"ca","cayman islands":"ky","central african republic":"cf","chad":"td","chile":"cl","china":"cn","christmas island":"cx","cocos (keeling) islands":"cc","colombia":"co","comoros":"km","congo":"cg","congo, the democratic republic of the":"cd","cook islands":"ck","costa rica":"cr","croatia":"hr","cuba":"cu","curaçao":"cw","cyprus":"cy","czechia":"cz","côte d'ivoire":"ci","denmark":"dk","djibouti":"dj","dominica":"dm","dominican republic":"do","ecuador":"ec","egypt":"eg","el salvador":"sv","equatorial guinea":"gq","eritrea":"er","estonia":"ee","eswatini":"sz","ethiopia":"et","falkland islands (malvinas)":"fk","faroe islands":"fo","fiji":"fj","finland":"fi","france":"fr","french guiana":"gf","french polynesia":"pf","french southern territories":"tf","gabon":"ga","gambia":"gm","georgia":"ge","germany":"de","ghana":"gh","gibraltar":"gi","greece":"gr","greenland":"gl","grenada":"gd","guadeloupe":"gp","guam":"gu","guatemala":"gt","guernsey":"gg","guinea":"gn","guinea-bissau":"gw","guyana":"gy","haiti":"ht","heard island and mcdonald islands":"hm","holy see (vatican city state)":"va","honduras":"hn","hong kong":"hk","hungary":"hu","iceland":"is","india":"in","indonesia":"id","iran":"ir","iraq":"iq","ireland":"ie","isle of man":"im","israel":"il","italy":"it","jamaica":"jm","japan":"jp","jersey":"je","jordan":"jo","kazakhstan":"kz","kenya":"ke","kiribati":"ki","kuwait":"kw","kyrgyzstan":"kg","laos":"la","latvia":"lv","lebanon":"lb","lesotho":"ls","liberia":"lr","libya":"ly","liechtenstein":"li","lithuania":"lt","luxembourg":"lu","macao":"mo","madagascar":"mg","malawi":"mw","malaysia":"my","maldives":"mv","mali":"ml","malta":"mt","marshall islands":"mh","martinique":"mq","mauritania":"mr","mauritius":"mu","mayotte":"yt","mexico":"mx","micronesia, federated states of":"fm","moldova":"md","monaco":"mc","mongolia":"mn","montenegro":"me","montserrat":"ms","morocco":"ma","mozambique":"mz","myanmar":"mm","namibia":"na","nauru":"nr","nepal":"np","netherlands":"nl","new caledonia":"nc","new zealand":"nz","nicaragua":"ni","niger":"ne","nigeria":"ng","niue":"nu","norfolk island":"nf","north korea":"kp","north macedonia":"mk","northern mariana islands":"mp","norway":"no","oman":"om","pakistan":"pk","palau":"pw","palestine, state of":"ps","panama":"pa","papua new guinea":"pg","paraguay":"py","peru":"pe","philippines":"ph","pitcairn":"pn","poland":"pl","portugal":"pt","puerto rico":"pr","qatar":"qa","romania":"ro","russian federation":"ru","rwanda":"rw","réunion":"re","saint barthélemy":"bl","saint helena, ascension and tristan da cunha":"sh","saint kitts and nevis":"kn","saint lucia":"lc","saint martin (french part)":"mf","saint pierre and miquelon":"pm","saint vincent and the grenadines":"vc","samoa":"ws","san marino":"sm","sao tome and principe":"st","saudi arabia":"sa","senegal":"sn","serbia":"rs","seychelles":"sc","sierra leone":"sl","singapore":"sg","sint maarten (dutch part)":"sx","slovakia":"sk","slovenia":"si","solomon islands":"sb","somalia":"so","south africa":"za","south georgia and the south sandwich islands":"gs","south korea":"kr","south sudan":"ss","spain":"es","sri lanka":"lk","sudan":"sd","suriname":"sr","svalbard and jan mayen":"sj","sweden":"se","switzerland":"ch","syria":"sy","taiwan":"tw","tajikistan":"tj","tanzania":"tz","thailand":"th","timor-leste":"tl","togo":"tg","tokelau":"tk","tonga":"to","trinidad and tobago":"tt","tunisia":"tn","turkmenistan":"tm","turks and caicos islands":"tc","tuvalu":"tv","türkiye":"tr","uganda":"ug","ukraine":"ua","united arab emirates":"ae","united kingdom":"gb","united states":"us","united states minor outlying islands":"um","uruguay":"uy","uzbekistan":"uz","vanuatu":"vu","venezuela":"ve","vietnam":"vn","virgin islands, british":"vg","virgin islands, u.s.":"vi","wallis and futuna":"wf","western sahara":"eh","yemen":"ye","zambia":"zm","zimbabwe":"zw","åland islands":"ax"},"kmap":{"de":{"console":"qwertz/de-latin1-nodeadkeys.kmap.gz","kvm":"de","name":"German","x11":"de","x11var":"nodeadkeys"},"de-ch":{"console":"qwertz/sg-latin1.kmap.gz","kvm":"de-ch","name":"Swiss-German","x11":"ch","x11var":"de_nodeadkeys"},"dk":{"console":"qwerty/dk-latin1.kmap.gz","kvm":"da","name":"Danish","x11":"dk","x11var":"nodeadkeys"},"en-gb":{"console":"qwerty/uk.kmap.gz","kvm":"en-gb","name":"United Kingdom","x11":"gb","x11var":""},"en-us":{"console":"qwerty/us-latin1.kmap.gz","kvm":"en-us","name":"U.S. English","x11":"us","x11var":""},"es":{"console":"qwerty/es.kmap.gz","kvm":"es","name":"Spanish","x11":"es","x11var":"nodeadkeys"},"fi":{"console":"qwerty/fi-latin1.kmap.gz","kvm":"fi","name":"Finnish","x11":"fi","x11var":"nodeadkeys"},"fr":{"console":"azerty/fr-latin1.kmap.gz","kvm":"fr","name":"French","x11":"fr","x11var":"nodeadkeys"},"fr-be":{"console":"azerty/be2-latin1.kmap.gz","kvm":"fr-be","name":"Belgium-French","x11":"be","x11var":"nodeadkeys"},"fr-ca":{"console":"qwerty/cf.kmap.gz","kvm":"fr-ca","name":"Canada-French","x11":"ca","x11var":"fr-legacy"},"fr-ch":{"console":"qwertz/fr_CH-latin1.kmap.gz","kvm":"fr-ch","name":"Swiss-French","x11":"ch","x11var":"fr_nodeadkeys"},"hu":{"console":"qwertz/hu.kmap.gz","kvm":"hu","name":"Hungarian","x11":"hu","x11var":""},"is":{"console":"qwerty/is-latin1.kmap.gz","kvm":"is","name":"Icelandic","x11":"is","x11var":"nodeadkeys"},"it":{"console":"qwerty/it2.kmap.gz","kvm":"it","name":"Italian","x11":"it","x11var":"nodeadkeys"},"jp":{"console":"qwerty/jp106.kmap.gz","kvm":"ja","name":"Japanese","x11":"jp","x11var":""},"lt":{"console":"qwerty/lt.kmap.gz","kvm":"lt","name":"Lithuanian","x11":"lt","x11var":"std"},"mk":{"console":"qwerty/mk.kmap.gz","kvm":"mk","name":"Macedonian","x11":"mk","x11var":"nodeadkeys"},"nl":{"console":"qwerty/nl.kmap.gz","kvm":"nl","name":"Dutch","x11":"nl","x11var":""},"no":{"console":"qwerty/no-latin1.kmap.gz","kvm":"no","name":"Norwegian","x11":"no","x11var":"nodeadkeys"},"pl":{"console":"qwerty/pl.kmap.gz","kvm":"pl","name":"Polish","x11":"pl","x11var":""},"pt":{"console":"qwerty/pt-latin1.kmap.gz","kvm":"pt","name":"Portuguese","x11":"pt","x11var":"nodeadkeys"},"pt-br":{"console":"qwerty/br-latin1.kmap.gz","kvm":"pt-br","name":"Brazil-Portuguese","x11":"br","x11var":"nodeadkeys"},"se":{"console":"qwerty/se-latin1.kmap.gz","kvm":"sv","name":"Swedish","x11":"se","x11var":"nodeadkeys"},"si":{"console":"qwertz/slovene.kmap.gz","kvm":"sl","name":"Slovenian","x11":"si","x11var":""},"tr":{"console":"qwerty/trq.kmap.gz","kvm":"tr","name":"Turkish","x11":"tr","x11var":""}},"kmaphash":{"Belgium-French":"fr-be","Brazil-Portuguese":"pt-br","Canada-French":"fr-ca","Danish":"dk","Dutch":"nl","Finnish":"fi","French":"fr","German":"de","Hungarian":"hu","Icelandic":"is","Italian":"it","Japanese":"jp","Lithuanian":"lt","Macedonian":"mk","Norwegian":"no","Polish":"pl","Portuguese":"pt","Slovenian":"si","Spanish":"es","Swedish":"se","Swiss-French":"fr-ch","Swiss-German":"de-ch","Turkish":"tr","U.S. English":"en-us","United Kingdom":"en-gb"},"zones":{"Africa/Abidjan":1,"Africa/Accra":1,"Africa/Addis_Ababa":1,"Africa/Algiers":1,"Africa/Asmara":1,"Africa/Bamako":1,"Africa/Bangui":1,"Africa/Banjul":1,"Africa/Bissau":1,"Africa/Blantyre":1,"Africa/Brazzaville":1,"Africa/Bujumbura":1,"Africa/Cairo":1,"Africa/Casablanca":1,"Africa/Ceuta":1,"Africa/Conakry":1,"Africa/Dakar":1,"Africa/Dar_es_Salaam":1,"Africa/Djibouti":1,"Africa/Douala":1,"Africa/El_Aaiun":1,"Africa/Freetown":1,"Africa/Gaborone":1,"Africa/Harare":1,"Africa/Johannesburg":1,"Africa/Juba":1,"Africa/Kampala":1,"Africa/Khartoum":1,"Africa/Kigali":1,"Africa/Kinshasa":1,"Africa/Lagos":1,"Africa/Libreville":1,"Africa/Lome":1,"Africa/Luanda":1,"Africa/Lubumbashi":1,"Africa/Lusaka":1,"Africa/Malabo":1,"Africa/Maputo":1,"Africa/Maseru":1,"Africa/Mbabane":1,"Africa/Mogadishu":1,"Africa/Monrovia":1,"Africa/Nairobi":1,"Africa/Ndjamena":1,"Africa/Niamey":1,"Africa/Nouakchott":1,"Africa/Ouagadougou":1,"Africa/Porto-Novo":1,"Africa/Sao_Tome":1,"Africa/Tripoli":1,"Africa/Tunis":1,"Africa/Windhoek":1,"America/Adak":1,"America/Anchorage":1,"America/Anguilla":1,"America/Antigua":1,"America/Araguaina":1,"America/Argentina/Buenos_Aires":1,"America/Argentina/Catamarca":1,"America/Argentina/Cordoba":1,"America/Argentina/Jujuy":1,"America/Argentina/La_Rioja":1,"America/Argentina/Mendoza":1,"America/Argentina/Rio_Gallegos":1,"America/Argentina/Salta":1,"America/Argentina/San_Juan":1,"America/Argentina/San_Luis":1,"America/Argentina/Tucuman":1,"America/Argentina/Ushuaia":1,"America/Aruba":1,"America/Asuncion":1,"America/Atikokan":1,"America/Bahia":1,"America/Bahia_Banderas":1,"America/Barbados":1,"America/Belem":1,"America/Belize":1,"America/Blanc-Sablon":1,"America/Boa_Vista":1,"America/Bogota":1,"America/Boise":1,"America/Cambridge_Bay":1,"America/Campo_Grande":1,"America/Cancun":1,"America/Caracas":1,"America/Cayenne":1,"America/Cayman":1,"America/Chicago":1,"America/Chihuahua":1,"America/Ciudad_Juarez":1,"America/Costa_Rica":1,"America/Coyhaique":1,"America/Creston":1,"America/Cuiaba":1,"America/Curacao":1,"America/Danmarkshavn":1,"America/Dawson":1,"America/Dawson_Creek":1,"America/Denver":1,"America/Detroit":1,"America/Dominica":1,"America/Edmonton":1,"America/Eirunepe":1,"America/El_Salvador":1,"America/Fort_Nelson":1,"America/Fortaleza":1,"America/Glace_Bay":1,"America/Goose_Bay":1,"America/Grand_Turk":1,"America/Grenada":1,"America/Guadeloupe":1,"America/Guatemala":1,"America/Guayaquil":1,"America/Guyana":1,"America/Halifax":1,"America/Havana":1,"America/Hermosillo":1,"America/Indiana/Indianapolis":1,"America/Indiana/Knox":1,"America/Indiana/Marengo":1,"America/Indiana/Petersburg":1,"America/Indiana/Tell_City":1,"America/Indiana/Vevay":1,"America/Indiana/Vincennes":1,"America/Indiana/Winamac":1,"America/Inuvik":1,"America/Iqaluit":1,"America/Jamaica":1,"America/Juneau":1,"America/Kentucky/Louisville":1,"America/Kentucky/Monticello":1,"America/Kralendijk":1,"America/La_Paz":1,"America/Lima":1,"America/Los_Angeles":1,"America/Lower_Princes":1,"America/Maceio":1,"America/Managua":1,"America/Manaus":1,"America/Marigot":1,"America/Martinique":1,"America/Matamoros":1,"America/Mazatlan":1,"America/Menominee":1,"America/Merida":1,"America/Metlakatla":1,"America/Mexico_City":1,"America/Miquelon":1,"America/Moncton":1,"America/Monterrey":1,"America/Montevideo":1,"America/Montserrat":1,"America/Nassau":1,"America/New_York":1,"America/Nome":1,"America/Noronha":1,"America/North_Dakota/Beulah":1,"America/North_Dakota/Center":1,"America/North_Dakota/New_Salem":1,"America/Nuuk":1,"America/Ojinaga":1,"America/Panama":1,"America/Paramaribo":1,"America/Phoenix":1,"America/Port-au-Prince":1,"America/Port_of_Spain":1,"America/Porto_Velho":1,"America/Puerto_Rico":1,"America/Punta_Arenas":1,"America/Rankin_Inlet":1,"America/Recife":1,"America/Regina":1,"America/Resolute":1,"America/Rio_Branco":1,"America/Santarem":1,"America/Santiago":1,"America/Santo_Domingo":1,"America/Sao_Paulo":1,"America/Scoresbysund":1,"America/Sitka":1,"America/St_Barthelemy":1,"America/St_Johns":1,"America/St_Kitts":1,"America/St_Lucia":1,"America/St_Thomas":1,"America/St_Vincent":1,"America/Swift_Current":1,"America/Tegucigalpa":1,"America/Thule":1,"America/Tijuana":1,"America/Toronto":1,"America/Tortola":1,"America/Vancouver":1,"America/Whitehorse":1,"America/Winnipeg":1,"America/Yakutat":1,"Antarctica/Casey":1,"Antarctica/Davis":1,"Antarctica/DumontDUrville":1,"Antarctica/Macquarie":1,"Antarctica/Mawson":1,"Antarctica/McMurdo":1,"Antarctica/Palmer":1,"Antarctica/Rothera":1,"Antarctica/Syowa":1,"Antarctica/Troll":1,"Antarctica/Vostok":1,"Arctic/Longyearbyen":1,"Asia/Aden":1,"Asia/Almaty":1,"Asia/Amman":1,"Asia/Anadyr":1,"Asia/Aqtau":1,"Asia/Aqtobe":1,"Asia/Ashgabat":1,"Asia/Atyrau":1,"Asia/Baghdad":1,"Asia/Bahrain":1,"Asia/Baku":1,"Asia/Bangkok":1,"Asia/Barnaul":1,"Asia/Beirut":1,"Asia/Bishkek":1,"Asia/Brunei":1,"Asia/Chita":1,"Asia/Colombo":1,"Asia/Damascus":1,"Asia/Dhaka":1,"Asia/Dili":1,"Asia/Dubai":1,"Asia/Dushanbe":1,"Asia/Famagusta":1,"Asia/Gaza":1,"Asia/Hebron":1,"Asia/Ho_Chi_Minh":1,"Asia/Hong_Kong":1,"Asia/Hovd":1,"Asia/Irkutsk":1,"Asia/Jakarta":1,"Asia/Jayapura":1,"Asia/Jerusalem":1,"Asia/Kabul":1,"Asia/Kamchatka":1,"Asia/Karachi":1,"Asia/Kathmandu":1,"Asia/Khandyga":1,"Asia/Kolkata":1,"Asia/Krasnoyarsk":1,"Asia/Kuala_Lumpur":1,"Asia/Kuching":1,"Asia/Kuwait":1,"Asia/Macau":1,"Asia/Magadan":1,"Asia/Makassar":1,"Asia/Manila":1,"Asia/Muscat":1,"Asia/Nicosia":1,"Asia/Novokuznetsk":1,"Asia/Novosibirsk":1,"Asia/Omsk":1,"Asia/Oral":1,"Asia/Phnom_Penh":1,"Asia/Pontianak":1,"Asia/Pyongyang":1,"Asia/Qatar":1,"Asia/Qostanay":1,"Asia/Qyzylorda":1,"Asia/Riyadh":1,"Asia/Sakhalin":1,"Asia/Samarkand":1,"Asia/Seoul":1,"Asia/Shanghai":1,"Asia/Singapore":1,"Asia/Srednekolymsk":1,"Asia/Taipei":1,"Asia/Tashkent":1,"Asia/Tbilisi":1,"Asia/Tehran":1,"Asia/Thimphu":1,"Asia/Tokyo":1,"Asia/Tomsk":1,"Asia/Ulaanbaatar":1,"Asia/Urumqi":1,"Asia/Ust-Nera":1,"Asia/Vientiane":1,"Asia/Vladivostok":1,"Asia/Yakutsk":1,"Asia/Yangon":1,"Asia/Yekaterinburg":1,"Asia/Yerevan":1,"Atlantic/Azores":1,"Atlantic/Bermuda":1,"Atlantic/Canary":1,"Atlantic/Cape_Verde":1,"Atlantic/Faroe":1,"Atlantic/Madeira":1,"Atlantic/Reykjavik":1,"Atlantic/South_Georgia":1,"Atlantic/St_Helena":1,"Atlantic/Stanley":1,"Australia/Adelaide":1,"Australia/Brisbane":1,"Australia/Broken_Hill":1,"Australia/Darwin":1,"Australia/Eucla":1,"Australia/Hobart":1,"Australia/Lindeman":1,"Australia/Lord_Howe":1,"Australia/Melbourne":1,"Australia/Perth":1,"Australia/Sydney":1,"Europe/Amsterdam":1,"Europe/Andorra":1,"Europe/Astrakhan":1,"Europe/Athens":1,"Europe/Belgrade":1,"Europe/Berlin":1,"Europe/Bratislava":1,"Europe/Brussels":1,"Europe/Bucharest":1,"Europe/Budapest":1,"Europe/Busingen":1,"Europe/Chisinau":1,"Europe/Copenhagen":1,"Europe/Dublin":1,"Europe/Gibraltar":1,"Europe/Guernsey":1,"Europe/Helsinki":1,"Europe/Isle_of_Man":1,"Europe/Istanbul":1,"Europe/Jersey":1,"Europe/Kaliningrad":1,"Europe/Kirov":1,"Europe/Kyiv":1,"Europe/Lisbon":1,"Europe/Ljubljana":1,"Europe/London":1,"Europe/Luxembourg":1,"Europe/Madrid":1,"Europe/Malta":1,"Europe/Mariehamn":1,"Europe/Minsk":1,"Europe/Monaco":1,"Europe/Moscow":1,"Europe/Oslo":1,"Europe/Paris":1,"Europe/Podgorica":1,"Europe/Prague":1,"Europe/Riga":1,"Europe/Rome":1,"Europe/Samara":1,"Europe/San_Marino":1,"Europe/Sarajevo":1,"Europe/Saratov":1,"Europe/Simferopol":1,"Europe/Skopje":1,"Europe/Sofia":1,"Europe/Stockholm":1,"Europe/Tallinn":1,"Europe/Tirane":1,"Europe/Ulyanovsk":1,"Europe/Vaduz":1,"Europe/Vatican":1,"Europe/Vienna":1,"Europe/Vilnius":1,"Europe/Volgograd":1,"Europe/Warsaw":1,"Europe/Zagreb":1,"Europe/Zurich":1,"Indian/Antananarivo":1,"Indian/Chagos":1,"Indian/Christmas":1,"Indian/Cocos":1,"Indian/Comoro":1,"Indian/Kerguelen":1,"Indian/Mahe":1,"Indian/Maldives":1,"Indian/Mauritius":1,"Indian/Mayotte":1,"Indian/Reunion":1,"Pacific/Apia":1,"Pacific/Auckland":1,"Pacific/Bougainville":1,"Pacific/Chatham":1,"Pacific/Chuuk":1,"Pacific/Easter":1,"Pacific/Efate":1,"Pacific/Fakaofo":1,"Pacific/Fiji":1,"Pacific/Funafuti":1,"Pacific/Galapagos":1,"Pacific/Gambier":1,"Pacific/Guadalcanal":1,"Pacific/Guam":1,"Pacific/Honolulu":1,"Pacific/Kanton":1,"Pacific/Kiritimati":1,"Pacific/Kosrae":1,"Pacific/Kwajalein":1,"Pacific/Majuro":1,"Pacific/Marquesas":1,"Pacific/Midway":1,"Pacific/Nauru":1,"Pacific/Niue":1,"Pacific/Norfolk":1,"Pacific/Noumea":1,"Pacific/Pago_Pago":1,"Pacific/Palau":1,"Pacific/Pitcairn":1,"Pacific/Pohnpei":1,"Pacific/Port_Moresby":1,"Pacific/Rarotonga":1,"Pacific/Saipan":1,"Pacific/Tahiti":1,"Pacific/Tarawa":1,"Pacific/Tongatapu":1,"Pacific/Wake":1,"Pacific/Wallis":1}} \ No newline at end of file diff --git a/pkgs/by-name/pr/proxmox-auto-install-assistant/package.nix b/pkgs/by-name/pr/proxmox-auto-install-assistant/package.nix index 3bf6d51af746..593c320bbf23 100644 --- a/pkgs/by-name/pr/proxmox-auto-install-assistant/package.nix +++ b/pkgs/by-name/pr/proxmox-auto-install-assistant/package.nix @@ -9,15 +9,30 @@ versionCheckHook, }: +let + installer_src = fetchgit { + url = "git://git.proxmox.com/git/pve-installer.git"; + rev = "32afcd4cd534d8e2f99ae76aa0234a0a5c697ba9"; + hash = "sha256-mlTSkBr5glkCr21l2Z1GFICLOn02IOWjMKBy8BvkSzc="; + }; + + proxmox_crates_src = fetchgit { + url = "git://git.proxmox.com/git/proxmox.git"; + rev = "b9bc28082f820dbf88f8dcc02ba2250fc999f9d0"; + name = "proxmox"; + hash = "sha256-NPJi2BzANBfQx995lzIcgCKthWSv+8NeD8zrYnoMye8="; + }; +in rustPlatform.buildRustPackage { pname = "proxmox-auto-install-assistant"; - version = "9.1.6"; + version = "9.2.5"; - src = fetchgit { - url = "git://git.proxmox.com/git/pve-installer.git"; - rev = "eab66c74a79663008ab12990bd27195a8d5c4204"; - hash = "sha256-nMyi3GfdQv/L05hpReSIoFrvmpbs4+5t/lUXXgP0bUs="; - }; + srcs = [ + installer_src + proxmox_crates_src + ]; + + sourceRoot = installer_src.name; postPatch = '' rm -v .cargo/config.toml @@ -26,18 +41,18 @@ rustPlatform.buildRustPackage { # pre-generated using `make locale-info.json` # depends on non-packaged perl modules and debian-specific files cp -v ${./locale-info.json} locale-info.json + + # add necessary crates.io patches to redirect to checked-out repo + cat <>Cargo.toml + proxmox-network-types.path = "../proxmox/proxmox-network-types" + proxmox-installer-types.path = "../proxmox/proxmox-installer-types" + proxmox-sys.path = "../proxmox/proxmox-sys" + EOF ''; buildAndTestSubdir = "proxmox-auto-install-assistant"; - cargoLock = { - lockFile = ./Cargo.lock; - outputHashes = { - "proxmox-io-1.2.1" = "sha256-1F5PJKJ/Ys1EfFPqpP08pRiiTKOAt9IHZ/fbeYxH7SQ="; - "proxmox-lang-1.5.0" = "sha256-1F5PJKJ/Ys1EfFPqpP08pRiiTKOAt9IHZ/fbeYxH7SQ="; - "proxmox-sys-1.0.0" = "sha256-1F5PJKJ/Ys1EfFPqpP08pRiiTKOAt9IHZ/fbeYxH7SQ="; - }; - }; + cargoLock.lockFile = ./Cargo.lock; nativeBuildInputs = [ pkg-config ]; buildInputs = [ diff --git a/pkgs/by-name/sh/sherpa/package.nix b/pkgs/by-name/sh/sherpa/package.nix index f931d5437d53..0fac24ffca6e 100644 --- a/pkgs/by-name/sh/sherpa/package.nix +++ b/pkgs/by-name/sh/sherpa/package.nix @@ -6,7 +6,7 @@ gfortran, libzip, lhapdf, - patchelf, + testers, }: stdenv.mkDerivation (finalAttrs: { @@ -27,8 +27,7 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ cmake gfortran - ] - ++ lib.optionals stdenv.hostPlatform.isLinux [ patchelf ]; + ]; buildInputs = [ libzip @@ -38,15 +37,12 @@ stdenv.mkDerivation (finalAttrs: { cmakeFlags = [ # Needed to initialize a valid SHERPA_LIBRARY_PATH "-DCMAKE_INSTALL_LIBDIR=lib" + (lib.cmakeFeature "CMAKE_INSTALL_NAME_DIR" "${placeholder "out"}/lib/SHERPA-MC") ]; - preFixup = - lib.optionalString stdenv.hostPlatform.isDarwin '' - install_name_tool -add_rpath "$out"/lib/SHERPA-MC "$out"/bin/Sherpa - '' - + lib.optionalString stdenv.hostPlatform.isLinux '' - patchelf --add-rpath "$out"/lib/SHERPA-MC "$out"/bin/Sherpa - ''; + passthru.tests.version = testers.testVersion { + package = finalAttrs.finalPackage; + }; meta = { description = "Monte Carlo event generator for the Simulation of High-Energy Reactions of PArticles"; @@ -54,7 +50,5 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://gitlab.com/sherpa-team/sherpa"; platforms = lib.platforms.unix; maintainers = with lib.maintainers; [ veprbl ]; - # never built on aarch64-darwin since first introduction in nixpkgs - broken = stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64; }; }) diff --git a/pkgs/by-name/sn/snakemake/package.nix b/pkgs/by-name/sn/snakemake/package.nix index dedcaab6cfbd..c4cc82e62483 100644 --- a/pkgs/by-name/sn/snakemake/package.nix +++ b/pkgs/by-name/sn/snakemake/package.nix @@ -11,7 +11,7 @@ python3Packages.buildPythonApplication (finalAttrs: { pname = "snakemake"; - version = "9.21.0"; + version = "9.21.1"; pyproject = true; __structuredAttrs = true; @@ -19,7 +19,7 @@ python3Packages.buildPythonApplication (finalAttrs: { owner = "snakemake"; repo = "snakemake"; tag = "v${finalAttrs.version}"; - hash = "sha256-+EO+BTMkui0mJvEf0TOaCRBH8MzLsit8xK+71gujHt0="; + hash = "sha256-i5F8Dt6DJtR3WBoAAt+/6WMaB+LDG18xKuNQ7HZ2zow="; }; postPatch = '' diff --git a/pkgs/by-name/st/stable-diffusion-cpp/package.nix b/pkgs/by-name/st/stable-diffusion-cpp/package.nix index f05db0512451..198b82c0f8ed 100644 --- a/pkgs/by-name/st/stable-diffusion-cpp/package.nix +++ b/pkgs/by-name/st/stable-diffusion-cpp/package.nix @@ -42,7 +42,7 @@ let in effectiveStdenv.mkDerivation (finalAttrs: { pname = "stable-diffusion-cpp"; - version = "master-625-f683c88"; + version = "master-652-92dc726"; outputs = [ "out" @@ -52,8 +52,8 @@ effectiveStdenv.mkDerivation (finalAttrs: { src = fetchFromGitHub { owner = "leejet"; repo = "stable-diffusion.cpp"; - rev = "master-625-f683c88"; - hash = "sha256-eqVPgETCIwxvmpVwRUGx8hwqX9wV6ynER5uWxoctUw4="; + rev = "master-652-92dc726"; + hash = "sha256-Gk8y2ZvEQHO+p/l4nuioErARYqfLH6qbDwlmS5RXVI4="; fetchSubmodules = true; }; diff --git a/pkgs/by-name/su/surfpool/package.nix b/pkgs/by-name/su/surfpool/package.nix index 196a4a8ff2f1..cb502011838f 100644 --- a/pkgs/by-name/su/surfpool/package.nix +++ b/pkgs/by-name/su/surfpool/package.nix @@ -18,18 +18,18 @@ in rustPlatform.buildRustPackage (finalAttrs: { pname = "surfpool-cli"; - version = "1.3.0"; + version = "1.3.1"; __structuredAttrs = true; src = fetchFromGitHub { owner = "solana-foundation"; repo = "surfpool"; tag = "v${finalAttrs.version}"; - hash = "sha256-Yy30n/dZgDkXmWZM5KmoK+CJNCPvNcKvk5N+fusELJ4="; + hash = "sha256-ZxF2wysE48C14gm62hsWHh/i6BWTmTNUB/tBReqCue8="; fetchSubmodules = true; }; - cargoHash = "sha256-GGuonsdJU/E6A5BM6qcx+f6yZEzvbrmTLBe2lNBdfDI="; + cargoHash = "sha256-WYsTPgRhC44KF/phjSy3iCwQQCTaqrB40/jWA6IdW30="; env = { RUSTFLAGS = "-Aunused"; diff --git a/pkgs/by-name/te/tev/package.nix b/pkgs/by-name/te/tev/package.nix index 12067fc0288b..cc34a401ba31 100644 --- a/pkgs/by-name/te/tev/package.nix +++ b/pkgs/by-name/te/tev/package.nix @@ -24,14 +24,14 @@ stdenv.mkDerivation rec { pname = "tev"; - version = "2.12.1"; + version = "2.12.2"; src = fetchFromGitHub { owner = "Tom94"; repo = "tev"; tag = "v${version}"; fetchSubmodules = true; - hash = "sha256-W/K70l4WXUyZUa1gVivr3y/CT4QYq12FuJqSLA2dyFU="; + hash = "sha256-+7P45Vski0BvQLtraxhhos+h+yf8E8CiCbsaFcgObo0="; }; postPatch = lib.optionalString stdenv.hostPlatform.isLinux ( diff --git a/pkgs/by-name/vi/victor-mono/package.nix b/pkgs/by-name/vi/victor-mono/package.nix index 7702c81cb644..94b215d79f48 100644 --- a/pkgs/by-name/vi/victor-mono/package.nix +++ b/pkgs/by-name/vi/victor-mono/package.nix @@ -2,8 +2,8 @@ lib, stdenvNoCC, fetchzip, + installFonts, }: - stdenvNoCC.mkDerivation rec { pname = "victor-mono"; version = "1.5.6"; @@ -21,22 +21,20 @@ stdenvNoCC.mkDerivation rec { hash = "sha256-PnCCU7PO+XcxUk445sU5xVl8XqdSPJighjtDTqI6qiw="; }; - installPhase = '' - runHook preInstall - - mkdir -p "$out/share/fonts/" - - mv OTF $out/share/fonts/opentype - mv TTF $out/share/fonts/truetype - - runHook postInstall - ''; + nativeBuildInputs = [ installFonts ]; + outputs = [ + "out" + "webfont" + ]; meta = { description = "Free programming font with cursive italics and ligatures"; homepage = "https://rubjo.github.io/victor-mono"; license = lib.licenses.ofl; - maintainers = with lib.maintainers; [ jpotier ]; + maintainers = with lib.maintainers; [ + jpotier + seudonym + ]; platforms = lib.platforms.all; }; } diff --git a/pkgs/by-name/we/weidu/package.nix b/pkgs/by-name/we/weidu/package.nix index 4e34d334b331..feccebc28a90 100644 --- a/pkgs/by-name/we/weidu/package.nix +++ b/pkgs/by-name/we/weidu/package.nix @@ -2,11 +2,11 @@ stdenv, lib, fetchFromGitHub, + versionCheckHook, elkhound, ocaml-ng, perl, which, - fetchpatch, }: let @@ -18,38 +18,27 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "weidu"; - version = "249.00"; + version = "251"; src = fetchFromGitHub { owner = "WeiDUorg"; repo = "weidu"; - rev = "v${finalAttrs.version}"; - sha256 = "sha256-+vkKTzFZdAzY2dL+mZ4A0PDxhTKGgs9bfArz7S6b4m4="; + rev = "v${finalAttrs.version}.00"; + sha256 = "sha256-oVQYESBqp0fJ+ECLGQOPCECnDpGMR8U5ijvTVPc8z4g="; }; - patches = [ - (fetchpatch { - url = "https://github.com/WeiDUorg/weidu/commit/bb90190d8bf7d102952c07d8288a7dc6c7a3322e.patch"; - hash = "sha256-Z4hHdMR1dYjJeERJSqlYynyPu2CvE6+XJuCr9ogDmvk="; - }) - ]; - postPatch = '' - substitute sample.Configuration Configuration \ - --replace-fail /usr/bin ${lib.makeBinPath [ ocaml' ]} \ - --replace-fail /usr/local/bin ${lib.makeBinPath [ ocaml' ]} \ - --replace-fail elkhound ${lib.getExe elkhound} + substituteInPlace Configuration \ + --replace-fail ' = elkhound' ' = ${lib.getExe elkhound}' mkdir -p obj/{.depend,x86_LINUX} - - # undefined reference to `caml_hash_univ_param' - sed -i "20,21d;s/old_hash_param/hash_param/" hashtbl-4.03.0/myhashtbl.ml ''; nativeBuildInputs = [ elkhound ocaml' perl + versionCheckHook which ]; @@ -71,6 +60,8 @@ stdenv.mkDerivation (finalAttrs: { runHook postInstall ''; + doInstallCheck = true; + meta = { description = "InfinityEngine Modding Engine"; homepage = "https://weidu.org"; diff --git a/pkgs/by-name/ya/yazi/plugins/close-and-restore-tab/default.nix b/pkgs/by-name/ya/yazi/plugins/close-and-restore-tab/default.nix index 8f3dfbacc298..6a5e416f436f 100644 --- a/pkgs/by-name/ya/yazi/plugins/close-and-restore-tab/default.nix +++ b/pkgs/by-name/ya/yazi/plugins/close-and-restore-tab/default.nix @@ -5,13 +5,13 @@ }: mkYaziPlugin { pname = "close-and-restore-tab.yazi"; - version = "0-unstable-2026-05-23"; + version = "0-unstable-2026-05-30"; src = fetchFromGitHub { owner = "MasouShizuka"; repo = "close-and-restore-tab.yazi"; - rev = "d7638aadf1f6c4ca5ed2dbff2d3b07c6f86d9804"; - hash = "sha256-s9VOheYlUw7uqxZnd0+mN6lFghOi1shxf0DVIfn6unQ="; + rev = "b2153bc68696edc8e17fc90e73310e274035c674"; + hash = "sha256-3bcnXXYfmvJGxxVKEHAy3so1KRFr1oIdj01A8WIU5VM="; }; meta = { diff --git a/pkgs/by-name/ya/yazi/plugins/mediainfo/default.nix b/pkgs/by-name/ya/yazi/plugins/mediainfo/default.nix index eb2beac639a9..45f9c9350898 100644 --- a/pkgs/by-name/ya/yazi/plugins/mediainfo/default.nix +++ b/pkgs/by-name/ya/yazi/plugins/mediainfo/default.nix @@ -5,13 +5,13 @@ }: mkYaziPlugin { pname = "mediainfo.yazi"; - version = "0-unstable-2026-05-19"; + version = "0-unstable-2026-06-03"; src = fetchFromGitHub { owner = "boydaihungst"; repo = "mediainfo.yazi"; - rev = "4f80288c7286efb7ea3ffb6193027f2f1a027473"; - hash = "sha256-xxOM5cdAEGgUrcFViKWFgwwQdCYpsbvE+Ji0Gerk7UA="; + rev = "ef8105a52b2f2bc59aeef38e02b2c69418131352"; + hash = "sha256-1qHCeLn6bPdOs3Z176367t6/m9sothyqHe+rqkKqgiI="; }; meta = { diff --git a/pkgs/by-name/ya/yazi/plugins/projects/default.nix b/pkgs/by-name/ya/yazi/plugins/projects/default.nix index 865d7d23a9bd..438d1e466ae6 100644 --- a/pkgs/by-name/ya/yazi/plugins/projects/default.nix +++ b/pkgs/by-name/ya/yazi/plugins/projects/default.nix @@ -5,13 +5,13 @@ }: mkYaziPlugin { pname = "projects.yazi"; - version = "0-unstable-2026-02-15"; + version = "0-unstable-2026-05-30"; src = fetchFromGitHub { owner = "MasouShizuka"; repo = "projects.yazi"; - rev = "198c2ba30e4916ca275d2a08bd329fcf32735866"; - hash = "sha256-Grvtx+N1DpdpMaVuDwaHu3S7zu6pQtmu1twvFIowbLM="; + rev = "112a2707e9d37c02304449fbc8669d0264841e22"; + hash = "sha256-w7QTVogc7pqVa56fSCl22m8AkOHO5jq+yXLfCRaY1Yg="; }; meta = { diff --git a/pkgs/development/compilers/zig/generic.nix b/pkgs/development/compilers/zig/generic.nix index f311672ad09e..842986195940 100644 --- a/pkgs/development/compilers/zig/generic.nix +++ b/pkgs/development/compilers/zig/generic.nix @@ -176,6 +176,7 @@ stdenv.mkDerivation (finalAttrs: { description = "General-purpose programming language and toolchain for maintaining robust, optimal, and reusable software"; homepage = "https://ziglang.org/"; changelog = "https://ziglang.org/download/${finalAttrs.version}/release-notes.html"; + donationPage = "https://ziglang.org/zsf/"; license = lib.licenses.mit; maintainers = [ ]; teams = [ lib.teams.zig ]; diff --git a/pkgs/development/python-modules/aiohomematic-config/default.nix b/pkgs/development/python-modules/aiohomematic-config/default.nix index 8ffabedec640..122b437bd024 100644 --- a/pkgs/development/python-modules/aiohomematic-config/default.nix +++ b/pkgs/development/python-modules/aiohomematic-config/default.nix @@ -3,28 +3,31 @@ buildPythonPackage, fetchFromGitHub, lib, + openccu-data, pydantic, pytest-asyncio, + pytest-xdist, pytestCheckHook, setuptools, }: buildPythonPackage (finalAttrs: { pname = "aiohomematic-config"; - version = "2026.4.1"; + version = "2026.5.0"; pyproject = true; src = fetchFromGitHub { owner = "sukramj"; repo = "aiohomematic-config"; tag = finalAttrs.version; - hash = "sha256-I75OPUA/gdLdMAJU0iYYQUk54f5cQQ5UWsRQHayqpyo="; + hash = "sha256-uBIdBpjkEIPyuNxTEgTVc068K8UIVvdBXvwZ1MYh7rs="; }; build-system = [ setuptools ]; dependencies = [ aiohomematic + openccu-data pydantic ]; @@ -32,6 +35,7 @@ buildPythonPackage (finalAttrs: { nativeCheckInputs = [ pytest-asyncio + pytest-xdist pytestCheckHook ]; diff --git a/pkgs/development/python-modules/aiohomematic/default.nix b/pkgs/development/python-modules/aiohomematic/default.nix index 43e343eea57d..d226d6ebaed6 100644 --- a/pkgs/development/python-modules/aiohomematic/default.nix +++ b/pkgs/development/python-modules/aiohomematic/default.nix @@ -4,6 +4,7 @@ buildPythonPackage, fetchFromGitHub, freezegun, + openccu-data, orjson, pydantic, pydevccu, @@ -18,7 +19,7 @@ buildPythonPackage rec { pname = "aiohomematic"; - version = "2026.4.6"; + version = "2026.5.11"; pyproject = true; disabled = pythonOlder "3.14"; @@ -27,13 +28,14 @@ buildPythonPackage rec { owner = "SukramJ"; repo = "aiohomematic"; tag = version; - hash = "sha256-R7hQprIAK7Xs+XpmMecAGGrAYzfBk+fQo17tkByC0Kc="; + hash = "sha256-Ua7/sLhL0mbZvJwx+TNfXoP+z+jE2TyCO3DqsFpPe6A="; }; build-system = [ setuptools ]; dependencies = [ aiohttp + openccu-data orjson pydantic python-slugify diff --git a/pkgs/development/python-modules/aqipy-atmotech/default.nix b/pkgs/development/python-modules/aqipy-atmotech/default.nix index 29e903db42e5..80a007f0146d 100644 --- a/pkgs/development/python-modules/aqipy-atmotech/default.nix +++ b/pkgs/development/python-modules/aqipy-atmotech/default.nix @@ -3,25 +3,28 @@ buildPythonPackage, fetchFromGitHub, pytestCheckHook, + setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "aqipy-atmotech"; version = "0.1.5"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "atmotube"; repo = "aqipy"; - rev = version; + tag = finalAttrs.version; hash = "sha256-tqHhfJmtVFUSO57Cid9y3LK4pOoG7ROtwDT2hY5IE1Y="; }; + build-system = [ setuptools ]; + nativeCheckInputs = [ pytestCheckHook ]; postPatch = '' substituteInPlace setup.py \ - --replace "'pytest-runner'" "" + --replace-fail "'pytest-runner'" "" ''; pythonImportsCheck = [ "aqipy" ]; @@ -29,7 +32,8 @@ buildPythonPackage rec { meta = { description = "Library for AQI calculation"; homepage = "https://github.com/atmotube/aqipy"; + changelog = "https://github.com/atmotube/aqipy/releases/tag/${finalAttrs.version}"; license = lib.licenses.asl20; maintainers = with lib.maintainers; [ fab ]; }; -} +}) diff --git a/pkgs/development/python-modules/llama-cloud/default.nix b/pkgs/development/python-modules/llama-cloud/default.nix index c8a14d375290..d909e9f6a398 100644 --- a/pkgs/development/python-modules/llama-cloud/default.nix +++ b/pkgs/development/python-modules/llama-cloud/default.nix @@ -25,13 +25,13 @@ buildPythonPackage (finalAttrs: { pname = "llama-cloud"; - version = "2.7.0"; + version = "2.8.0"; pyproject = true; src = fetchPypi { pname = "llama_cloud"; inherit (finalAttrs) version; - hash = "sha256-JlwSx3r31VWDTq97tN8Qp7gPDq6mlGmzrnk1rbya8eQ="; + hash = "sha256-7hPs2yySQ2PrECOkNhnb0HLhgsWW7VwpK4pclbAaDOU="; }; postPatch = '' diff --git a/pkgs/development/python-modules/openccu-data/default.nix b/pkgs/development/python-modules/openccu-data/default.nix new file mode 100644 index 000000000000..925e79400eb1 --- /dev/null +++ b/pkgs/development/python-modules/openccu-data/default.nix @@ -0,0 +1,36 @@ +{ + buildPythonPackage, + fetchFromGitHub, + lib, + pytestCheckHook, + setuptools, +}: + +buildPythonPackage (finalAttrs: { + pname = "openccu-data"; + version = "2026.5.0"; + pyproject = true; + + src = fetchFromGitHub { + owner = "SukramJ"; + repo = "openccu-data"; + tag = finalAttrs.version; + hash = "sha256-jJNNpBeEQ1CPZP/5ssenXSmvC7FMbUUBhG1Ty/3hGvk="; + }; + + build-system = [ setuptools ]; + + pythonImportsCheck = [ "openccu_data" ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + meta = { + changelog = "https://github.com/SukramJ/openccu-data/blob/${finalAttrs.src.tag}/changelog.md"; + description = "Extract and distribute Homematic CCU/OpenCCU configuration metadata"; + homepage = "https://github.com/SukramJ/openccu-data"; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.dotlambda ]; + }; +}) diff --git a/pkgs/development/python-modules/pydevccu/default.nix b/pkgs/development/python-modules/pydevccu/default.nix index e1f597b27955..6a5ce143d989 100644 --- a/pkgs/development/python-modules/pydevccu/default.nix +++ b/pkgs/development/python-modules/pydevccu/default.nix @@ -12,7 +12,7 @@ buildPythonPackage (finalAttrs: { pname = "pydevccu"; - version = "0.2.3"; + version = "0.2.4"; pyproject = true; disabled = pythonOlder "3.13"; @@ -21,7 +21,7 @@ buildPythonPackage (finalAttrs: { owner = "SukramJ"; repo = "pydevccu"; tag = finalAttrs.version; - hash = "sha256-dOk0Sb7RR21Mzke+wkhEca8HMVt7pcU5eXs/hzojFBQ="; + hash = "sha256-/Z1+k9CNTQsqTXSIqmUQn7r5WBTgZmqsg5Z+cq9nR3Q="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/pypdf/default.nix b/pkgs/development/python-modules/pypdf/default.nix index dc6123994982..c31050919373 100644 --- a/pkgs/development/python-modules/pypdf/default.nix +++ b/pkgs/development/python-modules/pypdf/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { pname = "pypdf"; - version = "6.10.2"; + version = "6.12.2"; pyproject = true; src = fetchFromGitHub { @@ -32,7 +32,7 @@ buildPythonPackage rec { tag = version; # fetch sample files used in tests fetchSubmodules = true; - hash = "sha256-f7U9kZrAnUHv0nBrcHI+Otd49jIJz0d1uWRHymWJnYo="; + hash = "sha256-rRvRAasPgE5nCChYJYB9olSE3RWmztYSJoAbmh+a3Q0="; }; outputs = [ diff --git a/pkgs/development/python-modules/snakemake-storage-plugin-xrootd/default.nix b/pkgs/development/python-modules/snakemake-storage-plugin-xrootd/default.nix index fc67fd23a9ad..802082fd6bfa 100644 --- a/pkgs/development/python-modules/snakemake-storage-plugin-xrootd/default.nix +++ b/pkgs/development/python-modules/snakemake-storage-plugin-xrootd/default.nix @@ -1,5 +1,6 @@ { lib, + stdenv, pkgs, buildPythonPackage, fetchFromGitHub, @@ -51,7 +52,9 @@ buildPythonPackage (finalAttrs: { xrootd ]; - pythonImportsCheck = [ "snakemake_storage_plugin_xrootd" ]; + # When doCheck is disabled, nnativeCheckInputs are not available and the package fails to import: + # ModuleNotFoundError: No module named 'snakemake' + pythonImportsCheck = lib.optionals finalAttrs.doCheck [ "snakemake_storage_plugin_xrootd" ]; nativeCheckInputs = [ pytestCheckHook @@ -60,6 +63,16 @@ buildPythonPackage (finalAttrs: { enabledTestPaths = [ "tests/tests.py" ]; + # Tests fail on darwin even with: + # - __darwinAllowLocalNetworking = true; + # - sandbox = false + # - writableTmpDirAsHomeHook + # + # Failed: XRootD server terminated unexpectedly. + # 260604 22:16:56 259 XrdConfig: Unable to set permission for admin path /tmp/.xrd/; operation not permitted + # ------ xrootd anon@91-224-148-58.tetaneutral.net:32293 initialization failed. + doCheck = !stdenv.hostPlatform.isDarwin; + meta = { description = "Snakemake storage plugin for handling input and output via XRootD"; homepage = "https://github.com/snakemake/snakemake-storage-plugin-xrootd"; diff --git a/pkgs/servers/home-assistant/custom-components/homematicip_local/package.nix b/pkgs/servers/home-assistant/custom-components/homematicip_local/package.nix index 60dc275ef585..2c26d535c936 100644 --- a/pkgs/servers/home-assistant/custom-components/homematicip_local/package.nix +++ b/pkgs/servers/home-assistant/custom-components/homematicip_local/package.nix @@ -7,20 +7,22 @@ aiohomematic-config, aiohomematic-test-support, home-assistant, + openccu-data, pytest-homeassistant-custom-component, + pytest-xdist, pytestCheckHook, }: buildHomeAssistantComponent rec { owner = "SukramJ"; domain = "homematicip_local"; - version = "2.6.0"; + version = "2.7.3"; src = fetchFromGitHub { owner = "SukramJ"; repo = "custom_homematic"; tag = version; - hash = "sha256-u3REMGuaQ+wQgDgiTvplBRMbzZJDUfcbyJm9tYOuYIw="; + hash = "sha256-9dXvIxMMdHTOi9JbRsHbySqRUYq6dN+MzrOocq9cpdA="; }; postPatch = '' @@ -33,20 +35,25 @@ buildHomeAssistantComponent rec { dependencies = [ aiohomematic aiohomematic-config + openccu-data ]; nativeCheckInputs = [ aiohomematic-test-support async-upnp-client pytest-homeassistant-custom-component + pytest-xdist pytestCheckHook ]; + disabledTestPaths = [ + # tries to write to the Nix store + "tests/test_blueprints.py" + ]; + disabledTests = [ # custom_components.homematicip_local.support.InvalidConfig: C "test_async_validate_config_and_get_system_information" - # Failed: Lingering timer after test - "test_reauth_flow_success" ]; meta = { diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 57f3a030a9da..cace61a17aef 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -11752,6 +11752,8 @@ self: super: with self; { opencc = callPackage ../development/python-modules/opencc { }; + openccu-data = callPackage ../development/python-modules/openccu-data { }; + opencensus = callPackage ../development/python-modules/opencensus { }; opencensus-context = callPackage ../development/python-modules/opencensus-context { }; diff --git a/pkgs/top-level/qt5-packages.nix b/pkgs/top-level/qt5-packages.nix index b6af4b4bcc4e..14b41c632887 100644 --- a/pkgs/top-level/qt5-packages.nix +++ b/pkgs/top-level/qt5-packages.nix @@ -110,10 +110,6 @@ makeScopeWithSplicing' { maplibre-native-qt = callPackage ../development/libraries/maplibre-native-qt { }; - mlt = pkgs.mlt.override { - qt = qt5; - }; - polkit-qt = callPackage ../development/libraries/polkit-qt-1 { }; poppler = callPackage ../development/libraries/poppler { @@ -124,9 +120,7 @@ makeScopeWithSplicing' { pyotherside = callPackage ../development/libraries/pyotherside { }; - qca = callPackage ../development/libraries/qca { - inherit (libsForQt5) qtbase; - }; + qca = callPackage ../development/libraries/qca { }; qca-qt5 = self.qca; qcoro = callPackage ../development/libraries/qcoro { }; @@ -194,6 +188,7 @@ makeScopeWithSplicing' { timed = callPackage ../applications/system/timed { }; } // lib.optionalAttrs config.allowAliases { + mlt = throw "'libsForQt5.mlt' was removed due to lack of upstream support since v7.36.0, use 'qt6Packages.mlt'."; # Added 2026-06-05 futuresql = throw "libsForQt5.futuresql has been removed"; # Added 2026-05-01 kdb = throw "libsForQt5.kdb has been removed"; # Added 2026-05-01 kdiagram = throw "libsForQt5.kdiagram has been removed"; # Added 2026-05-01 diff --git a/pkgs/top-level/qt6-packages.nix b/pkgs/top-level/qt6-packages.nix index 85e7bc2b9d16..5dff670a2b98 100644 --- a/pkgs/top-level/qt6-packages.nix +++ b/pkgs/top-level/qt6-packages.nix @@ -86,17 +86,13 @@ makeScopeWithSplicing' { }; libquotient = callPackage ../development/libraries/libquotient { }; - mlt = pkgs.mlt.override { - qt = qt6; - }; + mlt = callPackage ../by-name/ml/mlt/package.nix { }; maplibre-native-qt = callPackage ../development/libraries/maplibre-native-qt { }; pyotherside = callPackage ../development/libraries/pyotherside { }; - qca = callPackage ../development/libraries/qca { - inherit (qt6) qtbase qt5compat; - }; + qca = callPackage ../development/libraries/qca { }; qcoro = callPackage ../development/libraries/qcoro { }; qcustomplot = callPackage ../development/libraries/qcustomplot { }; qgpgme = callPackage ../development/libraries/qgpgme { };