update deps

This commit is contained in:
Robin Appelman 2024-01-06 23:45:49 +01:00
commit be990ef3b4
5 changed files with 421 additions and 333 deletions

View file

@ -29,6 +29,19 @@ jobs:
authToken: '${{ secrets.ATTIC_TOKEN }}' authToken: '${{ secrets.ATTIC_TOKEN }}'
- run: nix build .#clippy - run: nix build .#clippy
msrv:
runs-on: ubuntu-latest
needs: check
steps:
- uses: actions/checkout@v3
- uses: cachix/install-nix-action@v20
- uses: icewind1991/attic-action@v1
with:
name: ci
instance: https://cache.icewind.me
authToken: '${{ secrets.ATTIC_TOKEN }}'
- run: nix build .#msrv
matrix: matrix:
runs-on: ubuntu-latest runs-on: ubuntu-latest
outputs: outputs:

645
Cargo.lock generated

File diff suppressed because it is too large Load diff

View file

@ -3,35 +3,36 @@ name = "palantir"
version = "0.1.0" version = "0.1.0"
authors = ["Robin Appelman <robin@icewind.nl>"] authors = ["Robin Appelman <robin@icewind.nl>"]
edition = "2021" edition = "2021"
rust-version = "1.70.0"
[dependencies] [dependencies]
color-eyre = "0.6.1" color-eyre = "0.6.2"
warp = "0.3.2" warp = "0.3.6"
tokio = { version = "1.19.2", features = ["macros", "rt-multi-thread"] } tokio = { version = "1.35.1", features = ["macros", "rt-multi-thread"] }
ctrlc = { version = "3.2.2", features = ["termination"] } ctrlc = { version = "3.4.2", features = ["termination"] }
dotenvy = "0.15.7" dotenvy = "0.15.7"
regex = { version = "1.5.6", default-features = false, features = ["std"] } regex = { version = "1.10.2", default-features = false, features = ["std"] }
once_cell = "1.12.0" once_cell = "1.19.0"
hostname = "0.3.1" hostname = "0.3.1"
libc = "0.2.126" libc = "0.2.151"
ahash = "0.7.6" ahash = "0.8.7"
bollard = "0.13.0" bollard = "0.15.0"
futures-util = "0.3.21" futures-util = "0.3.30"
libmdns = "0.7.0" libmdns = "0.7.5"
tracing = "0.1.35" tracing = "0.1.40"
tracing-subscriber = "0.3.11" tracing-subscriber = "0.3.18"
nvml-wrapper = "0.8.0" nvml-wrapper = "0.9.0"
if-addrs = "0.7.0" if-addrs = "0.11.0"
sysconf = "0.3.4" sysconf = "0.3.4"
thiserror = "1.0.40" thiserror = "1.0.56"
clap = { version = "4.2.7", features = ["derive"] } clap = { version = "4.4.13", features = ["derive"] }
[target.'cfg(windows)'.dependencies] [target.'cfg(windows)'.dependencies]
serde = { version = "1.0.163", features = ["derive"] } serde = { version = "1.0.195", features = ["derive"] }
sysinfo = { version = "0.29.0" } sysinfo = { version = "0.30.5" }
winapi = { version = "0.3.9", features = ["sysinfoapi", "processthreadsapi", "powerbase", "minwindef", "winnt", "winbase", "winerror", "impl-default"] } winapi = { version = "0.3.9", features = ["sysinfoapi", "processthreadsapi", "powerbase", "minwindef", "winnt", "winbase", "winerror", "impl-default"] }
wmi = { version = "0.13.0" } wmi = { version = "0.13.1" }
winreg = { version = "0.50.0", features = ["serialization-serde"] } winreg = { version = "0.52.0", features = ["serialization-serde"] }
os-thread-local = "0.1.3" os-thread-local = "0.1.3"
[dev-dependencies] [dev-dependencies]

32
flake.lock generated
View file

@ -10,11 +10,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1687811683, "lastModified": 1689107909,
"narHash": "sha256-j0+0y2CBlwrbVkVEZajjAy9gdzHRNCq8hQTRe+QXTAQ=", "narHash": "sha256-fb+zxf7AWesECHx1foXOM3NcKHLrdeXzGb6s2AhT6pE=",
"owner": "icewind1991", "owner": "icewind1991",
"repo": "cross-naersk", "repo": "cross-naersk",
"rev": "5e987fcf0521602914773016b173403d0fa873f9", "rev": "51de54599de569e6faa2ee33dd659c5c028d9911",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -30,11 +30,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1688229166, "lastModified": 1698420672,
"narHash": "sha256-9lGDg8K1ASjTThzYjctdgd35WqocIIeakQXs5tAbQsM=", "narHash": "sha256-/TdeHMPRjjdJub7p7+w55vyABrsJlt5QkznPYy55vKA=",
"owner": "nix-community", "owner": "nix-community",
"repo": "naersk", "repo": "naersk",
"rev": "714e701eb4ca2491d34d794b98be4b994a796ae7", "rev": "aeb58d5e8faead8980a807c840232697982d47b9",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -45,16 +45,16 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1685533922, "lastModified": 1704420045,
"narHash": "sha256-y4FCQpYafMQ42l1V+NUrMel9RtFtZo59PzdzflKR/lo=", "narHash": "sha256-C36QmoJd5tdQ5R9MC1jM7fBkZW9zBUqbUCsgwS6j4QU=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "3a70dd92993182f8e514700ccf5b1ae9fc8a3b8d", "rev": "c1be43e8e837b8dbee2b3665a007e761680f0c3d",
"type": "github" "type": "github"
}, },
"original": { "original": {
"id": "nixpkgs", "id": "nixpkgs",
"ref": "nixos-23.05", "ref": "nixos-23.11",
"type": "indirect" "type": "indirect"
} }
}, },
@ -77,11 +77,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1685587239, "lastModified": 1704507282,
"narHash": "sha256-zpOir1AWpWyQscP5dMpqMrCgBzjzH7Wv0FNUsQ0dcS0=", "narHash": "sha256-PDfS8fj40mm2QWpbd/aiocgwcI/WHzqLKERRJkoEvXU=",
"owner": "oxalica", "owner": "oxalica",
"repo": "rust-overlay", "repo": "rust-overlay",
"rev": "acb7e896a73b0cf2c6ffe40b2051eb7f88fc2a10", "rev": "a127cccf7943beae944953963ba118d643299c3b",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -110,11 +110,11 @@
"systems": "systems" "systems": "systems"
}, },
"locked": { "locked": {
"lastModified": 1685518550, "lastModified": 1701680307,
"narHash": "sha256-o2d0KcvaXzTrPRIo0kOLV0/QXHhDQ5DTi+OxcjO8xqY=", "narHash": "sha256-kAuep2h5ajznlPMD9rnQyffWG8EM/C73lejGofXvdM8=",
"owner": "numtide", "owner": "numtide",
"repo": "flake-utils", "repo": "flake-utils",
"rev": "a1720a10a6cfe8234c0e93907ffe81be440f4cef", "rev": "4022d587cbbfd70fe950c1e2083a02621806a725",
"type": "github" "type": "github"
}, },
"original": { "original": {

View file

@ -1,6 +1,6 @@
{ {
inputs = { inputs = {
nixpkgs.url = "nixpkgs/nixos-23.05"; nixpkgs.url = "nixpkgs/nixos-23.11";
utils.url = "github:numtide/flake-utils"; utils.url = "github:numtide/flake-utils";
naersk.url = "github:nix-community/naersk"; naersk.url = "github:nix-community/naersk";
naersk.inputs.nixpkgs.follows = "nixpkgs"; naersk.inputs.nixpkgs.follows = "nixpkgs";
@ -28,7 +28,8 @@
pkgs = import nixpkgs { pkgs = import nixpkgs {
inherit system overlays; inherit system overlays;
}; };
lib = pkgs.lib; inherit (pkgs) lib rust-bin callPackage;
inherit (builtins) fromTOML readFile map replaceStrings;
hostTarget = pkgs.hostPlatform.config; hostTarget = pkgs.hostPlatform.config;
targets = [ targets = [
@ -43,12 +44,16 @@
releaseTargets = lib.lists.remove hostTarget targets; releaseTargets = lib.lists.remove hostTarget targets;
artifactForTarget = target: "palantir${cross-naersk'.execSufficForTarget target}"; artifactForTarget = target: "palantir${cross-naersk'.execSufficForTarget target}";
assetNameForTarget = target: "palantir-${builtins.replaceStrings ["-unknown" "-gnu" "-musl" "abihf" "-pc"] ["" "" "" "" ""] target}${cross-naersk'.execSufficForTarget target}"; assetNameForTarget = target: "palantir-${replaceStrings ["-unknown" "-gnu" "-musl" "abihf" "-pc"] ["" "" "" "" ""] target}${cross-naersk'.execSufficForTarget target}";
cross-naersk' = pkgs.callPackage cross-naersk {inherit naersk;}; cross-naersk' = callPackage cross-naersk {inherit naersk;};
src = lib.sources.sourceByRegex (lib.cleanSource ./.) ["Cargo.*" "(src|benches)(/.*)?"]; src = lib.sources.sourceByRegex (lib.cleanSource ./.) ["Cargo.*" "(src|benches)(/.*)?"];
msrv = (fromTOML (readFile ./Cargo.toml)).package.rust-version;
toolchain = rust-bin.stable.latest.default;
msrvToolchain = rust-bin.stable."${msrv}".default;
nearskOpt = { nearskOpt = {
pname = "palantir"; pname = "palantir";
root = src; root = src;
@ -57,6 +62,10 @@
}; };
buildTarget = target: (cross-naersk'.buildPackage target) nearskOpt; buildTarget = target: (cross-naersk'.buildPackage target) nearskOpt;
hostNaersk = cross-naersk'.hostNaersk; hostNaersk = cross-naersk'.hostNaersk;
msrvNaersk = callPackage naersk {
rustc = msrvToolchain;
cargo = msrvToolchain;
};
in rec { in rec {
packages = packages =
nixpkgs.lib.attrsets.genAttrs targets buildTarget nixpkgs.lib.attrsets.genAttrs targets buildTarget
@ -70,6 +79,10 @@
// { // {
mode = "clippy"; mode = "clippy";
}); });
msrv = msrvNaersk.buildPackage (nearskOpt
// {
mode = "check";
});
default = palantir; default = palantir;
}; };
@ -92,7 +105,9 @@
# `nix develop` # `nix develop`
devShells.default = cross-naersk'.mkShell targets { devShells.default = cross-naersk'.mkShell targets {
nativeBuildInputs = with pkgs; [ nativeBuildInputs = with pkgs; [
toolchain
bacon bacon
cargo-msrv
]; ];
}; };
}) })