bump dependencies versions to build with rust 1.84 #24

Open
Armael wants to merge 4 commits from bump-deps into main
5 changed files with 2669 additions and 2178 deletions

View file

@ -8,19 +8,19 @@ when:
steps:
- name: check formatting
image: nixpkgs/nix:nixos-22.05
image: nixpkgs/nix:nixos-24.11
environment:
NIX_PATH: 'nixpkgs=channel:nixos-22.05'
NIX_PATH: 'nixpkgs=channel:nixos-24.11'
commands:
- nix-shell -p cargo -p rustfmt --run 'cargo fmt -- --check'
- name: build
image: nixpkgs/nix:nixos-22.05
image: nixpkgs/nix:nixos-24.11
commands:
- nix build --extra-experimental-features nix-command --extra-experimental-features flakes .#debug.x86_64-linux.diplonat
- name: test
image: nixpkgs/nix:nixos-22.05
image: nixpkgs/nix:nixos-24.11
commands:
- nix build --extra-experimental-features nix-command --extra-experimental-features flakes .#test.x86_64-linux.diplonat
- ./result-bin/bin/diplonat-*

1699
Cargo.lock generated

File diff suppressed because it is too large Load diff

3128
Cargo.nix

File diff suppressed because it is too large Load diff

View file

@ -12,13 +12,13 @@ envy = "0.4"
futures = "0.3.5"
get_if_addrs = "0.5"
igd = { version = "0.12.0", features = ["aio"] }
iptables = "0.2.2"
iptables = "0.3.0"
log = "0.4"
pretty_env_logger = "0.4"
regex = "1"
reqwest = { version = "0.11", default-features = false, features = ["json", "rustls-tls-manual-roots" ] }
serde = { version = "1.0.107", features = ["derive"] }
serde = { version = "1.0.217", features = ["derive"] }
serde-lexpr = "0.1.1"
serde_json = "1.0.53"
serde_json = "1.0.138"
tokio = { version = "1", features = ["sync", "rt-multi-thread", "net", "macros"] }
stun-client = "0.1.2"
stun-client = "0.1.4"

View file

@ -4,9 +4,7 @@ mod options_test;
mod runtime;
pub use options::{ConfigOpts, ConfigOptsBase, ConfigOptsConsul};
pub use runtime::{
RuntimeConfig, RuntimeConfigConsul, RuntimeConfigFirewall, RuntimeConfigIgd, RuntimeConfigStun,
};
pub use runtime::{RuntimeConfig, RuntimeConfigConsul, RuntimeConfigStun};
pub const EXPIRATION_TIME: u16 = 300;
pub const REFRESH_TIME: u16 = 60;