diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 55623c525ed0..47ac9ca135e5 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -10207,6 +10207,11 @@ githubId = 6544084; name = "Kai Harries"; }; + kai-tub = { + name = "Kai Norman Clasen"; + github = "kai-tub"; + githubId = 46302524; + }; kalbasit = { email = "wael.nasreddine@gmail.com"; matrix = "@kalbasit:matrix.org"; diff --git a/nixos/doc/manual/release-notes/rl-2405.section.md b/nixos/doc/manual/release-notes/rl-2405.section.md index 3f4549911fe4..58ceb99b9d7b 100644 --- a/nixos/doc/manual/release-notes/rl-2405.section.md +++ b/nixos/doc/manual/release-notes/rl-2405.section.md @@ -37,6 +37,10 @@ In addition to numerous new and upgraded packages, this release has the followin Use `services.pipewire.extraConfig` or `services.pipewire.configPackages` for PipeWire and `services.pipewire.wireplumber.configPackages` for WirePlumber instead." +- `teleport` has been upgraded from major version 14 to major version 15. + Refer to upstream [upgrade instructions](https://goteleport.com/docs/management/operations/upgrading/) + and release notes for [v15](https://goteleport.com/docs/changelog/#1500-013124). + - A new option `systemd.sysusers.enable` was added. If enabled, users and groups are created with systemd-sysusers instead of with a custom perl script. @@ -419,6 +423,14 @@ The pre-existing [services.ankisyncd](#opt-services.ankisyncd.enable) has been m - `nomad_1_4` has been removed, as it is now unsupported upstream. +- Dwarf Fortress has been updated to version 50, and its derivations continue to menace with spikes of Nix and bash. Version 50 is identical to the version on Steam, but without the paid elements like tilepacks. + dfhack and Dwarf Therapist still work, and older versions are still packaged in case you'd like to roll back. Note that DF 50 saves will not be compatible with DF 0.47 and earlier. + See [Bay 12 Games](http://www.bay12games.com/dwarves/) for more details on what's new in Dwarf Fortress. + + - Running an earlier version can be achieved through an override: `dwarf-fortress-packages.dwarf-fortress-full.override { dfVersion = "0.47.5"; }` + + - Ruby plugin support has been disabled in DFHack. Many of the Ruby plugins have been converted to Lua, and support was removed upstream due to frequent crashes. + - The `livebook` package is now built as a `mix release` instead of an `escript`. This means that configuration now has to be done using [environment variables](https://hexdocs.pm/livebook/readme.html#environment-variables) instead of command line arguments. This has the further implication that the `livebook` service configuration has changed: diff --git a/nixos/modules/misc/nixpkgs.nix b/nixos/modules/misc/nixpkgs.nix index 433bcd93213d..60a6fb57c7a2 100644 --- a/nixos/modules/misc/nixpkgs.nix +++ b/nixos/modules/misc/nixpkgs.nix @@ -153,11 +153,10 @@ in ''; type = configType; description = '' - The configuration of the Nix Packages collection. (For - details, see the Nixpkgs documentation.) It allows you to set - package configuration options. + Global configuration for Nixpkgs. + The complete list of [Nixpkgs configuration options](https://nixos.org/manual/nixpkgs/unstable/#sec-config-options-reference) is in the [Nixpkgs manual section on global configuration](https://nixos.org/manual/nixpkgs/unstable/#chap-packageconfig). - Ignored when `nixpkgs.pkgs` is set. + Ignored when {option}`nixpkgs.pkgs` is set. ''; }; diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index dda647ac1994..e92cbe31e25a 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -265,6 +265,7 @@ ./programs/skim.nix ./programs/slock.nix ./programs/sniffnet.nix + ./programs/soundmodem.nix ./programs/spacefm.nix ./programs/ssh.nix ./programs/starship.nix @@ -286,8 +287,8 @@ ./programs/virt-manager.nix ./programs/wavemon.nix ./programs/wayland/cardboard.nix - ./programs/wayland/labwc.nix ./programs/wayland/hyprland.nix + ./programs/wayland/labwc.nix ./programs/wayland/river.nix ./programs/wayland/sway.nix ./programs/wayland/waybar.nix diff --git a/nixos/modules/programs/soundmodem.nix b/nixos/modules/programs/soundmodem.nix new file mode 100644 index 000000000000..59c1f2fb2ded --- /dev/null +++ b/nixos/modules/programs/soundmodem.nix @@ -0,0 +1,34 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + cfg = config.programs.soundmodem; +in +{ + options = { + programs.soundmodem = { + enable = mkOption { + type = types.bool; + default = false; + description = lib.mdDoc '' + Whether to add Soundmodem to the global environment and configure a + wrapper for 'soundmodemconfig' for users in the 'soundmodem' group. + ''; + }; + package = mkPackageOption pkgs "soundmodem" { }; + }; + }; + + config = mkIf cfg.enable { + environment.systemPackages = [ soundmodem ]; + users.groups.soundmodem = { }; + + security.wrappers.soundmodemconfig = { + source = "${cfg.package}/bin/soundmodemconfig"; + owner = "root"; + group = "soundmodem"; + permissions = "u+rx,g+x"; + }; + }; +} diff --git a/nixos/modules/services/misc/ollama.nix b/nixos/modules/services/misc/ollama.nix index b2c3de09015b..948c8f17f989 100644 --- a/nixos/modules/services/misc/ollama.nix +++ b/nixos/modules/services/misc/ollama.nix @@ -85,7 +85,7 @@ in }; serviceConfig = { ExecStart = "${lib.getExe ollamaPackage} serve"; - WorkingDirectory = "%S/ollama"; + WorkingDirectory = cfg.home; StateDirectory = [ "ollama" ]; DynamicUser = true; }; diff --git a/nixos/modules/services/networking/shadowsocks.nix b/nixos/modules/services/networking/shadowsocks.nix index 84d7ece075fe..2f6f40f2b0f6 100644 --- a/nixos/modules/services/networking/shadowsocks.nix +++ b/nixos/modules/services/networking/shadowsocks.nix @@ -136,10 +136,16 @@ in ###### implementation config = mkIf cfg.enable { - assertions = singleton - { assertion = cfg.password == null || cfg.passwordFile == null; - message = "Cannot use both password and passwordFile for shadowsocks-libev"; - }; + assertions = [ + { + # xor, make sure either password or passwordFile be set. + # shadowsocks-libev not support plain/none encryption method + # which indicated that password must set. + assertion = let noPasswd = cfg.password == null; noPasswdFile = cfg.passwordFile == null; + in (noPasswd && !noPasswdFile) || (!noPasswd && noPasswdFile); + message = "Option `password` or `passwordFile` must be set and cannot be set simultaneously"; + } + ]; systemd.services.shadowsocks-libev = { description = "shadowsocks-libev Daemon"; diff --git a/nixos/tests/teleport.nix b/nixos/tests/teleport.nix index d68917c6c7ac..2fb347155759 100644 --- a/nixos/tests/teleport.nix +++ b/nixos/tests/teleport.nix @@ -9,8 +9,8 @@ with import ../lib/testing-python.nix { inherit system pkgs; }; let packages = with pkgs; { "default" = teleport; - "12" = teleport_12; "13" = teleport_13; + "14" = teleport_14; }; minimal = package: { diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix index 0d7964e2e655..238893644d7f 100644 --- a/pkgs/applications/editors/vim/plugins/generated.nix +++ b/pkgs/applications/editors/vim/plugins/generated.nix @@ -11111,6 +11111,18 @@ final: prev: meta.homepage = "https://github.com/Pocco81/true-zen.nvim/"; }; + trust-vim = buildVimPlugin { + pname = "trust.vim"; + version = "2022-04-14"; + src = fetchFromGitHub { + owner = "tesaguri"; + repo = "trust.vim"; + rev = "3e17b29ff13f862eeda269d7ce0260571dab6cb7"; + sha256 = "1zvxjgyzzhnza2gv528dvyp7m1nvsz5gjn0qp65jn0k7y4gh3nnl"; + }; + meta.homepage = "https://github.com/tesaguri/trust.vim/"; + }; + tslime-vim = buildVimPlugin { pname = "tslime.vim"; version = "2020-09-09"; diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names index ace647e29b52..41835ac6856c 100644 --- a/pkgs/applications/editors/vim/plugins/vim-plugin-names +++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names @@ -933,6 +933,7 @@ https://github.com/tremor-rs/tremor-vim/,, https://github.com/cappyzawa/trim.nvim/,, https://github.com/folke/trouble.nvim/,, https://github.com/Pocco81/true-zen.nvim/,, +https://github.com/tesaguri/trust.vim/,HEAD, https://github.com/jgdavey/tslime.vim/,, https://github.com/Quramy/tsuquyomi/,, https://github.com/folke/twilight.nvim/,, diff --git a/pkgs/applications/misc/tiramisu/default.nix b/pkgs/applications/misc/tiramisu/default.nix index 8624bded6641..4a123be328c9 100644 --- a/pkgs/applications/misc/tiramisu/default.nix +++ b/pkgs/applications/misc/tiramisu/default.nix @@ -2,13 +2,15 @@ stdenv.mkDerivation rec { pname = "tiramisu"; - version = "2.0.20211107"; + # FIXME: once a newer release in upstream is available + version = "2.0-unstable-2023-03-29"; src = fetchFromGitHub { owner = "Sweets"; - repo = pname; - rev = version; - sha256 = "1n1x1ybbwbanibw7b90k7v4cadagl41li17hz2l8s2sapacvq3mw"; + repo = "tiramisu"; + # FIXME: use the current HEAD commit as upstream has no releases since 2021 + rev = "5dddd83abd695bfa15640047a97a08ff0a8d9f9b"; + hash = "sha256-owYk/YFwJbqO6/dbGKPE8SnmmH4KvH+o6uWptqQtpfI="; }; buildInputs = [ glib ]; diff --git a/pkgs/applications/networking/cluster/nomad/default.nix b/pkgs/applications/networking/cluster/nomad/default.nix index f94cb28ce2f5..89891fd04046 100644 --- a/pkgs/applications/networking/cluster/nomad/default.nix +++ b/pkgs/applications/networking/cluster/nomad/default.nix @@ -82,9 +82,9 @@ rec { nomad_1_7 = generic { buildGoModule = buildGo121Module; - version = "1.7.6"; - sha256 = "sha256-rEWXQwkW/muX3D0An3WmHCoboPACFCrSG7Tyzor2wnQ="; - vendorHash = "sha256-95yUtNfN/50LjWHHReaB4/riUqy8J67099bP8Ua7gRw="; + version = "1.7.7"; + sha256 = "sha256-4nuRheidR6rIoytrnDQdIP69f+sBLJ3Ias5DvqVaLFc="; + vendorHash = "sha256-ZuaD8iDsT+/eW0QUavf485R804Jtjl76NcQWYHA8QII="; license = lib.licenses.bsl11; passthru.tests.nomad = nixosTests.nomad; preCheck = '' diff --git a/pkgs/applications/networking/feedreaders/newsboat/default.nix b/pkgs/applications/networking/feedreaders/newsboat/default.nix index c522210bb6e7..bd89a2a0a329 100644 --- a/pkgs/applications/networking/feedreaders/newsboat/default.nix +++ b/pkgs/applications/networking/feedreaders/newsboat/default.nix @@ -3,16 +3,16 @@ rustPlatform.buildRustPackage rec { pname = "newsboat"; - version = "2.34"; + version = "2.35"; src = fetchFromGitHub { owner = "newsboat"; repo = "newsboat"; rev = "r${version}"; - hash = "sha256-knF+N/HHL/E6C973t+ww5XTLV2thwy7lMAeqTyXspHY="; + hash = "sha256-WbicKP46N8MVjUeerYUdcHJO5Qf7rQFyYCpxexd2wDY="; }; - cargoHash = "sha256-IsDym+tqF040SxCJF575OPm45IROYMFsCrxJcM1SAJ4="; + cargoHash = "sha256-B6U+DxIRm9Sn4x+dZCfNKENNDsTUVZFT6i0Yz47gjTs="; # TODO: Check if that's still needed postPatch = lib.optionalString stdenv.isDarwin '' diff --git a/pkgs/applications/radio/soundmodem/default.nix b/pkgs/applications/radio/soundmodem/default.nix index 01a8006822f6..f69fbfecd608 100644 --- a/pkgs/applications/radio/soundmodem/default.nix +++ b/pkgs/applications/radio/soundmodem/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkg-config, alsa-lib, audiofile, gtk2, libxml2 }: +{ lib, stdenv, fetchurl, pkg-config, alsa-lib, audiofile, gtk2, libxml2, copyDesktopItems, makeDesktopItem }: stdenv.mkDerivation rec { pname = "soundmodem"; @@ -9,13 +9,26 @@ stdenv.mkDerivation rec { sha256 = "156l3wjnh5rcisxb42kcmlf74swf679v4xnj09zy5j74rd4h721z"; }; - nativeBuildInputs = [ pkg-config ]; + nativeBuildInputs = [ + pkg-config + copyDesktopItems + ]; buildInputs = [ alsa-lib audiofile gtk2 libxml2 ]; patches = [ ./matFix.patch ]; doCheck = true; + desktopItems = [ + (makeDesktopItem { + name = "SoundmodemConfig"; + exec = "soundmodemconfig"; + desktopName = "SoundModemConfig"; + comment = "Audio based modem for ham radio supporting ax.25"; + categories = [ "Audio" ]; + }) + ]; + meta = with lib; { description = "Audio based modem for ham radio supporting ax.25"; longDescription = '' diff --git a/pkgs/applications/version-management/git-mit/default.nix b/pkgs/applications/version-management/git-mit/default.nix index f3dbcc6273d6..ff1f8e98a79d 100644 --- a/pkgs/applications/version-management/git-mit/default.nix +++ b/pkgs/applications/version-management/git-mit/default.nix @@ -10,7 +10,7 @@ }: let - version = "5.12.194"; + version = "5.12.196"; in rustPlatform.buildRustPackage { pname = "git-mit"; @@ -20,10 +20,10 @@ rustPlatform.buildRustPackage { owner = "PurpleBooth"; repo = "git-mit"; rev = "v${version}"; - hash = "sha256-9ITy2VPLIunSLSNx4EXbvxZ7V/Kr+DwmjzDVj/QVGHs="; + hash = "sha256-vv60+8H6WQes+xVJRsgLppwQ/DkQbfNC6tRx2TB/4HQ="; }; - cargoHash = "sha256-6R+T0BSgT6IivugkXXsX5xJ2c3/J3FnLY3ZvcfYW53E="; + cargoHash = "sha256-jK2GTI+T7Ie5cdQQQHh2aj6Egb/5BxsfJkFrSo+z7Pc="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/applications/version-management/gitui/default.nix b/pkgs/applications/version-management/gitui/default.nix deleted file mode 100644 index 4b31c2e24853..000000000000 --- a/pkgs/applications/version-management/gitui/default.nix +++ /dev/null @@ -1,55 +0,0 @@ -{ lib -, stdenv -, rustPlatform -, fetchFromGitHub -, libiconv -, openssl -, pkg-config -, xclip -, AppKit -, Security -}: - -rustPlatform.buildRustPackage rec { - pname = "gitui"; - version = "0.25.2"; - - src = fetchFromGitHub { - owner = "extrawurst"; - repo = pname; - rev = "v${version}"; - hash = "sha256-1sBuyY6lpxb/Vlpy6pi7YP69HZID6D97ZkVLbPEZ4Qw="; - }; - - cargoHash = "sha256-S8Oy5DII05430nkRJmMgZsb4fUIks2zliDea9RycH3E="; - - nativeBuildInputs = [ pkg-config ]; - - buildInputs = [ openssl ] - ++ lib.optional stdenv.isLinux xclip - ++ lib.optionals stdenv.isDarwin [ libiconv Security AppKit ]; - - # Needed to get openssl-sys to use pkg-config. - OPENSSL_NO_VENDOR = 1; - - # The cargo config overrides linkers for some targets, breaking the build - # on e.g. `aarch64-linux`. These overrides are not required in the Nix - # environment: delete them. - postPatch = "rm .cargo/config"; - - - # Getting app_config_path fails with a permission denied - checkFlags = [ - "--skip=keys::key_config::tests::test_symbolic_links" - ]; - - - meta = with lib; { - description = "Blazing fast terminal-ui for Git written in Rust"; - homepage = "https://github.com/extrawurst/gitui"; - changelog = "https://github.com/extrawurst/gitui/blob/v${version}/CHANGELOG.md"; - mainProgram = "gitui"; - license = licenses.mit; - maintainers = with maintainers; [ Br1ght0ne yanganto mfrw ]; - }; -} diff --git a/pkgs/by-name/at/atac/package.nix b/pkgs/by-name/at/atac/package.nix new file mode 100644 index 000000000000..89d02729f434 --- /dev/null +++ b/pkgs/by-name/at/atac/package.nix @@ -0,0 +1,46 @@ +{ + lib, + rustPlatform, + fetchFromGitHub, + pkg-config, + oniguruma, + stdenv, + darwin, +}: +rustPlatform.buildRustPackage rec { + pname = "atac"; + version = "0.11.3"; + + src = fetchFromGitHub { + owner = "Julien-cpsn"; + repo = "ATAC"; + rev = "v${version}"; + hash = "sha256-nYPqj3Wa5itw83s08qsEu30v/2NwkLwGE0LlNY9Msok="; + }; + + cargoHash = "sha256-Beh5out4Ess+FP+Dg601ZqyXotEfujqNX16Vupp5WRc="; + + nativeBuildInputs = [ + pkg-config + ]; + + buildInputs = + [ + oniguruma + ] + ++ lib.optionals stdenv.isDarwin [ + darwin.apple_sdk.frameworks.Security + ]; + + env = { + RUSTONIG_SYSTEM_LIBONIG = true; + }; + + meta = with lib; { + description = "A simple API client (postman like) in your terminal"; + homepage = "https://github.com/Julien-cpsn/ATAC"; + license = licenses.mit; + maintainers = with maintainers; [vinnymeller]; + mainProgram = "atac"; + }; +} diff --git a/pkgs/by-name/ca/castero/package.nix b/pkgs/by-name/ca/castero/package.nix new file mode 100644 index 000000000000..6359c5c69536 --- /dev/null +++ b/pkgs/by-name/ca/castero/package.nix @@ -0,0 +1,67 @@ +{ lib +, fetchFromGitHub +, python3 +}: + +python3.pkgs.buildPythonApplication rec { + pname = "castero"; + version = "0.9.5"; + pyproject = true; + + src = fetchFromGitHub { + owner = "xgi"; + repo = "castero"; + rev = "v${version}"; + hash = "sha256-6/7oCKBMEcQeJ8PaFP15Xef9sQRYCpigtzINv2M6GUY="; + }; + + nativeBuildInputs = with python3.pkgs; [ + setuptools + wheel + ]; + + propagatedBuildInputs = with python3.pkgs; [ + requests + grequests + cjkwrap + pytz + beautifulsoup4 + lxml + mpv + python-vlc + ]; + + nativeCheckInputs = with python3.pkgs; [ + pytestCheckHook + ]; + + pytestFlagsArray = [ + "tests" + ]; + + disabledTests = [ "test_datafile_download" ]; + + pythonImportCheck = [ + "castero" + ]; + + # Resolve configuration tests, which access $HOME + preCheck = '' + export HOME=$(mktemp -d) + ''; + + # Satisfy the python-mpv depedency, which is mpv within NixOS + postPatch = '' + substituteInPlace setup.py --replace-fail "python-mpv" "mpv" + ''; + + # VLC currently doesn't support Darwin on NixOS + meta = with lib; { + mainProgram = "castero"; + description = "TUI podcast client for the terminal"; + homepage = "https://github.com/xgi/castero"; + license = licenses.mit; + platforms = platforms.linux; + maintainers = with maintainers; [ keto ]; + }; +} diff --git a/pkgs/by-name/gi/gitui/package.nix b/pkgs/by-name/gi/gitui/package.nix new file mode 100644 index 000000000000..edc03effa5fd --- /dev/null +++ b/pkgs/by-name/gi/gitui/package.nix @@ -0,0 +1,63 @@ +{ lib +, stdenv +, rustPlatform +, fetchFromGitHub +, libiconv +, openssl +, pkg-config +, xclip +, darwin +}: + +rustPlatform.buildRustPackage rec { + pname = "gitui"; + version = "0.26.1"; + + src = fetchFromGitHub { + owner = "extrawurst"; + repo = "gitui"; + rev = "v${version}"; + hash = "sha256-JqxZbxjZrrdsXWhpYu0E9F18gMldtOLrAYd+uiY8IcQ="; + }; + + cargoHash = "sha256-zEoNyIiHQT6HBNSe+H7pz229K4eD0WMhp3I/6zJQHuU="; + + nativeBuildInputs = [ pkg-config ]; + + buildInputs = [ openssl ] + ++ lib.optional stdenv.isLinux xclip + ++ lib.optionals stdenv.isDarwin [ + libiconv + darwin.apple_sdk.frameworks.Security + darwin.apple_sdk.frameworks.AppKit + ]; + + postPatch = '' + # The cargo config overrides linkers for some targets, breaking the build + # on e.g. `aarch64-linux`. These overrides are not required in the Nix + # environment: delete them. + rm .cargo/config + + # build script tries to get version information from git + rm build.rs + substituteInPlace Cargo.toml --replace-fail 'build = "build.rs"' "" + ''; + + GITUI_BUILD_NAME = version; + # Needed to get openssl-sys to use pkg-config. + OPENSSL_NO_VENDOR = 1; + + # Getting app_config_path fails with a permission denied + checkFlags = [ + "--skip=keys::key_config::tests::test_symbolic_links" + ]; + + meta = { + description = "Blazing fast terminal-ui for Git written in Rust"; + homepage = "https://github.com/extrawurst/gitui"; + changelog = "https://github.com/extrawurst/gitui/blob/v${version}/CHANGELOG.md"; + mainProgram = "gitui"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ Br1ght0ne yanganto mfrw ]; + }; +} diff --git a/pkgs/by-name/hu/hugo/package.nix b/pkgs/by-name/hu/hugo/package.nix index cc95fa00ad9d..49ebe5433c0c 100644 --- a/pkgs/by-name/hu/hugo/package.nix +++ b/pkgs/by-name/hu/hugo/package.nix @@ -10,16 +10,16 @@ buildGoModule rec { pname = "hugo"; - version = "0.124.1"; + version = "0.125.0"; src = fetchFromGitHub { owner = "gohugoio"; repo = "hugo"; rev = "refs/tags/v${version}"; - hash = "sha256-ueosu4mUqI9TH3nlOEjZBkejeo3WEfPqzLRNbj1B2Ec="; + hash = "sha256-aPBS/8m57Dn8Uvem58KzaCZJ1Hn8doL1BsDdF7w5nJc="; }; - vendorHash = "sha256-LQLrbFJUW3X4F6L7JxQJRmkQFvuFraHJRBoGLt/ObSg="; + vendorHash = "sha256-jGCHlAE5mSDKpZVWgjCEN51sL+3GR/C5ROI9065OhRU="; doCheck = false; diff --git a/pkgs/by-name/im/immich-go/package.nix b/pkgs/by-name/im/immich-go/package.nix new file mode 100644 index 000000000000..cfa5a04bf246 --- /dev/null +++ b/pkgs/by-name/im/immich-go/package.nix @@ -0,0 +1,47 @@ +{ lib, buildGoModule, fetchFromGitHub, nix-update-script, testers, immich-go }: +buildGoModule rec { + pname = "immich-go"; + version = "0.13.2"; + + src = fetchFromGitHub { + owner = "simulot"; + repo = "immich-go"; + rev = "${version}"; + hash = "sha256-zYqPPLDfBx4FLvZIo5E6nAeIiFfBCLI00xLieXFkMxs="; + }; + + vendorHash = "sha256-Y5BujN2mk662oKxQpenjFlxazST2GqWr9ug0sOsxKbY="; + + # options used by upstream: + # https://github.com/simulot/immich-go/blob/0.13.2/.goreleaser.yaml + ldflags = [ + "-s" + "-w" + "-extldflags=-static" + "-X main.version=${version}" + "-X main.commit=${version}" + "-X main.date=unknown" + ]; + + passthru = { + updateScript = nix-update-script { }; + tests.versionTest = testers.testVersion { + package = immich-go; + command = "immich-go -h"; + version = version; + }; + }; + + meta = { + description = "Immich client tool for bulk-uploads"; + longDescription = '' + Immich-Go is an open-source tool designed to streamline uploading + large photo collections to your self-hosted Immich server. + ''; + homepage = "https://github.com/simulot/immich-go"; + mainProgram = "immich-go"; + license = lib.licenses.agpl3Only; + maintainers = with lib.maintainers; [ kai-tub ]; + changelog = "https://github.com/simulot/immich-go/releases/tag/${version}"; + }; +} diff --git a/pkgs/by-name/ne/netscanner/package.nix b/pkgs/by-name/ne/netscanner/package.nix index 1e2beb336ad3..7aa745856d34 100644 --- a/pkgs/by-name/ne/netscanner/package.nix +++ b/pkgs/by-name/ne/netscanner/package.nix @@ -6,7 +6,7 @@ }: let pname = "netscanner"; - version = "0.4.1"; + version = "0.4.2"; in rustPlatform.buildRustPackage { inherit pname version; @@ -17,10 +17,10 @@ rustPlatform.buildRustPackage { owner = "Chleba"; repo = "netscanner"; rev = "refs/tags/v${version}"; - hash = "sha256-E9WQpWqXWIhY1cq/5hqBbNBffe/nFLBelnFPW0tS5Ng="; + hash = "sha256-xdY3moWRmSMZ3PVyuHBnp8c9k5KxH+MoE5+s0QWSUM4="; }; - cargoHash = "sha256-G2ePiVmHyZ7a4gn7ZGg5y4lhfbWoWGh4+fG9pMHZueg="; + cargoHash = "sha256-15BNkrr79KMyFcn7NJrGCj25RjH/a4WUOQAoMPzJieQ="; postFixup = '' wrapProgram $out/bin/netscanner \ diff --git a/pkgs/by-name/ne/neverest/package.nix b/pkgs/by-name/ne/neverest/package.nix new file mode 100644 index 000000000000..04e68b52841f --- /dev/null +++ b/pkgs/by-name/ne/neverest/package.nix @@ -0,0 +1,63 @@ +{ lib +, rustPlatform +, fetchFromSourcehut +, stdenv +, pkg-config +, darwin +, installShellFiles +, installShellCompletions ? stdenv.hostPlatform == stdenv.buildPlatform +, installManPages ? stdenv.hostPlatform == stdenv.buildPlatform +, notmuch +, buildNoDefaultFeatures ? false +, buildFeatures ? [] +}: + +rustPlatform.buildRustPackage rec { + # Learn more about available cargo features at: + # - + # - + inherit buildNoDefaultFeatures buildFeatures; + + pname = "neverest"; + version = "1.0.0-beta"; + + src = fetchFromSourcehut { + owner = "~soywod"; + repo = "${pname}-cli"; + rev = "v${version}"; + hash = "sha256-3PSJyhxrOCiuHUeVHO77+NecnI5fN5EZfPhYizuYvtE="; + }; + + cargoSha256 = "i5or8oBtjGqOfTfwB7dYXn/OPgr5WEWNEvC0WdCCG+c="; + + nativeBuildInputs = [ pkg-config ] + ++ lib.optional (installManPages || installShellCompletions) installShellFiles; + + buildInputs = [ ] + ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ AppKit Cocoa Security ]) + ++ lib.optional (builtins.elem "notmuch" buildFeatures) notmuch; + + # TODO: unit tests temporarily broken, remove this line for the next + # beta.2 release + doCheck = false; + + postInstall = lib.optionalString installManPages '' + mkdir -p $out/man + $out/bin/neverest man $out/man + installManPage $out/man/* + '' + lib.optionalString installShellCompletions '' + installShellCompletion --cmd neverest \ + --bash <($out/bin/neverest completion bash) \ + --fish <($out/bin/neverest completion fish) \ + --zsh <($out/bin/neverest completion zsh) + ''; + + meta = with lib; { + description = "CLI to synchronize, backup and restore emails"; + mainProgram = "neverest"; + homepage = "https://pimalaya.org/neverest/cli/v${version}/"; + changelog = "https://git.sr.ht/~soywod/neverest-cli/tree/v${version}/item/CHANGELOG.md"; + license = licenses.mit; + maintainers = with maintainers; [ soywod ]; + }; +} diff --git a/pkgs/by-name/ni/niri/package.nix b/pkgs/by-name/ni/niri/package.nix index 2148c52f18b4..a24619921e52 100644 --- a/pkgs/by-name/ni/niri/package.nix +++ b/pkgs/by-name/ni/niri/package.nix @@ -62,8 +62,6 @@ rustPlatform.buildRustPackage rec { libglvnd # For libEGL ]; - LIBCLANG_PATH = "${libclang.lib}/lib"; - passthru.providedSessions = ["niri"]; postPatch = '' diff --git a/pkgs/by-name/ni/nix-inspect/package.nix b/pkgs/by-name/ni/nix-inspect/package.nix index 8d7d39a40b6a..a77365dcc18f 100644 --- a/pkgs/by-name/ni/nix-inspect/package.nix +++ b/pkgs/by-name/ni/nix-inspect/package.nix @@ -13,7 +13,7 @@ src = fetchFromGitHub { owner = "bluskript"; repo = "nix-inspect"; - rev = "3d0fea2bb246130825548fce331093ee9cc9c20b"; + rev = "74007c580b8282bd336130ddf354e71502b421a6"; hash = "sha256-JichXRSfTLfy+7fhbTvA89rQLkqsY2eHgEAeAHWbA9s="; }; @@ -21,7 +21,7 @@ inherit src; pname = "nix-inspect-worker"; - version = "0.1.0"; + version = "0.1.1"; sourceRoot = "source/worker"; nativeBuildInputs = [meson ninja pkg-config]; @@ -38,9 +38,9 @@ in rustPlatform.buildRustPackage { inherit src; pname = "nix-inspect"; - version = "0.1.0"; + version = "0.1.1"; - cargoHash = "sha256-FdpHdw7bg/nEG4GjYhrdIDB4MJ4n5LoWnW4mTG2Lh5I="; + cargoHash = "sha256-l+R7BLgJvK9mQ89GVAdTyQX81VMoV11h5KFlMUqAH30="; buildInputs = [workerPackage]; @@ -50,7 +50,7 @@ in ''; meta = with lib; { - description = "A Rust package for inspecting Nix expressions"; + description = "Interactive TUI for inspecting nix configs and other expressions"; homepage = "https://github.com/bluskript/nix-inspect"; license = licenses.mit; maintainers = with maintainers; [blusk]; diff --git a/pkgs/development/python-modules/google-cloud-bigquery-datatransfer/default.nix b/pkgs/development/python-modules/google-cloud-bigquery-datatransfer/default.nix index ce3ddc189ada..e7eaf3bd595e 100644 --- a/pkgs/development/python-modules/google-cloud-bigquery-datatransfer/default.nix +++ b/pkgs/development/python-modules/google-cloud-bigquery-datatransfer/default.nix @@ -1,30 +1,34 @@ -{ lib -, buildPythonPackage -, fetchPypi -, google-api-core -, libcst -, mock -, proto-plus -, protobuf -, pytest-asyncio -, pytestCheckHook -, pythonOlder -, pytz +{ + lib, + buildPythonPackage, + fetchPypi, + google-api-core, + libcst, + mock, + proto-plus, + protobuf, + pytest-asyncio, + pytestCheckHook, + pythonOlder, + pytz, + setuptools, }: buildPythonPackage rec { pname = "google-cloud-bigquery-datatransfer"; - version = "3.15.1"; - format = "setuptools"; + version = "3.15.2"; + pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-2A0v6UBFHeP0fsU71e22Aau7HfQYnN4fo4bYD3G+p2I="; + hash = "sha256-oX4E3G3PB9qqCo5ZWt+p702oV5KUzlIdXNczthJ73Q0="; }; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ google-api-core libcst proto-plus diff --git a/pkgs/development/python-modules/langchain-core/default.nix b/pkgs/development/python-modules/langchain-core/default.nix index e7c3361e7158..bab510205cff 100644 --- a/pkgs/development/python-modules/langchain-core/default.nix +++ b/pkgs/development/python-modules/langchain-core/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "langchain-core"; - version = "0.1.42"; + version = "0.1.43"; pyproject = true; disabled = pythonOlder "3.8"; @@ -25,7 +25,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "langchain_core"; inherit version; - hash = "sha256-QHUb9g6l2OKy7+ZSkNtDRxfuODSHDAAuQOKBHwnYFOY="; + hash = "sha256-SZEz+two7899JDBiNlIVGAgLsQ/Yv290Jt5KK78q67U="; }; pythonRelaxDeps = [ diff --git a/pkgs/development/python-modules/msgraph-sdk/default.nix b/pkgs/development/python-modules/msgraph-sdk/default.nix index 7dc4e3fd062f..93b3b99acc32 100644 --- a/pkgs/development/python-modules/msgraph-sdk/default.nix +++ b/pkgs/development/python-modules/msgraph-sdk/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "msgraph-sdk"; - version = "1.2.0"; + version = "1.3.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "microsoftgraph"; repo = "msgraph-sdk-python"; rev = "refs/tags/v${version}"; - hash = "sha256-UaGdusPGWlF7gTzpCq9WrF/evdDSK5srrkH8/Vz9O8M="; + hash = "sha256-RdjACxEB4w1Sbdf8lPHd12XcEMXBqaa84mF9XvavyHo="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/nptyping/default.nix b/pkgs/development/python-modules/nptyping/default.nix index 883eb00384d9..eeb12a570fbd 100644 --- a/pkgs/development/python-modules/nptyping/default.nix +++ b/pkgs/development/python-modules/nptyping/default.nix @@ -51,6 +51,8 @@ buildPythonPackage rec { "tests/test_typeguard.py" # tries to build wheel of package, broken/unnecessary under Nix: "tests/test_wheel.py" + # beartype fails a type check + "tests/test_beartype.py" ]; pythonImportsCheck = [ diff --git a/pkgs/development/python-modules/peaqevcore/default.nix b/pkgs/development/python-modules/peaqevcore/default.nix index 3bec6c81fc11..632cff815397 100644 --- a/pkgs/development/python-modules/peaqevcore/default.nix +++ b/pkgs/development/python-modules/peaqevcore/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "peaqevcore"; - version = "19.7.14"; + version = "19.7.15"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-yUGvY5sjt2eXWpu/wSWjxpDpwBEJoZg3nI28QbdfiII="; + hash = "sha256-joEAdYJ+W+yqiiAOypEdKkwZQrFfzGvAu6Xg77B4Pss="; }; postPatch = '' diff --git a/pkgs/development/python-modules/ray/binary-hashes.nix b/pkgs/development/python-modules/ray/binary-hashes.nix index bff142637ab6..7edac88e6306 100644 --- a/pkgs/development/python-modules/ray/binary-hashes.nix +++ b/pkgs/development/python-modules/ray/binary-hashes.nix @@ -1,8 +1,8 @@ { cp310 = { - hash = "sha256-u3lZbEScS6AnvJg5KZYX2Mh2saW2Hxah5AGqkBrUUYM="; + hash = "sha256-y3T30qpaIeX53LMVpPm96CIyjna6lc0Lo3DP2gmKZ/Q="; }; cp311 = { - hash = "sha256-E8VV/nMPzjVXJuja56fWztvkcKfhJXSACOv8RLDFgn0="; + hash = "sha256-x9FDjLqHJuyaWclpZOAHtgoHKENmR/SMODIoaSwvLuA="; }; } diff --git a/pkgs/development/python-modules/ray/default.nix b/pkgs/development/python-modules/ray/default.nix index 9490d2d9e4f1..b1c886153192 100644 --- a/pkgs/development/python-modules/ray/default.nix +++ b/pkgs/development/python-modules/ray/default.nix @@ -52,7 +52,7 @@ let pname = "ray"; - version = "2.9.0"; + version = "2.10.0"; in buildPythonPackage rec { inherit pname version; diff --git a/pkgs/development/python-modules/types-aiobotocore/default.nix b/pkgs/development/python-modules/types-aiobotocore/default.nix index 17b959beeb4a..0c1a13950b7e 100644 --- a/pkgs/development/python-modules/types-aiobotocore/default.nix +++ b/pkgs/development/python-modules/types-aiobotocore/default.nix @@ -1,379 +1,378 @@ -{ lib -, buildPythonPackage -, fetchPypi -, setuptools -, botocore-stubs -, typing-extensions -, types-aiobotocore-accessanalyzer -, types-aiobotocore-account -, types-aiobotocore-acm -, types-aiobotocore-acm-pca -, aiobotocore -, botocore -, types-aiobotocore-alexaforbusiness -, types-aiobotocore-amp -, types-aiobotocore-amplify -, types-aiobotocore-amplifybackend -, types-aiobotocore-amplifyuibuilder -, types-aiobotocore-apigateway -, types-aiobotocore-apigatewaymanagementapi -, types-aiobotocore-apigatewayv2 -, types-aiobotocore-appconfig -, types-aiobotocore-appconfigdata -, types-aiobotocore-appfabric -, types-aiobotocore-appflow -, types-aiobotocore-appintegrations -, types-aiobotocore-application-autoscaling -, types-aiobotocore-application-insights -, types-aiobotocore-applicationcostprofiler -, types-aiobotocore-appmesh -, types-aiobotocore-apprunner -, types-aiobotocore-appstream -, types-aiobotocore-appsync -, types-aiobotocore-arc-zonal-shift -, types-aiobotocore-athena -, types-aiobotocore-auditmanager -, types-aiobotocore-autoscaling -, types-aiobotocore-autoscaling-plans -, types-aiobotocore-backup -, types-aiobotocore-backup-gateway -, types-aiobotocore-backupstorage -, types-aiobotocore-batch -, types-aiobotocore-billingconductor -, types-aiobotocore-braket -, types-aiobotocore-budgets -, types-aiobotocore-ce -, types-aiobotocore-chime -, types-aiobotocore-chime-sdk-identity -, types-aiobotocore-chime-sdk-media-pipelines -, types-aiobotocore-chime-sdk-meetings -, types-aiobotocore-chime-sdk-messaging -, types-aiobotocore-chime-sdk-voice -, types-aiobotocore-cleanrooms -, types-aiobotocore-cloud9 -, types-aiobotocore-cloudcontrol -, types-aiobotocore-clouddirectory -, types-aiobotocore-cloudformation -, types-aiobotocore-cloudfront -, types-aiobotocore-cloudhsm -, types-aiobotocore-cloudhsmv2 -, types-aiobotocore-cloudsearch -, types-aiobotocore-cloudsearchdomain -, types-aiobotocore-cloudtrail -, types-aiobotocore-cloudtrail-data -, types-aiobotocore-cloudwatch -, types-aiobotocore-codeartifact -, types-aiobotocore-codebuild -, types-aiobotocore-codecatalyst -, types-aiobotocore-codecommit -, types-aiobotocore-codedeploy -, types-aiobotocore-codeguru-reviewer -, types-aiobotocore-codeguru-security -, types-aiobotocore-codeguruprofiler -, types-aiobotocore-codepipeline -, types-aiobotocore-codestar -, types-aiobotocore-codestar-connections -, types-aiobotocore-codestar-notifications -, types-aiobotocore-cognito-identity -, types-aiobotocore-cognito-idp -, types-aiobotocore-cognito-sync -, types-aiobotocore-comprehend -, types-aiobotocore-comprehendmedical -, types-aiobotocore-compute-optimizer -, types-aiobotocore-config -, types-aiobotocore-connect -, types-aiobotocore-connect-contact-lens -, types-aiobotocore-connectcampaigns -, types-aiobotocore-connectcases -, types-aiobotocore-connectparticipant -, types-aiobotocore-controltower -, types-aiobotocore-cur -, types-aiobotocore-customer-profiles -, types-aiobotocore-databrew -, types-aiobotocore-dataexchange -, types-aiobotocore-datapipeline -, types-aiobotocore-datasync -, types-aiobotocore-dax -, types-aiobotocore-detective -, types-aiobotocore-devicefarm -, types-aiobotocore-devops-guru -, types-aiobotocore-directconnect -, types-aiobotocore-discovery -, types-aiobotocore-dlm -, types-aiobotocore-dms -, types-aiobotocore-docdb -, types-aiobotocore-docdb-elastic -, types-aiobotocore-drs -, types-aiobotocore-ds -, types-aiobotocore-dynamodb -, types-aiobotocore-dynamodbstreams -, types-aiobotocore-ebs -, types-aiobotocore-ec2 -, types-aiobotocore-ec2-instance-connect -, types-aiobotocore-ecr -, types-aiobotocore-ecr-public -, types-aiobotocore-ecs -, types-aiobotocore-efs -, types-aiobotocore-eks -, types-aiobotocore-elastic-inference -, types-aiobotocore-elasticache -, types-aiobotocore-elasticbeanstalk -, types-aiobotocore-elastictranscoder -, types-aiobotocore-elb -, types-aiobotocore-elbv2 -, types-aiobotocore-emr -, types-aiobotocore-emr-containers -, types-aiobotocore-emr-serverless -, types-aiobotocore-entityresolution -, types-aiobotocore-es -, types-aiobotocore-events -, types-aiobotocore-evidently -, types-aiobotocore-finspace -, types-aiobotocore-finspace-data -, types-aiobotocore-firehose -, types-aiobotocore-fis -, types-aiobotocore-fms -, types-aiobotocore-forecast -, types-aiobotocore-forecastquery -, types-aiobotocore-frauddetector -, types-aiobotocore-fsx -, types-aiobotocore-gamelift -, types-aiobotocore-gamesparks -, types-aiobotocore-glacier -, types-aiobotocore-globalaccelerator -, types-aiobotocore-glue -, types-aiobotocore-grafana -, types-aiobotocore-greengrass -, types-aiobotocore-greengrassv2 -, types-aiobotocore-groundstation -, types-aiobotocore-guardduty -, types-aiobotocore-health -, types-aiobotocore-healthlake -, types-aiobotocore-honeycode -, types-aiobotocore-iam -, types-aiobotocore-identitystore -, types-aiobotocore-imagebuilder -, types-aiobotocore-importexport -, types-aiobotocore-inspector -, types-aiobotocore-inspector2 -, types-aiobotocore-internetmonitor -, types-aiobotocore-iot -, types-aiobotocore-iot-data -, types-aiobotocore-iot-jobs-data -, types-aiobotocore-iot-roborunner -, types-aiobotocore-iot1click-devices -, types-aiobotocore-iot1click-projects -, types-aiobotocore-iotanalytics -, types-aiobotocore-iotdeviceadvisor -, types-aiobotocore-iotevents -, types-aiobotocore-iotevents-data -, types-aiobotocore-iotfleethub -, types-aiobotocore-iotfleetwise -, types-aiobotocore-iotsecuretunneling -, types-aiobotocore-iotsitewise -, types-aiobotocore-iotthingsgraph -, types-aiobotocore-iottwinmaker -, types-aiobotocore-iotwireless -, types-aiobotocore-ivs -, types-aiobotocore-ivs-realtime -, types-aiobotocore-ivschat -, types-aiobotocore-kafka -, types-aiobotocore-kafkaconnect -, types-aiobotocore-kendra -, types-aiobotocore-kendra-ranking -, types-aiobotocore-keyspaces -, types-aiobotocore-kinesis -, types-aiobotocore-kinesis-video-archived-media -, types-aiobotocore-kinesis-video-media -, types-aiobotocore-kinesis-video-signaling -, types-aiobotocore-kinesis-video-webrtc-storage -, types-aiobotocore-kinesisanalytics -, types-aiobotocore-kinesisanalyticsv2 -, types-aiobotocore-kinesisvideo -, types-aiobotocore-kms -, types-aiobotocore-lakeformation -, types-aiobotocore-lambda -, types-aiobotocore-lex-models -, types-aiobotocore-lex-runtime -, types-aiobotocore-lexv2-models -, types-aiobotocore-lexv2-runtime -, types-aiobotocore-license-manager -, types-aiobotocore-license-manager-linux-subscriptions -, types-aiobotocore-license-manager-user-subscriptions -, types-aiobotocore-lightsail -, types-aiobotocore-location -, types-aiobotocore-logs -, types-aiobotocore-lookoutequipment -, types-aiobotocore-lookoutmetrics -, types-aiobotocore-lookoutvision -, types-aiobotocore-m2 -, types-aiobotocore-machinelearning -, types-aiobotocore-macie -, types-aiobotocore-macie2 -, types-aiobotocore-managedblockchain -, types-aiobotocore-managedblockchain-query -, types-aiobotocore-marketplace-catalog -, types-aiobotocore-marketplace-entitlement -, types-aiobotocore-marketplacecommerceanalytics -, types-aiobotocore-mediaconnect -, types-aiobotocore-mediaconvert -, types-aiobotocore-medialive -, types-aiobotocore-mediapackage -, types-aiobotocore-mediapackage-vod -, types-aiobotocore-mediapackagev2 -, types-aiobotocore-mediastore -, types-aiobotocore-mediastore-data -, types-aiobotocore-mediatailor -, types-aiobotocore-medical-imaging -, types-aiobotocore-memorydb -, types-aiobotocore-meteringmarketplace -, types-aiobotocore-mgh -, types-aiobotocore-mgn -, types-aiobotocore-migration-hub-refactor-spaces -, types-aiobotocore-migrationhub-config -, types-aiobotocore-migrationhuborchestrator -, types-aiobotocore-migrationhubstrategy -, types-aiobotocore-mobile -, types-aiobotocore-mq -, types-aiobotocore-mturk -, types-aiobotocore-mwaa -, types-aiobotocore-neptune -, types-aiobotocore-network-firewall -, types-aiobotocore-networkmanager -, types-aiobotocore-nimble -, types-aiobotocore-oam -, types-aiobotocore-omics -, types-aiobotocore-opensearch -, types-aiobotocore-opensearchserverless -, types-aiobotocore-opsworks -, types-aiobotocore-opsworkscm -, types-aiobotocore-organizations -, types-aiobotocore-osis -, types-aiobotocore-outposts -, types-aiobotocore-panorama -, types-aiobotocore-payment-cryptography -, types-aiobotocore-payment-cryptography-data -, types-aiobotocore-personalize -, types-aiobotocore-personalize-events -, types-aiobotocore-personalize-runtime -, types-aiobotocore-pi -, types-aiobotocore-pinpoint -, types-aiobotocore-pinpoint-email -, types-aiobotocore-pinpoint-sms-voice -, types-aiobotocore-pinpoint-sms-voice-v2 -, types-aiobotocore-pipes -, types-aiobotocore-polly -, types-aiobotocore-pricing -, types-aiobotocore-privatenetworks -, types-aiobotocore-proton -, types-aiobotocore-qldb -, types-aiobotocore-qldb-session -, types-aiobotocore-quicksight -, types-aiobotocore-ram -, types-aiobotocore-rbin -, types-aiobotocore-rds -, types-aiobotocore-rds-data -, types-aiobotocore-redshift -, types-aiobotocore-redshift-data -, types-aiobotocore-redshift-serverless -, types-aiobotocore-rekognition -, types-aiobotocore-resiliencehub -, types-aiobotocore-resource-explorer-2 -, types-aiobotocore-resource-groups -, types-aiobotocore-resourcegroupstaggingapi -, types-aiobotocore-robomaker -, types-aiobotocore-rolesanywhere -, types-aiobotocore-route53 -, types-aiobotocore-route53-recovery-cluster -, types-aiobotocore-route53-recovery-control-config -, types-aiobotocore-route53-recovery-readiness -, types-aiobotocore-route53domains -, types-aiobotocore-route53resolver -, types-aiobotocore-rum -, types-aiobotocore-s3 -, types-aiobotocore-s3control -, types-aiobotocore-s3outposts -, types-aiobotocore-sagemaker -, types-aiobotocore-sagemaker-a2i-runtime -, types-aiobotocore-sagemaker-edge -, types-aiobotocore-sagemaker-featurestore-runtime -, types-aiobotocore-sagemaker-geospatial -, types-aiobotocore-sagemaker-metrics -, types-aiobotocore-sagemaker-runtime -, types-aiobotocore-savingsplans -, types-aiobotocore-scheduler -, types-aiobotocore-schemas -, types-aiobotocore-sdb -, types-aiobotocore-secretsmanager -, types-aiobotocore-securityhub -, types-aiobotocore-securitylake -, types-aiobotocore-serverlessrepo -, types-aiobotocore-service-quotas -, types-aiobotocore-servicecatalog -, types-aiobotocore-servicecatalog-appregistry -, types-aiobotocore-servicediscovery -, types-aiobotocore-ses -, types-aiobotocore-sesv2 -, types-aiobotocore-shield -, types-aiobotocore-signer -, types-aiobotocore-simspaceweaver -, types-aiobotocore-sms -, types-aiobotocore-sms-voice -, types-aiobotocore-snow-device-management -, types-aiobotocore-snowball -, types-aiobotocore-sns -, types-aiobotocore-sqs -, types-aiobotocore-ssm -, types-aiobotocore-ssm-contacts -, types-aiobotocore-ssm-incidents -, types-aiobotocore-ssm-sap -, types-aiobotocore-sso -, types-aiobotocore-sso-admin -, types-aiobotocore-sso-oidc -, types-aiobotocore-stepfunctions -, types-aiobotocore-storagegateway -, types-aiobotocore-sts -, types-aiobotocore-support -, types-aiobotocore-support-app -, types-aiobotocore-swf -, types-aiobotocore-synthetics -, types-aiobotocore-textract -, types-aiobotocore-timestream-query -, types-aiobotocore-timestream-write -, types-aiobotocore-tnb -, types-aiobotocore-transcribe -, types-aiobotocore-transfer -, types-aiobotocore-translate -, types-aiobotocore-verifiedpermissions -, types-aiobotocore-voice-id -, types-aiobotocore-vpc-lattice -, types-aiobotocore-waf -, types-aiobotocore-waf-regional -, types-aiobotocore-wafv2 -, types-aiobotocore-wellarchitected -, types-aiobotocore-wisdom -, types-aiobotocore-workdocs -, types-aiobotocore-worklink -, types-aiobotocore-workmail -, types-aiobotocore-workmailmessageflow -, types-aiobotocore-workspaces -, types-aiobotocore-workspaces-web -, types-aiobotocore-xray +{ + lib, + buildPythonPackage, + fetchPypi, + setuptools, + botocore-stubs, + typing-extensions, + types-aiobotocore-accessanalyzer, + types-aiobotocore-account, + types-aiobotocore-acm, + types-aiobotocore-acm-pca, + aiobotocore, + botocore, + types-aiobotocore-alexaforbusiness, + types-aiobotocore-amp, + types-aiobotocore-amplify, + types-aiobotocore-amplifybackend, + types-aiobotocore-amplifyuibuilder, + types-aiobotocore-apigateway, + types-aiobotocore-apigatewaymanagementapi, + types-aiobotocore-apigatewayv2, + types-aiobotocore-appconfig, + types-aiobotocore-appconfigdata, + types-aiobotocore-appfabric, + types-aiobotocore-appflow, + types-aiobotocore-appintegrations, + types-aiobotocore-application-autoscaling, + types-aiobotocore-application-insights, + types-aiobotocore-applicationcostprofiler, + types-aiobotocore-appmesh, + types-aiobotocore-apprunner, + types-aiobotocore-appstream, + types-aiobotocore-appsync, + types-aiobotocore-arc-zonal-shift, + types-aiobotocore-athena, + types-aiobotocore-auditmanager, + types-aiobotocore-autoscaling, + types-aiobotocore-autoscaling-plans, + types-aiobotocore-backup, + types-aiobotocore-backup-gateway, + types-aiobotocore-backupstorage, + types-aiobotocore-batch, + types-aiobotocore-billingconductor, + types-aiobotocore-braket, + types-aiobotocore-budgets, + types-aiobotocore-ce, + types-aiobotocore-chime, + types-aiobotocore-chime-sdk-identity, + types-aiobotocore-chime-sdk-media-pipelines, + types-aiobotocore-chime-sdk-meetings, + types-aiobotocore-chime-sdk-messaging, + types-aiobotocore-chime-sdk-voice, + types-aiobotocore-cleanrooms, + types-aiobotocore-cloud9, + types-aiobotocore-cloudcontrol, + types-aiobotocore-clouddirectory, + types-aiobotocore-cloudformation, + types-aiobotocore-cloudfront, + types-aiobotocore-cloudhsm, + types-aiobotocore-cloudhsmv2, + types-aiobotocore-cloudsearch, + types-aiobotocore-cloudsearchdomain, + types-aiobotocore-cloudtrail, + types-aiobotocore-cloudtrail-data, + types-aiobotocore-cloudwatch, + types-aiobotocore-codeartifact, + types-aiobotocore-codebuild, + types-aiobotocore-codecatalyst, + types-aiobotocore-codecommit, + types-aiobotocore-codedeploy, + types-aiobotocore-codeguru-reviewer, + types-aiobotocore-codeguru-security, + types-aiobotocore-codeguruprofiler, + types-aiobotocore-codepipeline, + types-aiobotocore-codestar, + types-aiobotocore-codestar-connections, + types-aiobotocore-codestar-notifications, + types-aiobotocore-cognito-identity, + types-aiobotocore-cognito-idp, + types-aiobotocore-cognito-sync, + types-aiobotocore-comprehend, + types-aiobotocore-comprehendmedical, + types-aiobotocore-compute-optimizer, + types-aiobotocore-config, + types-aiobotocore-connect, + types-aiobotocore-connect-contact-lens, + types-aiobotocore-connectcampaigns, + types-aiobotocore-connectcases, + types-aiobotocore-connectparticipant, + types-aiobotocore-controltower, + types-aiobotocore-cur, + types-aiobotocore-customer-profiles, + types-aiobotocore-databrew, + types-aiobotocore-dataexchange, + types-aiobotocore-datapipeline, + types-aiobotocore-datasync, + types-aiobotocore-dax, + types-aiobotocore-detective, + types-aiobotocore-devicefarm, + types-aiobotocore-devops-guru, + types-aiobotocore-directconnect, + types-aiobotocore-discovery, + types-aiobotocore-dlm, + types-aiobotocore-dms, + types-aiobotocore-docdb, + types-aiobotocore-docdb-elastic, + types-aiobotocore-drs, + types-aiobotocore-ds, + types-aiobotocore-dynamodb, + types-aiobotocore-dynamodbstreams, + types-aiobotocore-ebs, + types-aiobotocore-ec2, + types-aiobotocore-ec2-instance-connect, + types-aiobotocore-ecr, + types-aiobotocore-ecr-public, + types-aiobotocore-ecs, + types-aiobotocore-efs, + types-aiobotocore-eks, + types-aiobotocore-elastic-inference, + types-aiobotocore-elasticache, + types-aiobotocore-elasticbeanstalk, + types-aiobotocore-elastictranscoder, + types-aiobotocore-elb, + types-aiobotocore-elbv2, + types-aiobotocore-emr, + types-aiobotocore-emr-containers, + types-aiobotocore-emr-serverless, + types-aiobotocore-entityresolution, + types-aiobotocore-es, + types-aiobotocore-events, + types-aiobotocore-evidently, + types-aiobotocore-finspace, + types-aiobotocore-finspace-data, + types-aiobotocore-firehose, + types-aiobotocore-fis, + types-aiobotocore-fms, + types-aiobotocore-forecast, + types-aiobotocore-forecastquery, + types-aiobotocore-frauddetector, + types-aiobotocore-fsx, + types-aiobotocore-gamelift, + types-aiobotocore-gamesparks, + types-aiobotocore-glacier, + types-aiobotocore-globalaccelerator, + types-aiobotocore-glue, + types-aiobotocore-grafana, + types-aiobotocore-greengrass, + types-aiobotocore-greengrassv2, + types-aiobotocore-groundstation, + types-aiobotocore-guardduty, + types-aiobotocore-health, + types-aiobotocore-healthlake, + types-aiobotocore-honeycode, + types-aiobotocore-iam, + types-aiobotocore-identitystore, + types-aiobotocore-imagebuilder, + types-aiobotocore-importexport, + types-aiobotocore-inspector, + types-aiobotocore-inspector2, + types-aiobotocore-internetmonitor, + types-aiobotocore-iot, + types-aiobotocore-iot-data, + types-aiobotocore-iot-jobs-data, + types-aiobotocore-iot-roborunner, + types-aiobotocore-iot1click-devices, + types-aiobotocore-iot1click-projects, + types-aiobotocore-iotanalytics, + types-aiobotocore-iotdeviceadvisor, + types-aiobotocore-iotevents, + types-aiobotocore-iotevents-data, + types-aiobotocore-iotfleethub, + types-aiobotocore-iotfleetwise, + types-aiobotocore-iotsecuretunneling, + types-aiobotocore-iotsitewise, + types-aiobotocore-iotthingsgraph, + types-aiobotocore-iottwinmaker, + types-aiobotocore-iotwireless, + types-aiobotocore-ivs, + types-aiobotocore-ivs-realtime, + types-aiobotocore-ivschat, + types-aiobotocore-kafka, + types-aiobotocore-kafkaconnect, + types-aiobotocore-kendra, + types-aiobotocore-kendra-ranking, + types-aiobotocore-keyspaces, + types-aiobotocore-kinesis, + types-aiobotocore-kinesis-video-archived-media, + types-aiobotocore-kinesis-video-media, + types-aiobotocore-kinesis-video-signaling, + types-aiobotocore-kinesis-video-webrtc-storage, + types-aiobotocore-kinesisanalytics, + types-aiobotocore-kinesisanalyticsv2, + types-aiobotocore-kinesisvideo, + types-aiobotocore-kms, + types-aiobotocore-lakeformation, + types-aiobotocore-lambda, + types-aiobotocore-lex-models, + types-aiobotocore-lex-runtime, + types-aiobotocore-lexv2-models, + types-aiobotocore-lexv2-runtime, + types-aiobotocore-license-manager, + types-aiobotocore-license-manager-linux-subscriptions, + types-aiobotocore-license-manager-user-subscriptions, + types-aiobotocore-lightsail, + types-aiobotocore-location, + types-aiobotocore-logs, + types-aiobotocore-lookoutequipment, + types-aiobotocore-lookoutmetrics, + types-aiobotocore-lookoutvision, + types-aiobotocore-m2, + types-aiobotocore-machinelearning, + types-aiobotocore-macie, + types-aiobotocore-macie2, + types-aiobotocore-managedblockchain, + types-aiobotocore-managedblockchain-query, + types-aiobotocore-marketplace-catalog, + types-aiobotocore-marketplace-entitlement, + types-aiobotocore-marketplacecommerceanalytics, + types-aiobotocore-mediaconnect, + types-aiobotocore-mediaconvert, + types-aiobotocore-medialive, + types-aiobotocore-mediapackage, + types-aiobotocore-mediapackage-vod, + types-aiobotocore-mediapackagev2, + types-aiobotocore-mediastore, + types-aiobotocore-mediastore-data, + types-aiobotocore-mediatailor, + types-aiobotocore-medical-imaging, + types-aiobotocore-memorydb, + types-aiobotocore-meteringmarketplace, + types-aiobotocore-mgh, + types-aiobotocore-mgn, + types-aiobotocore-migration-hub-refactor-spaces, + types-aiobotocore-migrationhub-config, + types-aiobotocore-migrationhuborchestrator, + types-aiobotocore-migrationhubstrategy, + types-aiobotocore-mobile, + types-aiobotocore-mq, + types-aiobotocore-mturk, + types-aiobotocore-mwaa, + types-aiobotocore-neptune, + types-aiobotocore-network-firewall, + types-aiobotocore-networkmanager, + types-aiobotocore-nimble, + types-aiobotocore-oam, + types-aiobotocore-omics, + types-aiobotocore-opensearch, + types-aiobotocore-opensearchserverless, + types-aiobotocore-opsworks, + types-aiobotocore-opsworkscm, + types-aiobotocore-organizations, + types-aiobotocore-osis, + types-aiobotocore-outposts, + types-aiobotocore-panorama, + types-aiobotocore-payment-cryptography, + types-aiobotocore-payment-cryptography-data, + types-aiobotocore-personalize, + types-aiobotocore-personalize-events, + types-aiobotocore-personalize-runtime, + types-aiobotocore-pi, + types-aiobotocore-pinpoint, + types-aiobotocore-pinpoint-email, + types-aiobotocore-pinpoint-sms-voice, + types-aiobotocore-pinpoint-sms-voice-v2, + types-aiobotocore-pipes, + types-aiobotocore-polly, + types-aiobotocore-pricing, + types-aiobotocore-privatenetworks, + types-aiobotocore-proton, + types-aiobotocore-qldb, + types-aiobotocore-qldb-session, + types-aiobotocore-quicksight, + types-aiobotocore-ram, + types-aiobotocore-rbin, + types-aiobotocore-rds, + types-aiobotocore-rds-data, + types-aiobotocore-redshift, + types-aiobotocore-redshift-data, + types-aiobotocore-redshift-serverless, + types-aiobotocore-rekognition, + types-aiobotocore-resiliencehub, + types-aiobotocore-resource-explorer-2, + types-aiobotocore-resource-groups, + types-aiobotocore-resourcegroupstaggingapi, + types-aiobotocore-robomaker, + types-aiobotocore-rolesanywhere, + types-aiobotocore-route53, + types-aiobotocore-route53-recovery-cluster, + types-aiobotocore-route53-recovery-control-config, + types-aiobotocore-route53-recovery-readiness, + types-aiobotocore-route53domains, + types-aiobotocore-route53resolver, + types-aiobotocore-rum, + types-aiobotocore-s3, + types-aiobotocore-s3control, + types-aiobotocore-s3outposts, + types-aiobotocore-sagemaker, + types-aiobotocore-sagemaker-a2i-runtime, + types-aiobotocore-sagemaker-edge, + types-aiobotocore-sagemaker-featurestore-runtime, + types-aiobotocore-sagemaker-geospatial, + types-aiobotocore-sagemaker-metrics, + types-aiobotocore-sagemaker-runtime, + types-aiobotocore-savingsplans, + types-aiobotocore-scheduler, + types-aiobotocore-schemas, + types-aiobotocore-sdb, + types-aiobotocore-secretsmanager, + types-aiobotocore-securityhub, + types-aiobotocore-securitylake, + types-aiobotocore-serverlessrepo, + types-aiobotocore-service-quotas, + types-aiobotocore-servicecatalog, + types-aiobotocore-servicecatalog-appregistry, + types-aiobotocore-servicediscovery, + types-aiobotocore-ses, + types-aiobotocore-sesv2, + types-aiobotocore-shield, + types-aiobotocore-signer, + types-aiobotocore-simspaceweaver, + types-aiobotocore-sms, + types-aiobotocore-sms-voice, + types-aiobotocore-snow-device-management, + types-aiobotocore-snowball, + types-aiobotocore-sns, + types-aiobotocore-sqs, + types-aiobotocore-ssm, + types-aiobotocore-ssm-contacts, + types-aiobotocore-ssm-incidents, + types-aiobotocore-ssm-sap, + types-aiobotocore-sso, + types-aiobotocore-sso-admin, + types-aiobotocore-sso-oidc, + types-aiobotocore-stepfunctions, + types-aiobotocore-storagegateway, + types-aiobotocore-sts, + types-aiobotocore-support, + types-aiobotocore-support-app, + types-aiobotocore-swf, + types-aiobotocore-synthetics, + types-aiobotocore-textract, + types-aiobotocore-timestream-query, + types-aiobotocore-timestream-write, + types-aiobotocore-tnb, + types-aiobotocore-transcribe, + types-aiobotocore-transfer, + types-aiobotocore-translate, + types-aiobotocore-verifiedpermissions, + types-aiobotocore-voice-id, + types-aiobotocore-vpc-lattice, + types-aiobotocore-waf, + types-aiobotocore-waf-regional, + types-aiobotocore-wafv2, + types-aiobotocore-wellarchitected, + types-aiobotocore-wisdom, + types-aiobotocore-workdocs, + types-aiobotocore-worklink, + types-aiobotocore-workmail, + types-aiobotocore-workmailmessageflow, + types-aiobotocore-workspaces, + types-aiobotocore-workspaces-web, + types-aiobotocore-xray, }: buildPythonPackage rec { pname = "types-aiobotocore"; - version = "2.12.2"; + version = "2.12.3"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-cpw68B9rX30QE+pbfSRV00wg05XZuKmSYNdJ53uo7+M="; + hash = "sha256-h1dg3vgjPBYErgj8UKEcckCQuzGZr+VfhAuBS1biJ/M="; }; - build-system = [ - setuptools - ]; + build-system = [ setuptools ]; dependencies = [ botocore-stubs @@ -381,25 +380,15 @@ buildPythonPackage rec { ]; passthru.optional-dependencies = { - accessanalyzer = [ - types-aiobotocore-accessanalyzer - ]; - account = [ - types-aiobotocore-account - ]; - acm = [ - types-aiobotocore-acm - ]; - acm-pca = [ - types-aiobotocore-acm-pca - ]; + accessanalyzer = [ types-aiobotocore-accessanalyzer ]; + account = [ types-aiobotocore-account ]; + acm = [ types-aiobotocore-acm ]; + acm-pca = [ types-aiobotocore-acm-pca ]; aiobotocore = [ aiobotocore botocore ]; - alexaforbusiness = [ - types-aiobotocore-alexaforbusiness - ]; + alexaforbusiness = [ types-aiobotocore-alexaforbusiness ]; all = [ types-aiobotocore-accessanalyzer types-aiobotocore-account @@ -755,351 +744,121 @@ buildPythonPackage rec { types-aiobotocore-workspaces-web types-aiobotocore-xray ]; - amp = [ - types-aiobotocore-amp - ]; - amplify = [ - types-aiobotocore-amplify - ]; - amplifybackend = [ - types-aiobotocore-amplifybackend - ]; - amplifyuibuilder = [ - types-aiobotocore-amplifyuibuilder - ]; - apigateway = [ - types-aiobotocore-apigateway - ]; - apigatewaymanagementapi = [ - types-aiobotocore-apigatewaymanagementapi - ]; - apigatewayv2 = [ - types-aiobotocore-apigatewayv2 - ]; - appconfig = [ - types-aiobotocore-appconfig - ]; - appconfigdata = [ - types-aiobotocore-appconfigdata - ]; - appfabric = [ - types-aiobotocore-appfabric - ]; - appflow = [ - types-aiobotocore-appflow - ]; - appintegrations = [ - types-aiobotocore-appintegrations - ]; - application-autoscaling = [ - types-aiobotocore-application-autoscaling - ]; - application-insights = [ - types-aiobotocore-application-insights - ]; - applicationcostprofiler = [ - types-aiobotocore-applicationcostprofiler - ]; - appmesh = [ - types-aiobotocore-appmesh - ]; - apprunner = [ - types-aiobotocore-apprunner - ]; - appstream = [ - types-aiobotocore-appstream - ]; - appsync = [ - types-aiobotocore-appsync - ]; - arc-zonal-shift = [ - types-aiobotocore-arc-zonal-shift - ]; - athena = [ - types-aiobotocore-athena - ]; - auditmanager = [ - types-aiobotocore-auditmanager - ]; - autoscaling = [ - types-aiobotocore-autoscaling - ]; - autoscaling-plans = [ - types-aiobotocore-autoscaling-plans - ]; - backup = [ - types-aiobotocore-backup - ]; - backup-gateway = [ - types-aiobotocore-backup-gateway - ]; - backupstorage = [ - types-aiobotocore-backupstorage - ]; - batch = [ - types-aiobotocore-batch - ]; - billingconductor = [ - types-aiobotocore-billingconductor - ]; - braket = [ - types-aiobotocore-braket - ]; - budgets = [ - types-aiobotocore-budgets - ]; - ce = [ - types-aiobotocore-ce - ]; - chime = [ - types-aiobotocore-chime - ]; - chime-sdk-identity = [ - types-aiobotocore-chime-sdk-identity - ]; - chime-sdk-media-pipelines = [ - types-aiobotocore-chime-sdk-media-pipelines - ]; - chime-sdk-meetings = [ - types-aiobotocore-chime-sdk-meetings - ]; - chime-sdk-messaging = [ - types-aiobotocore-chime-sdk-messaging - ]; - chime-sdk-voice = [ - types-aiobotocore-chime-sdk-voice - ]; - cleanrooms = [ - types-aiobotocore-cleanrooms - ]; - cloud9 = [ - types-aiobotocore-cloud9 - ]; - cloudcontrol = [ - types-aiobotocore-cloudcontrol - ]; - clouddirectory = [ - types-aiobotocore-clouddirectory - ]; - cloudformation = [ - types-aiobotocore-cloudformation - ]; - cloudfront = [ - types-aiobotocore-cloudfront - ]; - cloudhsm = [ - types-aiobotocore-cloudhsm - ]; - cloudhsmv2 = [ - types-aiobotocore-cloudhsmv2 - ]; - cloudsearch = [ - types-aiobotocore-cloudsearch - ]; - cloudsearchdomain = [ - types-aiobotocore-cloudsearchdomain - ]; - cloudtrail = [ - types-aiobotocore-cloudtrail - ]; - cloudtrail-data = [ - types-aiobotocore-cloudtrail-data - ]; - cloudwatch = [ - types-aiobotocore-cloudwatch - ]; - codeartifact = [ - types-aiobotocore-codeartifact - ]; - codebuild = [ - types-aiobotocore-codebuild - ]; - codecatalyst = [ - types-aiobotocore-codecatalyst - ]; - codecommit = [ - types-aiobotocore-codecommit - ]; - codedeploy = [ - types-aiobotocore-codedeploy - ]; - codeguru-reviewer = [ - types-aiobotocore-codeguru-reviewer - ]; - codeguru-security = [ - types-aiobotocore-codeguru-security - ]; - codeguruprofiler = [ - types-aiobotocore-codeguruprofiler - ]; - codepipeline = [ - types-aiobotocore-codepipeline - ]; - codestar = [ - types-aiobotocore-codestar - ]; - codestar-connections = [ - types-aiobotocore-codestar-connections - ]; - codestar-notifications = [ - types-aiobotocore-codestar-notifications - ]; - cognito-identity = [ - types-aiobotocore-cognito-identity - ]; - cognito-idp = [ - types-aiobotocore-cognito-idp - ]; - cognito-sync = [ - types-aiobotocore-cognito-sync - ]; - comprehend = [ - types-aiobotocore-comprehend - ]; - comprehendmedical = [ - types-aiobotocore-comprehendmedical - ]; - compute-optimizer = [ - types-aiobotocore-compute-optimizer - ]; - config = [ - types-aiobotocore-config - ]; - connect = [ - types-aiobotocore-connect - ]; - connect-contact-lens = [ - types-aiobotocore-connect-contact-lens - ]; - connectcampaigns = [ - types-aiobotocore-connectcampaigns - ]; - connectcases = [ - types-aiobotocore-connectcases - ]; - connectparticipant = [ - types-aiobotocore-connectparticipant - ]; - controltower = [ - types-aiobotocore-controltower - ]; - cur = [ - types-aiobotocore-cur - ]; - customer-profiles = [ - types-aiobotocore-customer-profiles - ]; - databrew = [ - types-aiobotocore-databrew - ]; - dataexchange = [ - types-aiobotocore-dataexchange - ]; - datapipeline = [ - types-aiobotocore-datapipeline - ]; - datasync = [ - types-aiobotocore-datasync - ]; - dax = [ - types-aiobotocore-dax - ]; - detective = [ - types-aiobotocore-detective - ]; - devicefarm = [ - types-aiobotocore-devicefarm - ]; - devops-guru = [ - types-aiobotocore-devops-guru - ]; - directconnect = [ - types-aiobotocore-directconnect - ]; - discovery = [ - types-aiobotocore-discovery - ]; - dlm = [ - types-aiobotocore-dlm - ]; - dms = [ - types-aiobotocore-dms - ]; - docdb = [ - types-aiobotocore-docdb - ]; - docdb-elastic = [ - types-aiobotocore-docdb-elastic - ]; - drs = [ - types-aiobotocore-drs - ]; - ds = [ - types-aiobotocore-ds - ]; - dynamodb = [ - types-aiobotocore-dynamodb - ]; - dynamodbstreams = [ - types-aiobotocore-dynamodbstreams - ]; - ebs = [ - types-aiobotocore-ebs - ]; - ec2 = [ - types-aiobotocore-ec2 - ]; - ec2-instance-connect = [ - types-aiobotocore-ec2-instance-connect - ]; - ecr = [ - types-aiobotocore-ecr - ]; - ecr-public = [ - types-aiobotocore-ecr-public - ]; - ecs = [ - types-aiobotocore-ecs - ]; - efs = [ - types-aiobotocore-efs - ]; - eks = [ - types-aiobotocore-eks - ]; - elastic-inference = [ - types-aiobotocore-elastic-inference - ]; - elasticache = [ - types-aiobotocore-elasticache - ]; - elasticbeanstalk = [ - types-aiobotocore-elasticbeanstalk - ]; - elastictranscoder = [ - types-aiobotocore-elastictranscoder - ]; - elb = [ - types-aiobotocore-elb - ]; - elbv2 = [ - types-aiobotocore-elbv2 - ]; - emr = [ - types-aiobotocore-emr - ]; - emr-containers = [ - types-aiobotocore-emr-containers - ]; - emr-serverless = [ - types-aiobotocore-emr-serverless - ]; - entityresolution = [ - types-aiobotocore-entityresolution - ]; - es = [ - types-aiobotocore-es - ]; + amp = [ types-aiobotocore-amp ]; + amplify = [ types-aiobotocore-amplify ]; + amplifybackend = [ types-aiobotocore-amplifybackend ]; + amplifyuibuilder = [ types-aiobotocore-amplifyuibuilder ]; + apigateway = [ types-aiobotocore-apigateway ]; + apigatewaymanagementapi = [ types-aiobotocore-apigatewaymanagementapi ]; + apigatewayv2 = [ types-aiobotocore-apigatewayv2 ]; + appconfig = [ types-aiobotocore-appconfig ]; + appconfigdata = [ types-aiobotocore-appconfigdata ]; + appfabric = [ types-aiobotocore-appfabric ]; + appflow = [ types-aiobotocore-appflow ]; + appintegrations = [ types-aiobotocore-appintegrations ]; + application-autoscaling = [ types-aiobotocore-application-autoscaling ]; + application-insights = [ types-aiobotocore-application-insights ]; + applicationcostprofiler = [ types-aiobotocore-applicationcostprofiler ]; + appmesh = [ types-aiobotocore-appmesh ]; + apprunner = [ types-aiobotocore-apprunner ]; + appstream = [ types-aiobotocore-appstream ]; + appsync = [ types-aiobotocore-appsync ]; + arc-zonal-shift = [ types-aiobotocore-arc-zonal-shift ]; + athena = [ types-aiobotocore-athena ]; + auditmanager = [ types-aiobotocore-auditmanager ]; + autoscaling = [ types-aiobotocore-autoscaling ]; + autoscaling-plans = [ types-aiobotocore-autoscaling-plans ]; + backup = [ types-aiobotocore-backup ]; + backup-gateway = [ types-aiobotocore-backup-gateway ]; + backupstorage = [ types-aiobotocore-backupstorage ]; + batch = [ types-aiobotocore-batch ]; + billingconductor = [ types-aiobotocore-billingconductor ]; + braket = [ types-aiobotocore-braket ]; + budgets = [ types-aiobotocore-budgets ]; + ce = [ types-aiobotocore-ce ]; + chime = [ types-aiobotocore-chime ]; + chime-sdk-identity = [ types-aiobotocore-chime-sdk-identity ]; + chime-sdk-media-pipelines = [ types-aiobotocore-chime-sdk-media-pipelines ]; + chime-sdk-meetings = [ types-aiobotocore-chime-sdk-meetings ]; + chime-sdk-messaging = [ types-aiobotocore-chime-sdk-messaging ]; + chime-sdk-voice = [ types-aiobotocore-chime-sdk-voice ]; + cleanrooms = [ types-aiobotocore-cleanrooms ]; + cloud9 = [ types-aiobotocore-cloud9 ]; + cloudcontrol = [ types-aiobotocore-cloudcontrol ]; + clouddirectory = [ types-aiobotocore-clouddirectory ]; + cloudformation = [ types-aiobotocore-cloudformation ]; + cloudfront = [ types-aiobotocore-cloudfront ]; + cloudhsm = [ types-aiobotocore-cloudhsm ]; + cloudhsmv2 = [ types-aiobotocore-cloudhsmv2 ]; + cloudsearch = [ types-aiobotocore-cloudsearch ]; + cloudsearchdomain = [ types-aiobotocore-cloudsearchdomain ]; + cloudtrail = [ types-aiobotocore-cloudtrail ]; + cloudtrail-data = [ types-aiobotocore-cloudtrail-data ]; + cloudwatch = [ types-aiobotocore-cloudwatch ]; + codeartifact = [ types-aiobotocore-codeartifact ]; + codebuild = [ types-aiobotocore-codebuild ]; + codecatalyst = [ types-aiobotocore-codecatalyst ]; + codecommit = [ types-aiobotocore-codecommit ]; + codedeploy = [ types-aiobotocore-codedeploy ]; + codeguru-reviewer = [ types-aiobotocore-codeguru-reviewer ]; + codeguru-security = [ types-aiobotocore-codeguru-security ]; + codeguruprofiler = [ types-aiobotocore-codeguruprofiler ]; + codepipeline = [ types-aiobotocore-codepipeline ]; + codestar = [ types-aiobotocore-codestar ]; + codestar-connections = [ types-aiobotocore-codestar-connections ]; + codestar-notifications = [ types-aiobotocore-codestar-notifications ]; + cognito-identity = [ types-aiobotocore-cognito-identity ]; + cognito-idp = [ types-aiobotocore-cognito-idp ]; + cognito-sync = [ types-aiobotocore-cognito-sync ]; + comprehend = [ types-aiobotocore-comprehend ]; + comprehendmedical = [ types-aiobotocore-comprehendmedical ]; + compute-optimizer = [ types-aiobotocore-compute-optimizer ]; + config = [ types-aiobotocore-config ]; + connect = [ types-aiobotocore-connect ]; + connect-contact-lens = [ types-aiobotocore-connect-contact-lens ]; + connectcampaigns = [ types-aiobotocore-connectcampaigns ]; + connectcases = [ types-aiobotocore-connectcases ]; + connectparticipant = [ types-aiobotocore-connectparticipant ]; + controltower = [ types-aiobotocore-controltower ]; + cur = [ types-aiobotocore-cur ]; + customer-profiles = [ types-aiobotocore-customer-profiles ]; + databrew = [ types-aiobotocore-databrew ]; + dataexchange = [ types-aiobotocore-dataexchange ]; + datapipeline = [ types-aiobotocore-datapipeline ]; + datasync = [ types-aiobotocore-datasync ]; + dax = [ types-aiobotocore-dax ]; + detective = [ types-aiobotocore-detective ]; + devicefarm = [ types-aiobotocore-devicefarm ]; + devops-guru = [ types-aiobotocore-devops-guru ]; + directconnect = [ types-aiobotocore-directconnect ]; + discovery = [ types-aiobotocore-discovery ]; + dlm = [ types-aiobotocore-dlm ]; + dms = [ types-aiobotocore-dms ]; + docdb = [ types-aiobotocore-docdb ]; + docdb-elastic = [ types-aiobotocore-docdb-elastic ]; + drs = [ types-aiobotocore-drs ]; + ds = [ types-aiobotocore-ds ]; + dynamodb = [ types-aiobotocore-dynamodb ]; + dynamodbstreams = [ types-aiobotocore-dynamodbstreams ]; + ebs = [ types-aiobotocore-ebs ]; + ec2 = [ types-aiobotocore-ec2 ]; + ec2-instance-connect = [ types-aiobotocore-ec2-instance-connect ]; + ecr = [ types-aiobotocore-ecr ]; + ecr-public = [ types-aiobotocore-ecr-public ]; + ecs = [ types-aiobotocore-ecs ]; + efs = [ types-aiobotocore-efs ]; + eks = [ types-aiobotocore-eks ]; + elastic-inference = [ types-aiobotocore-elastic-inference ]; + elasticache = [ types-aiobotocore-elasticache ]; + elasticbeanstalk = [ types-aiobotocore-elasticbeanstalk ]; + elastictranscoder = [ types-aiobotocore-elastictranscoder ]; + elb = [ types-aiobotocore-elb ]; + elbv2 = [ types-aiobotocore-elbv2 ]; + emr = [ types-aiobotocore-emr ]; + emr-containers = [ types-aiobotocore-emr-containers ]; + emr-serverless = [ types-aiobotocore-emr-serverless ]; + entityresolution = [ types-aiobotocore-entityresolution ]; + es = [ types-aiobotocore-es ]; essential = [ types-aiobotocore-cloudformation types-aiobotocore-dynamodb @@ -1109,705 +868,239 @@ buildPythonPackage rec { types-aiobotocore-s3 types-aiobotocore-sqs ]; - events = [ - types-aiobotocore-events - ]; - evidently = [ - types-aiobotocore-evidently - ]; - finspace = [ - types-aiobotocore-finspace - ]; - finspace-data = [ - types-aiobotocore-finspace-data - ]; - firehose = [ - types-aiobotocore-firehose - ]; - fis = [ - types-aiobotocore-fis - ]; - fms = [ - types-aiobotocore-fms - ]; - forecast = [ - types-aiobotocore-forecast - ]; - forecastquery = [ - types-aiobotocore-forecastquery - ]; - frauddetector = [ - types-aiobotocore-frauddetector - ]; - fsx = [ - types-aiobotocore-fsx - ]; - gamelift = [ - types-aiobotocore-gamelift - ]; - gamesparks = [ - types-aiobotocore-gamesparks - ]; - glacier = [ - types-aiobotocore-glacier - ]; - globalaccelerator = [ - types-aiobotocore-globalaccelerator - ]; - glue = [ - types-aiobotocore-glue - ]; - grafana = [ - types-aiobotocore-grafana - ]; - greengrass = [ - types-aiobotocore-greengrass - ]; - greengrassv2 = [ - types-aiobotocore-greengrassv2 - ]; - groundstation = [ - types-aiobotocore-groundstation - ]; - guardduty = [ - types-aiobotocore-guardduty - ]; - health = [ - types-aiobotocore-health - ]; - healthlake = [ - types-aiobotocore-healthlake - ]; - honeycode = [ - types-aiobotocore-honeycode - ]; - iam = [ - types-aiobotocore-iam - ]; - identitystore = [ - types-aiobotocore-identitystore - ]; - imagebuilder = [ - types-aiobotocore-imagebuilder - ]; - importexport = [ - types-aiobotocore-importexport - ]; - inspector = [ - types-aiobotocore-inspector - ]; - inspector2 = [ - types-aiobotocore-inspector2 - ]; - internetmonitor = [ - types-aiobotocore-internetmonitor - ]; - iot = [ - types-aiobotocore-iot - ]; - iot-data = [ - types-aiobotocore-iot-data - ]; - iot-jobs-data = [ - types-aiobotocore-iot-jobs-data - ]; - iot-roborunner = [ - types-aiobotocore-iot-roborunner - ]; - iot1click-devices = [ - types-aiobotocore-iot1click-devices - ]; - iot1click-projects = [ - types-aiobotocore-iot1click-projects - ]; - iotanalytics = [ - types-aiobotocore-iotanalytics - ]; - iotdeviceadvisor = [ - types-aiobotocore-iotdeviceadvisor - ]; - iotevents = [ - types-aiobotocore-iotevents - ]; - iotevents-data = [ - types-aiobotocore-iotevents-data - ]; - iotfleethub = [ - types-aiobotocore-iotfleethub - ]; - iotfleetwise = [ - types-aiobotocore-iotfleetwise - ]; - iotsecuretunneling = [ - types-aiobotocore-iotsecuretunneling - ]; - iotsitewise = [ - types-aiobotocore-iotsitewise - ]; - iotthingsgraph = [ - types-aiobotocore-iotthingsgraph - ]; - iottwinmaker = [ - types-aiobotocore-iottwinmaker - ]; - iotwireless = [ - types-aiobotocore-iotwireless - ]; - ivs = [ - types-aiobotocore-ivs - ]; - ivs-realtime = [ - types-aiobotocore-ivs-realtime - ]; - ivschat = [ - types-aiobotocore-ivschat - ]; - kafka = [ - types-aiobotocore-kafka - ]; - kafkaconnect = [ - types-aiobotocore-kafkaconnect - ]; - kendra = [ - types-aiobotocore-kendra - ]; - kendra-ranking = [ - types-aiobotocore-kendra-ranking - ]; - keyspaces = [ - types-aiobotocore-keyspaces - ]; - kinesis = [ - types-aiobotocore-kinesis - ]; - kinesis-video-archived-media = [ - types-aiobotocore-kinesis-video-archived-media - ]; - kinesis-video-media = [ - types-aiobotocore-kinesis-video-media - ]; - kinesis-video-signaling = [ - types-aiobotocore-kinesis-video-signaling - ]; - kinesis-video-webrtc-storage = [ - types-aiobotocore-kinesis-video-webrtc-storage - ]; - kinesisanalytics = [ - types-aiobotocore-kinesisanalytics - ]; - kinesisanalyticsv2 = [ - types-aiobotocore-kinesisanalyticsv2 - ]; - kinesisvideo = [ - types-aiobotocore-kinesisvideo - ]; - kms = [ - types-aiobotocore-kms - ]; - lakeformation = [ - types-aiobotocore-lakeformation - ]; - lambda = [ - types-aiobotocore-lambda - ]; - lex-models = [ - types-aiobotocore-lex-models - ]; - lex-runtime = [ - types-aiobotocore-lex-runtime - ]; - lexv2-models = [ - types-aiobotocore-lexv2-models - ]; - lexv2-runtime = [ - types-aiobotocore-lexv2-runtime - ]; - license-manager = [ - types-aiobotocore-license-manager - ]; - license-manager-linux-subscriptions = [ - types-aiobotocore-license-manager-linux-subscriptions - ]; - license-manager-user-subscriptions = [ - types-aiobotocore-license-manager-user-subscriptions - ]; - lightsail = [ - types-aiobotocore-lightsail - ]; - location = [ - types-aiobotocore-location - ]; - logs = [ - types-aiobotocore-logs - ]; - lookoutequipment = [ - types-aiobotocore-lookoutequipment - ]; - lookoutmetrics = [ - types-aiobotocore-lookoutmetrics - ]; - lookoutvision = [ - types-aiobotocore-lookoutvision - ]; - m2 = [ - types-aiobotocore-m2 - ]; - machinelearning = [ - types-aiobotocore-machinelearning - ]; - macie = [ - types-aiobotocore-macie - ]; - macie2 = [ - types-aiobotocore-macie2 - ]; - managedblockchain = [ - types-aiobotocore-managedblockchain - ]; - managedblockchain-query = [ - types-aiobotocore-managedblockchain-query - ]; - marketplace-catalog = [ - types-aiobotocore-marketplace-catalog - ]; - marketplace-entitlement = [ - types-aiobotocore-marketplace-entitlement - ]; - marketplacecommerceanalytics = [ - types-aiobotocore-marketplacecommerceanalytics - ]; - mediaconnect = [ - types-aiobotocore-mediaconnect - ]; - mediaconvert = [ - types-aiobotocore-mediaconvert - ]; - medialive = [ - types-aiobotocore-medialive - ]; - mediapackage = [ - types-aiobotocore-mediapackage - ]; - mediapackage-vod = [ - types-aiobotocore-mediapackage-vod - ]; - mediapackagev2 = [ - types-aiobotocore-mediapackagev2 - ]; - mediastore = [ - types-aiobotocore-mediastore - ]; - mediastore-data = [ - types-aiobotocore-mediastore-data - ]; - mediatailor = [ - types-aiobotocore-mediatailor - ]; - medical-imaging = [ - types-aiobotocore-medical-imaging - ]; - memorydb = [ - types-aiobotocore-memorydb - ]; - meteringmarketplace = [ - types-aiobotocore-meteringmarketplace - ]; - mgh = [ - types-aiobotocore-mgh - ]; - mgn = [ - types-aiobotocore-mgn - ]; - migration-hub-refactor-spaces = [ - types-aiobotocore-migration-hub-refactor-spaces - ]; - migrationhub-config = [ - types-aiobotocore-migrationhub-config - ]; - migrationhuborchestrator = [ - types-aiobotocore-migrationhuborchestrator - ]; - migrationhubstrategy = [ - types-aiobotocore-migrationhubstrategy - ]; - mobile = [ - types-aiobotocore-mobile - ]; - mq = [ - types-aiobotocore-mq - ]; - mturk = [ - types-aiobotocore-mturk - ]; - mwaa = [ - types-aiobotocore-mwaa - ]; - neptune = [ - types-aiobotocore-neptune - ]; - network-firewall = [ - types-aiobotocore-network-firewall - ]; - networkmanager = [ - types-aiobotocore-networkmanager - ]; - nimble = [ - types-aiobotocore-nimble - ]; - oam = [ - types-aiobotocore-oam - ]; - omics = [ - types-aiobotocore-omics - ]; - opensearch = [ - types-aiobotocore-opensearch - ]; - opensearchserverless = [ - types-aiobotocore-opensearchserverless - ]; - opsworks = [ - types-aiobotocore-opsworks - ]; - opsworkscm = [ - types-aiobotocore-opsworkscm - ]; - organizations = [ - types-aiobotocore-organizations - ]; - osis = [ - types-aiobotocore-osis - ]; - outposts = [ - types-aiobotocore-outposts - ]; - panorama = [ - types-aiobotocore-panorama - ]; - payment-cryptography = [ - types-aiobotocore-payment-cryptography - ]; - payment-cryptography-data = [ - types-aiobotocore-payment-cryptography-data - ]; - personalize = [ - types-aiobotocore-personalize - ]; - personalize-events = [ - types-aiobotocore-personalize-events - ]; - personalize-runtime = [ - types-aiobotocore-personalize-runtime - ]; - pi = [ - types-aiobotocore-pi - ]; - pinpoint = [ - types-aiobotocore-pinpoint - ]; - pinpoint-email = [ - types-aiobotocore-pinpoint-email - ]; - pinpoint-sms-voice = [ - types-aiobotocore-pinpoint-sms-voice - ]; - pinpoint-sms-voice-v2 = [ - types-aiobotocore-pinpoint-sms-voice-v2 - ]; - pipes = [ - types-aiobotocore-pipes - ]; - polly = [ - types-aiobotocore-polly - ]; - pricing = [ - types-aiobotocore-pricing - ]; - privatenetworks = [ - types-aiobotocore-privatenetworks - ]; - proton = [ - types-aiobotocore-proton - ]; - qldb = [ - types-aiobotocore-qldb - ]; - qldb-session = [ - types-aiobotocore-qldb-session - ]; - quicksight = [ - types-aiobotocore-quicksight - ]; - ram = [ - types-aiobotocore-ram - ]; - rbin = [ - types-aiobotocore-rbin - ]; - rds = [ - types-aiobotocore-rds - ]; - rds-data = [ - types-aiobotocore-rds-data - ]; - redshift = [ - types-aiobotocore-redshift - ]; - redshift-data = [ - types-aiobotocore-redshift-data - ]; - redshift-serverless = [ - types-aiobotocore-redshift-serverless - ]; - rekognition = [ - types-aiobotocore-rekognition - ]; - resiliencehub = [ - types-aiobotocore-resiliencehub - ]; - resource-explorer-2 = [ - types-aiobotocore-resource-explorer-2 - ]; - resource-groups = [ - types-aiobotocore-resource-groups - ]; - resourcegroupstaggingapi = [ - types-aiobotocore-resourcegroupstaggingapi - ]; - robomaker = [ - types-aiobotocore-robomaker - ]; - rolesanywhere = [ - types-aiobotocore-rolesanywhere - ]; - route53 = [ - types-aiobotocore-route53 - ]; - route53-recovery-cluster = [ - types-aiobotocore-route53-recovery-cluster - ]; - route53-recovery-control-config = [ - types-aiobotocore-route53-recovery-control-config - ]; - route53-recovery-readiness = [ - types-aiobotocore-route53-recovery-readiness - ]; - route53domains = [ - types-aiobotocore-route53domains - ]; - route53resolver = [ - types-aiobotocore-route53resolver - ]; - rum = [ - types-aiobotocore-rum - ]; - s3 = [ - types-aiobotocore-s3 - ]; - s3control = [ - types-aiobotocore-s3control - ]; - s3outposts = [ - types-aiobotocore-s3outposts - ]; - sagemaker = [ - types-aiobotocore-sagemaker - ]; - sagemaker-a2i-runtime = [ - types-aiobotocore-sagemaker-a2i-runtime - ]; - sagemaker-edge = [ - types-aiobotocore-sagemaker-edge - ]; - sagemaker-featurestore-runtime = [ - types-aiobotocore-sagemaker-featurestore-runtime - ]; - sagemaker-geospatial = [ - types-aiobotocore-sagemaker-geospatial - ]; - sagemaker-metrics = [ - types-aiobotocore-sagemaker-metrics - ]; - sagemaker-runtime = [ - types-aiobotocore-sagemaker-runtime - ]; - savingsplans = [ - types-aiobotocore-savingsplans - ]; - scheduler = [ - types-aiobotocore-scheduler - ]; - schemas = [ - types-aiobotocore-schemas - ]; - sdb = [ - types-aiobotocore-sdb - ]; - secretsmanager = [ - types-aiobotocore-secretsmanager - ]; - securityhub = [ - types-aiobotocore-securityhub - ]; - securitylake = [ - types-aiobotocore-securitylake - ]; - serverlessrepo = [ - types-aiobotocore-serverlessrepo - ]; - service-quotas = [ - types-aiobotocore-service-quotas - ]; - servicecatalog = [ - types-aiobotocore-servicecatalog - ]; - servicecatalog-appregistry = [ - types-aiobotocore-servicecatalog-appregistry - ]; - servicediscovery = [ - types-aiobotocore-servicediscovery - ]; - ses = [ - types-aiobotocore-ses - ]; - sesv2 = [ - types-aiobotocore-sesv2 - ]; - shield = [ - types-aiobotocore-shield - ]; - signer = [ - types-aiobotocore-signer - ]; - simspaceweaver = [ - types-aiobotocore-simspaceweaver - ]; - sms = [ - types-aiobotocore-sms - ]; - sms-voice = [ - types-aiobotocore-sms-voice - ]; - snow-device-management = [ - types-aiobotocore-snow-device-management - ]; - snowball = [ - types-aiobotocore-snowball - ]; - sns = [ - types-aiobotocore-sns - ]; - sqs = [ - types-aiobotocore-sqs - ]; - ssm = [ - types-aiobotocore-ssm - ]; - ssm-contacts = [ - types-aiobotocore-ssm-contacts - ]; - ssm-incidents = [ - types-aiobotocore-ssm-incidents - ]; - ssm-sap = [ - types-aiobotocore-ssm-sap - ]; - sso = [ - types-aiobotocore-sso - ]; - sso-admin = [ - types-aiobotocore-sso-admin - ]; - sso-oidc = [ - types-aiobotocore-sso-oidc - ]; - stepfunctions = [ - types-aiobotocore-stepfunctions - ]; - storagegateway = [ - types-aiobotocore-storagegateway - ]; - sts = [ - types-aiobotocore-sts - ]; - support = [ - types-aiobotocore-support - ]; - support-app = [ - types-aiobotocore-support-app - ]; - swf = [ - types-aiobotocore-swf - ]; - synthetics = [ - types-aiobotocore-synthetics - ]; - textract = [ - types-aiobotocore-textract - ]; - timestream-query = [ - types-aiobotocore-timestream-query - ]; - timestream-write = [ - types-aiobotocore-timestream-write - ]; - tnb = [ - types-aiobotocore-tnb - ]; - transcribe = [ - types-aiobotocore-transcribe - ]; - transfer = [ - types-aiobotocore-transfer - ]; - translate = [ - types-aiobotocore-translate - ]; - verifiedpermissions = [ - types-aiobotocore-verifiedpermissions - ]; - voice-id = [ - types-aiobotocore-voice-id - ]; - vpc-lattice = [ - types-aiobotocore-vpc-lattice - ]; - waf = [ - types-aiobotocore-waf - ]; - waf-regional = [ - types-aiobotocore-waf-regional - ]; - wafv2 = [ - types-aiobotocore-wafv2 - ]; - wellarchitected = [ - types-aiobotocore-wellarchitected - ]; - wisdom = [ - types-aiobotocore-wisdom - ]; - workdocs = [ - types-aiobotocore-workdocs - ]; - worklink = [ - types-aiobotocore-worklink - ]; - workmail = [ - types-aiobotocore-workmail - ]; - workmailmessageflow = [ - types-aiobotocore-workmailmessageflow - ]; - workspaces = [ - types-aiobotocore-workspaces - ]; - workspaces-web = [ - types-aiobotocore-workspaces-web - ]; - xray = [ - types-aiobotocore-xray - ]; + events = [ types-aiobotocore-events ]; + evidently = [ types-aiobotocore-evidently ]; + finspace = [ types-aiobotocore-finspace ]; + finspace-data = [ types-aiobotocore-finspace-data ]; + firehose = [ types-aiobotocore-firehose ]; + fis = [ types-aiobotocore-fis ]; + fms = [ types-aiobotocore-fms ]; + forecast = [ types-aiobotocore-forecast ]; + forecastquery = [ types-aiobotocore-forecastquery ]; + frauddetector = [ types-aiobotocore-frauddetector ]; + fsx = [ types-aiobotocore-fsx ]; + gamelift = [ types-aiobotocore-gamelift ]; + gamesparks = [ types-aiobotocore-gamesparks ]; + glacier = [ types-aiobotocore-glacier ]; + globalaccelerator = [ types-aiobotocore-globalaccelerator ]; + glue = [ types-aiobotocore-glue ]; + grafana = [ types-aiobotocore-grafana ]; + greengrass = [ types-aiobotocore-greengrass ]; + greengrassv2 = [ types-aiobotocore-greengrassv2 ]; + groundstation = [ types-aiobotocore-groundstation ]; + guardduty = [ types-aiobotocore-guardduty ]; + health = [ types-aiobotocore-health ]; + healthlake = [ types-aiobotocore-healthlake ]; + honeycode = [ types-aiobotocore-honeycode ]; + iam = [ types-aiobotocore-iam ]; + identitystore = [ types-aiobotocore-identitystore ]; + imagebuilder = [ types-aiobotocore-imagebuilder ]; + importexport = [ types-aiobotocore-importexport ]; + inspector = [ types-aiobotocore-inspector ]; + inspector2 = [ types-aiobotocore-inspector2 ]; + internetmonitor = [ types-aiobotocore-internetmonitor ]; + iot = [ types-aiobotocore-iot ]; + iot-data = [ types-aiobotocore-iot-data ]; + iot-jobs-data = [ types-aiobotocore-iot-jobs-data ]; + iot-roborunner = [ types-aiobotocore-iot-roborunner ]; + iot1click-devices = [ types-aiobotocore-iot1click-devices ]; + iot1click-projects = [ types-aiobotocore-iot1click-projects ]; + iotanalytics = [ types-aiobotocore-iotanalytics ]; + iotdeviceadvisor = [ types-aiobotocore-iotdeviceadvisor ]; + iotevents = [ types-aiobotocore-iotevents ]; + iotevents-data = [ types-aiobotocore-iotevents-data ]; + iotfleethub = [ types-aiobotocore-iotfleethub ]; + iotfleetwise = [ types-aiobotocore-iotfleetwise ]; + iotsecuretunneling = [ types-aiobotocore-iotsecuretunneling ]; + iotsitewise = [ types-aiobotocore-iotsitewise ]; + iotthingsgraph = [ types-aiobotocore-iotthingsgraph ]; + iottwinmaker = [ types-aiobotocore-iottwinmaker ]; + iotwireless = [ types-aiobotocore-iotwireless ]; + ivs = [ types-aiobotocore-ivs ]; + ivs-realtime = [ types-aiobotocore-ivs-realtime ]; + ivschat = [ types-aiobotocore-ivschat ]; + kafka = [ types-aiobotocore-kafka ]; + kafkaconnect = [ types-aiobotocore-kafkaconnect ]; + kendra = [ types-aiobotocore-kendra ]; + kendra-ranking = [ types-aiobotocore-kendra-ranking ]; + keyspaces = [ types-aiobotocore-keyspaces ]; + kinesis = [ types-aiobotocore-kinesis ]; + kinesis-video-archived-media = [ types-aiobotocore-kinesis-video-archived-media ]; + kinesis-video-media = [ types-aiobotocore-kinesis-video-media ]; + kinesis-video-signaling = [ types-aiobotocore-kinesis-video-signaling ]; + kinesis-video-webrtc-storage = [ types-aiobotocore-kinesis-video-webrtc-storage ]; + kinesisanalytics = [ types-aiobotocore-kinesisanalytics ]; + kinesisanalyticsv2 = [ types-aiobotocore-kinesisanalyticsv2 ]; + kinesisvideo = [ types-aiobotocore-kinesisvideo ]; + kms = [ types-aiobotocore-kms ]; + lakeformation = [ types-aiobotocore-lakeformation ]; + lambda = [ types-aiobotocore-lambda ]; + lex-models = [ types-aiobotocore-lex-models ]; + lex-runtime = [ types-aiobotocore-lex-runtime ]; + lexv2-models = [ types-aiobotocore-lexv2-models ]; + lexv2-runtime = [ types-aiobotocore-lexv2-runtime ]; + license-manager = [ types-aiobotocore-license-manager ]; + license-manager-linux-subscriptions = [ types-aiobotocore-license-manager-linux-subscriptions ]; + license-manager-user-subscriptions = [ types-aiobotocore-license-manager-user-subscriptions ]; + lightsail = [ types-aiobotocore-lightsail ]; + location = [ types-aiobotocore-location ]; + logs = [ types-aiobotocore-logs ]; + lookoutequipment = [ types-aiobotocore-lookoutequipment ]; + lookoutmetrics = [ types-aiobotocore-lookoutmetrics ]; + lookoutvision = [ types-aiobotocore-lookoutvision ]; + m2 = [ types-aiobotocore-m2 ]; + machinelearning = [ types-aiobotocore-machinelearning ]; + macie = [ types-aiobotocore-macie ]; + macie2 = [ types-aiobotocore-macie2 ]; + managedblockchain = [ types-aiobotocore-managedblockchain ]; + managedblockchain-query = [ types-aiobotocore-managedblockchain-query ]; + marketplace-catalog = [ types-aiobotocore-marketplace-catalog ]; + marketplace-entitlement = [ types-aiobotocore-marketplace-entitlement ]; + marketplacecommerceanalytics = [ types-aiobotocore-marketplacecommerceanalytics ]; + mediaconnect = [ types-aiobotocore-mediaconnect ]; + mediaconvert = [ types-aiobotocore-mediaconvert ]; + medialive = [ types-aiobotocore-medialive ]; + mediapackage = [ types-aiobotocore-mediapackage ]; + mediapackage-vod = [ types-aiobotocore-mediapackage-vod ]; + mediapackagev2 = [ types-aiobotocore-mediapackagev2 ]; + mediastore = [ types-aiobotocore-mediastore ]; + mediastore-data = [ types-aiobotocore-mediastore-data ]; + mediatailor = [ types-aiobotocore-mediatailor ]; + medical-imaging = [ types-aiobotocore-medical-imaging ]; + memorydb = [ types-aiobotocore-memorydb ]; + meteringmarketplace = [ types-aiobotocore-meteringmarketplace ]; + mgh = [ types-aiobotocore-mgh ]; + mgn = [ types-aiobotocore-mgn ]; + migration-hub-refactor-spaces = [ types-aiobotocore-migration-hub-refactor-spaces ]; + migrationhub-config = [ types-aiobotocore-migrationhub-config ]; + migrationhuborchestrator = [ types-aiobotocore-migrationhuborchestrator ]; + migrationhubstrategy = [ types-aiobotocore-migrationhubstrategy ]; + mobile = [ types-aiobotocore-mobile ]; + mq = [ types-aiobotocore-mq ]; + mturk = [ types-aiobotocore-mturk ]; + mwaa = [ types-aiobotocore-mwaa ]; + neptune = [ types-aiobotocore-neptune ]; + network-firewall = [ types-aiobotocore-network-firewall ]; + networkmanager = [ types-aiobotocore-networkmanager ]; + nimble = [ types-aiobotocore-nimble ]; + oam = [ types-aiobotocore-oam ]; + omics = [ types-aiobotocore-omics ]; + opensearch = [ types-aiobotocore-opensearch ]; + opensearchserverless = [ types-aiobotocore-opensearchserverless ]; + opsworks = [ types-aiobotocore-opsworks ]; + opsworkscm = [ types-aiobotocore-opsworkscm ]; + organizations = [ types-aiobotocore-organizations ]; + osis = [ types-aiobotocore-osis ]; + outposts = [ types-aiobotocore-outposts ]; + panorama = [ types-aiobotocore-panorama ]; + payment-cryptography = [ types-aiobotocore-payment-cryptography ]; + payment-cryptography-data = [ types-aiobotocore-payment-cryptography-data ]; + personalize = [ types-aiobotocore-personalize ]; + personalize-events = [ types-aiobotocore-personalize-events ]; + personalize-runtime = [ types-aiobotocore-personalize-runtime ]; + pi = [ types-aiobotocore-pi ]; + pinpoint = [ types-aiobotocore-pinpoint ]; + pinpoint-email = [ types-aiobotocore-pinpoint-email ]; + pinpoint-sms-voice = [ types-aiobotocore-pinpoint-sms-voice ]; + pinpoint-sms-voice-v2 = [ types-aiobotocore-pinpoint-sms-voice-v2 ]; + pipes = [ types-aiobotocore-pipes ]; + polly = [ types-aiobotocore-polly ]; + pricing = [ types-aiobotocore-pricing ]; + privatenetworks = [ types-aiobotocore-privatenetworks ]; + proton = [ types-aiobotocore-proton ]; + qldb = [ types-aiobotocore-qldb ]; + qldb-session = [ types-aiobotocore-qldb-session ]; + quicksight = [ types-aiobotocore-quicksight ]; + ram = [ types-aiobotocore-ram ]; + rbin = [ types-aiobotocore-rbin ]; + rds = [ types-aiobotocore-rds ]; + rds-data = [ types-aiobotocore-rds-data ]; + redshift = [ types-aiobotocore-redshift ]; + redshift-data = [ types-aiobotocore-redshift-data ]; + redshift-serverless = [ types-aiobotocore-redshift-serverless ]; + rekognition = [ types-aiobotocore-rekognition ]; + resiliencehub = [ types-aiobotocore-resiliencehub ]; + resource-explorer-2 = [ types-aiobotocore-resource-explorer-2 ]; + resource-groups = [ types-aiobotocore-resource-groups ]; + resourcegroupstaggingapi = [ types-aiobotocore-resourcegroupstaggingapi ]; + robomaker = [ types-aiobotocore-robomaker ]; + rolesanywhere = [ types-aiobotocore-rolesanywhere ]; + route53 = [ types-aiobotocore-route53 ]; + route53-recovery-cluster = [ types-aiobotocore-route53-recovery-cluster ]; + route53-recovery-control-config = [ types-aiobotocore-route53-recovery-control-config ]; + route53-recovery-readiness = [ types-aiobotocore-route53-recovery-readiness ]; + route53domains = [ types-aiobotocore-route53domains ]; + route53resolver = [ types-aiobotocore-route53resolver ]; + rum = [ types-aiobotocore-rum ]; + s3 = [ types-aiobotocore-s3 ]; + s3control = [ types-aiobotocore-s3control ]; + s3outposts = [ types-aiobotocore-s3outposts ]; + sagemaker = [ types-aiobotocore-sagemaker ]; + sagemaker-a2i-runtime = [ types-aiobotocore-sagemaker-a2i-runtime ]; + sagemaker-edge = [ types-aiobotocore-sagemaker-edge ]; + sagemaker-featurestore-runtime = [ types-aiobotocore-sagemaker-featurestore-runtime ]; + sagemaker-geospatial = [ types-aiobotocore-sagemaker-geospatial ]; + sagemaker-metrics = [ types-aiobotocore-sagemaker-metrics ]; + sagemaker-runtime = [ types-aiobotocore-sagemaker-runtime ]; + savingsplans = [ types-aiobotocore-savingsplans ]; + scheduler = [ types-aiobotocore-scheduler ]; + schemas = [ types-aiobotocore-schemas ]; + sdb = [ types-aiobotocore-sdb ]; + secretsmanager = [ types-aiobotocore-secretsmanager ]; + securityhub = [ types-aiobotocore-securityhub ]; + securitylake = [ types-aiobotocore-securitylake ]; + serverlessrepo = [ types-aiobotocore-serverlessrepo ]; + service-quotas = [ types-aiobotocore-service-quotas ]; + servicecatalog = [ types-aiobotocore-servicecatalog ]; + servicecatalog-appregistry = [ types-aiobotocore-servicecatalog-appregistry ]; + servicediscovery = [ types-aiobotocore-servicediscovery ]; + ses = [ types-aiobotocore-ses ]; + sesv2 = [ types-aiobotocore-sesv2 ]; + shield = [ types-aiobotocore-shield ]; + signer = [ types-aiobotocore-signer ]; + simspaceweaver = [ types-aiobotocore-simspaceweaver ]; + sms = [ types-aiobotocore-sms ]; + sms-voice = [ types-aiobotocore-sms-voice ]; + snow-device-management = [ types-aiobotocore-snow-device-management ]; + snowball = [ types-aiobotocore-snowball ]; + sns = [ types-aiobotocore-sns ]; + sqs = [ types-aiobotocore-sqs ]; + ssm = [ types-aiobotocore-ssm ]; + ssm-contacts = [ types-aiobotocore-ssm-contacts ]; + ssm-incidents = [ types-aiobotocore-ssm-incidents ]; + ssm-sap = [ types-aiobotocore-ssm-sap ]; + sso = [ types-aiobotocore-sso ]; + sso-admin = [ types-aiobotocore-sso-admin ]; + sso-oidc = [ types-aiobotocore-sso-oidc ]; + stepfunctions = [ types-aiobotocore-stepfunctions ]; + storagegateway = [ types-aiobotocore-storagegateway ]; + sts = [ types-aiobotocore-sts ]; + support = [ types-aiobotocore-support ]; + support-app = [ types-aiobotocore-support-app ]; + swf = [ types-aiobotocore-swf ]; + synthetics = [ types-aiobotocore-synthetics ]; + textract = [ types-aiobotocore-textract ]; + timestream-query = [ types-aiobotocore-timestream-query ]; + timestream-write = [ types-aiobotocore-timestream-write ]; + tnb = [ types-aiobotocore-tnb ]; + transcribe = [ types-aiobotocore-transcribe ]; + transfer = [ types-aiobotocore-transfer ]; + translate = [ types-aiobotocore-translate ]; + verifiedpermissions = [ types-aiobotocore-verifiedpermissions ]; + voice-id = [ types-aiobotocore-voice-id ]; + vpc-lattice = [ types-aiobotocore-vpc-lattice ]; + waf = [ types-aiobotocore-waf ]; + waf-regional = [ types-aiobotocore-waf-regional ]; + wafv2 = [ types-aiobotocore-wafv2 ]; + wellarchitected = [ types-aiobotocore-wellarchitected ]; + wisdom = [ types-aiobotocore-wisdom ]; + workdocs = [ types-aiobotocore-workdocs ]; + worklink = [ types-aiobotocore-worklink ]; + workmail = [ types-aiobotocore-workmail ]; + workmailmessageflow = [ types-aiobotocore-workmailmessageflow ]; + workspaces = [ types-aiobotocore-workspaces ]; + workspaces-web = [ types-aiobotocore-workspaces-web ]; + xray = [ types-aiobotocore-xray ]; }; # Package has no tests diff --git a/pkgs/development/python-modules/types-awscrt/default.nix b/pkgs/development/python-modules/types-awscrt/default.nix index 7b0e42df6d5a..a9f1eb3d4614 100644 --- a/pkgs/development/python-modules/types-awscrt/default.nix +++ b/pkgs/development/python-modules/types-awscrt/default.nix @@ -1,13 +1,14 @@ -{ lib -, buildPythonPackage -, fetchPypi -, poetry-core -, pythonOlder +{ + lib, + buildPythonPackage, + fetchPypi, + poetry-core, + pythonOlder, }: buildPythonPackage rec { pname = "types-awscrt"; - version = "0.20.5"; + version = "0.20.9"; pyproject = true; disabled = pythonOlder "3.7"; @@ -15,16 +16,12 @@ buildPythonPackage rec { src = fetchPypi { pname = "types_awscrt"; inherit version; - hash = "sha256-YYEbv03pUkiTn5J2pDS+k9K5X2zP6KqU5WmZ6XeM/MI="; + hash = "sha256-ZImKL0okaPZiM8uMKcX2bekHz4C6HvW7E1mu8vgbtSE="; }; - nativeBuildInputs = [ - poetry-core - ]; + build-system = [ poetry-core ]; - pythonImportsCheck = [ - "awscrt-stubs" - ]; + pythonImportsCheck = [ "awscrt-stubs" ]; meta = with lib; { description = "Type annotations and code completion for awscrt"; diff --git a/pkgs/development/python-modules/yfinance/default.nix b/pkgs/development/python-modules/yfinance/default.nix index 18e86dc16102..bc270fbb8e65 100644 --- a/pkgs/development/python-modules/yfinance/default.nix +++ b/pkgs/development/python-modules/yfinance/default.nix @@ -1,35 +1,39 @@ -{ lib -, appdirs -, beautifulsoup4 -, buildPythonPackage -, cryptography -, fetchFromGitHub -, frozendict -, html5lib -, multitasking -, numpy -, pandas -, peewee -, pythonOlder -, requests -, lxml +{ + lib, + appdirs, + beautifulsoup4, + buildPythonPackage, + cryptography, + fetchFromGitHub, + frozendict, + html5lib, + lxml, + multitasking, + numpy, + pandas, + peewee, + pythonOlder, + requests, + setuptools, }: buildPythonPackage rec { pname = "yfinance"; - version = "0.2.37"; - format = "setuptools"; + version = "0.2.38"; + pyproject = true; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "ranaroussi"; - repo = pname; + repo = "yfinance"; rev = "refs/tags/${version}"; - hash = "sha256-rptCZ4Yiz6VbV/woHN6JpRNsZL4SrqepoIw4tYpU4x0="; + hash = "sha256-ZGwtu2vLcE9pM73umhnFwSzjQnGjTOTtVF607ox7I6E="; }; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ appdirs beautifulsoup4 cryptography @@ -46,13 +50,10 @@ buildPythonPackage rec { # Tests require internet access doCheck = false; - pythonImportsCheck = [ - "yfinance" - ]; + pythonImportsCheck = [ "yfinance" ]; meta = with lib; { description = "Module to doiwnload Yahoo! Finance market data"; - mainProgram = "sample"; homepage = "https://github.com/ranaroussi/yfinance"; changelog = "https://github.com/ranaroussi/yfinance/blob/${version}/CHANGELOG.rst"; license = licenses.asl20; diff --git a/pkgs/development/tools/analysis/checkov/default.nix b/pkgs/development/tools/analysis/checkov/default.nix index 702fdeb47e89..ad4669290b33 100644 --- a/pkgs/development/tools/analysis/checkov/default.nix +++ b/pkgs/development/tools/analysis/checkov/default.nix @@ -6,14 +6,14 @@ python3.pkgs.buildPythonApplication rec { pname = "checkov"; - version = "3.2.66"; + version = "3.2.68"; pyproject = true; src = fetchFromGitHub { owner = "bridgecrewio"; repo = "checkov"; rev = "refs/tags/${version}"; - hash = "sha256-Wtpg3Fk3hxmbZ2Tz5XIjM2mdh8jq4O67nD2rxAGlcaY="; + hash = "sha256-6nOIVcPlVp49kqoH7EPI1VVTC85S4wqwx+aU+5wy758="; }; patches = [ ./flake8-compat-5.x.patch ]; diff --git a/pkgs/games/dwarf-fortress/default.nix b/pkgs/games/dwarf-fortress/default.nix index 777866d8fb0e..ee02364a40a4 100644 --- a/pkgs/games/dwarf-fortress/default.nix +++ b/pkgs/games/dwarf-fortress/default.nix @@ -38,39 +38,38 @@ let getAttr importJSON listToAttrs + optionalAttrs recurseIntoAttrs replaceStrings + versionAtLeast ; callPackage = newScope self; # The latest Dwarf Fortress version. Maintainers: when a new version comes # out, ensure that (unfuck|dfhack|twbt) are all up to date before changing - # this. - latestVersion = "0.47.05"; + # this. Note that unfuck and twbt are not required for 50. + latestVersion = "50.12"; # Converts a version to a package name. versionToName = version: "dwarf-fortress_${replaceStrings ["."] ["_"] version}"; - dwarf-therapist-original = libsForQt5.callPackage ./dwarf-therapist { - texlive = texliveBasic.withPackages (ps: with ps; [ float caption wrapfig adjmulticol sidecap preprint enumitem ]); - }; - # A map of names to each Dwarf Fortress package we know about. df-games = listToAttrs (map (dfVersion: { name = versionToName dfVersion; value = let - # I can't believe this syntax works. Spikes of Nix code indeed... + isAtLeast50 = versionAtLeast dfVersion "50.0"; + + dwarf-fortress-unfuck = optionalAttrs (!isAtLeast50) (callPackage ./unfuck.nix { inherit dfVersion; }); + dwarf-fortress = callPackage ./game.nix { inherit dfVersion; inherit dwarf-fortress-unfuck; }; - dwarf-fortress-unfuck = callPackage ./unfuck.nix { inherit dfVersion; }; - - twbt = callPackage ./twbt { inherit dfVersion; }; + twbt = optionalAttrs (!isAtLeast50) (callPackage ./twbt { inherit dfVersion; }); dfhack = callPackage ./dfhack { inherit (perlPackages) XMLLibXML XMLLibXSLT; @@ -80,7 +79,13 @@ let dwarf-therapist = libsForQt5.callPackage ./dwarf-therapist/wrapper.nix { inherit dwarf-fortress; - dwarf-therapist = dwarf-therapist-original; + dwarf-therapist = (libsForQt5.callPackage ./dwarf-therapist { + texlive = texliveBasic.withPackages (ps: with ps; [ float caption wrapfig adjmulticol sidecap preprint enumitem ]); + }).override (optionalAttrs (!isAtLeast50) { + # 41.2.5 is the last version to support Dwarf Fortress 0.47. + version = "41.2.5"; + hash = "sha256-xfYBtnO1n6OcliVt07GsQ9alDJIfWdVhtuyWwuvXSZs="; + }); }; in callPackage ./wrapper { @@ -97,7 +102,6 @@ let # Aliases for the latest Dwarf Fortress and the selected Therapist install dwarf-fortress = getAttr (versionToName latestVersion) df-games; - inherit dwarf-therapist-original; dwarf-therapist = dwarf-fortress.dwarf-therapist; dwarf-fortress-original = dwarf-fortress.dwarf-fortress; diff --git a/pkgs/games/dwarf-fortress/df_permission b/pkgs/games/dwarf-fortress/df_permission/2010 similarity index 100% rename from pkgs/games/dwarf-fortress/df_permission rename to pkgs/games/dwarf-fortress/df_permission/2010 diff --git a/pkgs/games/dwarf-fortress/df_permission/2024 b/pkgs/games/dwarf-fortress/df_permission/2024 new file mode 100644 index 000000000000..cdea6958fabd --- /dev/null +++ b/pkgs/games/dwarf-fortress/df_permission/2024 @@ -0,0 +1,57 @@ +From: Tarn Adams +Date: Thu, 4 Apr 2024 20:18:35 -0700 +Subject: Re: Dwarf Fortress v50 Redistribution for NixOS +To: Morgan + +Yeah, it's fine to continue redistributing the classic version as before. + +Ah, yeah, I'm aware of the command line issue. Hopefully it can be cleaned +up with some of the other missing functionality like legends mode image +export. + +Tarn + +On Wed, Apr 3, 2024 at 1:26 AM Morgan wrote: + +> Tarn, +> +> I maintain the Dwarf Fortress package for NixOS (), +> and wanted to double check with you that packaging v50.x and later is +> still okay. One of our maintainers previously received permission, but +> that was 14(!) years ago: +> +> +> https://github.com/NixOS/nixpkgs/blob/master/pkgs/games/dwarf-fortress/df_permission +> +> Users installing Dwarf Fortress using Nix automatically pull the +> tar.bz2 classic builds from the Bay 12 Games site. The Nix package +> recipes make minor changes to some of the executable files; namely, +> patching paths to shared object files like SDL, ld-linux.so, and +> libc++ using patchelf. Users who install Nix or run NixOS can run this +> whole process automatically and have a working Dwarf Fortress with: +> +> `nix run nixpkgs#dwarf-fortress` +> +> We don't and can't distribute any of the files from Steam, though +> users who buy the game can link the Steam game data directory into +> their Nix Dwarf Fortress data directory and use the tile packs from +> the Steam version, if they like. +> +> ~ +> +> Enough of that formality: thanks for the game, it's a blast and a joy +> for the imagination. I use it to make maps for large scale (50+ +> people) D&D campaigns in Southern California. +> +> BTW, automatic world generation mode using the command line seems to +> be broken in v50.12. It navigates to the worldgen menu but doesn't get +> farther. I'm hoping I can release some Nix scripts that people can use +> to export world images and such in batch mode at some point, so I +> don't have to even mess with extracting the game files to get +> interesting map exports. +> +> Thanks, +> Morgan Jones +> ---- +> < We are failing in translating hyperreal concepts > -The Board +> diff --git a/pkgs/games/dwarf-fortress/dfhack/default.nix b/pkgs/games/dwarf-fortress/dfhack/default.nix index 12d097c71415..156dac32c472 100644 --- a/pkgs/games/dwarf-fortress/dfhack/default.nix +++ b/pkgs/games/dwarf-fortress/dfhack/default.nix @@ -1,20 +1,27 @@ { stdenv -, buildEnv , lib , fetchFromGitHub , fetchpatch , cmake +, ninja , writeScriptBin , perl , XMLLibXML , XMLLibXSLT +, makeWrapper , zlib -, ruby , enableStoneSense ? false , allegro5 , libGLU , libGL , SDL +, SDL2 +, coreutils +, util-linux +, ncurses +, strace +, binutils +, gnused , dfVersion }: @@ -28,48 +35,60 @@ let optional optionals optionalString - platforms versionOlder + versionAtLeast ; dfhack-releases = { "0.44.10" = { dfHackRelease = "0.44.10-r2"; - sha256 = "19bxsghxzw3bilhr8sm4axz7p7z8lrvbdsd1vdjf5zbg04rs866i"; + hash = "sha256-0RikMwFv/eJk26Hptnam6J97flekapQhjWvw3+HTfaU="; xmlRev = "321bd48b10c4c3f694cc801a7dee6be392c09b7b"; - prerelease = false; }; "0.44.11" = { dfHackRelease = "0.44.11-beta2.1"; - sha256 = "1jgwcqg9m1ybv3szgnklp6zfpiw5mswla464dlj2gfi5v82zqbv2"; + hash = "sha256-Yi/8BdoluickbcQQRbmuhcfrvrl02vf12MuHmh5m/Mk="; xmlRev = "f27ebae6aa8fb12c46217adec5a812cd49a905c8"; prerelease = true; }; "0.44.12" = { dfHackRelease = "0.44.12-r1"; - sha256 = "0j03lq6j6w378z6cvm7jspxc7hhrqm8jaszlq0mzfvap0k13fgyy"; + hash = "sha256-3j83wgRXbfcrwPRrJVHFGcLD+tXy1M3MR2dwIw2mA0g="; xmlRev = "23500e4e9bd1885365d0a2ef1746c321c1dd5094"; - prerelease = false; }; "0.47.02" = { dfHackRelease = "0.47.02-alpha0"; - sha256 = "19lgykgqm0si9vd9hx4zw8b5m9188gg8r1a6h25np2m2ziqwbjj9"; + hash = "sha256-ScrFcfyiimuLgEaFjN5DKKRaFuKfdJjaTlGDit/0j6Y="; xmlRev = "23500e4e9bd1885365d0a2ef1746c321c1dd509a"; prerelease = true; }; "0.47.04" = { dfHackRelease = "0.47.04-r5"; - sha256 = "sha256-0s+/LKbqsS/mrxKPDeniqykE5+Gy3ZzCa8yEDzMyssY="; + hash = "sha256-0s+/LKbqsS/mrxKPDeniqykE5+Gy3ZzCa8yEDzMyssY="; xmlRev = "be0444cc165a1abff053d5893dc1f780f06526b7"; - prerelease = false; }; "0.47.05" = { dfHackRelease = "0.47.05-r7"; - sha256 = "sha256-vBKUTSjfCnalkBzfjaIKcxUuqsGGOTtoJC1RHJIDlNc="; + hash = "sha256-vBKUTSjfCnalkBzfjaIKcxUuqsGGOTtoJC1RHJIDlNc="; xmlRev = "f5019a5c6f19ef05a28bd974c3e8668b78e6e2a4"; - prerelease = false; }; - + "50.10" = { + dfHackRelease = "50.10-r1.1"; + hash = "sha256-k2j8G4kJ/RYE8W0YDOxcsRb5qjjn4El+rigf0v3AqZU="; + xmlRev = "041493b221e0799c106abeac1f86df4535ab80d3"; + needsPatches = true; + }; + "50.11" = { + dfHackRelease = "50.11-r7"; + hash = "sha256-3KsFc0i4XkzoeRvcl5GUlx/fJB1HyqfZm+xL6T4oT/A="; + xmlRev = "cca87907c1cbfcf4af957b0bea3a961a345b1581"; + needsPatches = true; + }; + "50.12" = { + dfHackRelease = "50.12-r3"; + hash = "sha256-2mO8DpNmZRCV7IRY0arf3SMvlO4Pxs61Kxfh3q3k3HU="; + xmlRev = "980b1af13acc31660dce632f913c968f52e2b275"; + }; }; release = @@ -80,6 +99,8 @@ let else throw "[DFHack] Unsupported Dwarf Fortress version: ${dfVersion}"; version = release.dfHackRelease; + isAtLeast50 = versionAtLeast version "50.0"; + needs50Patches = isAtLeast50 && (release.needsPatches or false); # revision of library/xml submodule xmlRev = release.xmlRev; @@ -119,7 +140,7 @@ in owner = "DFHack"; repo = "dfhack"; rev = release.dfHackRelease; - sha256 = release.sha256; + inherit (release) hash; fetchSubmodules = true; }; @@ -133,6 +154,14 @@ in name = "fix-protobuf.patch"; url = "https://github.com/DFHack/dfhack/commit/7bdf958518d2892ee89a7173224a069c4a2190d8.patch"; hash = "sha256-p+mKhmYbnhWKNiGPMjbYO505Gcg634n0nudqH0NX3KY="; + }) ++ optional needs50Patches (fetchpatch { + name = "use-system-sdl2.patch"; + url = "https://github.com/DFHack/dfhack/commit/734fb730d72e53ebe67f4a041a24dd7c50307ee3.patch"; + hash = "sha256-uLX0gdVSzKEVibyUc1UxcQzdYkRm6D8DF+1eSOxM+qU="; + }) ++ optional needs50Patches (fetchpatch { + name = "rename-lerp.patch"; + url = "https://github.com/DFHack/dfhack/commit/389dcf5cfcdb8bfb8deeb05fa5756c9f4f5709d1.patch"; + hash = "sha256-QuDtGURhP+nM+x+8GIKO5LrMcmBkl9JSHHIeqzqGIPQ="; }); # gcc 11 fix @@ -150,27 +179,71 @@ in sed -i 's@cached_path = path_string.*@cached_path = getenv("DF_DIR");@' library/Process-linux.cpp ''; - nativeBuildInputs = [ cmake perl XMLLibXML XMLLibXSLT fakegit ]; + nativeBuildInputs = [ cmake ninja perl XMLLibXML XMLLibXSLT makeWrapper fakegit ]; + # We don't use system libraries because dfhack needs old C++ ABI. - buildInputs = [ zlib SDL ] + buildInputs = [ zlib ] + ++ optional isAtLeast50 SDL2 + ++ optional (!isAtLeast50) SDL ++ optionals enableStoneSense [ allegro5 libGLU libGL ]; preConfigure = '' - # Trick build system into believing we have .git + # Trick the build system into believing we have .git. mkdir -p .git/modules/library/xml touch .git/index .git/modules/library/xml/index ''; - cmakeFlags = [ "-DDFHACK_BUILD_ARCH=${arch}" "-DDOWNLOAD_RUBY=OFF" ] - ++ optionals enableStoneSense [ "-DBUILD_STONESENSE=ON" "-DSTONESENSE_INTERNAL_SO=OFF" ]; + cmakeFlags = [ + # Race condition in `Generating codegen.out.xml and df/headers` that is fixed when using Ninja. + "-GNinja" + "-DDFHACK_BUILD_ARCH=${arch}" - # dfhack expects an unversioned libruby.so to be present in the hack - # subdirectory for ruby plugins to function. - postInstall = '' - ln -s ${ruby}/lib/libruby-*.so $out/hack/libruby.so + # Don't download anything. + "-DDOWNLOAD_RUBY=OFF" + "-DUSE_SYSTEM_SDL2=ON" + + # Ruby support with dfhack is very spotty and was removed in version 50. + "-DBUILD_RUBY=OFF" + ] ++ optionals enableStoneSense [ "-DBUILD_STONESENSE=ON" "-DSTONESENSE_INTERNAL_SO=OFF" ]; + + NIX_CFLAGS_COMPILE = [ "-Wno-error=deprecated-enum-enum-conversion" ] + ++ optionals (versionOlder version "0.47") [ "-fpermissive" ]; + + preFixup = '' + # Wrap dfhack scripts. + if [ -f $out/dfhack ]; then + wrapProgram $out/dfhack \ + --inherit-argv0 \ + --set-default SteamAppId 0 \ + --set-default DFHACK_NO_RENAME_LIBSTDCXX 1 \ + --suffix PATH : ${lib.makeBinPath [ + coreutils util-linux strace gnused binutils ncurses + ]} + fi + + if [ -f $out/dfhack-run ]; then + wrapProgram $out/dfhack-run \ + --inherit-argv0 \ + --suffix PATH : ${lib.makeBinPath [ + coreutils + ]} + fi + + # Create a dfhackrc that changes to the correct home directory. + cat < $out/.dfhackrc + #!/usr/bin/env bash + # nixpkgs dfhackrc helper + if [ -d "\$NIXPKGS_DF_HOME" ]; then + cd "\$NIXPKGS_DF_HOME" + DF_DIR="\$NIXPKGS_DF_HOME" + fi + export DF_DIR + EOF ''; - passthru = { inherit dfVersion; }; + passthru = { + inherit dfVersion; + }; meta = { description = "Memory hacking library for Dwarf Fortress and a set of tools that use it"; diff --git a/pkgs/games/dwarf-fortress/dwarf-therapist/default.nix b/pkgs/games/dwarf-fortress/dwarf-therapist/default.nix index 55de9ffdf45e..d51c8274bb06 100644 --- a/pkgs/games/dwarf-fortress/dwarf-therapist/default.nix +++ b/pkgs/games/dwarf-fortress/dwarf-therapist/default.nix @@ -6,22 +6,29 @@ , cmake , texlive , ninja +, version ? "42.1.5" +, hash ? "sha256-aUakfUjnIZWNDhCkG3A6u7BaaCG8kPMV/Fu2S73CoDg=" }: stdenv.mkDerivation rec { pname = "dwarf-therapist"; - version = "41.2.2"; + + inherit version; src = fetchFromGitHub { owner = "Dwarf-Therapist"; repo = "Dwarf-Therapist"; rev = "v${version}"; - sha256 = "sha256-zsEG68ioSw64UfmqlTLO1i5sObg8C4zxvdPxdQGMhhU="; + inherit hash; }; nativeBuildInputs = [ texlive cmake ninja ]; buildInputs = [ qtbase qtdeclarative ]; + enableParallelBuilding = true; + + cmakeFlags = [ "-GNinja" ]; + installPhase = if stdenv.isDarwin then '' mkdir -p $out/Applications @@ -31,8 +38,8 @@ stdenv.mkDerivation rec { dontWrapQtApps = true; meta = with lib; { - description = "Tool to manage dwarves in a running game of Dwarf Fortress"; mainProgram = "dwarftherapist"; + description = "Tool to manage dwarves in a running game of Dwarf Fortress"; maintainers = with maintainers; [ abbradar bendlas numinit jonringer ]; license = licenses.mit; platforms = platforms.x86; diff --git a/pkgs/games/dwarf-fortress/dwarf-therapist/wrapper.nix b/pkgs/games/dwarf-fortress/dwarf-therapist/wrapper.nix index eaf391bbe6b1..503dff90cd45 100644 --- a/pkgs/games/dwarf-fortress/dwarf-therapist/wrapper.nix +++ b/pkgs/games/dwarf-fortress/dwarf-therapist/wrapper.nix @@ -1,10 +1,12 @@ -{ stdenv, dwarf-therapist, dwarf-fortress, substituteAll, coreutils, wrapQtAppsHook }: +{ stdenv, dwarf-therapist, dwarf-fortress, substituteAll, coreutils, wrapQtAppsHook +}: let - platformSlug = - if stdenv.hostPlatform.is32bit then - "linux32" else "linux64"; - inifile = "linux/v0.${dwarf-fortress.baseVersion}.${dwarf-fortress.patchVersion}_${platformSlug}.ini"; + platformSlug = let + prefix = if dwarf-fortress.baseVersion >= 50 then "-classic_" else "_"; + base = if stdenv.hostPlatform.is32bit then "linux32" else "linux64"; + in prefix + base; + inifile = "linux/v0.${builtins.toString dwarf-fortress.baseVersion}.${dwarf-fortress.patchVersion}${platformSlug}.ini"; in @@ -40,8 +42,9 @@ stdenv.mkDerivation { wrapQtApp $out/bin/dwarftherapist # Fix up memory layouts - rm -rf $out/share/dwarftherapist/memory_layouts/linux - mkdir -p $out/share/dwarftherapist/memory_layouts/linux + ini_path="$out/share/dwarftherapist/memory_layouts/${inifile}" + rm -f "$ini_path" + mkdir -p "$(dirname -- "$ini_path")" orig_md5=$(cat "${dwarf-fortress}/hash.md5.orig" | cut -c1-8) patched_md5=$(cat "${dwarf-fortress}/hash.md5" | cut -c1-8) input_file="${dwarf-therapist}/share/dwarftherapist/memory_layouts/${inifile}" @@ -53,7 +56,7 @@ stdenv.mkDerivation { echo " Output: $output_file" echo " Replace: $patched_md5" - substitute "$input_file" "$output_file" --replace "$orig_md5" "$patched_md5" + substitute "$input_file" "$output_file" --replace-fail "$orig_md5" "$patched_md5" ''; preferLocalBuild = true; diff --git a/pkgs/games/dwarf-fortress/game.json b/pkgs/games/dwarf-fortress/game.json index 522cccdcda45..c287a4dd8449 100644 --- a/pkgs/games/dwarf-fortress/game.json +++ b/pkgs/games/dwarf-fortress/game.json @@ -135,5 +135,14 @@ "legacy_s": "1rb7h8lzlsjs08rvhhl3nwbrpj54zijijp4y0qdp4vyzsig6nisk", "legacy32": "0ayw09x9smihh8qp5pdvr6vvhwkvcqz36h3lh4g1b5kzxj7g9cyf", "legacy32_s": "10gfxlysfs9gyi1mv52idp5xk45g9h517g2jq4a8cqp2j7594v9c" + }, + "50.10": { + "linux": "13s5p7205r9ha2j5n7carrwd0y7krq34bcdl08khp0kh2v4470a3" + }, + "50.11": { + "linux": "0iz2d88gzvn0vjxlr99f13j4awhvh2lggjmipdwpbxhfsqih7dx0" + }, + "50.12": { + "linux": "070014fzwszfgjyxjyij0k0hadah6s62lpi91ykp3vs220azya1m" } } diff --git a/pkgs/games/dwarf-fortress/game.nix b/pkgs/games/dwarf-fortress/game.nix index 8d351cdbbd0d..9cf7847d1489 100644 --- a/pkgs/games/dwarf-fortress/game.nix +++ b/pkgs/games/dwarf-fortress/game.nix @@ -2,11 +2,15 @@ , lib , fetchurl , SDL +, SDL2 +, SDL2_image +, SDL2_mixer +, fmodex , dwarf-fortress-unfuck +, autoPatchelfHook # Our own "unfuck" libs for macOS , ncurses -, fmodex , gcc , dfVersion @@ -22,13 +26,13 @@ let hasAttr licenses maintainers - makeLibraryPath + optional + optionals optionalString splitVersion + toInt ; - libpath = makeLibraryPath [ stdenv.cc.cc stdenv.cc.libc dwarf-fortress-unfuck SDL ]; - # Map Dwarf Fortress platform names to Nixpkgs platform names. # Other srcs are avilable like 32-bit mac & win, but I have only # included the ones most likely to be needed by Nixpkgs users. @@ -41,9 +45,15 @@ let i686-cygwin = "win32"; }; - dfVersionTriple = splitVersion dfVersion; - baseVersion = elemAt dfVersionTriple 1; - patchVersion = elemAt dfVersionTriple 2; + dfVersionTuple = splitVersion dfVersion; + dfVersionBaseIndex = let + x = (builtins.length dfVersionTuple) - 2; + in if x >= 0 then x else 0; + baseVersion = toInt (elemAt dfVersionTuple dfVersionBaseIndex); + patchVersion = elemAt dfVersionTuple (dfVersionBaseIndex + 1); + + isAtLeast50 = baseVersion >= 50; + enableUnfuck = !isAtLeast50 && dwarf-fortress-unfuck != null; game = if hasAttr dfVersion df-hashes @@ -57,7 +67,10 @@ let if hasAttr dfPlatform game then getAttr dfPlatform game else throw "Unsupported dfPlatform: ${dfPlatform}"; - + exe = if stdenv.isLinux then + if baseVersion >= 50 then "dwarfort" else "libs/Dwarf_Fortress" + else + "dwarfort.exe"; in stdenv.mkDerivation { @@ -65,25 +78,49 @@ stdenv.mkDerivation { version = dfVersion; src = fetchurl { - url = "https://www.bay12games.com/dwarves/df_${baseVersion}_${patchVersion}_${dfPlatform}.tar.bz2"; + url = "https://www.bay12games.com/dwarves/df_${toString baseVersion}_${toString patchVersion}_${dfPlatform}.tar.bz2"; inherit sha256; }; + sourceRoot = "."; + + postUnpack = optionalString stdenv.isLinux '' + directory=${ + if stdenv.isLinux then "df_linux" + else if stdenv.isDarwin then "df_osx" + else throw "Unsupported system" + } + if [ -d "$directory" ]; then + mv "$directory/"* . + fi + ''; + + nativeBuildInputs = [ autoPatchelfHook ]; + buildInputs = optionals isAtLeast50 [ SDL2 SDL2_image SDL2_mixer ] + ++ optional (!isAtLeast50) SDL + ++ optional enableUnfuck dwarf-fortress-unfuck + ++ [ stdenv.cc.cc.lib ]; + installPhase = '' + runHook preInstall + + exe=$out/${exe} mkdir -p $out cp -r * $out - rm $out/libs/lib* - exe=$out/${if stdenv.isLinux then "libs/Dwarf_Fortress" - else "dwarfort.exe"} + # Lots of files are +x in the newer releases... + find $out -type d -exec chmod 0755 {} \; + find $out -type f -exec chmod 0644 {} \; + chmod +x $exe + [ -f $out/df ] && chmod +x $out/df + [ -f $out/run_df ] && chmod +x $out/run_df + + # We don't need any of these since they will just break autoPatchelf on $out/hash.md5.orig - '' + optionalString stdenv.isLinux '' - patchelf \ - --set-interpreter $(cat ${stdenv.cc}/nix-support/dynamic-linker) \ - --set-rpath "${libpath}" \ - $exe + echo "Original MD5: $(<$out/hash.md5.orig)" >&2 '' + optionalString stdenv.isDarwin '' # My custom unfucked dwarfort.exe for macOS. Can't use # absolute paths because original doesn't have enough @@ -101,12 +138,24 @@ stdenv.mkDerivation { @executable_path/libs/libstdc++.6.dylib \ $exe '' + '' - # Store the new hash - md5sum $exe | awk '{ print $1 }' > $out/hash.md5 + ls -al $out + runHook postInstall + ''; + + preFixup = '' + recompute_hash() { + # Store the new hash as the very last step. + exe=$out/${exe} + md5sum $exe | awk '{ print $1 }' > $out/hash.md5 + echo "Patched MD5: $(<$out/hash.md5)" >&2 + } + + # Ensure that this runs after autoPatchelfHook. + trap recompute_hash EXIT ''; passthru = { - inherit baseVersion patchVersion dfVersion; + inherit baseVersion patchVersion dfVersion exe; updateScript = ./update.sh; }; diff --git a/pkgs/games/dwarf-fortress/lazy-pack.nix b/pkgs/games/dwarf-fortress/lazy-pack.nix index dcaa8102ae98..d47292484561 100644 --- a/pkgs/games/dwarf-fortress/lazy-pack.nix +++ b/pkgs/games/dwarf-fortress/lazy-pack.nix @@ -41,6 +41,8 @@ let then getAttr dfGame df-games else throw "Unknown Dwarf Fortress version: ${dfVersion}"; dwarf-therapist = dwarf-fortress.dwarf-therapist; + + mainProgram = if enableDFHack then "dfhack" else "dwarf-fortress"; in buildEnv { name = "dwarf-fortress-full"; @@ -54,6 +56,7 @@ buildEnv { ++ optional enableLegendsBrowser legends-browser; meta = { + inherit mainProgram; description = "An opinionated wrapper for Dwarf Fortress"; maintainers = with maintainers; [ Baughn numinit ]; license = licenses.mit; diff --git a/pkgs/games/dwarf-fortress/twbt/default.nix b/pkgs/games/dwarf-fortress/twbt/default.nix index 3c582a67770e..0ccb859b5be3 100644 --- a/pkgs/games/dwarf-fortress/twbt/default.nix +++ b/pkgs/games/dwarf-fortress/twbt/default.nix @@ -81,8 +81,12 @@ stdenvNoCC.mkDerivation rec { cp -a *.png $art/data/art/ ''; + passthru = { + inherit dfVersion; + }; + meta = { - description = "A plugin for Dwarf Fortress / DFHack that improves various aspects the game interface"; + description = "A plugin for Dwarf Fortress / DFHack that improves various aspects of the game interface"; maintainers = with maintainers; [ Baughn numinit ]; license = licenses.mit; platforms = platforms.linux; diff --git a/pkgs/games/dwarf-fortress/unfuck.nix b/pkgs/games/dwarf-fortress/unfuck.nix index 3aeee27d87a5..a1baa2d83f75 100644 --- a/pkgs/games/dwarf-fortress/unfuck.nix +++ b/pkgs/games/dwarf-fortress/unfuck.nix @@ -1,6 +1,7 @@ { stdenv , lib , fetchFromGitHub +, fetchpatch , cmake , libGL , libSM @@ -32,43 +33,43 @@ let unfuck-releases = { "0.43.05" = { unfuckRelease = "0.43.05"; - sha256 = "173dyrbxlzqvjf1j3n7vpns4gfjkpyvk9z16430xnmd5m6nda8p2"; + hash = "sha256-4iLVrKmlVdvBICb8NLe/U7pHtL372CGDkxt/2lf2bZw="; }; "0.44.05" = { unfuckRelease = "0.44.05"; - sha256 = "00yj4l4gazxg4i6fj9rwri6vm17i6bviy2mpkx0z5c0mvsr7s14b"; + hash = "sha256-iwR9st4VsPJBn7cKH/cy8YS6Tcw8J+lMJK9/9Qgl0gM="; }; "0.44.09" = { unfuckRelease = "0.44.09"; - sha256 = "138p0v8z2x47f0fk9k6g75ikw5wb3vxldwv5ggbkf4hhvlw6lvzm"; + hash = "sha256-9W9qON0QEjfXe2XzRvseixc+YznPzDQdcId08dEGF40="; }; "0.44.10" = { unfuckRelease = "0.44.10"; - sha256 = "0vb19qx2ibc79j4bgbk9lskb883qfb0815zw1dfz9k7rqwal8mzj"; + hash = "sha256-8ldEFcf5zPRdC/yXgMByeCC0pqZprreITIetKDpOYW0="; }; "0.44.11" = { unfuckRelease = "0.44.11.1"; - sha256 = "1kszkb1d1vll8p04ja41nangsaxb5lv4p3xh2jhmsmipfixw7nvz"; + hash = "sha256-f9vDe3Q3Vl2hFLCPSzYtqyv9rLKBKEnARZTu0MKaX88="; }; "0.44.12" = { unfuckRelease = "0.44.12"; - sha256 = "1kszkb1d1vll8p04ja41nangsaxb5lv4p3xh2jhmsmipfixw7nvz"; + hash = "sha256-f9vDe3Q3Vl2hFLCPSzYtqyv9rLKBKEnARZTu0MKaX88="; }; "0.47.01" = { unfuckRelease = "0.47.01"; - sha256 = "11xvb3qh4crdf59pwfwpi73rzm3ysd1r1xp2k1jp7527jmqapk4k"; + hash = "sha256-k8yrcJVHlHNlmOL2kEPTftSfx4mXO35TcS0zAvFYu4c="; }; "0.47.02" = { unfuckRelease = "0.47.01"; - sha256 = "11xvb3qh4crdf59pwfwpi73rzm3ysd1r1xp2k1jp7527jmqapk4k"; + hash = "sha256-k8yrcJVHlHNlmOL2kEPTftSfx4mXO35TcS0zAvFYu4c="; }; "0.47.04" = { unfuckRelease = "0.47.04"; - sha256 = "1wa990xbsyiiz7abq153xmafvvk1dmgz33rp907d005kzl1z86i9"; + hash = "sha256-KRr0A/2zANAOSDeP8V9tYe7tVO2jBLzU+TF6vTpISfE="; }; "0.47.05" = { - unfuckRelease = "0.47.04"; - sha256 = "1wa990xbsyiiz7abq153xmafvvk1dmgz33rp907d005kzl1z86i9"; + unfuckRelease = "0.47.05-final"; + hash = "sha256-kBdzU6KDpODOBP9XHM7lQRIEWUGOj838vXF1FbSr0Xw="; }; }; @@ -86,9 +87,17 @@ stdenv.mkDerivation { owner = "svenstaro"; repo = "dwarf_fortress_unfuck"; rev = release.unfuckRelease; - sha256 = release.sha256; + inherit (release) hash; }; + patches = lib.optionals (versionOlder release.unfuckRelease "0.47.05") [( + fetchpatch { + name = "fix-noreturn-returning.patch"; + url = "https://github.com/svenstaro/dwarf_fortress_unfuck/commit/6dcfe5ae869fddd51940c6c37a95f7bc639f4389.patch"; + hash = "sha256-b9eI3iR7dmFqCrktPyn6QJ9U2A/7LvfYRS+vE3BOaqk="; + } + )]; + postPatch = '' # https://github.com/svenstaro/dwarf_fortress_unfuck/pull/27 substituteInPlace CMakeLists.txt --replace \''${GLEW_LIBRARIES} GLEW::glew diff --git a/pkgs/games/dwarf-fortress/update.sh b/pkgs/games/dwarf-fortress/update.sh index 5b99dff8aa77..892e031f7883 100755 --- a/pkgs/games/dwarf-fortress/update.sh +++ b/pkgs/games/dwarf-fortress/update.sh @@ -2,9 +2,7 @@ #! nix-shell -i bash -p jq nix coreutils curl # systems to generate hashes for -systems='linux linux32 osx osx32 - win win_s win32 win32_s - legacy legacy_s legacy32 legacy32_s' +systems='linux osx' if [ $# -eq 0 ]; then versions="$(curl http://www.bay12games.com/dwarves/ \ diff --git a/pkgs/games/dwarf-fortress/wrapper/default.nix b/pkgs/games/dwarf-fortress/wrapper/default.nix index a4433821d20d..2dd771ee922d 100644 --- a/pkgs/games/dwarf-fortress/wrapper/default.nix +++ b/pkgs/games/dwarf-fortress/wrapper/default.nix @@ -2,6 +2,7 @@ , lib , buildEnv , substituteAll +, makeWrapper , runCommand , coreutils , gawk @@ -12,6 +13,9 @@ , enableSoundSense ? false , soundSense , jdk +, expect +, xvfb-run +, writeText , enableStoneSense ? false , enableTWBT ? false , twbt @@ -31,10 +35,15 @@ }: let - dfhack_ = dfhack.override { + dfhack' = dfhack.override { inherit enableStoneSense; }; + isAtLeast50 = dwarf-fortress.baseVersion >= 50; + + # If TWBT is null or the dfVersion is wrong, it isn't supported (for example, on version 50). + enableTWBT' = enableTWBT && twbt != null && (twbt.dfVersion or null) == dwarf-fortress.version; + ptheme = if builtins.isString theme then builtins.getAttr theme themes @@ -46,19 +55,19 @@ let # These are in inverse order for first packages to override the next ones. paths = extraPackages ++ lib.optional (theme != null) ptheme - ++ lib.optional enableDFHack dfhack_ + ++ lib.optional enableDFHack dfhack' ++ lib.optional enableSoundSense soundSense - ++ lib.optionals enableTWBT [ twbt.lib twbt.art ] + ++ lib.optionals enableTWBT' [ twbt.lib twbt.art ] ++ [ dwarf-fortress ]; ignoreCollisions = true; }; - settings_ = lib.recursiveUpdate { + settings' = lib.recursiveUpdate { init = { PRINT_MODE = if enableTextMode then "TEXT" - else if enableTWBT then "TWBT" + else if enableTWBT' then "TWBT" else if stdenv.hostPlatform.isDarwin then "STANDARD" # https://www.bay12games.com/dwarves/mantisbt/view.php?id=11680 else null; INTRO = enableIntro; @@ -77,23 +86,31 @@ let else throw "dwarf-fortress: unsupported configuration value ${toString v}"; config = runCommand "dwarf-fortress-config" { - nativeBuildInputs = [ gawk ]; + nativeBuildInputs = [ gawk makeWrapper ]; } ('' mkdir -p $out/data/init edit_setting() { v=''${v//'&'/'\&'} - if ! gawk -i inplace -v RS='\r?\n' ' - { n += sub("\\[" ENVIRON["k"] ":[^]]*\\]", "[" ENVIRON["k"] ":" ENVIRON["v"] "]"); print } - END { exit(!n) } - ' "$out/$file"; then - echo "error: no setting named '$k' in $file" >&2 - exit 1 + if [ -f "$out/$file" ]; then + if ! gawk -i inplace -v RS='\r?\n' ' + { n += sub("\\[" ENVIRON["k"] ":[^]]*\\]", "[" ENVIRON["k"] ":" ENVIRON["v"] "]"); print } + END { exit(!n) } + ' "$out/$file"; then + echo "error: no setting named '$k' in $out/$file" >&2 + exit 1 + fi + else + echo "warning: no file $out/$file; cannot edit" >&2 fi } - '' + forEach settings_ (file: kv: '' + '' + forEach settings' (file: kv: '' file=data/init/${lib.escapeShellArg file}.txt - cp ${baseEnv}/"$file" "$out/$file" + if [ -f "${baseEnv}/$file" ]; then + cp "${baseEnv}/$file" "$out/$file" + else + echo "warning: no file ${baseEnv}/$file; cannot copy" >&2 + fi '' + forEach kv (k: v: lib.optionalString (v != null) '' export k=${lib.escapeShellArg k} v=${lib.escapeShellArg (toTxt v)} edit_setting @@ -103,7 +120,7 @@ let # Patch the MD5 orig_md5=$(< "${dwarf-fortress}/hash.md5.orig") patched_md5=$(< "${dwarf-fortress}/hash.md5") - input_file="${dfhack_}/hack/symbols.xml" + input_file="${dfhack'}/hack/symbols.xml" output_file="$out/hack/symbols.xml" echo "[DFHack Wrapper] Fixing Dwarf Fortress MD5:" @@ -112,7 +129,7 @@ let echo " Output: $output_file" echo " Replace: $patched_md5" - substitute "$input_file" "$output_file" --replace "$orig_md5" "$patched_md5" + substitute "$input_file" "$output_file" --replace-fail "$orig_md5" "$patched_md5" ''); # This is a separate environment because the config files to modify may come @@ -124,11 +141,11 @@ let }; in -lib.throwIf (enableTWBT && !enableDFHack) "dwarf-fortress: TWBT requires DFHack to be enabled" +lib.throwIf (enableTWBT' && !enableDFHack) "dwarf-fortress: TWBT requires DFHack to be enabled" lib.throwIf (enableStoneSense && !enableDFHack) "dwarf-fortress: StoneSense requires DFHack to be enabled" -lib.throwIf (enableTextMode && enableTWBT) "dwarf-fortress: text mode and TWBT are mutually exclusive" +lib.throwIf (enableTextMode && enableTWBT') "dwarf-fortress: text mode and TWBT are mutually exclusive" -stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "dwarf-fortress"; version = dwarf-fortress.dfVersion; @@ -136,36 +153,40 @@ stdenv.mkDerivation { name = "dwarf-fortress-init"; src = ./dwarf-fortress-init.in; inherit env; - exe = - if stdenv.isLinux then "libs/Dwarf_Fortress" - else "dwarfort.exe"; + inherit (dwarf-fortress) exe; stdenv_shell = "${stdenv.shell}"; cp = "${coreutils}/bin/cp"; rm = "${coreutils}/bin/rm"; ln = "${coreutils}/bin/ln"; cat = "${coreutils}/bin/cat"; mkdir = "${coreutils}/bin/mkdir"; + printf = "${coreutils}/bin/printf"; + uname = "${coreutils}/bin/uname"; }; runDF = ./dwarf-fortress.in; - runDFHack = ./dfhack.in; runSoundSense = ./soundSense.in; passthru = { inherit dwarf-fortress dwarf-therapist twbt env; - dfhack = dfhack_; + dfhack = dfhack'; }; - buildCommand = '' + dontUnpack = true; + dontBuild = true; + preferLocalBuild = true; + installPhase = '' mkdir -p $out/bin substitute $runDF $out/bin/dwarf-fortress \ --subst-var-by stdenv_shell ${stdenv.shell} \ + --subst-var-by dfExe ${dwarf-fortress.exe} \ --subst-var dfInit chmod 755 $out/bin/dwarf-fortress '' + lib.optionalString enableDFHack '' - substitute $runDFHack $out/bin/dfhack \ + substitute $runDF $out/bin/dfhack \ --subst-var-by stdenv_shell ${stdenv.shell} \ + --subst-var-by dfExe dfhack \ --subst-var dfInit chmod 755 $out/bin/dfhack '' + lib.optionalString enableSoundSense '' @@ -176,7 +197,55 @@ stdenv.mkDerivation { chmod 755 $out/bin/soundsense ''; - preferLocalBuild = true; + doInstallCheck = true; + nativeInstallCheckInputs = [ expect xvfb-run ]; + + installCheckPhase = let + commonExpectStatements = fmod: lib.optionalString isAtLeast50 '' + expect "Loading audio..." + '' + lib.optionalString (!fmod && isAtLeast50) '' + expect "Failed to load fmod, trying SDL_mixer" + '' + lib.optionalString isAtLeast50 '' + expect "Audio loaded successfully!" + '' + '' + expect "Loading bindings from data/init/interface.txt" + ''; + dfHackExpectScript = writeText "dfhack-test.exp" ('' + spawn env NIXPKGS_DF_OPTS=debug xvfb-run $env(out)/bin/dfhack + '' + commonExpectStatements false + '' + expect "DFHack is ready. Have a nice day!" + expect "DFHack version ${version}" + expect "\[DFHack\]#" + send -- "lua print(os.getenv('out'))\r" + expect "$env(out)" + # Don't send 'die' here; just exit. Some versions of dfhack crash on exit. + exit 0 + ''); + vanillaExpectScript = fmod: writeText "vanilla-test.exp" ('' + spawn env NIXPKGS_DF_OPTS=debug,${lib.optionalString fmod "fmod"} xvfb-run $env(out)/bin/dwarf-fortress + '' + commonExpectStatements fmod + '' + exit 0 + ''); + in + '' + export HOME="$(mktemp -dt dwarf-fortress.XXXXXX)" + '' + lib.optionalString enableDFHack '' + expect ${dfHackExpectScript} + df_home="$(find ~ -name "df_*" | head -n1)" + test -f "$df_home/dfhack" + '' + lib.optionalString isAtLeast50 '' + expect ${vanillaExpectScript true} + df_home="$(find ~ -name "df_*" | head -n1)" + test ! -f "$df_home/dfhack" + test -f "$df_home/libfmod_plugin.so" + '' + '' + expect ${vanillaExpectScript false} + df_home="$(find ~ -name "df_*" | head -n1)" + test ! -f "$df_home/dfhack" + test ! -f "$df_home/libfmod_plugin.so" + '' + '' + test -d "$df_home/data" + ''; inherit (dwarf-fortress) meta; } diff --git a/pkgs/games/dwarf-fortress/wrapper/dfhack.in b/pkgs/games/dwarf-fortress/wrapper/dfhack.in deleted file mode 100755 index 0f74674baf29..000000000000 --- a/pkgs/games/dwarf-fortress/wrapper/dfhack.in +++ /dev/null @@ -1,11 +0,0 @@ -#!@stdenv_shell@ -e - -source @dfInit@ - -for i in *.init *.init-example dfhack-config/default dfhack-config/init hack/* stonesense/*; do - if [ -e "$i" ]; then update_path "$i"; fi -done - -cd "$DF_DIR" -LD_LIBRARY_PATH="$env_dir/hack/libs:$env_dir/hack${LD_LIBRARY_PATH:+:}$LD_LIBRARY_PATH" \ - LD_PRELOAD="$env_dir/hack/libdfhack.so:$LD_PRELOAD" exec $env_dir/libs/Dwarf_Fortress "$@" diff --git a/pkgs/games/dwarf-fortress/wrapper/dwarf-fortress-init.in b/pkgs/games/dwarf-fortress/wrapper/dwarf-fortress-init.in index 27639e57f212..61b1b4da6168 100644 --- a/pkgs/games/dwarf-fortress/wrapper/dwarf-fortress-init.in +++ b/pkgs/games/dwarf-fortress/wrapper/dwarf-fortress-init.in @@ -1,45 +1,181 @@ #!@stdenv_shell@ -e +set -euo pipefail shopt -s extglob -[ -z "$DF_DIR" ] && export DF_DIR="${XDG_DATA_HOME:-$HOME/.local/share}/df_linux" -env_dir="@env@" -exe="$env_dir/@exe@" +export NIXPKGS_DF_ENV="@env@" -update_path() { - local path="$1" +if [[ -v DF_DIR ]] && [ -n "$DF_DIR" ] && { [[ ! -v NIXPKGS_DF_HOME ]] || [ -z "$NIXPKGS_DF_HOME" ]; }; then + # Compatibility for users that were using DF_DIR, since the dfhack script clobbers this variable. + export NIXPKGS_DF_HOME="$DF_DIR" +fi - @mkdir@ -p "$DF_DIR/$(dirname "$path")" - # If user has replaced these data directories, let them stay. - if [ ! -e "$DF_DIR/$path" ] || [ -L "$DF_DIR/$path" ]; then - @rm@ -f "$DF_DIR/$path" - @ln@ -s "$env_dir/$path" "$DF_DIR/$path" +if [[ ! -v NIXPKGS_DF_HOME ]] || [ -z "$NIXPKGS_DF_HOME" ]; then + export NIXPKGS_DF_HOME="${XDG_DATA_HOME:-$HOME/.local/share}/df_linux" +fi + +# Compatibility. +export DF_DIR="$NIXPKGS_DF_HOME" + +### BEGIN: Default DF options +declare -A _NIXPKGS_DF_OPTS +_NIXPKGS_DF_OPTS[fmod]=0 # Don't use fmod by default. +_NIXPKGS_DF_OPTS[debug]=0 # No debugging output by default. +### END: Default DF options + +# Read NIXPKGS_DF_OPTS. +if [[ ! -v NIXPKGS_DF_OPTS ]]; then + NIXPKGS_DF_OPTS='' +fi +IFS=',' read -ra options <<< "$NIXPKGS_DF_OPTS" +for option in ${options[@]+"${options[@]}"}; do + key="${option%=*}" + value="${option##*=}" + if [ -n "$key" ]; then + if [ -z "$value" ] || [ "$key" == "$value" ]; then + value=1 + fi + _NIXPKGS_DF_OPTS["$key"]="$value" + fi +done + +# Rebuild the canonical option string from the read options. +NIXPKGS_DF_OPTS='' +for key in "${!_NIXPKGS_DF_OPTS[@]}"; do + value="${_NIXPKGS_DF_OPTS["${key}"]}" + NIXPKGS_DF_OPTS="$NIXPKGS_DF_OPTS$key=$value," +done +NIXPKGS_DF_OPTS="${NIXPKGS_DF_OPTS%,}" + +# Echoes a log. +# $@: log messages +log() { + for msg in "$@"; do + echo "[nixpkgs] $msg" >&2 + done +} + +# Echoes a log if NIXPKGS_DF_OPTS includes debug. +# $@: log messages +debug() { + if [ "${_NIXPKGS_DF_OPTS[debug]}" -ne 0 ]; then + log "$@" fi } +# Updates a path in $NIXPKGS_DF_HOME from $NIXPKGS_DF_ENV. +# $1: The environment path. +update_path() { + local path="$1" + local orig="$NIXPKGS_DF_ENV/$path" + local final="$NIXPKGS_DF_HOME/$path" + + # If user has replaced these data directories, let them stay. + @mkdir@ -p "$(dirname -- "$final")" + if [ ! -e "$final" ] || [ -L "$final" ]; then + debug "Linking: $final -> $orig" + @rm@ -f "$final" + @ln@ -s "$orig" "$final" + else + debug "Not updating: $final" + fi +} + +# Cleans up a path in $NIXPKGS_DF_HOME that may or may not be in $NIXPKGS_DF_ENV. +# $1: The environment path. +cleanup_path() { + local path="$1" + local final="$NIXPKGS_DF_HOME/$path" + + # Let them stay if not a link. + if [ ! -e "$final" ] || [ -L "$final" ]; then + debug "Cleaning up: $final" + @rm@ -f "$final" + else + debug "Not cleaning: $final" + fi +} + +# Force copies a path in $NIXPKGS_DF_HOME that may or may not be in $NIXPKGS_DF_ENV. +# $1: The environment path. forcecopy_path() { local path="$1" - @mkdir@ -p "$DF_DIR/$(dirname "$path")" - @rm@ -rf "$DF_DIR/$path" - @cp@ -rL --no-preserve=all "$env_dir/$path" "$DF_DIR/$path" + if [ -z "$NIXPKGS_DF_ENV" ] || [ -z "$path" ]; then + # Avoid producing "/" for any `rm -rf` + return + fi + + local orig="$NIXPKGS_DF_ENV/$path" + local final="$NIXPKGS_DF_HOME/$path" + + if [ -e "$orig" ]; then + debug "Force copying: $orig -> $final" + @mkdir@ -p "$(dirname -- "$final")" + @rm@ -rf "$final" + @cp@ -rL --no-preserve=all "$orig" "$final" + else + debug "Removing: $final" + @rm@ -rf "$final" + fi } -@mkdir@ -p "$DF_DIR" +# Runs the final executable. Expects NIXPKGS_DF_HOME and NIXPKGS_DF_EXE to be set. +go() { + cd "$NIXPKGS_DF_HOME" + debug "Executing: $NIXPKGS_DF_HOME/$NIXPKGS_DF_EXE" + + # If we make it past here, we want to log. + # shellcheck disable=SC2093 + exec -a "$NIXPKGS_DF_EXE" "$NIXPKGS_DF_HOME/$NIXPKGS_DF_EXE" + log "Execution of $NIXPKGS_DF_HOME/$NIXPKGS_DF_EXE failed!" + exit 1 +} + +@mkdir@ -p "$NIXPKGS_DF_HOME" @cat@ <&2 -Using $DF_DIR as Dwarf Fortress overlay directory. -If you do any changes in it, don't forget to clean it when updating the game version! -We try to detect changes based on data directories being symbolic links -- keep this in mind. - +/------------------------------------------------------------------------------\\ +| Hello from the nixpkgs Dwarf Fortress wrapper! | +| | +| Using the following Dwarf Fortress overlay directory as NIXPKGS_DF_HOME: | +| $(@printf@ '% -76s' "$NIXPKGS_DF_HOME") | +| | +| If you make any changes in it, don't forget to clean it when updating the | +| game version! We detect changes if data directories are symbolic links. | +| | +| Even though we do our best on our own, this script may miss some. Submit a | +| pull request if there are any that become a problem. | +| | +| We started with the following nixpkgs launch options as NIXPKGS_DF_OPTS: | +| $(@printf@ '% -76s' "$NIXPKGS_DF_OPTS") | +| | +| If you want to try fmod over SDL_mixer, set NIXPKGS_DF_OPTS=fmod. | +\\------------------------------------------------------------------------------/ EOF -cd "$env_dir" -for i in data/init/* data/!(init|index|announcement) raw; do - update_path "$i" +cd "$NIXPKGS_DF_ENV" + +# All potential important files in DF 50 and below. +for path in dwarfort *.so libs raw data/init/* data/!(init|index|announcement); do + force_delete=0 + if [[ "$path" == libfmod*.so* ]] && [ "${_NIXPKGS_DF_OPTS[fmod]}" -eq 0 ]; then + force_delete=1 + fi + + if [ -e "$path" ] && [ "$force_delete" -eq 0 ]; then + update_path "$path" + else + cleanup_path "$path" + fi done -forcecopy_path data/index -# For some reason, it's needed to be writable... -forcecopy_path data/announcement -forcecopy_path data/help -forcecopy_path data/dipscript +# These need to be copied due to read only flags on older versions of DF. +for path in index announcement help dipscript; do + forcecopy_path "data/$path" +done + +# Handle library paths on Darwin. +if [ "$(@uname@)" == Darwin ]; then + export DYLD_LIBRARY_PATH="$NIXPKGS_DF_ENV/libs" + export DYLD_FRAMEWORK_PATH="$NIXPKGS_DF_ENV/libs" +fi diff --git a/pkgs/games/dwarf-fortress/wrapper/dwarf-fortress.in b/pkgs/games/dwarf-fortress/wrapper/dwarf-fortress.in index 4448bd05fda5..29db9c128f4c 100644 --- a/pkgs/games/dwarf-fortress/wrapper/dwarf-fortress.in +++ b/pkgs/games/dwarf-fortress/wrapper/dwarf-fortress.in @@ -1,9 +1,35 @@ #!@stdenv_shell@ -e +export NIXPKGS_DF_EXE="@dfExe@" source @dfInit@ -export DYLD_LIBRARY_PATH="$env_dir/libs" -export DYLD_FRAMEWORK_PATH="$env_dir/libs" +# If we're switching back from dfhack to vanilla, cleanup all dfhack +# links so Dwarf Fortress doesn't autoload its leftover libdfhooks.so. +# Otherwise, populate them. +dfhack_files=( + dfhack + dfhack-run + .dfhackrc + libdfhooks.so + dfhack-config/default + dfhack-config/init + hack/* + stonesense/* + *.init *.init-example +) -cd "$DF_DIR" -exec "$exe" "$@" +if [ "${NIXPKGS_DF_EXE##*/}" == dfhack ]; then + for i in "${dfhack_files[@]}"; do + if [ -e "$i" ]; then + update_path "$i" + else + cleanup_path "$i" + fi + done +else + for i in "${dfhack_files[@]}"; do + cleanup_path "$i" + done +fi + +go diff --git a/pkgs/games/dwarf-fortress/wrapper/soundSense.in b/pkgs/games/dwarf-fortress/wrapper/soundSense.in index 28357ed7579f..16818156934a 100644 --- a/pkgs/games/dwarf-fortress/wrapper/soundSense.in +++ b/pkgs/games/dwarf-fortress/wrapper/soundSense.in @@ -1,10 +1,10 @@ #!@stdenv_shell@ -e +export NIXPKGS_DF_EXE="soundsense/soundSense.sh" source @dfInit@ -for p in soundsense/*; do - update_path "$p" +for path in soundsense/*; do + update_path "$path" done -cd "$DF_DIR" -PATH=@jre@/bin exec $DF_DIR/soundsense/soundSense.sh +PATH="@jre@/bin:$PATH" go diff --git a/pkgs/servers/http/nginx/modules.nix b/pkgs/servers/http/nginx/modules.nix index 978a1c854b38..4d8a1daa81cb 100644 --- a/pkgs/servers/http/nginx/modules.nix +++ b/pkgs/servers/http/nginx/modules.nix @@ -385,13 +385,7 @@ let self = { inputs = [ luajit_openresty ]; - preConfigure = let - # fix compilation against nginx 1.23.0 - nginx-1-23-patch = fetchpatch { - url = "https://github.com/openresty/lua-nginx-module/commit/b6d167cf1a93c0c885c28db5a439f2404874cb26.patch"; - sha256 = "sha256-l7GHFNZXg+RG2SIBjYJO1JHdGUtthWnzLIqEORJUNr4="; - }; - in '' + preConfigure = '' export LUAJIT_LIB="${luajit_openresty}/lib" export LUAJIT_INC="$(realpath ${luajit_openresty}/include/luajit-*)" @@ -399,7 +393,6 @@ let self = { lua_src=$TMPDIR/lua-src cp -r "${src}/" "$lua_src" chmod -R +w "$lua_src" - patch -p1 -d $lua_src -i ${nginx-1-23-patch} export configureFlags="''${configureFlags//"${src}"/"$lua_src"}" unset lua_src ''; @@ -786,8 +779,8 @@ let self = { name = "spnego-http-auth"; owner = "stnoonan"; repo = "spnego-http-auth-nginx-module"; - rev = "72c8ee04c81f929ec84d5a6d126f789b77781a8c"; - sha256 = "05rw3a7cv651951li995r5l1yzz6kwkm2xpbd59jsfzd74bw941i"; + rev = "3575542b3147bd03a6c68a750c3662b0d72ed94e"; + hash = "sha256-s0m5h7m7dsPD5o2SvBb9L2kB57jwXZK5SkdkGuOmlgs="; }; inputs = [ libkrb5 ]; @@ -796,7 +789,7 @@ let self = { description = "SPNEGO HTTP Authentication Module"; homepage = "https://github.com/stnoonan/spnego-http-auth-nginx-module"; license = with licenses; [ bsd2 ]; - maintainers = with maintainers; [ ]; + maintainers = teams.deshaw.members; }; }; diff --git a/pkgs/servers/mediamtx/default.nix b/pkgs/servers/mediamtx/default.nix index c1385b98b6a5..cdc7226a4d28 100644 --- a/pkgs/servers/mediamtx/default.nix +++ b/pkgs/servers/mediamtx/default.nix @@ -1,21 +1,33 @@ { lib , fetchFromGitHub +, fetchurl , buildGoModule , nixosTests }: +let + hlsJs = fetchurl { + url = "https://cdn.jsdelivr.net/npm/hls.js@v1.5.8/dist/hls.min.js"; + hash = "sha256-KG8Cm0dAsFbrBHuMi9c+bMocpSvWWK4c9aWH9LGfDY4="; + }; +in buildGoModule rec { pname = "mediamtx"; - version = "1.5.1"; + # check for hls.js version updates in internal/servers/hls/hlsjsdownloader/VERSION + version = "1.7.0"; src = fetchFromGitHub { owner = "bluenviron"; repo = pname; rev = "v${version}"; - hash = "sha256-FtMjcPeXLkITuGFwjHQ2Tu5pK3Hb/3L9SmcJaJFkP9k="; + hash = "sha256-i4tuGlRW5/HZobeSsgzWjHxIxZKB0cZIJcJyD0O/eIY="; }; - vendorHash = "sha256-nchBsmk5hAqBPXk5aUSf/H46PdCg8JfGbeV4VBXBs+E="; + vendorHash = "sha256-RWHu6VuL9RmmAS1CyInXVbn3dxU6yTAze92C19Fm6gM="; + + postPatch = '' + cp ${hlsJs} internal/servers/hls/hls.min.js + ''; # Tests need docker doCheck = false; diff --git a/pkgs/servers/search/meilisearch/Cargo.lock b/pkgs/servers/search/meilisearch/Cargo.lock index 18858d021413..2ec78384a3b4 100644 --- a/pkgs/servers/search/meilisearch/Cargo.lock +++ b/pkgs/servers/search/meilisearch/Cargo.lock @@ -494,7 +494,7 @@ checksum = "8c3c1a368f70d6cf7302d78f8f7093da241fb8e8807c05cc9e51a125895a6d5b" [[package]] name = "benchmarks" -version = "1.7.3" +version = "1.7.6" dependencies = [ "anyhow", "bytes", @@ -628,7 +628,7 @@ dependencies = [ [[package]] name = "build-info" -version = "1.7.3" +version = "1.7.6" dependencies = [ "anyhow", "time", @@ -1529,7 +1529,7 @@ dependencies = [ [[package]] name = "dump" -version = "1.7.3" +version = "1.7.6" dependencies = [ "anyhow", "big_s", @@ -1767,7 +1767,7 @@ dependencies = [ [[package]] name = "file-store" -version = "1.7.3" +version = "1.7.6" dependencies = [ "faux", "tempfile", @@ -1790,7 +1790,7 @@ dependencies = [ [[package]] name = "filter-parser" -version = "1.7.3" +version = "1.7.6" dependencies = [ "insta", "nom", @@ -1810,7 +1810,7 @@ dependencies = [ [[package]] name = "flatten-serde-json" -version = "1.7.3" +version = "1.7.6" dependencies = [ "criterion", "serde_json", @@ -1928,7 +1928,7 @@ dependencies = [ [[package]] name = "fuzzers" -version = "1.7.3" +version = "1.7.6" dependencies = [ "arbitrary", "clap", @@ -2145,9 +2145,9 @@ checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" [[package]] name = "grenad" -version = "0.4.5" +version = "0.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a007932af5475ebb5c63bef8812bb1c36f317983bb4ca663e9d6dd58d6a0f8c" +checksum = "c297f45167e6d543eb728e12ff284283e4ba2182a25c6cdcec883fda3316c7e7" dependencies = [ "bytemuck", "byteorder", @@ -2157,9 +2157,9 @@ dependencies = [ [[package]] name = "h2" -version = "0.3.24" +version = "0.3.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb2c4422095b67ee78da96fbb51a4cc413b3b25883c7717ff7ca1ab31022c9c9" +checksum = "81fe527a889e1532da5c525686d96d4c2e74cdd345badf8dfef9f6b39dd5f5e8" dependencies = [ "bytes", "fnv", @@ -2420,7 +2420,7 @@ checksum = "206ca75c9c03ba3d4ace2460e57b189f39f43de612c2f85836e65c929701bb2d" [[package]] name = "index-scheduler" -version = "1.7.3" +version = "1.7.6" dependencies = [ "anyhow", "big_s", @@ -2607,7 +2607,7 @@ dependencies = [ [[package]] name = "json-depth-checker" -version = "1.7.3" +version = "1.7.6" dependencies = [ "criterion", "serde_json", @@ -3115,7 +3115,7 @@ checksum = "490cc448043f947bae3cbee9c203358d62dbee0db12107a74be5c30ccfd09771" [[package]] name = "meili-snap" -version = "1.7.3" +version = "1.7.6" dependencies = [ "insta", "md5", @@ -3124,7 +3124,7 @@ dependencies = [ [[package]] name = "meilisearch" -version = "1.7.3" +version = "1.7.6" dependencies = [ "actix-cors", "actix-http", @@ -3217,7 +3217,7 @@ dependencies = [ [[package]] name = "meilisearch-auth" -version = "1.7.3" +version = "1.7.6" dependencies = [ "base64 0.21.7", "enum-iterator", @@ -3236,7 +3236,7 @@ dependencies = [ [[package]] name = "meilisearch-types" -version = "1.7.3" +version = "1.7.6" dependencies = [ "actix-web", "anyhow", @@ -3266,7 +3266,7 @@ dependencies = [ [[package]] name = "meilitool" -version = "1.7.3" +version = "1.7.6" dependencies = [ "anyhow", "clap", @@ -3305,7 +3305,7 @@ dependencies = [ [[package]] name = "milli" -version = "1.7.3" +version = "1.7.6" dependencies = [ "arroy", "big_s", @@ -3746,7 +3746,7 @@ checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" [[package]] name = "permissive-json-pointer" -version = "1.7.3" +version = "1.7.6" dependencies = [ "big_s", "serde_json", @@ -5941,7 +5941,7 @@ dependencies = [ [[package]] name = "xtask" -version = "1.7.3" +version = "1.7.6" dependencies = [ "anyhow", "build-info", diff --git a/pkgs/servers/search/meilisearch/default.nix b/pkgs/servers/search/meilisearch/default.nix index 0c988d345d22..8e816c0c1360 100644 --- a/pkgs/servers/search/meilisearch/default.nix +++ b/pkgs/servers/search/meilisearch/default.nix @@ -6,9 +6,10 @@ , SystemConfiguration , nixosTests , nix-update-script +, libclang }: -let version = "1.7.3"; +let version = "1.7.6"; in rustPlatform.buildRustPackage { pname = "meilisearch"; @@ -18,7 +19,7 @@ rustPlatform.buildRustPackage { owner = "meilisearch"; repo = "MeiliSearch"; rev = "refs/tags/v${version}"; - hash = "sha256-2kwogur6hS7/xjUhH9aRJevWbtgg5xQkvB/aIj7wyJ8="; + hash = "sha256-LsJM7zkoiu5LZb/rhnZaAS/wVNH8b6YZ+vNEE1wVIIk="; }; cargoBuildFlags = [ @@ -43,6 +44,8 @@ rustPlatform.buildRustPackage { Security SystemConfiguration ]; + env.LIBCLANG_PATH = "${libclang.lib}/lib"; + passthru = { updateScript = nix-update-script { }; tests = { diff --git a/pkgs/servers/teleport/12/Cargo.lock b/pkgs/servers/teleport/12/Cargo.lock deleted file mode 100644 index 1eb7a42879cd..000000000000 --- a/pkgs/servers/teleport/12/Cargo.lock +++ /dev/null @@ -1,1887 +0,0 @@ -# This file is automatically @generated by Cargo. -# It is not intended for manual editing. -version = 3 - -[[package]] -name = "adler" -version = "1.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" - -[[package]] -name = "aho-corasick" -version = "0.7.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc936419f96fa211c1b9166887b38e5e40b19958e5b895be7c1f93adec7071ac" -dependencies = [ - "memchr", -] - -[[package]] -name = "asn1-rs" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf6690c370453db30743b373a60ba498fc0d6d83b11f4abfd87a84a075db5dd4" -dependencies = [ - "asn1-rs-derive", - "asn1-rs-impl", - "displaydoc", - "nom", - "num-traits", - "rusticata-macros", - "thiserror", - "time", -] - -[[package]] -name = "asn1-rs-derive" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "726535892e8eae7e70657b4c8ea93d26b8553afb1ce617caee529ef96d7dee6c" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.107", - "synstructure", -] - -[[package]] -name = "asn1-rs-impl" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2777730b2039ac0f95f093556e61b6d26cebed5393ca6f152717777cec3a42ed" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.107", -] - -[[package]] -name = "atomic-polyfill" -version = "0.1.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3ff7eb3f316534d83a8a2c3d1674ace8a5a71198eba31e2e2b597833f699b28" -dependencies = [ - "critical-section", -] - -[[package]] -name = "atty" -version = "0.2.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8" -dependencies = [ - "hermit-abi 0.1.19", - "libc", - "winapi", -] - -[[package]] -name = "autocfg" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" - -[[package]] -name = "base64" -version = "0.13.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8" - -[[package]] -name = "base64ct" -version = "1.5.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b645a089122eccb6111b4f81cbc1a49f5900ac4666bb93ac027feaecf15607bf" - -[[package]] -name = "bindgen" -version = "0.66.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f2b84e06fc203107bfbad243f4aba2af864eb7db3b1cf46ea0a023b0b433d2a7" -dependencies = [ - "bitflags 2.4.1", - "cexpr", - "clang-sys", - "lazy_static", - "lazycell", - "peeking_take_while", - "proc-macro2", - "quote", - "regex", - "rustc-hash", - "shlex", - "syn 2.0.39", -] - -[[package]] -name = "bitflags" -version = "1.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" - -[[package]] -name = "bitflags" -version = "2.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "327762f6e5a765692301e5bb513e0d9fef63be86bbc14528052b1cd3e6f03e07" - -[[package]] -name = "block-buffer" -version = "0.7.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0940dc441f31689269e10ac70eb1002a3a1d3ad1390e030043662eb7fe4688b" -dependencies = [ - "block-padding", - "byte-tools", - "byteorder", - "generic-array 0.12.4", -] - -[[package]] -name = "block-padding" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa79dedbb091f449f1f39e53edf88d5dbe95f895dae6135a8d7b881fb5af73f5" -dependencies = [ - "byte-tools", -] - -[[package]] -name = "boring" -version = "3.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ae1aba472e42d3cf45ac6d0a6c8fc3ddf743871209e1b40229aed9fbdf48ece" -dependencies = [ - "bitflags 2.4.1", - "boring-sys", - "foreign-types", - "libc", - "once_cell", -] - -[[package]] -name = "boring-sys" -version = "3.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ceced5be0047c7c48d77599535fd7f0a81c1b0f0a1e97e7eece24c45022bb481" -dependencies = [ - "bindgen", - "cmake", - "fs_extra", - "fslock", -] - -[[package]] -name = "bufstream" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "40e38929add23cdf8a366df9b0e088953150724bcbe5fc330b0d8eb3b328eec8" - -[[package]] -name = "bumpalo" -version = "3.11.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "572f695136211188308f16ad2ca5c851a712c464060ae6974944458eb83880ba" - -[[package]] -name = "byte-tools" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3b5ca7a04898ad4bcd41c90c5285445ff5b791899bb1b0abdd2a2aa791211d7" - -[[package]] -name = "byteorder" -version = "1.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610" - -[[package]] -name = "cbindgen" -version = "0.24.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a6358dedf60f4d9b8db43ad187391afe959746101346fe51bb978126bec61dfb" -dependencies = [ - "clap", - "heck", - "indexmap", - "log", - "proc-macro2", - "quote", - "serde", - "serde_json", - "syn 1.0.107", - "tempfile", - "toml", -] - -[[package]] -name = "cc" -version = "1.0.78" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a20104e2335ce8a659d6dd92a51a767a0c062599c73b343fd152cb401e828c3d" - -[[package]] -name = "cexpr" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6fac387a98bb7c37292057cffc56d62ecb629900026402633ae9160df93a8766" -dependencies = [ - "nom", -] - -[[package]] -name = "cfg-if" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" - -[[package]] -name = "cipher" -version = "0.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d1873270f8f7942c191139cb8a40fd228da6c3fd2fc376d7e92d47aa14aeb59e" -dependencies = [ - "crypto-common", - "inout", -] - -[[package]] -name = "clang-sys" -version = "1.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa2e27ae6ab525c3d369ded447057bca5438d86dc3a68f6faafb8269ba82ebf3" -dependencies = [ - "glob", - "libc", - "libloading", -] - -[[package]] -name = "clap" -version = "3.2.23" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "71655c45cb9845d3270c9d6df84ebe72b4dad3c2ba3f7023ad47c144e4e473a5" -dependencies = [ - "atty", - "bitflags 1.3.2", - "clap_lex", - "indexmap", - "strsim", - "termcolor", - "textwrap", -] - -[[package]] -name = "clap_lex" -version = "0.2.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2850f2f5a82cbf437dd5af4d49848fbdfc27c157c3d010345776f952765261c5" -dependencies = [ - "os_str_bytes", -] - -[[package]] -name = "cmake" -version = "0.1.49" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db34956e100b30725f2eb215f90d4871051239535632f84fea3bc92722c66b7c" -dependencies = [ - "cc", -] - -[[package]] -name = "const-oid" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e4c78c047431fee22c1a7bb92e00ad095a02a983affe4d8a72e2a2c62c1b94f3" - -[[package]] -name = "const-oid" -version = "0.9.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cec318a675afcb6a1ea1d4340e2d377e56e47c266f28043ceccbf4412ddfdd3b" - -[[package]] -name = "crc32fast" -version = "1.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b540bd8bc810d3885c6ea91e2018302f68baba2129ab3e88f32389ee9370880d" -dependencies = [ - "cfg-if", -] - -[[package]] -name = "critical-section" -version = "1.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6548a0ad5d2549e111e1f6a11a6c2e2d00ce6a3dafe22948d67c2b443f775e52" - -[[package]] -name = "crypto-bigint" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "03c6a1d5fa1de37e071642dfa44ec552ca5b299adb128fab16138e24b548fd21" -dependencies = [ - "generic-array 0.14.6", - "subtle 2.4.1", -] - -[[package]] -name = "crypto-common" -version = "0.1.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3" -dependencies = [ - "generic-array 0.14.6", - "typenum", -] - -[[package]] -name = "crypto-mac" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4434400df11d95d556bac068ddfedd482915eb18fe8bea89bc80b6e4b1c179e5" -dependencies = [ - "generic-array 0.12.4", - "subtle 1.0.0", -] - -[[package]] -name = "data-encoding" -version = "2.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23d8666cb01533c39dde32bcbab8e227b4ed6679b2c925eba05feabea39508fb" - -[[package]] -name = "delog" -version = "0.1.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4cd67f90cc14e0a91cf693141453cccf2b74db9d59c40f6be18b79169fe77dfd" -dependencies = [ - "log", -] - -[[package]] -name = "der" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6919815d73839e7ad218de758883aae3a257ba6759ce7a9992501efbb53d705c" -dependencies = [ - "const-oid 0.7.1", - "crypto-bigint", - "pem-rfc7468 0.3.1", -] - -[[package]] -name = "der" -version = "0.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1a467a65c5e759bce6e65eaf91cc29f466cdc57cb65777bd646872a8a1fd4de" -dependencies = [ - "const-oid 0.9.1", - "pem-rfc7468 0.6.0", - "zeroize", -] - -[[package]] -name = "der-parser" -version = "8.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "42d4bc9b0db0a0df9ae64634ac5bdefb7afcb534e182275ca0beadbe486701c1" -dependencies = [ - "asn1-rs", - "displaydoc", - "nom", - "num-bigint 0.4.3", - "num-traits", - "rusticata-macros", -] - -[[package]] -name = "derivative" -version = "2.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fcc3dd5e9e9c0b295d6e1e4d811fb6f157d5ffd784b8d202fc62eac8035a770b" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.107", -] - -[[package]] -name = "digest" -version = "0.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f3d0c8c8752312f9713efd397ff63acb9f85585afbf179282e720e7704954dd5" -dependencies = [ - "generic-array 0.12.4", -] - -[[package]] -name = "digest" -version = "0.10.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8168378f4e5023e7218c89c891c0fd8ecdb5e5e4f18cb78f38cf245dd021e76f" -dependencies = [ - "const-oid 0.9.1", - "crypto-common", -] - -[[package]] -name = "displaydoc" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3bf95dc3f046b9da4f2d51833c0d3547d8564ef6910f5c1ed130306a75b92886" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.107", -] - -[[package]] -name = "env_logger" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85cdab6a89accf66733ad5a1693a4dcced6aeff64602b634530dd73c1f3ee9f0" -dependencies = [ - "humantime", - "is-terminal", - "log", - "regex", - "termcolor", -] - -[[package]] -name = "errno" -version = "0.2.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f639046355ee4f37944e44f60642c6f3a7efa3cf6b78c78a0d989a8ce6c396a1" -dependencies = [ - "errno-dragonfly", - "libc", - "winapi", -] - -[[package]] -name = "errno-dragonfly" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa68f1b12764fab894d2755d2518754e71b4fd80ecfb822714a1206c2aab39bf" -dependencies = [ - "cc", - "libc", -] - -[[package]] -name = "fake-simd" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e88a8acf291dafb59c2d96e8f59828f3838bb1a70398823ade51a84de6a6deed" - -[[package]] -name = "fastrand" -version = "1.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7a407cfaa3385c4ae6b23e84623d48c2798d06e3e6a1878f7f59f17b3f86499" -dependencies = [ - "instant", -] - -[[package]] -name = "flate2" -version = "1.0.25" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8a2db397cb1c8772f31494cb8917e48cd1e64f0fa7efac59fbd741a0a8ce841" -dependencies = [ - "crc32fast", - "miniz_oxide", -] - -[[package]] -name = "foreign-types" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d737d9aa519fb7b749cbc3b962edcf310a8dd1f4b67c91c4f83975dbdd17d965" -dependencies = [ - "foreign-types-macros", - "foreign-types-shared", -] - -[[package]] -name = "foreign-types-macros" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c8469d0d40519bc608ec6863f1cc88f3f1deee15913f2f3b3e573d81ed38cccc" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.107", -] - -[[package]] -name = "foreign-types-shared" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa9a19cbb55df58761df49b23516a86d432839add4af60fc256da840f66ed35b" - -[[package]] -name = "fs_extra" -version = "1.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "42703706b716c37f96a77aea830392ad231f44c9e9a67872fa5548707e11b11c" - -[[package]] -name = "fslock" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "04412b8935272e3a9bae6f48c7bfff74c2911f60525404edfdd28e49884c3bfb" -dependencies = [ - "libc", - "winapi", -] - -[[package]] -name = "generic-array" -version = "0.12.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ffdf9f34f1447443d37393cc6c2b8313aebddcd96906caf34e54c68d8e57d7bd" -dependencies = [ - "typenum", -] - -[[package]] -name = "generic-array" -version = "0.14.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bff49e947297f3312447abdca79f45f4738097cc82b06e72054d2223f601f1b9" -dependencies = [ - "typenum", - "version_check", -] - -[[package]] -name = "gethostname" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1ebd34e35c46e00bb73e81363248d627782724609fe1b6396f553f68fe3862e" -dependencies = [ - "libc", - "winapi", -] - -[[package]] -name = "getrandom" -version = "0.1.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8fc3cb4d91f53b50155bdcfd23f6a4c39ae1969c2ae85982b135750cccaf5fce" -dependencies = [ - "cfg-if", - "libc", - "wasi 0.9.0+wasi-snapshot-preview1", -] - -[[package]] -name = "getrandom" -version = "0.2.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c05aeb6a22b8f62540c194aac980f2115af067bfe15a0734d7277a768d396b31" -dependencies = [ - "cfg-if", - "libc", - "wasi 0.11.0+wasi-snapshot-preview1", -] - -[[package]] -name = "glob" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b919933a397b79c37e33b77bb2aa3dc8eb6e165ad809e58ff75bc7db2e34574" - -[[package]] -name = "hash32" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b0c35f58762feb77d74ebe43bdbc3210f09be9fe6742234d573bacc26ed92b67" -dependencies = [ - "byteorder", -] - -[[package]] -name = "hashbrown" -version = "0.12.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" - -[[package]] -name = "heapless" -version = "0.7.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db04bc24a18b9ea980628ecf00e6c0264f3c1426dac36c00cb49b6fbad8b0743" -dependencies = [ - "atomic-polyfill", - "hash32", - "rustc_version", - "spin 0.9.4", - "stable_deref_trait", -] - -[[package]] -name = "heck" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2540771e65fc8cb83cd6e8a237f70c319bd5c29f78ed1084ba5d50eeac86f7f9" - -[[package]] -name = "hermit-abi" -version = "0.1.19" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33" -dependencies = [ - "libc", -] - -[[package]] -name = "hermit-abi" -version = "0.2.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee512640fe35acbfb4bb779db6f0d80704c2cacfa2e39b601ef3e3f47d1ae4c7" -dependencies = [ - "libc", -] - -[[package]] -name = "hmac" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5dcb5e64cda4c23119ab41ba960d1e170a774c8e4b9d9e6a9bc18aabf5e59695" -dependencies = [ - "crypto-mac", - "digest 0.8.1", -] - -[[package]] -name = "humantime" -version = "2.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" - -[[package]] -name = "indexmap" -version = "1.9.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1885e79c1fc4b10f0e172c475f458b7f7b93061064d98c3293e98c5ba0c8b399" -dependencies = [ - "autocfg", - "hashbrown", -] - -[[package]] -name = "inout" -version = "0.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a0c10553d664a4d0bcff9f4215d0aac67a639cc68ef660840afe309b807bc9f5" -dependencies = [ - "generic-array 0.14.6", -] - -[[package]] -name = "instant" -version = "0.1.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c" -dependencies = [ - "cfg-if", -] - -[[package]] -name = "io-lifetimes" -version = "1.0.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46112a93252b123d31a119a8d1a1ac19deac4fac6e0e8b0df58f0d4e5870e63c" -dependencies = [ - "libc", - "windows-sys", -] - -[[package]] -name = "is-terminal" -version = "0.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "28dfb6c8100ccc63462345b67d1bbc3679177c75ee4bf59bf29c8b1d110b8189" -dependencies = [ - "hermit-abi 0.2.6", - "io-lifetimes", - "rustix", - "windows-sys", -] - -[[package]] -name = "iso7816" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7e6ac743d509349b7865595ce90bbfcfbe59f42b8ec0db9e76ec361ace3f652" -dependencies = [ - "delog", - "heapless", -] - -[[package]] -name = "iso7816-tlv" -version = "0.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "395d8e0ae63eb5016fbcf4a72864155880e34bce0158206fcfa7218efdd52e82" -dependencies = [ - "untrusted 0.9.0", -] - -[[package]] -name = "itoa" -version = "1.0.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fad582f4b9e86b6caa621cabeb0963332d92eea04729ab12892c2533951e6440" - -[[package]] -name = "js-sys" -version = "0.3.60" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49409df3e3bf0856b916e2ceaca09ee28e6871cf7d9ce97a692cacfdb2a25a47" -dependencies = [ - "wasm-bindgen", -] - -[[package]] -name = "lazy_static" -version = "1.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" -dependencies = [ - "spin 0.5.2", -] - -[[package]] -name = "lazycell" -version = "1.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55" - -[[package]] -name = "libc" -version = "0.2.139" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "201de327520df007757c1f0adce6e827fe8562fbc28bfd9c15571c66ca1f5f79" - -[[package]] -name = "libloading" -version = "0.7.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b67380fd3b2fbe7527a606e18729d21c6f3951633d0500574c4dc22d2d638b9f" -dependencies = [ - "cfg-if", - "winapi", -] - -[[package]] -name = "libm" -version = "0.2.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "348108ab3fba42ec82ff6e9564fc4ca0247bdccdc68dd8af9764bbc79c3c8ffb" - -[[package]] -name = "linux-raw-sys" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f051f77a7c8e6957c0696eac88f26b0117e54f52d3fc682ab19397a8812846a4" - -[[package]] -name = "lock_api" -version = "0.4.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "435011366fe56583b16cf956f9df0095b405b82d76425bc8981c0e22e60ec4df" -dependencies = [ - "autocfg", - "scopeguard", -] - -[[package]] -name = "log" -version = "0.4.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "abb12e687cfb44aa40f41fc3978ef76448f9b6038cad6aef4259d3c095a2382e" -dependencies = [ - "cfg-if", -] - -[[package]] -name = "md-5" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a18af3dcaf2b0219366cdb4e2af65a6101457b415c3d1a5c71dd9c2b7c77b9c8" -dependencies = [ - "block-buffer", - "digest 0.8.1", - "opaque-debug", -] - -[[package]] -name = "md4" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4030c65cf2aab7ada769cae7d1e7159f8d034d6ded4f39afba037f094bfd9a1" -dependencies = [ - "block-buffer", - "digest 0.8.1", - "fake-simd", - "opaque-debug", -] - -[[package]] -name = "memchr" -version = "2.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d" - -[[package]] -name = "minimal-lexical" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" - -[[package]] -name = "miniz_oxide" -version = "0.6.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b275950c28b37e794e8c55d88aeb5e139d0ce23fdbbeda68f8d7174abdf9e8fa" -dependencies = [ - "adler", -] - -[[package]] -name = "nom" -version = "7.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8903e5a29a317527874d0402f867152a3d21c908bb0b933e416c65e301d4c36" -dependencies = [ - "memchr", - "minimal-lexical", -] - -[[package]] -name = "num-bigint" -version = "0.2.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "090c7f9998ee0ff65aa5b723e4009f7b217707f1fb5ea551329cc4d6231fb304" -dependencies = [ - "autocfg", - "num-integer", - "num-traits", -] - -[[package]] -name = "num-bigint" -version = "0.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f93ab6289c7b344a8a9f60f88d80aa20032336fe78da341afc91c8a2341fc75f" -dependencies = [ - "autocfg", - "num-integer", - "num-traits", -] - -[[package]] -name = "num-bigint-dig" -version = "0.8.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2399c9463abc5f909349d8aa9ba080e0b88b3ce2885389b60b993f39b1a56905" -dependencies = [ - "byteorder", - "lazy_static", - "libm", - "num-integer", - "num-iter", - "num-traits", - "rand 0.8.5", - "smallvec", - "zeroize", -] - -[[package]] -name = "num-derive" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "876a53fff98e03a936a674b29568b0e605f06b29372c2489ff4de23f1949743d" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.107", -] - -[[package]] -name = "num-integer" -version = "0.1.45" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "225d3389fb3509a24c93f5c29eb6bde2586b98d9f016636dff58d7c6f7569cd9" -dependencies = [ - "autocfg", - "num-traits", -] - -[[package]] -name = "num-iter" -version = "0.1.43" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d03e6c028c5dc5cac6e2dec0efda81fc887605bb3d884578bb6d6bf7514e252" -dependencies = [ - "autocfg", - "num-integer", - "num-traits", -] - -[[package]] -name = "num-traits" -version = "0.2.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "578ede34cf02f8924ab9447f50c28075b4d3e5b269972345e7e0372b38c6cdcd" -dependencies = [ - "autocfg", - "libm", -] - -[[package]] -name = "num_enum" -version = "0.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca565a7df06f3d4b485494f25ba05da1435950f4dc263440eda7a6fa9b8e36e4" -dependencies = [ - "derivative", - "num_enum_derive", -] - -[[package]] -name = "num_enum_derive" -version = "0.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ffa5a33ddddfee04c0283a7653987d634e880347e96b5b2ed64de07efb59db9d" -dependencies = [ - "proc-macro-crate", - "proc-macro2", - "quote", - "syn 1.0.107", -] - -[[package]] -name = "oid-registry" -version = "0.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9bedf36ffb6ba96c2eb7144ef6270557b52e54b20c0a8e1eb2ff99a6c6959bff" -dependencies = [ - "asn1-rs", -] - -[[package]] -name = "once_cell" -version = "1.16.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86f0b0d4bf799edbc74508c1e8bf170ff5f41238e5f8225603ca7caaae2b7860" - -[[package]] -name = "opaque-debug" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2839e79665f131bdb5782e51f2c6c9599c133c6098982a54c794358bf432529c" - -[[package]] -name = "os_str_bytes" -version = "6.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b7820b9daea5457c9f21c69448905d723fbd21136ccf521748f23fd49e723ee" - -[[package]] -name = "peeking_take_while" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "19b17cddbe7ec3f8bc800887bab5e717348c95ea2ca0b1bf0837fb964dc67099" - -[[package]] -name = "pem-rfc7468" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "01de5d978f34aa4b2296576379fcc416034702fd94117c56ffd8a1a767cefb30" -dependencies = [ - "base64ct", -] - -[[package]] -name = "pem-rfc7468" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "24d159833a9105500e0398934e205e0773f0b27529557134ecfc51c27646adac" -dependencies = [ - "base64ct", -] - -[[package]] -name = "pkcs1" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a78f66c04ccc83dd4486fd46c33896f4e17b24a7a3a6400dedc48ed0ddd72320" -dependencies = [ - "der 0.5.1", - "pkcs8 0.8.0", - "zeroize", -] - -[[package]] -name = "pkcs1" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eff33bdbdfc54cc98a2eca766ebdec3e1b8fb7387523d5c9c9a2891da856f719" -dependencies = [ - "der 0.6.1", - "pkcs8 0.9.0", - "spki 0.6.0", - "zeroize", -] - -[[package]] -name = "pkcs8" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7cabda3fb821068a9a4fab19a683eac3af12edf0f34b94a8be53c4972b8149d0" -dependencies = [ - "der 0.5.1", - "spki 0.5.4", - "zeroize", -] - -[[package]] -name = "pkcs8" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9eca2c590a5f85da82668fa685c09ce2888b9430e83299debf1f34b65fd4a4ba" -dependencies = [ - "der 0.6.1", - "spki 0.6.0", -] - -[[package]] -name = "png" -version = "0.17.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d708eaf860a19b19ce538740d2b4bdeeb8337fa53f7738455e706623ad5c638" -dependencies = [ - "bitflags 1.3.2", - "crc32fast", - "flate2", - "miniz_oxide", -] - -[[package]] -name = "ppv-lite86" -version = "0.2.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" - -[[package]] -name = "proc-macro-crate" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d6ea3c4595b96363c13943497db34af4460fb474a95c43f4446ad341b8c9785" -dependencies = [ - "toml", -] - -[[package]] -name = "proc-macro2" -version = "1.0.69" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "134c189feb4956b20f6f547d2cf727d4c0fe06722b20a0eec87ed445a97f92da" -dependencies = [ - "unicode-ident", -] - -[[package]] -name = "quote" -version = "1.0.33" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae" -dependencies = [ - "proc-macro2", -] - -[[package]] -name = "rand" -version = "0.7.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a6b1679d49b24bbfe0c803429aa1874472f50d9b363131f0e89fc356b544d03" -dependencies = [ - "getrandom 0.1.16", - "libc", - "rand_chacha 0.2.2", - "rand_core 0.5.1", - "rand_hc", -] - -[[package]] -name = "rand" -version = "0.8.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404" -dependencies = [ - "libc", - "rand_chacha 0.3.1", - "rand_core 0.6.4", -] - -[[package]] -name = "rand_chacha" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4c8ed856279c9737206bf725bf36935d8666ead7aa69b52be55af369d193402" -dependencies = [ - "ppv-lite86", - "rand_core 0.5.1", -] - -[[package]] -name = "rand_chacha" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88" -dependencies = [ - "ppv-lite86", - "rand_core 0.6.4", -] - -[[package]] -name = "rand_core" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90bde5296fc891b0cef12a6d03ddccc162ce7b2aff54160af9338f8d40df6d19" -dependencies = [ - "getrandom 0.1.16", -] - -[[package]] -name = "rand_core" -version = "0.6.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" -dependencies = [ - "getrandom 0.2.8", -] - -[[package]] -name = "rand_hc" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca3129af7b92a17112d59ad498c6f81eaf463253766b90396d39ea7a39d6613c" -dependencies = [ - "rand_core 0.5.1", -] - -[[package]] -name = "rc4" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f1256e23efe6097f27aa82d6ca6889361c001586ae0f6917cbad072f05eb275" -dependencies = [ - "cipher", -] - -[[package]] -name = "rdp-client" -version = "0.1.0" -dependencies = [ - "bitflags 1.3.2", - "byteorder", - "cbindgen", - "env_logger", - "iso7816", - "iso7816-tlv", - "libc", - "log", - "num-derive", - "num-traits", - "png", - "rand 0.8.5", - "rand_chacha 0.3.1", - "rdp-rs", - "rsa 0.7.2", - "tempfile", - "utf16string", - "uuid", -] - -[[package]] -name = "rdp-rs" -version = "0.1.0" -source = "git+https://github.com/gravitational/rdp-rs?rev=0ddb504e10051aaa8f0de57580a973d2853a5b7d#0ddb504e10051aaa8f0de57580a973d2853a5b7d" -dependencies = [ - "boring", - "bufstream", - "byteorder", - "gethostname", - "hmac", - "indexmap", - "md-5", - "md4", - "num-bigint 0.2.6", - "num_enum", - "oid-registry", - "rand 0.7.3", - "rc4", - "ring", - "rsa 0.6.1", - "rustls", - "x509-parser", - "yasna", -] - -[[package]] -name = "redox_syscall" -version = "0.2.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a" -dependencies = [ - "bitflags 1.3.2", -] - -[[package]] -name = "regex" -version = "1.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e076559ef8e241f2ae3479e36f97bd5741c0330689e217ad51ce2c76808b868a" -dependencies = [ - "aho-corasick", - "memchr", - "regex-syntax", -] - -[[package]] -name = "regex-syntax" -version = "0.6.28" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "456c603be3e8d448b072f410900c09faf164fbce2d480456f50eea6e25f9c848" - -[[package]] -name = "ring" -version = "0.16.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3053cf52e236a3ed746dfc745aa9cacf1b791d846bdaf412f60a8d7d6e17c8fc" -dependencies = [ - "cc", - "libc", - "once_cell", - "spin 0.5.2", - "untrusted 0.7.1", - "web-sys", - "winapi", -] - -[[package]] -name = "rsa" -version = "0.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4cf22754c49613d2b3b119f0e5d46e34a2c628a937e3024b8762de4e7d8c710b" -dependencies = [ - "byteorder", - "digest 0.10.6", - "num-bigint-dig", - "num-integer", - "num-iter", - "num-traits", - "pkcs1 0.3.3", - "pkcs8 0.8.0", - "rand_core 0.6.4", - "smallvec", - "subtle 2.4.1", - "zeroize", -] - -[[package]] -name = "rsa" -version = "0.7.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "094052d5470cbcef561cb848a7209968c9f12dfa6d668f4bca048ac5de51099c" -dependencies = [ - "byteorder", - "digest 0.10.6", - "num-bigint-dig", - "num-integer", - "num-iter", - "num-traits", - "pkcs1 0.4.1", - "pkcs8 0.9.0", - "rand_core 0.6.4", - "signature", - "smallvec", - "subtle 2.4.1", - "zeroize", -] - -[[package]] -name = "rustc-hash" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" - -[[package]] -name = "rustc_version" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366" -dependencies = [ - "semver", -] - -[[package]] -name = "rusticata-macros" -version = "4.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "faf0c4a6ece9950b9abdb62b1cfcf2a68b3b67a10ba445b3bb85be2a293d0632" -dependencies = [ - "nom", -] - -[[package]] -name = "rustix" -version = "0.36.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a3807b5d10909833d3e9acd1eb5fb988f79376ff10fce42937de71a449c4c588" -dependencies = [ - "bitflags 1.3.2", - "errno", - "io-lifetimes", - "libc", - "linux-raw-sys", - "windows-sys", -] - -[[package]] -name = "rustls" -version = "0.20.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "539a2bfe908f471bfa933876bd1eb6a19cf2176d375f82ef7f99530a40e48c2c" -dependencies = [ - "log", - "ring", - "sct", - "webpki", -] - -[[package]] -name = "ryu" -version = "1.0.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b4b9743ed687d4b4bcedf9ff5eaa7398495ae14e61cba0a295704edbc7decde" - -[[package]] -name = "scopeguard" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" - -[[package]] -name = "sct" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d53dcdb7c9f8158937a7981b48accfd39a43af418591a5d008c7b22b5e1b7ca4" -dependencies = [ - "ring", - "untrusted 0.7.1", -] - -[[package]] -name = "semver" -version = "1.0.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "58bc9567378fc7690d6b2addae4e60ac2eeea07becb2c64b9f218b53865cba2a" - -[[package]] -name = "serde" -version = "1.0.151" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97fed41fc1a24994d044e6db6935e69511a1153b52c15eb42493b26fa87feba0" -dependencies = [ - "serde_derive", -] - -[[package]] -name = "serde_derive" -version = "1.0.151" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "255abe9a125a985c05190d687b320c12f9b1f0b99445e608c21ba0782c719ad8" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.107", -] - -[[package]] -name = "serde_json" -version = "1.0.91" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "877c235533714907a8c2464236f5c4b2a17262ef1bd71f38f35ea592c8da6883" -dependencies = [ - "itoa", - "ryu", - "serde", -] - -[[package]] -name = "shlex" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43b2853a4d09f215c24cc5489c992ce46052d359b5109343cbafbf26bc62f8a3" - -[[package]] -name = "signature" -version = "1.6.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "74233d3b3b2f6d4b006dc19dee745e73e2a6bfb6f93607cd3b02bd5b00797d7c" -dependencies = [ - "digest 0.10.6", - "rand_core 0.6.4", -] - -[[package]] -name = "smallvec" -version = "1.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a507befe795404456341dfab10cef66ead4c041f62b8b11bbb92bffe5d0953e0" - -[[package]] -name = "spin" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d" - -[[package]] -name = "spin" -version = "0.9.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f6002a767bff9e83f8eeecf883ecb8011875a21ae8da43bffb817a57e78cc09" -dependencies = [ - "lock_api", -] - -[[package]] -name = "spki" -version = "0.5.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44d01ac02a6ccf3e07db148d2be087da624fea0221a16152ed01f0496a6b0a27" -dependencies = [ - "base64ct", - "der 0.5.1", -] - -[[package]] -name = "spki" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67cf02bbac7a337dc36e4f5a693db6c21e7863f45070f7064577eb4367a3212b" -dependencies = [ - "base64ct", - "der 0.6.1", -] - -[[package]] -name = "stable_deref_trait" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3" - -[[package]] -name = "strsim" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" - -[[package]] -name = "subtle" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2d67a5a62ba6e01cb2192ff309324cb4875d0c451d55fe2319433abe7a05a8ee" - -[[package]] -name = "subtle" -version = "2.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6bdef32e8150c2a081110b42772ffe7d7c9032b606bc226c8260fd97e0976601" - -[[package]] -name = "syn" -version = "1.0.107" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f4064b5b16e03ae50984a5a8ed5d4f8803e6bc1fd170a3cda91a1be4b18e3f5" -dependencies = [ - "proc-macro2", - "quote", - "unicode-ident", -] - -[[package]] -name = "syn" -version = "2.0.39" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23e78b90f2fcf45d3e842032ce32e3f2d1545ba6636271dcbf24fa306d87be7a" -dependencies = [ - "proc-macro2", - "quote", - "unicode-ident", -] - -[[package]] -name = "synstructure" -version = "0.12.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f36bdaa60a83aca3921b5259d5400cbf5e90fc51931376a9bd4a0eb79aa7210f" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.107", - "unicode-xid", -] - -[[package]] -name = "tempfile" -version = "3.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af18f7ae1acd354b992402e9ec5864359d693cd8a79dcbef59f76891701c1e95" -dependencies = [ - "cfg-if", - "fastrand", - "redox_syscall", - "rustix", - "windows-sys", -] - -[[package]] -name = "termcolor" -version = "1.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bab24d30b911b2376f3a13cc2cd443142f0c81dda04c118693e35b3835757755" -dependencies = [ - "winapi-util", -] - -[[package]] -name = "textwrap" -version = "0.16.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "222a222a5bfe1bba4a77b45ec488a741b3cb8872e5e499451fd7d0129c9c7c3d" - -[[package]] -name = "thiserror" -version = "1.0.38" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a9cd18aa97d5c45c6603caea1da6628790b37f7a34b6ca89522331c5180fed0" -dependencies = [ - "thiserror-impl", -] - -[[package]] -name = "thiserror-impl" -version = "1.0.38" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1fb327af4685e4d03fa8cbcf1716380da910eeb2bb8be417e7f9fd3fb164f36f" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.107", -] - -[[package]] -name = "time" -version = "0.3.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a561bf4617eebd33bca6434b988f39ed798e527f51a1e797d0ee4f61c0a38376" -dependencies = [ - "itoa", - "serde", - "time-core", - "time-macros", -] - -[[package]] -name = "time-core" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2e153e1f1acaef8acc537e68b44906d2db6436e2b35ac2c6b42640fff91f00fd" - -[[package]] -name = "time-macros" -version = "0.2.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d967f99f534ca7e495c575c62638eebc2898a8c84c119b89e250477bc4ba16b2" -dependencies = [ - "time-core", -] - -[[package]] -name = "toml" -version = "0.5.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1333c76748e868a4d9d1017b5ab53171dfd095f70c712fdb4653a406547f598f" -dependencies = [ - "serde", -] - -[[package]] -name = "typenum" -version = "1.16.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "497961ef93d974e23eb6f433eb5fe1b7930b659f06d12dec6fc44a8f554c0bba" - -[[package]] -name = "unicode-ident" -version = "1.0.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "84a22b9f218b40614adcb3f4ff08b703773ad44fa9423e4e0d346d5db86e4ebc" - -[[package]] -name = "unicode-xid" -version = "0.2.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f962df74c8c05a667b5ee8bcf162993134c104e96440b663c8daa176dc772d8c" - -[[package]] -name = "untrusted" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a156c684c91ea7d62626509bce3cb4e1d9ed5c4d978f7b4352658f96a4c26b4a" - -[[package]] -name = "untrusted" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1" - -[[package]] -name = "utf16string" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b62a1e85e12d5d712bf47a85f426b73d303e2d00a90de5f3004df3596e9d216" -dependencies = [ - "byteorder", -] - -[[package]] -name = "uuid" -version = "1.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "422ee0de9031b5b948b97a8fc04e3aa35230001a722ddd27943e0be31564ce4c" -dependencies = [ - "getrandom 0.2.8", -] - -[[package]] -name = "version_check" -version = "0.9.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" - -[[package]] -name = "wasi" -version = "0.9.0+wasi-snapshot-preview1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519" - -[[package]] -name = "wasi" -version = "0.11.0+wasi-snapshot-preview1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" - -[[package]] -name = "wasm-bindgen" -version = "0.2.83" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eaf9f5aceeec8be17c128b2e93e031fb8a4d469bb9c4ae2d7dc1888b26887268" -dependencies = [ - "cfg-if", - "wasm-bindgen-macro", -] - -[[package]] -name = "wasm-bindgen-backend" -version = "0.2.83" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c8ffb332579b0557b52d268b91feab8df3615f265d5270fec2a8c95b17c1142" -dependencies = [ - "bumpalo", - "log", - "once_cell", - "proc-macro2", - "quote", - "syn 1.0.107", - "wasm-bindgen-shared", -] - -[[package]] -name = "wasm-bindgen-macro" -version = "0.2.83" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "052be0f94026e6cbc75cdefc9bae13fd6052cdcaf532fa6c45e7ae33a1e6c810" -dependencies = [ - "quote", - "wasm-bindgen-macro-support", -] - -[[package]] -name = "wasm-bindgen-macro-support" -version = "0.2.83" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "07bc0c051dc5f23e307b13285f9d75df86bfdf816c5721e573dec1f9b8aa193c" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.107", - "wasm-bindgen-backend", - "wasm-bindgen-shared", -] - -[[package]] -name = "wasm-bindgen-shared" -version = "0.2.83" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1c38c045535d93ec4f0b4defec448e4291638ee608530863b1e2ba115d4fff7f" - -[[package]] -name = "web-sys" -version = "0.3.60" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bcda906d8be16e728fd5adc5b729afad4e444e106ab28cd1c7256e54fa61510f" -dependencies = [ - "js-sys", - "wasm-bindgen", -] - -[[package]] -name = "webpki" -version = "0.22.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "07ecc0cd7cac091bf682ec5efa18b1cff79d617b84181f38b3951dbe135f607f" -dependencies = [ - "ring", - "untrusted 0.7.1", -] - -[[package]] -name = "winapi" -version = "0.3.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" -dependencies = [ - "winapi-i686-pc-windows-gnu", - "winapi-x86_64-pc-windows-gnu", -] - -[[package]] -name = "winapi-i686-pc-windows-gnu" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" - -[[package]] -name = "winapi-util" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178" -dependencies = [ - "winapi", -] - -[[package]] -name = "winapi-x86_64-pc-windows-gnu" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" - -[[package]] -name = "windows-sys" -version = "0.42.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a3e1820f08b8513f676f7ab6c1f99ff312fb97b553d30ff4dd86f9f15728aa7" -dependencies = [ - "windows_aarch64_gnullvm", - "windows_aarch64_msvc", - "windows_i686_gnu", - "windows_i686_msvc", - "windows_x86_64_gnu", - "windows_x86_64_gnullvm", - "windows_x86_64_msvc", -] - -[[package]] -name = "windows_aarch64_gnullvm" -version = "0.42.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41d2aa71f6f0cbe00ae5167d90ef3cfe66527d6f613ca78ac8024c3ccab9a19e" - -[[package]] -name = "windows_aarch64_msvc" -version = "0.42.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd0f252f5a35cac83d6311b2e795981f5ee6e67eb1f9a7f64eb4500fbc4dcdb4" - -[[package]] -name = "windows_i686_gnu" -version = "0.42.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fbeae19f6716841636c28d695375df17562ca208b2b7d0dc47635a50ae6c5de7" - -[[package]] -name = "windows_i686_msvc" -version = "0.42.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "84c12f65daa39dd2babe6e442988fc329d6243fdce47d7d2d155b8d874862246" - -[[package]] -name = "windows_x86_64_gnu" -version = "0.42.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf7b1b21b5362cbc318f686150e5bcea75ecedc74dd157d874d754a2ca44b0ed" - -[[package]] -name = "windows_x86_64_gnullvm" -version = "0.42.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09d525d2ba30eeb3297665bd434a54297e4170c7f1a44cad4ef58095b4cd2028" - -[[package]] -name = "windows_x86_64_msvc" -version = "0.42.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f40009d85759725a34da6d89a94e63d7bdc50a862acf0dbc7c8e488f1edcb6f5" - -[[package]] -name = "x509-parser" -version = "0.14.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e0ecbeb7b67ce215e40e3cc7f2ff902f94a223acf44995934763467e7b1febc8" -dependencies = [ - "asn1-rs", - "base64", - "data-encoding", - "der-parser", - "lazy_static", - "nom", - "oid-registry", - "rusticata-macros", - "thiserror", - "time", -] - -[[package]] -name = "yasna" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0de7bff972b4f2a06c85f6d8454b09df153af7e3a4ec2aac81db1b105b684ddb" - -[[package]] -name = "zeroize" -version = "1.5.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c394b5bd0c6f669e7275d9c20aa90ae064cb22e75a1cad54e1b34088034b149f" diff --git a/pkgs/servers/teleport/12/default.nix b/pkgs/servers/teleport/12/default.nix deleted file mode 100644 index 7d1e28afb4c7..000000000000 --- a/pkgs/servers/teleport/12/default.nix +++ /dev/null @@ -1,17 +0,0 @@ -{ callPackage, ... }@args: -callPackage ../generic.nix ({ - version = "12.4.32"; - hash = "sha256-dYriqQwrc3tfLv+/G/W8n+4cLbPUq7lq1/kGH/GIsHs="; - vendorHash = "sha256-R7gWdUIrc7VLe+9/En47FI3G9x2V1VGUVTrT/kmA9c4="; - yarnHash = "sha256-Sr9T2TmrysMQs6A00rHU1IZjslu8jyYkVnYE6AmBmLA="; - cargoLock = { - lockFile = ./Cargo.lock; - outputHashes = { - "rdp-rs-0.1.0" = "sha256-4NbAsEmyUdmBcHuzx+SLQCGKICC4V4FX4GTK2SzyHC0="; - }; - }; - extPatches = [ - # https://github.com/NixOS/nixpkgs/issues/120738 - ../tsh.patch - ]; -} // builtins.removeAttrs args [ "callPackage" ]) diff --git a/pkgs/servers/teleport/13/default.nix b/pkgs/servers/teleport/13/default.nix index 06905183b5ab..a35385374c58 100644 --- a/pkgs/servers/teleport/13/default.nix +++ b/pkgs/servers/teleport/13/default.nix @@ -1,5 +1,5 @@ -{ callPackage, ... }@args: -callPackage ../generic.nix ({ +args: +import ../generic.nix (args // { version = "13.4.14"; hash = "sha256-g11D5lekI3pUpKf5CLUuNjejs0gN/bEemHkCj3akha0="; vendorHash = "sha256-kiDhlR/P81u/yNq72JuskES/UzMrTFzJT0H3xldGk8I="; @@ -14,4 +14,4 @@ callPackage ../generic.nix ({ # https://github.com/NixOS/nixpkgs/issues/120738 ../tsh.patch ]; -} // builtins.removeAttrs args [ "callPackage" ]) +}) diff --git a/pkgs/servers/teleport/14/default.nix b/pkgs/servers/teleport/14/default.nix index 6044975e62f2..59cf021201dd 100644 --- a/pkgs/servers/teleport/14/default.nix +++ b/pkgs/servers/teleport/14/default.nix @@ -1,5 +1,5 @@ -{ callPackage, ... }@args: -callPackage ../generic.nix ({ +args: +import ../generic.nix (args // { version = "14.3.0"; hash = "sha256-yTbJeHCmPlelq7BrZQRY3XyNQiovV7NQ1tNh2NfYGbk="; vendorHash = "sha256-lHsgSbY1nqQminU67QgV6FbHXNlv5tCMv2oVq48S33M="; @@ -14,4 +14,4 @@ callPackage ../generic.nix ({ # https://github.com/NixOS/nixpkgs/issues/120738 ../tsh_14.patch ]; -} // builtins.removeAttrs args [ "callPackage" ]) +}) diff --git a/pkgs/servers/teleport/15/Cargo.lock b/pkgs/servers/teleport/15/Cargo.lock new file mode 100644 index 000000000000..2ca88c909399 --- /dev/null +++ b/pkgs/servers/teleport/15/Cargo.lock @@ -0,0 +1,3354 @@ +# This file is automatically @generated by Cargo. +# It is not intended for manual editing. +version = 3 + +[[package]] +name = "addr2line" +version = "0.21.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8a30b2e23b9e17a9f90641c7ab1549cd9b44f296d3ccbf309d2863cfe398a0cb" +dependencies = [ + "gimli", +] + +[[package]] +name = "adler" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" + +[[package]] +name = "aes" +version = "0.8.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ac1f845298e95f983ff1944b728ae08b8cebab80d684f0a832ed0fc74dfa27e2" +dependencies = [ + "cfg-if", + "cipher", + "cpufeatures", +] + +[[package]] +name = "aho-corasick" +version = "1.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b2969dcb958b36655471fc61f7e416fa76033bdd4bfed0678d8fee1e2d07a1f0" +dependencies = [ + "memchr", +] + +[[package]] +name = "asn1-rs" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "22ad1373757efa0f70ec53939aabc7152e1591cb485208052993070ac8d2429d" +dependencies = [ + "asn1-rs-derive", + "asn1-rs-impl", + "displaydoc", + "nom", + "num-traits", + "rusticata-macros", + "thiserror", +] + +[[package]] +name = "asn1-rs-derive" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7378575ff571966e99a744addeff0bff98b8ada0dedf1956d59e634db95eaac1" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.39", + "synstructure", +] + +[[package]] +name = "asn1-rs-impl" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7b18050c2cd6fe86c3a76584ef5e0baf286d038cda203eb6223df2cc413565f7" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.39", +] + +[[package]] +name = "async-dnssd" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "98efc05996cc8d660e88841fcffb75aa71be5339c9ae559a8c8016c048420b82" +dependencies = [ + "bitflags 1.3.2", + "futures-channel", + "futures-core", + "futures-executor", + "futures-util", + "libc", + "log", + "pin-utils", + "pkg-config", + "tokio", + "winapi", +] + +[[package]] +name = "async-recursion" +version = "1.0.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5fd55a5ba1179988837d24ab4c7cc8ed6efdeff578ede0416b4225a5fca35bd0" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.39", +] + +[[package]] +name = "atomic-polyfill" +version = "1.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8cf2bce30dfe09ef0bfaef228b9d414faaf7e563035494d7fe092dba54b300f4" +dependencies = [ + "critical-section", +] + +[[package]] +name = "atty" +version = "0.2.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8" +dependencies = [ + "hermit-abi 0.1.19", + "libc", + "winapi", +] + +[[package]] +name = "autocfg" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" + +[[package]] +name = "backtrace" +version = "0.3.69" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2089b7e3f35b9dd2d0ed921ead4f6d318c27680d4a5bd167b3ee120edb105837" +dependencies = [ + "addr2line", + "cc", + "cfg-if", + "libc", + "miniz_oxide", + "object", + "rustc-demangle", +] + +[[package]] +name = "base16ct" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4c7f02d4ea65f2c1853089ffd8d2787bdbc63de2f0d29dedbcf8ccdfa0ccd4cf" + +[[package]] +name = "base64" +version = "0.21.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "35636a1494ede3b646cc98f74f8e62c773a38a659ebc777a2cf26b9b74171df9" + +[[package]] +name = "base64ct" +version = "1.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8c3c1a368f70d6cf7302d78f8f7093da241fb8e8807c05cc9e51a125895a6d5b" + +[[package]] +name = "bindgen" +version = "0.68.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "726e4313eb6ec35d2730258ad4e15b547ee75d6afaa1361a922e78e59b7d8078" +dependencies = [ + "bitflags 2.4.2", + "cexpr", + "clang-sys", + "lazy_static", + "lazycell", + "peeking_take_while", + "proc-macro2", + "quote", + "regex", + "rustc-hash", + "shlex", + "syn 2.0.39", +] + +[[package]] +name = "bit_field" +version = "0.10.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dc827186963e592360843fb5ba4b973e145841266c1357f7180c43526f2e5b61" + +[[package]] +name = "bitflags" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" + +[[package]] +name = "bitflags" +version = "2.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ed570934406eb16438a4e976b1b4500774099c13b8cb96eec99f620f05090ddf" + +[[package]] +name = "bitvec" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1bc2832c24239b0141d5674bb9174f9d68a8b5b3f2753311927c172ca46f7e9c" +dependencies = [ + "funty", + "radium", + "tap", + "wyz", +] + +[[package]] +name = "block-buffer" +version = "0.10.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3078c7629b62d3f0439517fa394996acacc5cbc91c5a20d8c658e77abd503a71" +dependencies = [ + "generic-array", +] + +[[package]] +name = "block-padding" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a8894febbff9f758034a5b8e12d87918f56dfc64a8e1fe757d65e29041538d93" +dependencies = [ + "generic-array", +] + +[[package]] +name = "boring" +version = "4.4.0" +source = "git+https://github.com/gravitational/boring?rev=605253d99d5e363e178bcf97e1d4622e33844cd5#605253d99d5e363e178bcf97e1d4622e33844cd5" +dependencies = [ + "bitflags 2.4.2", + "boring-sys", + "foreign-types", + "libc", + "once_cell", +] + +[[package]] +name = "boring-sys" +version = "4.4.0" +source = "git+https://github.com/gravitational/boring?rev=605253d99d5e363e178bcf97e1d4622e33844cd5#605253d99d5e363e178bcf97e1d4622e33844cd5" +dependencies = [ + "bindgen", + "cmake", + "fs_extra", + "fslock", +] + +[[package]] +name = "bumpalo" +version = "3.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f30e7476521f6f8af1a1c4c0b8cc94f0bee37d91763d0ca2665f299b6cd8aec" + +[[package]] +name = "byteorder" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" + +[[package]] +name = "bytes" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a2bd12c1caf447e69cd4528f47f94d203fd2582878ecb9e9465484c4148a8223" + +[[package]] +name = "cbc" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "26b52a9543ae338f279b96b0b9fed9c8093744685043739079ce85cd58f289a6" +dependencies = [ + "cipher", +] + +[[package]] +name = "cbindgen" +version = "0.26.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "da6bc11b07529f16944307272d5bd9b22530bc7d05751717c9d416586cedab49" +dependencies = [ + "clap", + "heck", + "indexmap 1.9.3", + "log", + "proc-macro2", + "quote", + "serde", + "serde_json", + "syn 1.0.109", + "tempfile", + "toml", +] + +[[package]] +name = "cc" +version = "1.0.83" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f1174fb0b6ec23863f8b971027804a42614e347eafb0a95bf0b12cdae21fc4d0" +dependencies = [ + "libc", +] + +[[package]] +name = "cexpr" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6fac387a98bb7c37292057cffc56d62ecb629900026402633ae9160df93a8766" +dependencies = [ + "nom", +] + +[[package]] +name = "cfg-if" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" + +[[package]] +name = "cfg_aliases" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fd16c4719339c4530435d38e511904438d07cce7950afa3718a84ac36c10e89e" + +[[package]] +name = "cipher" +version = "0.4.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "773f3b9af64447d2ce9850330c473515014aa235e6a783b02db81ff39e4a3dad" +dependencies = [ + "crypto-common", + "inout", +] + +[[package]] +name = "clang-sys" +version = "1.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c688fc74432808e3eb684cae8830a86be1d66a2bd58e1f248ed0960a590baf6f" +dependencies = [ + "glob", + "libc", + "libloading", +] + +[[package]] +name = "clap" +version = "3.2.25" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4ea181bf566f71cb9a5d17a59e1871af638180a18fb0035c92ae62b705207123" +dependencies = [ + "atty", + "bitflags 1.3.2", + "clap_lex", + "indexmap 1.9.3", + "strsim", + "termcolor", + "textwrap", +] + +[[package]] +name = "clap_lex" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2850f2f5a82cbf437dd5af4d49848fbdfc27c157c3d010345776f952765261c5" +dependencies = [ + "os_str_bytes", +] + +[[package]] +name = "cmake" +version = "0.1.50" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a31c789563b815f77f4250caee12365734369f942439b7defd71e18a48197130" +dependencies = [ + "cc", +] + +[[package]] +name = "console_error_panic_hook" +version = "0.1.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a06aeb73f470f66dcdbf7223caeebb85984942f22f1adb2a088cf9668146bbbc" +dependencies = [ + "cfg-if", + "wasm-bindgen", +] + +[[package]] +name = "const-oid" +version = "0.9.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "28c122c3980598d243d63d9a704629a2d748d101f278052ff068be5a4423ab6f" + +[[package]] +name = "core-foundation" +version = "0.9.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "91e195e091a93c46f7102ec7818a2aa394e1e1771c3ab4825963fa03e45afb8f" +dependencies = [ + "core-foundation-sys", + "libc", +] + +[[package]] +name = "core-foundation-sys" +version = "0.8.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "06ea2b9bc92be3c2baa9334a323ebca2d6f074ff852cd1d7b11064035cd3868f" + +[[package]] +name = "cpufeatures" +version = "0.2.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ce420fe07aecd3e67c5f910618fe65e94158f6dcc0adf44e00d69ce2bdfe0fd0" +dependencies = [ + "libc", +] + +[[package]] +name = "critical-section" +version = "1.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7059fff8937831a9ae6f0fe4d658ffabf58f2ca96aa9dec1c889f936f705f216" + +[[package]] +name = "crypto" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bf1e6e5492f8f0830c37f301f6349e0dac8b2466e4fe89eef90e9eef906cd046" +dependencies = [ + "crypto-common", +] + +[[package]] +name = "crypto-bigint" +version = "0.5.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0dc92fb57ca44df6db8059111ab3af99a63d5d0f8375d9972e319a379c6bab76" +dependencies = [ + "generic-array", + "rand_core", + "subtle", + "zeroize", +] + +[[package]] +name = "crypto-common" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3" +dependencies = [ + "generic-array", + "typenum", +] + +[[package]] +name = "crypto-mac" +version = "0.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b1d1a86f49236c215f271d40892d5fc950490551400b02ef360692c29815c714" +dependencies = [ + "generic-array", + "subtle", +] + +[[package]] +name = "curve25519-dalek" +version = "4.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e89b8c6a2e4b1f45971ad09761aafb85514a84744b67a95e32c3cc1352d1f65c" +dependencies = [ + "cfg-if", + "cpufeatures", + "curve25519-dalek-derive", + "digest", + "fiat-crypto", + "platforms", + "rustc_version", + "subtle", + "zeroize", +] + +[[package]] +name = "curve25519-dalek-derive" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f46882e17999c6cc590af592290432be3bce0428cb0d5f8b6715e4dc7b383eb3" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.39", +] + +[[package]] +name = "delog" +version = "0.1.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "af2b93368262340c9d4441251b824500d1b641a50957ecf4219a2cc41b9eac8f" +dependencies = [ + "log", +] + +[[package]] +name = "der" +version = "0.7.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fffa369a668c8af7dbf8b5e56c9f744fbd399949ed171606040001947de40b1c" +dependencies = [ + "const-oid", + "der_derive", + "flagset", + "pem-rfc7468", + "zeroize", +] + +[[package]] +name = "der-parser" +version = "9.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5cd0a5c643689626bec213c4d8bd4d96acc8ffdb4ad4bb6bc16abf27d5f4b553" +dependencies = [ + "asn1-rs", + "displaydoc", + "nom", + "num-traits", + "rusticata-macros", +] + +[[package]] +name = "der_derive" +version = "0.7.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5fe87ce4529967e0ba1dcf8450bab64d97dfd5010a6256187ffe2e43e6f0e049" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.39", +] + +[[package]] +name = "deranged" +version = "0.3.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8eb30d70a07a3b04884d2677f06bec33509dc67ca60d92949e5535352d3191dc" +dependencies = [ + "powerfmt", +] + +[[package]] +name = "des" +version = "0.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ffdd80ce8ce993de27e9f063a444a4d53ce8e8db4c1f00cc03af5ad5a9867a1e" +dependencies = [ + "cipher", +] + +[[package]] +name = "digest" +version = "0.10.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292" +dependencies = [ + "block-buffer", + "const-oid", + "crypto-common", + "subtle", +] + +[[package]] +name = "displaydoc" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "487585f4d0c6655fe74905e2504d8ad6908e4db67f744eb140876906c2f3175d" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.39", +] + +[[package]] +name = "ecdsa" +version = "0.16.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ee27f32b5c5292967d2d4a9d7f1e0b0aed2c15daded5a60300e4abb9d8020bca" +dependencies = [ + "der", + "digest", + "elliptic-curve", + "rfc6979", + "signature", + "spki", +] + +[[package]] +name = "ed25519" +version = "2.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "115531babc129696a58c64a4fef0a8bf9e9698629fb97e9e40767d235cfbcd53" +dependencies = [ + "pkcs8", + "signature", +] + +[[package]] +name = "ed25519-dalek" +version = "2.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1f628eaec48bfd21b865dc2950cfa014450c01d2fa2b69a86c2fd5844ec523c0" +dependencies = [ + "curve25519-dalek", + "ed25519", + "rand_core", + "serde", + "sha2", + "subtle", + "zeroize", +] + +[[package]] +name = "elliptic-curve" +version = "0.13.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b5e6043086bf7973472e0c7dff2142ea0b680d30e18d9cc40f267efbf222bd47" +dependencies = [ + "base16ct", + "crypto-bigint", + "digest", + "ff", + "generic-array", + "group", + "hkdf", + "pem-rfc7468", + "pkcs8", + "rand_core", + "sec1", + "subtle", + "zeroize", +] + +[[package]] +name = "encoding_rs" +version = "0.8.33" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7268b386296a025e474d5140678f75d6de9493ae55a5d709eeb9dd08149945e1" +dependencies = [ + "cfg-if", +] + +[[package]] +name = "env_logger" +version = "0.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "95b3f3e67048839cb0d0781f445682a35113da7121f7c949db0e2be96a4fbece" +dependencies = [ + "humantime", + "is-terminal", + "log", + "regex", + "termcolor", +] + +[[package]] +name = "equivalent" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" + +[[package]] +name = "errno" +version = "0.3.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a258e46cdc063eb8519c00b9fc845fc47bcfca4130e2f08e88665ceda8474245" +dependencies = [ + "libc", + "windows-sys 0.52.0", +] + +[[package]] +name = "fastrand" +version = "2.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "25cbce373ec4653f1a01a31e8a5e5ec0c622dc27ff9c4e6606eefef5cbbed4a5" + +[[package]] +name = "ff" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ded41244b729663b1e574f1b4fb731469f69f79c17667b5d776b16cda0479449" +dependencies = [ + "rand_core", + "subtle", +] + +[[package]] +name = "fiat-crypto" +version = "0.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "27573eac26f4dd11e2b1916c3fe1baa56407c83c71a773a8ba17ec0bca03b6b7" + +[[package]] +name = "flagset" +version = "0.4.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d52a7e408202050813e6f1d9addadcaafef3dca7530c7ddfb005d4081cce6779" + +[[package]] +name = "fnv" +version = "1.0.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" + +[[package]] +name = "foreign-types" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d737d9aa519fb7b749cbc3b962edcf310a8dd1f4b67c91c4f83975dbdd17d965" +dependencies = [ + "foreign-types-macros", + "foreign-types-shared", +] + +[[package]] +name = "foreign-types-macros" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1a5c6c585bc94aaf2c7b51dd4c2ba22680844aba4c687be581871a6f518c5742" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.39", +] + +[[package]] +name = "foreign-types-shared" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aa9a19cbb55df58761df49b23516a86d432839add4af60fc256da840f66ed35b" + +[[package]] +name = "form_urlencoded" +version = "1.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e13624c2627564efccf4934284bdd98cbaa14e79b0b5a141218e507b3a823456" +dependencies = [ + "percent-encoding", +] + +[[package]] +name = "fs_extra" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "42703706b716c37f96a77aea830392ad231f44c9e9a67872fa5548707e11b11c" + +[[package]] +name = "fslock" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "04412b8935272e3a9bae6f48c7bfff74c2911f60525404edfdd28e49884c3bfb" +dependencies = [ + "libc", + "winapi", +] + +[[package]] +name = "funty" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e6d5a32815ae3f33302d95fdcb2ce17862f8c65363dcfd29360480ba1001fc9c" + +[[package]] +name = "futures" +version = "0.3.29" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "da0290714b38af9b4a7b094b8a37086d1b4e61f2df9122c3cad2577669145335" +dependencies = [ + "futures-channel", + "futures-core", + "futures-executor", + "futures-io", + "futures-sink", + "futures-task", + "futures-util", +] + +[[package]] +name = "futures-channel" +version = "0.3.29" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ff4dd66668b557604244583e3e1e1eada8c5c2e96a6d0d6653ede395b78bbacb" +dependencies = [ + "futures-core", + "futures-sink", +] + +[[package]] +name = "futures-core" +version = "0.3.29" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eb1d22c66e66d9d72e1758f0bd7d4fd0bee04cad842ee34587d68c07e45d088c" + +[[package]] +name = "futures-executor" +version = "0.3.29" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0f4fb8693db0cf099eadcca0efe2a5a22e4550f98ed16aba6c48700da29597bc" +dependencies = [ + "futures-core", + "futures-task", + "futures-util", +] + +[[package]] +name = "futures-io" +version = "0.3.29" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8bf34a163b5c4c52d0478a4d757da8fb65cabef42ba90515efee0f6f9fa45aaa" + +[[package]] +name = "futures-macro" +version = "0.3.29" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "53b153fd91e4b0147f4aced87be237c98248656bb01050b96bf3ee89220a8ddb" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.39", +] + +[[package]] +name = "futures-sink" +version = "0.3.29" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e36d3378ee38c2a36ad710c5d30c2911d752cb941c00c72dbabfb786a7970817" + +[[package]] +name = "futures-task" +version = "0.3.29" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "efd193069b0ddadc69c46389b740bbccdd97203899b48d09c5f7969591d6bae2" + +[[package]] +name = "futures-util" +version = "0.3.29" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a19526d624e703a3179b3d322efec918b6246ea0fa51d41124525f00f1cc8104" +dependencies = [ + "futures-channel", + "futures-core", + "futures-io", + "futures-macro", + "futures-sink", + "futures-task", + "memchr", + "pin-project-lite", + "pin-utils", + "slab", +] + +[[package]] +name = "generic-array" +version = "0.14.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a" +dependencies = [ + "typenum", + "version_check", + "zeroize", +] + +[[package]] +name = "getrandom" +version = "0.2.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "190092ea657667030ac6a35e305e62fc4dd69fd98ac98631e5d3a2b1575a12b5" +dependencies = [ + "cfg-if", + "js-sys", + "libc", + "wasi", + "wasm-bindgen", +] + +[[package]] +name = "gimli" +version = "0.28.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4271d37baee1b8c7e4b708028c57d816cf9d2434acb33a549475f78c181f6253" + +[[package]] +name = "glob" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" + +[[package]] +name = "group" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f0f9ef7462f7c099f518d754361858f86d8a07af53ba9af0fe635bbccb151a63" +dependencies = [ + "ff", + "rand_core", + "subtle", +] + +[[package]] +name = "h2" +version = "0.3.24" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bb2c4422095b67ee78da96fbb51a4cc413b3b25883c7717ff7ca1ab31022c9c9" +dependencies = [ + "bytes", + "fnv", + "futures-core", + "futures-sink", + "futures-util", + "http", + "indexmap 2.1.0", + "slab", + "tokio", + "tokio-util", + "tracing", +] + +[[package]] +name = "hash32" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b0c35f58762feb77d74ebe43bdbc3210f09be9fe6742234d573bacc26ed92b67" +dependencies = [ + "byteorder", +] + +[[package]] +name = "hashbrown" +version = "0.12.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" + +[[package]] +name = "hashbrown" +version = "0.14.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604" + +[[package]] +name = "heapless" +version = "0.7.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cdc6457c0eb62c71aac4bc17216026d8410337c4126773b9c5daba343f17964f" +dependencies = [ + "atomic-polyfill", + "hash32", + "rustc_version", + "spin 0.9.8", + "stable_deref_trait", +] + +[[package]] +name = "heck" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" + +[[package]] +name = "hermit-abi" +version = "0.1.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33" +dependencies = [ + "libc", +] + +[[package]] +name = "hermit-abi" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d77f7ec81a6d05a3abb01ab6eb7590f6083d08449fe5a1c8b1e620283546ccb7" + +[[package]] +name = "hkdf" +version = "0.12.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "791a029f6b9fc27657f6f188ec6e5e43f6911f6f878e0dc5501396e09809d437" +dependencies = [ + "hmac", +] + +[[package]] +name = "hmac" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6c49c37c09c17a53d937dfbb742eb3a961d65a994e6bcdcf37e7399d0cc8ab5e" +dependencies = [ + "digest", +] + +[[package]] +name = "http" +version = "0.2.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8947b1a6fad4393052c7ba1f4cd97bed3e953a95c79c92ad9b051a04611d9fbb" +dependencies = [ + "bytes", + "fnv", + "itoa", +] + +[[package]] +name = "http-body" +version = "0.4.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d5f38f16d184e36f2408a55281cd658ecbd3ca05cce6d6510a176eca393e26d1" +dependencies = [ + "bytes", + "http", + "pin-project-lite", +] + +[[package]] +name = "httparse" +version = "1.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d897f394bad6a705d5f4104762e116a75639e470d80901eed05a860a95cb1904" + +[[package]] +name = "httpdate" +version = "1.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "df3b46402a9d5adb4c86a0cf463f42e19994e3ee891101b1841f30a545cb49a9" + +[[package]] +name = "humantime" +version = "2.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" + +[[package]] +name = "hyper" +version = "0.14.27" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ffb1cfd654a8219eaef89881fdb3bb3b1cdc5fa75ded05d6933b2b382e395468" +dependencies = [ + "bytes", + "futures-channel", + "futures-core", + "futures-util", + "h2", + "http", + "http-body", + "httparse", + "httpdate", + "itoa", + "pin-project-lite", + "socket2 0.4.10", + "tokio", + "tower-service", + "tracing", + "want", +] + +[[package]] +name = "hyper-rustls" +version = "0.24.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec3efd23720e2049821a693cbc7e65ea87c72f1c58ff2f9522ff332b1491e590" +dependencies = [ + "futures-util", + "http", + "hyper", + "rustls", + "tokio", + "tokio-rustls", +] + +[[package]] +name = "idna" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "634d9b1461af396cad843f47fdba5597a4f9e6ddd4bfb6ff5d85028c25cb12f6" +dependencies = [ + "unicode-bidi", + "unicode-normalization", +] + +[[package]] +name = "indexmap" +version = "1.9.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99" +dependencies = [ + "autocfg", + "hashbrown 0.12.3", +] + +[[package]] +name = "indexmap" +version = "2.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d530e1a18b1cb4c484e6e34556a0d948706958449fca0cab753d649f2bce3d1f" +dependencies = [ + "equivalent", + "hashbrown 0.14.3", +] + +[[package]] +name = "inout" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a0c10553d664a4d0bcff9f4215d0aac67a639cc68ef660840afe309b807bc9f5" +dependencies = [ + "block-padding", + "generic-array", +] + +[[package]] +name = "instant" +version = "0.1.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c" +dependencies = [ + "cfg-if", +] + +[[package]] +name = "ipnet" +version = "2.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f518f335dce6725a761382244631d86cf0ccb2863413590b31338feb467f9c3" + +[[package]] +name = "ironrdp" +version = "0.1.0" +dependencies = [ + "console_error_panic_hook", + "getrandom", + "ironrdp-graphics", + "ironrdp-pdu", + "ironrdp-session", + "js-sys", + "log", + "time", + "tracing", + "tracing-subscriber", + "tracing-web", + "wasm-bindgen", + "web-sys", +] + +[[package]] +name = "ironrdp-async" +version = "0.1.0" +source = "git+https://github.com/Devolutions/IronRDP?rev=04d78b6581efe91095169fb8a83eef1aa2d33a2d#04d78b6581efe91095169fb8a83eef1aa2d33a2d" +dependencies = [ + "bytes", + "ironrdp-connector", + "ironrdp-pdu", + "tracing", +] + +[[package]] +name = "ironrdp-cliprdr" +version = "0.1.0" +source = "git+https://github.com/Devolutions/IronRDP?rev=04d78b6581efe91095169fb8a83eef1aa2d33a2d#04d78b6581efe91095169fb8a83eef1aa2d33a2d" +dependencies = [ + "bitflags 2.4.2", + "ironrdp-pdu", + "ironrdp-svc", + "thiserror", + "tracing", +] + +[[package]] +name = "ironrdp-connector" +version = "0.1.0" +source = "git+https://github.com/Devolutions/IronRDP?rev=04d78b6581efe91095169fb8a83eef1aa2d33a2d#04d78b6581efe91095169fb8a83eef1aa2d33a2d" +dependencies = [ + "ironrdp-error", + "ironrdp-pdu", + "ironrdp-svc", + "rand_core", + "sspi 0.11.0", + "tracing", + "url", + "winapi", +] + +[[package]] +name = "ironrdp-dvc" +version = "0.1.0" +source = "git+https://github.com/Devolutions/IronRDP?rev=04d78b6581efe91095169fb8a83eef1aa2d33a2d#04d78b6581efe91095169fb8a83eef1aa2d33a2d" +dependencies = [ + "ironrdp-pdu", + "ironrdp-svc", + "slab", + "tracing", +] + +[[package]] +name = "ironrdp-error" +version = "0.1.0" +source = "git+https://github.com/Devolutions/IronRDP?rev=04d78b6581efe91095169fb8a83eef1aa2d33a2d#04d78b6581efe91095169fb8a83eef1aa2d33a2d" + +[[package]] +name = "ironrdp-graphics" +version = "0.1.0" +source = "git+https://github.com/Devolutions/IronRDP?rev=04d78b6581efe91095169fb8a83eef1aa2d33a2d#04d78b6581efe91095169fb8a83eef1aa2d33a2d" +dependencies = [ + "bit_field", + "bitflags 2.4.2", + "bitvec", + "byteorder", + "ironrdp-error", + "ironrdp-pdu", + "lazy_static", + "num-derive", + "num-traits", + "thiserror", +] + +[[package]] +name = "ironrdp-pdu" +version = "0.1.0" +source = "git+https://github.com/Devolutions/IronRDP?rev=04d78b6581efe91095169fb8a83eef1aa2d33a2d#04d78b6581efe91095169fb8a83eef1aa2d33a2d" +dependencies = [ + "bit_field", + "bitflags 2.4.2", + "byteorder", + "der-parser", + "ironrdp-error", + "md-5", + "num-bigint", + "num-derive", + "num-integer", + "num-traits", + "pkcs1", + "sha1", + "tap", + "thiserror", + "x509-cert", +] + +[[package]] +name = "ironrdp-rdpdr" +version = "0.1.0" +source = "git+https://github.com/Devolutions/IronRDP?rev=04d78b6581efe91095169fb8a83eef1aa2d33a2d#04d78b6581efe91095169fb8a83eef1aa2d33a2d" +dependencies = [ + "bitflags 2.4.2", + "ironrdp-error", + "ironrdp-pdu", + "ironrdp-svc", + "tracing", +] + +[[package]] +name = "ironrdp-rdpsnd" +version = "0.1.0" +source = "git+https://github.com/Devolutions/IronRDP?rev=04d78b6581efe91095169fb8a83eef1aa2d33a2d#04d78b6581efe91095169fb8a83eef1aa2d33a2d" +dependencies = [ + "ironrdp-pdu", + "ironrdp-svc", +] + +[[package]] +name = "ironrdp-session" +version = "0.1.0" +source = "git+https://github.com/Devolutions/IronRDP?rev=04d78b6581efe91095169fb8a83eef1aa2d33a2d#04d78b6581efe91095169fb8a83eef1aa2d33a2d" +dependencies = [ + "ironrdp-connector", + "ironrdp-dvc", + "ironrdp-error", + "ironrdp-graphics", + "ironrdp-pdu", + "ironrdp-svc", + "tracing", +] + +[[package]] +name = "ironrdp-svc" +version = "0.1.0" +source = "git+https://github.com/Devolutions/IronRDP?rev=04d78b6581efe91095169fb8a83eef1aa2d33a2d#04d78b6581efe91095169fb8a83eef1aa2d33a2d" +dependencies = [ + "bitflags 2.4.2", + "ironrdp-pdu", +] + +[[package]] +name = "ironrdp-tls" +version = "0.1.0" +source = "git+https://github.com/Devolutions/IronRDP?rev=04d78b6581efe91095169fb8a83eef1aa2d33a2d#04d78b6581efe91095169fb8a83eef1aa2d33a2d" +dependencies = [ + "tokio", + "tokio-rustls", + "x509-cert", +] + +[[package]] +name = "ironrdp-tokio" +version = "0.1.0" +source = "git+https://github.com/Devolutions/IronRDP?rev=04d78b6581efe91095169fb8a83eef1aa2d33a2d#04d78b6581efe91095169fb8a83eef1aa2d33a2d" +dependencies = [ + "bytes", + "ironrdp-async", + "tokio", +] + +[[package]] +name = "is-terminal" +version = "0.4.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cb0889898416213fab133e1d33a0e5858a48177452750691bde3666d0fdbaf8b" +dependencies = [ + "hermit-abi 0.3.3", + "rustix", + "windows-sys 0.48.0", +] + +[[package]] +name = "iso7816" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b3af73ac9c821e7aea3280532118e15cdf9e7bb45c923cbf0e319ae25b27d20c" +dependencies = [ + "delog", + "heapless", +] + +[[package]] +name = "iso7816-tlv" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d47365efc3b4c252f8a3384445c0f7e8a4e0ae5c22bf3bedd2dd16f9bb45016a" +dependencies = [ + "untrusted", +] + +[[package]] +name = "itoa" +version = "1.0.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "af150ab688ff2122fcef229be89cb50dd66af9e01a4ff320cc137eecc9bacc38" + +[[package]] +name = "js-sys" +version = "0.3.67" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9a1d36f1235bc969acba30b7f5990b864423a6068a10f7c90ae8f0112e3a59d1" +dependencies = [ + "wasm-bindgen", +] + +[[package]] +name = "keccak" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f6d5ed8676d904364de097082f4e7d240b571b67989ced0240f08b7f966f940" +dependencies = [ + "cpufeatures", +] + +[[package]] +name = "lazy_static" +version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" +dependencies = [ + "spin 0.5.2", +] + +[[package]] +name = "lazycell" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55" + +[[package]] +name = "libc" +version = "0.2.151" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "302d7ab3130588088d277783b1e2d2e10c9e9e4a16dd9050e6ec93fb3e7048f4" + +[[package]] +name = "libloading" +version = "0.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b67380fd3b2fbe7527a606e18729d21c6f3951633d0500574c4dc22d2d638b9f" +dependencies = [ + "cfg-if", + "winapi", +] + +[[package]] +name = "libm" +version = "0.2.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4ec2a862134d2a7d32d7983ddcdd1c4923530833c9f2ea1a44fc5fa473989058" + +[[package]] +name = "linux-raw-sys" +version = "0.4.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c4cd1a83af159aa67994778be9070f0ae1bd732942279cabb14f86f986a21456" + +[[package]] +name = "lock_api" +version = "0.4.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3c168f8615b12bc01f9c17e2eb0cc07dcae1940121185446edc3744920e8ef45" +dependencies = [ + "autocfg", + "scopeguard", +] + +[[package]] +name = "log" +version = "0.4.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f" + +[[package]] +name = "md-5" +version = "0.10.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d89e7ee0cfbedfc4da3340218492196241d89eefb6dab27de5df917a6d2e78cf" +dependencies = [ + "cfg-if", + "digest", +] + +[[package]] +name = "md4" +version = "0.10.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7da5ac363534dce5fabf69949225e174fbf111a498bf0ff794c8ea1fba9f3dda" +dependencies = [ + "digest", +] + +[[package]] +name = "memchr" +version = "2.6.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f665ee40bc4a3c5590afb1e9677db74a508659dfd71e126420da8274909a0167" + +[[package]] +name = "mime" +version = "0.3.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a" + +[[package]] +name = "minimal-lexical" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" + +[[package]] +name = "miniz_oxide" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e7810e0be55b428ada41041c41f32c9f1a42817901b4ccf45fa3d4b6561e74c7" +dependencies = [ + "adler", +] + +[[package]] +name = "mio" +version = "0.8.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a4a650543ca06a924e8b371db273b2756685faae30f8487da1b56505a8f78b0c" +dependencies = [ + "libc", + "wasi", + "windows-sys 0.48.0", +] + +[[package]] +name = "nom" +version = "7.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d273983c5a657a70a3e8f2a01329822f3b8c8172b73826411a55751e404a0a4a" +dependencies = [ + "memchr", + "minimal-lexical", +] + +[[package]] +name = "nu-ansi-term" +version = "0.46.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "77a8165726e8236064dbb45459242600304b42a5ea24ee2948e18e023bf7ba84" +dependencies = [ + "overload", + "winapi", +] + +[[package]] +name = "num-bigint" +version = "0.4.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "608e7659b5c3d7cba262d894801b9ec9d00de989e8a82bd4bef91d08da45cdc0" +dependencies = [ + "autocfg", + "num-integer", + "num-traits", +] + +[[package]] +name = "num-bigint-dig" +version = "0.8.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dc84195820f291c7697304f3cbdadd1cb7199c0efc917ff5eafd71225c136151" +dependencies = [ + "byteorder", + "lazy_static", + "libm", + "num-integer", + "num-iter", + "num-traits", + "rand", + "serde", + "smallvec", + "zeroize", +] + +[[package]] +name = "num-conv" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9" + +[[package]] +name = "num-derive" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cfb77679af88f8b125209d354a202862602672222e7f2313fdd6dc349bad4712" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.39", +] + +[[package]] +name = "num-integer" +version = "0.1.45" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "225d3389fb3509a24c93f5c29eb6bde2586b98d9f016636dff58d7c6f7569cd9" +dependencies = [ + "autocfg", + "num-traits", +] + +[[package]] +name = "num-iter" +version = "0.1.43" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7d03e6c028c5dc5cac6e2dec0efda81fc887605bb3d884578bb6d6bf7514e252" +dependencies = [ + "autocfg", + "num-integer", + "num-traits", +] + +[[package]] +name = "num-traits" +version = "0.2.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "39e3200413f237f41ab11ad6d161bc7239c84dcb631773ccd7de3dfe4b5c267c" +dependencies = [ + "autocfg", + "libm", +] + +[[package]] +name = "num_cpus" +version = "1.16.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43" +dependencies = [ + "hermit-abi 0.3.3", + "libc", +] + +[[package]] +name = "object" +version = "0.32.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9cf5f9dd3933bd50a9e1f149ec995f39ae2c496d31fd772c1fd45ebc27e902b0" +dependencies = [ + "memchr", +] + +[[package]] +name = "oid" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c19903c598813dba001b53beeae59bb77ad4892c5c1b9b3500ce4293a0d06c2" +dependencies = [ + "serde", +] + +[[package]] +name = "once_cell" +version = "1.18.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d" + +[[package]] +name = "openssl-probe" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" + +[[package]] +name = "os_str_bytes" +version = "6.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e2355d85b9a3786f481747ced0e0ff2ba35213a1f9bd406ed906554d7af805a1" + +[[package]] +name = "overload" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39" + +[[package]] +name = "p256" +version = "0.13.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c9863ad85fa8f4460f9c48cb909d38a0d689dba1f6f6988a5e3e0d31071bcd4b" +dependencies = [ + "ecdsa", + "elliptic-curve", + "primeorder", + "sha2", +] + +[[package]] +name = "p384" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "70786f51bcc69f6a4c0360e063a4cac5419ef7c5cd5b3c99ad70f3be5ba79209" +dependencies = [ + "ecdsa", + "elliptic-curve", + "primeorder", + "sha2", +] + +[[package]] +name = "parking_lot" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7d17b78036a60663b797adeaee46f5c9dfebb86948d1255007a1d6be0271ff99" +dependencies = [ + "instant", + "lock_api", + "parking_lot_core 0.8.6", +] + +[[package]] +name = "parking_lot" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f" +dependencies = [ + "lock_api", + "parking_lot_core 0.9.9", +] + +[[package]] +name = "parking_lot_core" +version = "0.8.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "60a2cfe6f0ad2bfc16aefa463b497d5c7a5ecd44a23efa72aa342d90177356dc" +dependencies = [ + "cfg-if", + "instant", + "libc", + "redox_syscall 0.2.16", + "smallvec", + "winapi", +] + +[[package]] +name = "parking_lot_core" +version = "0.9.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4c42a9226546d68acdd9c0a280d17ce19bfe27a46bf68784e4066115788d008e" +dependencies = [ + "cfg-if", + "libc", + "redox_syscall 0.4.1", + "smallvec", + "windows-targets 0.48.5", +] + +[[package]] +name = "pbkdf2" +version = "0.12.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f8ed6a7761f76e3b9f92dfb0a60a6a6477c61024b775147ff0973a02653abaf2" +dependencies = [ + "digest", + "hmac", + "sha1", +] + +[[package]] +name = "peeking_take_while" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "19b17cddbe7ec3f8bc800887bab5e717348c95ea2ca0b1bf0837fb964dc67099" + +[[package]] +name = "pem-rfc7468" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "88b39c9bfcfc231068454382784bb460aae594343fb030d46e9f50a645418412" +dependencies = [ + "base64ct", +] + +[[package]] +name = "percent-encoding" +version = "2.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" + +[[package]] +name = "picky" +version = "7.0.0-rc.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "52cccdaffd2f361b4b4eb70b4249bd71d89bb66cb84b7f76483ecd1640c543ce" +dependencies = [ + "base64", + "digest", + "ed25519-dalek", + "md-5", + "num-bigint-dig", + "p256", + "p384", + "picky-asn1", + "picky-asn1-der", + "picky-asn1-x509", + "rand", + "rand_core", + "rsa", + "serde", + "sha1", + "sha2", + "sha3", + "thiserror", + "x25519-dalek", + "zeroize", +] + +[[package]] +name = "picky-asn1" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "295eea0f33c16be21e2a98b908fdd4d73c04dd48c8480991b76dbcf0cb58b212" +dependencies = [ + "oid", + "serde", + "serde_bytes", + "time", + "zeroize", +] + +[[package]] +name = "picky-asn1-der" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5df7873a9e36d42dadb393bea5e211fe83d793c172afad5fb4ec846ec582793f" +dependencies = [ + "picky-asn1", + "serde", + "serde_bytes", +] + +[[package]] +name = "picky-asn1-x509" +version = "0.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2c5f20f71a68499ff32310f418a6fad8816eac1a2859ed3f0c5c741389dd6208" +dependencies = [ + "base64", + "num-bigint-dig", + "oid", + "picky-asn1", + "picky-asn1-der", + "serde", + "widestring", + "zeroize", +] + +[[package]] +name = "picky-krb" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f71cf61ebe6e657a81bcac31f9d61d52c23a1fd517b0dad77b915a7d3d15d2e8" +dependencies = [ + "aes", + "byteorder", + "cbc", + "crypto", + "des", + "hmac", + "num-bigint-dig", + "oid", + "pbkdf2", + "picky-asn1", + "picky-asn1-der", + "picky-asn1-x509", + "rand", + "serde", + "sha1", + "thiserror", + "uuid", +] + +[[package]] +name = "pin-project-lite" +version = "0.2.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8afb450f006bf6385ca15ef45d71d2288452bc3683ce2e2cacc0d18e4be60b58" + +[[package]] +name = "pin-utils" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" + +[[package]] +name = "pkcs1" +version = "0.7.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c8ffb9f10fa047879315e6625af03c164b16962a5368d724ed16323b68ace47f" +dependencies = [ + "der", + "pkcs8", + "spki", +] + +[[package]] +name = "pkcs8" +version = "0.10.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f950b2377845cebe5cf8b5165cb3cc1a5e0fa5cfa3e1f7f55707d8fd82e0a7b7" +dependencies = [ + "der", + "spki", +] + +[[package]] +name = "pkg-config" +version = "0.3.27" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "26072860ba924cbfa98ea39c8c19b4dd6a4a25423dbdf219c1eca91aa0cf6964" + +[[package]] +name = "platforms" +version = "3.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "14e6ab3f592e6fb464fc9712d8d6e6912de6473954635fd76a589d832cffcbb0" + +[[package]] +name = "portpicker" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "be97d76faf1bfab666e1375477b23fde79eccf0276e9b63b92a39d676a889ba9" +dependencies = [ + "rand", +] + +[[package]] +name = "powerfmt" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391" + +[[package]] +name = "ppv-lite86" +version = "0.2.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" + +[[package]] +name = "primeorder" +version = "0.13.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "353e1ca18966c16d9deb1c69278edbc5f194139612772bd9537af60ac231e1e6" +dependencies = [ + "elliptic-curve", +] + +[[package]] +name = "proc-macro2" +version = "1.0.70" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "39278fbbf5fb4f646ce651690877f89d1c5811a3d4acb27700c1cb3cdb78fd3b" +dependencies = [ + "unicode-ident", +] + +[[package]] +name = "quote" +version = "1.0.33" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae" +dependencies = [ + "proc-macro2", +] + +[[package]] +name = "radium" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dc33ff2d4973d518d823d61aa239014831e521c75da58e3df4840d3f47749d09" + +[[package]] +name = "rand" +version = "0.8.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404" +dependencies = [ + "libc", + "rand_chacha", + "rand_core", +] + +[[package]] +name = "rand_chacha" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88" +dependencies = [ + "ppv-lite86", + "rand_core", +] + +[[package]] +name = "rand_core" +version = "0.6.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" +dependencies = [ + "getrandom", +] + +[[package]] +name = "rdp-client" +version = "0.1.0" +dependencies = [ + "bitflags 2.4.2", + "boring", + "byteorder", + "bytes", + "cbindgen", + "env_logger", + "ironrdp-cliprdr", + "ironrdp-connector", + "ironrdp-pdu", + "ironrdp-rdpdr", + "ironrdp-rdpsnd", + "ironrdp-session", + "ironrdp-svc", + "ironrdp-tls", + "ironrdp-tokio", + "iso7816", + "iso7816-tlv", + "log", + "parking_lot 0.12.1", + "rand", + "rand_chacha", + "rsa", + "sspi 0.10.1", + "static_init", + "tempfile", + "tokio", + "tokio-boring", + "utf16string", + "uuid", +] + +[[package]] +name = "redox_syscall" +version = "0.2.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a" +dependencies = [ + "bitflags 1.3.2", +] + +[[package]] +name = "redox_syscall" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4722d768eff46b75989dd134e5c353f0d6296e5aaa3132e776cbdb56be7731aa" +dependencies = [ + "bitflags 1.3.2", +] + +[[package]] +name = "regex" +version = "1.10.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "380b951a9c5e80ddfd6136919eef32310721aa4aacd4889a8d39124b026ab343" +dependencies = [ + "aho-corasick", + "memchr", + "regex-automata", + "regex-syntax", +] + +[[package]] +name = "regex-automata" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5f804c7828047e88b2d32e2d7fe5a105da8ee3264f01902f796c8e067dc2483f" +dependencies = [ + "aho-corasick", + "memchr", + "regex-syntax", +] + +[[package]] +name = "regex-syntax" +version = "0.8.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f" + +[[package]] +name = "reqwest" +version = "0.11.22" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "046cd98826c46c2ac8ddecae268eb5c2e58628688a5fc7a2643704a73faba95b" +dependencies = [ + "base64", + "bytes", + "encoding_rs", + "futures-core", + "futures-util", + "h2", + "http", + "http-body", + "hyper", + "hyper-rustls", + "ipnet", + "js-sys", + "log", + "mime", + "once_cell", + "percent-encoding", + "pin-project-lite", + "rustls", + "rustls-native-certs", + "rustls-pemfile", + "serde", + "serde_json", + "serde_urlencoded", + "system-configuration", + "tokio", + "tokio-rustls", + "tower-service", + "url", + "wasm-bindgen", + "wasm-bindgen-futures", + "web-sys", + "webpki-roots", + "winreg 0.50.0", +] + +[[package]] +name = "rfc6979" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f8dd2a808d456c4a54e300a23e9f5a67e122c3024119acbfd73e3bf664491cb2" +dependencies = [ + "hmac", + "subtle", +] + +[[package]] +name = "ring" +version = "0.17.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "684d5e6e18f669ccebf64a92236bb7db9a34f07be010e3627368182027180866" +dependencies = [ + "cc", + "getrandom", + "libc", + "spin 0.9.8", + "untrusted", + "windows-sys 0.48.0", +] + +[[package]] +name = "rsa" +version = "0.9.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5d0e5124fcb30e76a7e79bfee683a2746db83784b86289f6251b54b7950a0dfc" +dependencies = [ + "const-oid", + "digest", + "num-bigint-dig", + "num-integer", + "num-traits", + "pkcs1", + "pkcs8", + "rand_core", + "signature", + "spki", + "subtle", + "zeroize", +] + +[[package]] +name = "rustc-demangle" +version = "0.1.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76" + +[[package]] +name = "rustc-hash" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" + +[[package]] +name = "rustc_version" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366" +dependencies = [ + "semver", +] + +[[package]] +name = "rusticata-macros" +version = "4.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "faf0c4a6ece9950b9abdb62b1cfcf2a68b3b67a10ba445b3bb85be2a293d0632" +dependencies = [ + "nom", +] + +[[package]] +name = "rustix" +version = "0.38.26" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9470c4bf8246c8daf25f9598dca807fb6510347b1e1cfa55749113850c79d88a" +dependencies = [ + "bitflags 2.4.2", + "errno", + "libc", + "linux-raw-sys", + "windows-sys 0.52.0", +] + +[[package]] +name = "rustls" +version = "0.21.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "629648aced5775d558af50b2b4c7b02983a04b312126d45eeead26e7caa498b9" +dependencies = [ + "log", + "ring", + "rustls-webpki", + "sct", +] + +[[package]] +name = "rustls-native-certs" +version = "0.6.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a9aace74cb666635c918e9c12bc0d348266037aa8eb599b5cba565709a8dff00" +dependencies = [ + "openssl-probe", + "rustls-pemfile", + "schannel", + "security-framework", +] + +[[package]] +name = "rustls-pemfile" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1c74cae0a4cf6ccbbf5f359f08efdf8ee7e1dc532573bf0db71968cb56b1448c" +dependencies = [ + "base64", +] + +[[package]] +name = "rustls-webpki" +version = "0.101.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8b6275d1ee7a1cd780b64aca7726599a1dbc893b1e64144529e55c3c2f745765" +dependencies = [ + "ring", + "untrusted", +] + +[[package]] +name = "ryu" +version = "1.0.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1ad4cc8da4ef723ed60bced201181d83791ad433213d8c24efffda1eec85d741" + +[[package]] +name = "schannel" +version = "0.1.22" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0c3733bf4cf7ea0880754e19cb5a462007c4a8c1914bff372ccc95b464f1df88" +dependencies = [ + "windows-sys 0.48.0", +] + +[[package]] +name = "scopeguard" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" + +[[package]] +name = "sct" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "da046153aa2352493d6cb7da4b6e5c0c057d8a1d0a9aa8560baffdd945acd414" +dependencies = [ + "ring", + "untrusted", +] + +[[package]] +name = "sec1" +version = "0.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d3e97a565f76233a6003f9f5c54be1d9c5bdfa3eccfb189469f11ec4901c47dc" +dependencies = [ + "base16ct", + "der", + "generic-array", + "pkcs8", + "subtle", + "zeroize", +] + +[[package]] +name = "security-framework" +version = "2.9.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "05b64fb303737d99b81884b2c63433e9ae28abebe5eb5045dcdd175dc2ecf4de" +dependencies = [ + "bitflags 1.3.2", + "core-foundation", + "core-foundation-sys", + "libc", + "security-framework-sys", +] + +[[package]] +name = "security-framework-sys" +version = "2.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e932934257d3b408ed8f30db49d85ea163bfe74961f017f405b025af298f0c7a" +dependencies = [ + "core-foundation-sys", + "libc", +] + +[[package]] +name = "semver" +version = "1.0.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "836fa6a3e1e547f9a2c4040802ec865b5d85f4014efe00555d7090a3dcaa1090" + +[[package]] +name = "serde" +version = "1.0.193" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "25dd9975e68d0cb5aa1120c288333fc98731bd1dd12f561e468ea4728c042b89" +dependencies = [ + "serde_derive", +] + +[[package]] +name = "serde_bytes" +version = "0.11.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ab33ec92f677585af6d88c65593ae2375adde54efdbf16d597f2cbc7a6d368ff" +dependencies = [ + "serde", +] + +[[package]] +name = "serde_derive" +version = "1.0.193" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "43576ca501357b9b071ac53cdc7da8ef0cbd9493d8df094cd821777ea6e894d3" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.39", +] + +[[package]] +name = "serde_json" +version = "1.0.108" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3d1c7e3eac408d115102c4c24ad393e0821bb3a5df4d506a80f85f7a742a526b" +dependencies = [ + "itoa", + "ryu", + "serde", +] + +[[package]] +name = "serde_urlencoded" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d3491c14715ca2294c4d6a88f15e84739788c1d030eed8c110436aafdaa2f3fd" +dependencies = [ + "form_urlencoded", + "itoa", + "ryu", + "serde", +] + +[[package]] +name = "sha1" +version = "0.10.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e3bf829a2d51ab4a5ddf1352d8470c140cadc8301b2ae1789db023f01cedd6ba" +dependencies = [ + "cfg-if", + "cpufeatures", + "digest", +] + +[[package]] +name = "sha2" +version = "0.10.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "793db75ad2bcafc3ffa7c68b215fee268f537982cd901d132f89c6343f3a3dc8" +dependencies = [ + "cfg-if", + "cpufeatures", + "digest", +] + +[[package]] +name = "sha3" +version = "0.10.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "75872d278a8f37ef87fa0ddbda7802605cb18344497949862c0d4dcb291eba60" +dependencies = [ + "digest", + "keccak", +] + +[[package]] +name = "sharded-slab" +version = "0.1.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f40ca3c46823713e0d4209592e8d6e826aa57e928f09752619fc696c499637f6" +dependencies = [ + "lazy_static", +] + +[[package]] +name = "shlex" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64" + +[[package]] +name = "signal-hook-registry" +version = "1.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d8229b473baa5980ac72ef434c4415e70c4b5e71b423043adb4ba059f89c99a1" +dependencies = [ + "libc", +] + +[[package]] +name = "signature" +version = "2.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "77549399552de45a898a580c1b41d445bf730df867cc44e6c0233bbc4b8329de" +dependencies = [ + "digest", + "rand_core", +] + +[[package]] +name = "slab" +version = "0.4.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f92a496fb766b417c996b9c5e57daf2f7ad3b0bebe1ccfca4856390e3d3bb67" +dependencies = [ + "autocfg", +] + +[[package]] +name = "smallvec" +version = "1.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970" + +[[package]] +name = "socket2" +version = "0.4.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9f7916fc008ca5542385b89a3d3ce689953c143e9304a9bf8beec1de48994c0d" +dependencies = [ + "libc", + "winapi", +] + +[[package]] +name = "socket2" +version = "0.5.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7b5fac59a5cb5dd637972e5fca70daf0523c9067fcdc4842f053dae04a18f8e9" +dependencies = [ + "libc", + "windows-sys 0.48.0", +] + +[[package]] +name = "spin" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d" + +[[package]] +name = "spin" +version = "0.9.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67" +dependencies = [ + "lock_api", +] + +[[package]] +name = "spki" +version = "0.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d91ed6c858b01f942cd56b37a94b3e0a1798290327d1236e4d9cf4eaca44d29d" +dependencies = [ + "base64ct", + "der", +] + +[[package]] +name = "sspi" +version = "0.10.1" +source = "git+https://github.com/Devolutions/sspi-rs?rev=d54bdfcafa0e10d9d78224ebacc4f2a0992a6b79#d54bdfcafa0e10d9d78224ebacc4f2a0992a6b79" +dependencies = [ + "async-dnssd", + "async-recursion", + "bitflags 2.4.2", + "byteorder", + "cfg-if", + "crypto-mac", + "futures", + "hmac", + "lazy_static", + "md-5", + "md4", + "num-bigint-dig", + "num-derive", + "num-traits", + "oid", + "picky", + "picky-asn1", + "picky-asn1-der", + "picky-asn1-x509", + "picky-krb", + "portpicker", + "rand", + "reqwest", + "serde", + "serde_derive", + "sha1", + "sha2", + "time", + "tokio", + "tracing", + "url", + "uuid", + "winapi", + "windows", + "windows-sys 0.48.0", + "winreg 0.51.0", + "zeroize", +] + +[[package]] +name = "sspi" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bf9e7d03e3a0314c94b37625112eeaba08068b0ffbb181deefd4c7deae5ba046" +dependencies = [ + "async-dnssd", + "async-recursion", + "bitflags 2.4.2", + "byteorder", + "cfg-if", + "crypto-mac", + "futures", + "hmac", + "lazy_static", + "md-5", + "md4", + "num-bigint-dig", + "num-derive", + "num-traits", + "oid", + "picky", + "picky-asn1", + "picky-asn1-der", + "picky-asn1-x509", + "picky-krb", + "rand", + "serde", + "serde_derive", + "sha1", + "sha2", + "time", + "tokio", + "tracing", + "url", + "uuid", + "winapi", + "windows", + "windows-sys 0.48.0", + "winreg 0.51.0", + "zeroize", +] + +[[package]] +name = "stable_deref_trait" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3" + +[[package]] +name = "static_init" +version = "1.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8a2a1c578e98c1c16fc3b8ec1328f7659a500737d7a0c6d625e73e830ff9c1f6" +dependencies = [ + "bitflags 1.3.2", + "cfg_aliases", + "libc", + "parking_lot 0.11.2", + "parking_lot_core 0.8.6", + "static_init_macro", + "winapi", +] + +[[package]] +name = "static_init_macro" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "70a2595fc3aa78f2d0e45dd425b22282dd863273761cc77780914b2cf3003acf" +dependencies = [ + "cfg_aliases", + "memchr", + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "strsim" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" + +[[package]] +name = "subtle" +version = "2.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6bdef32e8150c2a081110b42772ffe7d7c9032b606bc226c8260fd97e0976601" + +[[package]] +name = "syn" +version = "1.0.109" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", +] + +[[package]] +name = "syn" +version = "2.0.39" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "23e78b90f2fcf45d3e842032ce32e3f2d1545ba6636271dcbf24fa306d87be7a" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", +] + +[[package]] +name = "synstructure" +version = "0.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c8af7666ab7b6390ab78131fb5b0fce11d6b7a6951602017c35fa82800708971" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.39", +] + +[[package]] +name = "system-configuration" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ba3a3adc5c275d719af8cb4272ea1c4a6d668a777f37e115f6d11ddbc1c8e0e7" +dependencies = [ + "bitflags 1.3.2", + "core-foundation", + "system-configuration-sys", +] + +[[package]] +name = "system-configuration-sys" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a75fb188eb626b924683e3b95e3a48e63551fcfb51949de2f06a9d91dbee93c9" +dependencies = [ + "core-foundation-sys", + "libc", +] + +[[package]] +name = "tap" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369" + +[[package]] +name = "tempfile" +version = "3.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "01ce4141aa927a6d1bd34a041795abd0db1cccba5d5f24b009f694bdf3a1f3fa" +dependencies = [ + "cfg-if", + "fastrand", + "redox_syscall 0.4.1", + "rustix", + "windows-sys 0.52.0", +] + +[[package]] +name = "termcolor" +version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ff1bc3d3f05aff0403e8ac0d92ced918ec05b666a43f83297ccef5bea8a3d449" +dependencies = [ + "winapi-util", +] + +[[package]] +name = "textwrap" +version = "0.16.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "222a222a5bfe1bba4a77b45ec488a741b3cb8872e5e499451fd7d0129c9c7c3d" + +[[package]] +name = "thiserror" +version = "1.0.50" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f9a7210f5c9a7156bb50aa36aed4c95afb51df0df00713949448cf9e97d382d2" +dependencies = [ + "thiserror-impl", +] + +[[package]] +name = "thiserror-impl" +version = "1.0.50" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "266b2e40bc00e5a6c09c3584011e08b06f123c00362c92b975ba9843aaaa14b8" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.39", +] + +[[package]] +name = "thread_local" +version = "1.1.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3fdd6f064ccff2d6567adcb3873ca630700f00b5ad3f060c25b5dcfd9a4ce152" +dependencies = [ + "cfg-if", + "once_cell", +] + +[[package]] +name = "time" +version = "0.3.34" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c8248b6521bb14bc45b4067159b9b6ad792e2d6d754d6c41fb50e29fefe38749" +dependencies = [ + "deranged", + "itoa", + "js-sys", + "num-conv", + "powerfmt", + "serde", + "time-core", + "time-macros", +] + +[[package]] +name = "time-core" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3" + +[[package]] +name = "time-macros" +version = "0.2.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7ba3a3ef41e6672a2f0f001392bb5dcd3ff0a9992d618ca761a11c3121547774" +dependencies = [ + "num-conv", + "time-core", +] + +[[package]] +name = "tinyvec" +version = "1.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "87cc5ceb3875bb20c2890005a4e226a4651264a5c75edb2421b52861a0a0cb50" +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 = "tokio" +version = "1.36.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "61285f6515fa018fb2d1e46eb21223fff441ee8db5d0f1435e8ab4f5cdb80931" +dependencies = [ + "backtrace", + "bytes", + "libc", + "mio", + "num_cpus", + "parking_lot 0.12.1", + "pin-project-lite", + "signal-hook-registry", + "socket2 0.5.5", + "tokio-macros", + "windows-sys 0.48.0", +] + +[[package]] +name = "tokio-boring" +version = "4.4.0" +source = "git+https://github.com/gravitational/boring?rev=605253d99d5e363e178bcf97e1d4622e33844cd5#605253d99d5e363e178bcf97e1d4622e33844cd5" +dependencies = [ + "boring", + "boring-sys", + "once_cell", + "tokio", +] + +[[package]] +name = "tokio-macros" +version = "2.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5b8a1e28f2deaa14e508979454cb3a223b10b938b45af148bc0986de36f1923b" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.39", +] + +[[package]] +name = "tokio-rustls" +version = "0.24.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c28327cf380ac148141087fbfb9de9d7bd4e84ab5d2c28fbc911d753de8a7081" +dependencies = [ + "rustls", + "tokio", +] + +[[package]] +name = "tokio-util" +version = "0.7.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5419f34732d9eb6ee4c3578b7989078579b7f039cbbb9ca2c4da015749371e15" +dependencies = [ + "bytes", + "futures-core", + "futures-sink", + "pin-project-lite", + "tokio", + "tracing", +] + +[[package]] +name = "toml" +version = "0.5.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f4f7f0dd8d50a853a531c426359045b1998f04219d88799810762cd4ad314234" +dependencies = [ + "serde", +] + +[[package]] +name = "tower-service" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b6bc1c9ce2b5135ac7f93c72918fc37feb872bdc6a5533a8b85eb4b86bfdae52" + +[[package]] +name = "tracing" +version = "0.1.40" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef" +dependencies = [ + "log", + "pin-project-lite", + "tracing-attributes", + "tracing-core", +] + +[[package]] +name = "tracing-attributes" +version = "0.1.27" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.39", +] + +[[package]] +name = "tracing-core" +version = "0.1.32" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c06d3da6113f116aaee68e4d601191614c9053067f9ab7f6edbcb161237daa54" +dependencies = [ + "once_cell", + "valuable", +] + +[[package]] +name = "tracing-log" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ee855f1f400bd0e5c02d150ae5de3840039a3f54b025156404e34c23c03f47c3" +dependencies = [ + "log", + "once_cell", + "tracing-core", +] + +[[package]] +name = "tracing-subscriber" +version = "0.3.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ad0f048c97dbd9faa9b7df56362b8ebcaa52adb06b498c050d2f4e32f90a7a8b" +dependencies = [ + "nu-ansi-term", + "sharded-slab", + "smallvec", + "thread_local", + "time", + "tracing-core", + "tracing-log", +] + +[[package]] +name = "tracing-web" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b9e6a141feebd51f8d91ebfd785af50fca223c570b86852166caa3b141defe7c" +dependencies = [ + "js-sys", + "tracing-core", + "tracing-subscriber", + "wasm-bindgen", + "web-sys", +] + +[[package]] +name = "try-lock" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3528ecfd12c466c6f163363caf2d02a71161dd5e1cc6ae7b34207ea2d42d81ed" + +[[package]] +name = "typenum" +version = "1.17.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825" + +[[package]] +name = "unicode-bidi" +version = "0.3.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "92888ba5573ff080736b3648696b70cafad7d250551175acbaa4e0385b3e1460" + +[[package]] +name = "unicode-ident" +version = "1.0.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" + +[[package]] +name = "unicode-normalization" +version = "0.1.22" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c5713f0fc4b5db668a2ac63cdb7bb4469d8c9fed047b1d0292cc7b0ce2ba921" +dependencies = [ + "tinyvec", +] + +[[package]] +name = "untrusted" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1" + +[[package]] +name = "url" +version = "2.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "31e6302e3bb753d46e83516cae55ae196fc0c309407cf11ab35cc51a4c2a4633" +dependencies = [ + "form_urlencoded", + "idna", + "percent-encoding", +] + +[[package]] +name = "utf16string" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b62a1e85e12d5d712bf47a85f426b73d303e2d00a90de5f3004df3596e9d216" +dependencies = [ + "byteorder", +] + +[[package]] +name = "uuid" +version = "1.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5e395fcf16a7a3d8127ec99782007af141946b4795001f876d54fb0d55978560" +dependencies = [ + "getrandom", + "serde", +] + +[[package]] +name = "valuable" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d" + +[[package]] +name = "version_check" +version = "0.9.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" + +[[package]] +name = "want" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bfa7760aed19e106de2c7c0b581b509f2f25d3dacaf737cb82ac61bc6d760b0e" +dependencies = [ + "try-lock", +] + +[[package]] +name = "wasi" +version = "0.11.0+wasi-snapshot-preview1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" + +[[package]] +name = "wasm-bindgen" +version = "0.2.91" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c1e124130aee3fb58c5bdd6b639a0509486b0338acaaae0c84a5124b0f588b7f" +dependencies = [ + "cfg-if", + "wasm-bindgen-macro", +] + +[[package]] +name = "wasm-bindgen-backend" +version = "0.2.91" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c9e7e1900c352b609c8488ad12639a311045f40a35491fb69ba8c12f758af70b" +dependencies = [ + "bumpalo", + "log", + "once_cell", + "proc-macro2", + "quote", + "syn 2.0.39", + "wasm-bindgen-shared", +] + +[[package]] +name = "wasm-bindgen-futures" +version = "0.4.39" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ac36a15a220124ac510204aec1c3e5db8a22ab06fd6706d881dc6149f8ed9a12" +dependencies = [ + "cfg-if", + "js-sys", + "wasm-bindgen", + "web-sys", +] + +[[package]] +name = "wasm-bindgen-macro" +version = "0.2.91" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b30af9e2d358182b5c7449424f017eba305ed32a7010509ede96cdc4696c46ed" +dependencies = [ + "quote", + "wasm-bindgen-macro-support", +] + +[[package]] +name = "wasm-bindgen-macro-support" +version = "0.2.91" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "642f325be6301eb8107a83d12a8ac6c1e1c54345a7ef1a9261962dfefda09e66" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.39", + "wasm-bindgen-backend", + "wasm-bindgen-shared", +] + +[[package]] +name = "wasm-bindgen-shared" +version = "0.2.91" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4f186bd2dcf04330886ce82d6f33dd75a7bfcf69ecf5763b89fcde53b6ac9838" + +[[package]] +name = "web-sys" +version = "0.3.67" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "58cd2333b6e0be7a39605f0e255892fd7418a682d8da8fe042fe25128794d2ed" +dependencies = [ + "js-sys", + "wasm-bindgen", +] + +[[package]] +name = "webpki-roots" +version = "0.25.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1778a42e8b3b90bff8d0f5032bf22250792889a5cdc752aa0020c84abe3aaf10" + +[[package]] +name = "widestring" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "653f141f39ec16bba3c5abe400a0c60da7468261cc2cbf36805022876bc721a8" + +[[package]] +name = "winapi" +version = "0.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" +dependencies = [ + "winapi-i686-pc-windows-gnu", + "winapi-x86_64-pc-windows-gnu", +] + +[[package]] +name = "winapi-i686-pc-windows-gnu" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" + +[[package]] +name = "winapi-util" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f29e6f9198ba0d26b4c9f07dbe6f9ed633e1f3d5b8b414090084349e46a52596" +dependencies = [ + "winapi", +] + +[[package]] +name = "winapi-x86_64-pc-windows-gnu" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" + +[[package]] +name = "windows" +version = "0.51.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ca229916c5ee38c2f2bc1e9d8f04df975b4bd93f9955dc69fabb5d91270045c9" +dependencies = [ + "windows-core", + "windows-targets 0.48.5", +] + +[[package]] +name = "windows-core" +version = "0.51.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f1f8cf84f35d2db49a46868f947758c7a1138116f7fac3bc844f43ade1292e64" +dependencies = [ + "windows-targets 0.48.5", +] + +[[package]] +name = "windows-sys" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" +dependencies = [ + "windows-targets 0.48.5", +] + +[[package]] +name = "windows-sys" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" +dependencies = [ + "windows-targets 0.52.0", +] + +[[package]] +name = "windows-targets" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c" +dependencies = [ + "windows_aarch64_gnullvm 0.48.5", + "windows_aarch64_msvc 0.48.5", + "windows_i686_gnu 0.48.5", + "windows_i686_msvc 0.48.5", + "windows_x86_64_gnu 0.48.5", + "windows_x86_64_gnullvm 0.48.5", + "windows_x86_64_msvc 0.48.5", +] + +[[package]] +name = "windows-targets" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8a18201040b24831fbb9e4eb208f8892e1f50a37feb53cc7ff887feb8f50e7cd" +dependencies = [ + "windows_aarch64_gnullvm 0.52.0", + "windows_aarch64_msvc 0.52.0", + "windows_i686_gnu 0.52.0", + "windows_i686_msvc 0.52.0", + "windows_x86_64_gnu 0.52.0", + "windows_x86_64_gnullvm 0.52.0", + "windows_x86_64_msvc 0.52.0", +] + +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" + +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cb7764e35d4db8a7921e09562a0304bf2f93e0a51bfccee0bd0bb0b666b015ea" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bbaa0368d4f1d2aaefc55b6fcfee13f41544ddf36801e793edbbfd7d7df075ef" + +[[package]] +name = "windows_i686_gnu" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" + +[[package]] +name = "windows_i686_gnu" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a28637cb1fa3560a16915793afb20081aba2c92ee8af57b4d5f28e4b3e7df313" + +[[package]] +name = "windows_i686_msvc" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" + +[[package]] +name = "windows_i686_msvc" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ffe5e8e31046ce6230cc7215707b816e339ff4d4d67c65dffa206fd0f7aa7b9a" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3d6fa32db2bc4a2f5abeacf2b69f7992cd09dca97498da74a151a3132c26befd" + +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" + +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1a657e1e9d3f514745a572a6846d3c7aa7dbe1658c056ed9c3344c4109a6949e" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dff9641d1cd4be8d1a070daf9e3773c5f67e78b4d9d42263020c057706765c04" + +[[package]] +name = "winreg" +version = "0.50.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "524e57b2c537c0f9b1e69f1965311ec12182b4122e45035b1508cd24d2adadb1" +dependencies = [ + "cfg-if", + "windows-sys 0.48.0", +] + +[[package]] +name = "winreg" +version = "0.51.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "937f3df7948156640f46aacef17a70db0de5917bda9c92b0f751f3a955b588fc" +dependencies = [ + "cfg-if", + "windows-sys 0.48.0", +] + +[[package]] +name = "wyz" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "05f360fc0b24296329c78fda852a1e9ae82de9cf7b27dae4b7f62f118f77b9ed" +dependencies = [ + "tap", +] + +[[package]] +name = "x25519-dalek" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fb66477291e7e8d2b0ff1bcb900bf29489a9692816d79874bea351e7a8b6de96" +dependencies = [ + "curve25519-dalek", + "rand_core", + "serde", + "zeroize", +] + +[[package]] +name = "x509-cert" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "25eefca1d99701da3a57feb07e5079fc62abba059fc139e98c13bbb250f3ef29" +dependencies = [ + "const-oid", + "der", + "spki", +] + +[[package]] +name = "zeroize" +version = "1.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "525b4ec142c6b68a2d10f01f7bbf6755599ca3f81ea53b8431b7dd348f5fdb2d" +dependencies = [ + "zeroize_derive", +] + +[[package]] +name = "zeroize_derive" +version = "1.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.39", +] diff --git a/pkgs/servers/teleport/15/default.nix b/pkgs/servers/teleport/15/default.nix new file mode 100644 index 000000000000..a3d0bcefda34 --- /dev/null +++ b/pkgs/servers/teleport/15/default.nix @@ -0,0 +1,26 @@ +{ wasm-bindgen-cli, ... }@args: +import ../generic.nix (args // { + version = "15.2.2"; + hash = "sha256-LzJaskFaBtWkodeuT4mDNTs4+6FZj2OI+ZtjogU3KzQ="; + vendorHash = "sha256-D62Jk6LKdbprvkzAKoQVnEKdGQp5ITJYFf53q6154pU="; + yarnHash = "sha256-jpcjO1wT6m8J7LNQVeWo1j2G5P+sexrnNF1ipCZ8lCU="; + cargoLock = { + lockFile = ./Cargo.lock; + outputHashes = { + "boring-4.4.0" = "sha256-4wdl2kIA5oHQ0H6IddKQ+B5kRwrTeMbKe1+tAYZt2uw="; + "ironrdp-async-0.1.0" = "sha256-BKaVPr3O4D7DdwNJUjrU1zB7OwmJZnpJeyuMx+FqKjI="; + "sspi-0.10.1" = "sha256-fkclC/plTh2d8zcmqthYmr5yXqbPTeFxI1VuaPX5vxk="; + }; + }; + extPatches = [ + # https://github.com/NixOS/nixpkgs/issues/120738 + ../tsh_14.patch + ]; + + # wasm-bindgen-cli version must match the version of wasm-bindgen in Cargo.lock + wasm-bindgen-cli = wasm-bindgen-cli.override { + version = "0.2.91"; + hash = "sha256-f/RK6s12ItqKJWJlA2WtOXtwX4Y0qa8bq/JHlLTAS3c="; + cargoHash = "sha256-3vxVI0BhNz/9m59b+P2YEIrwGwlp7K3pyPKt4VqQuHE="; + }; +}) diff --git a/pkgs/servers/teleport/default.nix b/pkgs/servers/teleport/default.nix new file mode 100644 index 000000000000..b5fc9936e814 --- /dev/null +++ b/pkgs/servers/teleport/default.nix @@ -0,0 +1,12 @@ +{ callPackages, lib, ... }@args: +let + f = args: rec { + teleport_13 = import ./13 args; + teleport_14 = import ./14 args; + teleport_15 = import ./15 args; + teleport = teleport_15; + }; + # Ensure the following callPackages invocation includes everything 'generic' needs. + f' = lib.setFunctionArgs f (builtins.functionArgs (import ./generic.nix)); +in +callPackages f' (builtins.removeAttrs args [ "callPackages" ]) diff --git a/pkgs/servers/teleport/generic.nix b/pkgs/servers/teleport/generic.nix index d8b630d1a5f3..80a05f979175 100644 --- a/pkgs/servers/teleport/generic.nix +++ b/pkgs/servers/teleport/generic.nix @@ -6,14 +6,19 @@ , makeWrapper , CoreFoundation , AppKit +, binaryen +, cargo , libfido2 , nodejs , openssl , pkg-config +, rustc , Security , stdenv , xdg-utils , yarn +, wasm-bindgen-cli +, wasm-pack , prefetch-yarn-deps , nixosTests @@ -69,12 +74,23 @@ let pname = "teleport-webassets"; inherit src version; - nativeBuildInputs = [ - nodejs - yarn - prefetch-yarn-deps + cargoDeps = rustPlatform.importCargoLock cargoLock; + + RUSTFLAGS = builtins.concatStringsSep " " [ + "-C linker=lld" ]; + nativeBuildInputs = [ nodejs yarn prefetch-yarn-deps ] ++ + lib.optional (lib.versionAtLeast version "15") [ + binaryen + cargo + rustc + rustc.llvmPackages.lld + rustPlatform.cargoSetupHook + wasm-bindgen-cli + wasm-pack + ]; + configurePhase = '' export HOME=$(mktemp -d) ''; @@ -88,7 +104,16 @@ let --ignore-engines --ignore-scripts patchShebangs . - yarn build-ui-oss + ${if lib.versionAtLeast version "15" + then '' + PATH=$PATH:$PWD/node_modules/.bin + pushd web/packages/teleport + # https://github.com/gravitational/teleport/blob/6b91fe5bbb9e87db4c63d19f94ed4f7d0f9eba43/web/packages/teleport/README.md?plain=1#L18-L20 + RUST_MIN_STACK=16777216 wasm-pack build ./src/ironrdp --target web --mode no-install + vite build + popd + '' + else "yarn build-ui-oss"} ''; installPhase = '' @@ -154,7 +179,7 @@ buildGoModule rec { meta = with lib; { description = "Certificate authority and access plane for SSH, Kubernetes, web applications, and databases"; homepage = "https://goteleport.com/"; - license = licenses.asl20; + license = if lib.versionAtLeast version "15" then licenses.agpl3Plus else licenses.asl20; maintainers = with maintainers; [ arianvp justinas sigma tomberek freezeboy techknowlogick ]; platforms = platforms.unix; # go-libfido2 is broken on platforms with less than 64-bit because it defines an array diff --git a/pkgs/shells/hilbish/default.nix b/pkgs/shells/hilbish/default.nix index ed6bc7a159db..ae13e69b2e42 100644 --- a/pkgs/shells/hilbish/default.nix +++ b/pkgs/shells/hilbish/default.nix @@ -2,19 +2,19 @@ buildGoModule rec { pname = "hilbish"; - version = "2.2.1"; + version = "2.2.2"; src = fetchFromGitHub { owner = "Rosettea"; repo = "Hilbish"; rev = "v${version}"; - hash = "sha256-pXl0emLY+W0DkW4HONv3qVZzCEZnx/SX3MjyBajsosg="; + hash = "sha256-tkEEvxIBPpPbdIFxbo0pOHHORXEFZ8wn9emIeyz6glc="; fetchSubmodules = true; }; subPackages = [ "." ]; - vendorHash = "sha256-nE+THN+Q7Ze36c0nd3oROoFPLIzH/kw9qBwMxv+j9uE="; + vendorHash = "sha256-jf+S1On3Cib20Uepsm8WeRwEyuRKzSPFfsT2YVkx4fs="; ldflags = [ "-s" diff --git a/pkgs/tools/audio/wyoming/faster-whisper.nix b/pkgs/tools/audio/wyoming/faster-whisper.nix index a40657bdf5f6..6bebfd5bd630 100644 --- a/pkgs/tools/audio/wyoming/faster-whisper.nix +++ b/pkgs/tools/audio/wyoming/faster-whisper.nix @@ -5,14 +5,14 @@ python3Packages.buildPythonApplication rec { pname = "wyoming-faster-whisper"; - version = "2.0.0"; + version = "2.1.0"; pyproject = true; src = fetchFromGitHub { owner = "rhasspy"; repo = "wyoming-faster-whisper"; rev = "refs/tags/v${version}"; - hash = "sha256-CeFSxL2Mn9lgboKghbteCl6VMTqruJgrI0io+TdaV5k="; + hash = "sha256-zWa872YkPh8B7dE//leth+ixIa1wHSRcjkvH2lXzolc="; }; nativeBuildInputs = with python3Packages; [ diff --git a/pkgs/tools/misc/esphome/default.nix b/pkgs/tools/misc/esphome/default.nix index 80c5de0d5c94..972ac63e83dc 100644 --- a/pkgs/tools/misc/esphome/default.nix +++ b/pkgs/tools/misc/esphome/default.nix @@ -19,14 +19,14 @@ let in python.pkgs.buildPythonApplication rec { pname = "esphome"; - version = "2024.3.1"; + version = "2024.3.2"; pyproject = true; src = fetchFromGitHub { owner = pname; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-lWDQp3I8AJT5iTT8wMj/ZL6ykw2NNeLXdq1obnMP7Ao="; + hash = "sha256-WeTajznndw01jXIEnOiSEy9psLuMeAC6j7UmHg0+Fys="; }; nativeBuildInputs = with python.pkgs; [ diff --git a/pkgs/tools/misc/ollama/default.nix b/pkgs/tools/misc/ollama/default.nix index a377d200fbb8..fdda6ba3f1e8 100644 --- a/pkgs/tools/misc/ollama/default.nix +++ b/pkgs/tools/misc/ollama/default.nix @@ -100,10 +100,6 @@ let cudaPackages.cuda_cudart cudaPackages.cuda_cudart.static ]; - postBuild = '' - rm "$out/lib64" - ln -s "lib" "$out/lib64" - ''; }; runtimeLibs = lib.optionals enableRocm [ @@ -140,6 +136,8 @@ goBuild ((lib.optionalAttrs enableRocm { nativeBuildInputs = [ cmake + ] ++ lib.optionals enableRocm [ + rocmPackages.llvm.bintools ] ++ lib.optionals (enableRocm || enableCuda) [ makeWrapper ] ++ lib.optionals stdenv.isDarwin diff --git a/pkgs/tools/networking/edgedb/Cargo.lock b/pkgs/tools/networking/edgedb/Cargo.lock index 5372163a7ee7..42213f27d667 100644 --- a/pkgs/tools/networking/edgedb/Cargo.lock +++ b/pkgs/tools/networking/edgedb/Cargo.lock @@ -998,7 +998,7 @@ checksum = "9ea835d29036a4087793836fa931b08837ad5e957da9e23886b29586fb9b6650" [[package]] name = "edgedb-cli" -version = "4.0.2" +version = "4.1.1" dependencies = [ "ansi-escapes", "anyhow", @@ -2642,9 +2642,9 @@ checksum = "dc375e1527247fe1a97d8b7156678dfe7c1af2fc075c9a4db3690ecd2a148068" [[package]] name = "proc-macro2" -version = "1.0.59" +version = "1.0.78" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6aeca18b86b413c660b781aa319e4e2648a3e6f9eadc9b47e9038e6fe9f3451b" +checksum = "e2422ad645d89c99f8f3e6b88a9fdeca7fabeac836b1002371c4367c8f984aae" dependencies = [ "unicode-ident", ] diff --git a/pkgs/tools/networking/edgedb/default.nix b/pkgs/tools/networking/edgedb/default.nix index c78548833754..bcc62b79d194 100644 --- a/pkgs/tools/networking/edgedb/default.nix +++ b/pkgs/tools/networking/edgedb/default.nix @@ -19,13 +19,13 @@ rustPlatform.buildRustPackage rec { pname = "edgedb"; - version = "4.0.2"; + version = "4.1.1"; src = fetchFromGitHub { owner = "edgedb"; repo = "edgedb-cli"; rev = "v${version}"; - hash = "sha256-uilotat61U6jW1NLh7fVHOujkzUSFRdpeOx+ECGsByY="; + hash = "sha256-PHtjm3xlGwkDskH3A9/QQrmzt2Xi+sqnQAQV6WG7a6M="; fetchSubmodules = true; }; diff --git a/pkgs/tools/security/cloudfox/default.nix b/pkgs/tools/security/cloudfox/default.nix index 995ee7a326a9..97816db4c8c6 100644 --- a/pkgs/tools/security/cloudfox/default.nix +++ b/pkgs/tools/security/cloudfox/default.nix @@ -1,20 +1,21 @@ -{ lib -, buildGoModule -, fetchFromGitHub +{ + lib, + buildGoModule, + fetchFromGitHub, }: buildGoModule rec { pname = "cloudfox"; - version = "1.13.4"; + version = "1.14.0"; src = fetchFromGitHub { owner = "BishopFox"; repo = "cloudfox"; rev = "refs/tags/v${version}"; - hash = "sha256-nN/gSvAwKjfZulqH4caGoJmzlY0ik8JrFReuvYWwZTE="; + hash = "sha256-vh7U66od+i1kmTtpHZ1tuMPTl0AnXoYUKMU16ZgxFBQ="; }; - vendorHash = "sha256-aRbGBEci3QT1mH+yaOUVynPysJ1za6CaoLGppJaa94c="; + vendorHash = "sha256-2+UiaU4S64afH8Y8uz5ZclO5NxTi4YlUZ87ZN1MnLj0="; ldflags = [ "-w" @@ -26,10 +27,10 @@ buildGoModule rec { meta = with lib; { description = "Tool for situational awareness of cloud penetration tests"; - mainProgram = "cloudfox"; homepage = "https://github.com/BishopFox/cloudfox"; changelog = "https://github.com/BishopFox/cloudfox/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ fab ]; + mainProgram = "cloudfox"; }; } diff --git a/pkgs/tools/security/govulncheck/default.nix b/pkgs/tools/security/govulncheck/default.nix index 84aeaf51b947..166e6dd53963 100644 --- a/pkgs/tools/security/govulncheck/default.nix +++ b/pkgs/tools/security/govulncheck/default.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "govulncheck"; - version = "1.0.4"; + version = "1.1.0"; src = fetchFromGitHub { owner = "golang"; repo = "vuln"; rev = "refs/tags/v${version}"; - hash = "sha256-GLZaJ/hVA1A2Mek1G7QkDGowqa5Bm4sRh0Y7QMhud/w="; + hash = "sha256-sS58HyrwyRv3zYi8OgiDYnKSbyu2i3KVoSX/0wQbqGw="; }; patches = [ @@ -23,7 +23,7 @@ buildGoModule rec { }) ]; - vendorHash = "sha256-Jg2Nx63Xak149111jbBP6SgK3hze21Dx5qcDKXCqa48="; + vendorHash = "sha256-ZHf//khvBGG+gRBKoKZo4NKoIJCQsbQfe2uT7cAHDcM="; subPackages = [ "cmd/govulncheck" diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index faa715ecd4f6..c8a80540f9e8 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1219,6 +1219,7 @@ mapAliases ({ tdesktop = telegram-desktop; # Added 2023-04-07 telegram-cli = throw "telegram-cli was removed because it was broken and abandoned upstream"; # Added 2023-07-28 teleport_11 = throw "teleport 11 has been removed as it is EOL. Please upgrade to Teleport 12 or later"; # Added 2023-11-27 + teleport_12 = throw "teleport 12 has been removed as it is EOL. Please upgrade to Teleport 13 or later"; # Added 2024-02-04 teleprompter = throw "teleprompter has been removed. reason: upstream dead and does not work with recent electron versions"; # Added 2024-03-14 tensile = throw "'tensile' has been replaced with 'rocmPackages.tensile'"; # Added 2023-10-08 testVersion = testers.testVersion; # Added 2022-04-20 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 972c88222dca..d0559ca0b8cc 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2530,10 +2530,6 @@ with pkgs; gittyup = libsForQt5.callPackage ../applications/version-management/gittyup { }; - gitui = callPackage ../applications/version-management/gitui { - inherit (darwin.apple_sdk.frameworks) Security AppKit; - }; - gitweb = callPackage ../applications/version-management/gitweb { }; glab = callPackage ../applications/version-management/glab { }; @@ -13631,16 +13627,9 @@ with pkgs; telegraf = callPackage ../servers/monitoring/telegraf { }; - teleport_12 = callPackage ../servers/teleport/12 { + inherit (callPackages ../servers/teleport { inherit (darwin.apple_sdk.frameworks) CoreFoundation Security AppKit; - }; - teleport_13 = callPackage ../servers/teleport/13 { - inherit (darwin.apple_sdk.frameworks) CoreFoundation Security AppKit; - }; - teleport_14 = callPackage ../servers/teleport/14 { - inherit (darwin.apple_sdk.frameworks) CoreFoundation Security AppKit; - }; - teleport = teleport_14; + }) teleport_13 teleport_14 teleport_15 teleport; telepresence = callPackage ../tools/networking/telepresence { pythonPackages = python3Packages;