sinavir/multitenant-tvix-binary-cache
0
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

feat: Bump a lot of stuff

Browse source
This commit is contained in:
sinavir 2024-09-22 23:12:40 +02:00
parent c657d39905
commit 35103341c6
4 changed files with 109 additions and 76 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

140
Cargo.lock generated
View file

@ -206,9 +206,9 @@ checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
[[package]]
name = "axum"
version = "0.7.5"
version = "0.7.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3a6c9af12842a67734c9a2e355436e5d03b22383ed60cf13cd0c18fbfe3dcbcf"
checksum = "8f43644eed690f5374f1af436ecd6aea01cd201f6fbdf0178adaf6907afb2cec"
dependencies = [
"async-trait",
"axum-core",
@ -232,7 +232,7 @@ dependencies = [
"serde_urlencoded",
"sync_wrapper 1.0.1",
"tokio",
"tower",
"tower 0.5.1",
"tower-layer",
"tower-service",
"tracing",
@ -240,9 +240,9 @@ dependencies = [
[[package]]
name = "axum-core"
version = "0.4.3"
version = "0.4.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a15c63fd72d41492dc4f497196f5da1fb04fb7529e631d73630d1b491e47a2e3"
checksum = "5e6b8ba012a258d63c9adfa28b9ddcf66149da6f986c5b5452e629d5ee64bf00"
dependencies = [
"async-trait",
"bytes",
@ -253,7 +253,7 @@ dependencies = [
"mime",
"pin-project-lite",
"rustversion",
"sync_wrapper 0.1.2",
"sync_wrapper 1.0.1",
"tower-layer",
"tower-service",
"tracing",
@ -306,7 +306,7 @@ dependencies = [
"tokio",
"tonic",
"tonic-build",
"tower",
"tower 0.4.13",
]
[[package]]
@ -439,9 +439,9 @@ dependencies = [
[[package]]
name = "clap"
version = "4.5.17"
version = "4.5.18"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3e5a21b8495e732f1b3c364c9949b201ca7bae518c502c80256c96ad79eaf6ac"
checksum = "b0956a43b323ac1afaffc053ed5c4b7c1f1800bacd1683c353aabbb752515dd3"
dependencies = [
"clap_builder",
"clap_derive",
@ -449,9 +449,9 @@ dependencies = [
[[package]]
name = "clap_builder"
version = "4.5.17"
version = "4.5.18"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8cf2dd12af7a047ad9d6da2b6b249759a22a7abc0f474c1dae1777afa4b21a73"
checksum = "4d72166dd41634086d5803a47eb71ae740e61d84709c36f3c34110173db3961b"
dependencies = [
"anstream",
"anstyle",
@ -461,9 +461,9 @@ dependencies = [
[[package]]
name = "clap_derive"
version = "4.5.13"
version = "4.5.18"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "501d359d5f3dcaf6ecdeee48833ae73ec6e42723a1e52419c79abf9507eec0a0"
checksum = "4ac6a0c7b1a9e9a5186361f67dfa1b88213572f427fb9ab038efb2bd8c582dab"
dependencies = [
"heck 0.5.0",
"proc-macro2",
@ -1221,7 +1221,7 @@ dependencies = [
"pin-project-lite",
"socket2",
"tokio",
"tower",
"tower 0.4.13",
"tower-service",
"tracing",
]
@ -1559,7 +1559,7 @@ checksum = "defc4c55412d89136f966bbb339008b474350e5e6e78d2714439c386b3137a03"
[[package]]
name = "multitier-tvix-cache"
version = "0.1.0"
version = "0.2.0"
dependencies = [
"axum",
"clap",
@ -1572,8 +1572,8 @@ dependencies = [
"toml",
"tonic",
"tonic-health",
"tower",
"tower-http",
"tower 0.5.1",
"tower-http 0.6.0",
"tracing",
"tvix-castore",
"tvix-store",
@ -1584,7 +1584,7 @@ dependencies = [
[[package]]
name = "nar-bridge"
version = "0.1.0"
source = "git+https://git.dgnum.eu/mdebray/tvl-depot?rev=240b6a8ba42ec0295fecb228c161bfc45a6cd6bc#240b6a8ba42ec0295fecb228c161bfc45a6cd6bc"
source = "git+https://git.dgnum.eu/mdebray/tvl-depot?rev=1333cca6e467fb9d870e1b40c84314f80dbd4577#1333cca6e467fb9d870e1b40c84314f80dbd4577"
dependencies = [
"axum",
"bytes",
@ -1605,8 +1605,8 @@ dependencies = [
"tokio-util",
"tonic",
"tonic-build",
"tower",
"tower-http",
"tower 0.4.13",
"tower-http 0.5.2",
"tracing",
"tracing-subscriber",
"tvix-castore",
@ -1641,7 +1641,7 @@ dependencies = [
[[package]]
name = "nix-compat"
version = "0.1.0"
source = "git+https://git.dgnum.eu/mdebray/tvl-depot?rev=240b6a8ba42ec0295fecb228c161bfc45a6cd6bc#240b6a8ba42ec0295fecb228c161bfc45a6cd6bc"
source = "git+https://git.dgnum.eu/mdebray/tvl-depot?rev=1333cca6e467fb9d870e1b40c84314f80dbd4577#1333cca6e467fb9d870e1b40c84314f80dbd4577"
dependencies = [
"bitflags 2.6.0",
"bstr",
@ -1667,7 +1667,7 @@ dependencies = [
[[package]]
name = "nix-compat-derive"
version = "0.1.0"
source = "git+https://git.dgnum.eu/mdebray/tvl-depot?rev=240b6a8ba42ec0295fecb228c161bfc45a6cd6bc#240b6a8ba42ec0295fecb228c161bfc45a6cd6bc"
source = "git+https://git.dgnum.eu/mdebray/tvl-depot?rev=1333cca6e467fb9d870e1b40c84314f80dbd4577#1333cca6e467fb9d870e1b40c84314f80dbd4577"
dependencies = [
"proc-macro2",
"quote",
@ -2018,9 +2018,9 @@ checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec"
[[package]]
name = "portable-atomic"
version = "1.7.0"
version = "1.8.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "da544ee218f0d287a911e9c99a39a8c9bc8fcad3cb8db5959940044ecfc67265"
checksum = "d30538d42559de6b034bc76fd6dd4c38961b1ee5c6c56e3808c50128fdbc22ce"
[[package]]
name = "powerfmt"
@ -2058,9 +2058,9 @@ dependencies = [
[[package]]
name = "prost"
version = "0.13.2"
version = "0.13.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3b2ecbe40f08db5c006b5764a2645f7f3f141ce756412ac9e1dd6087e6d32995"
checksum = "7b0487d90e047de87f984913713b85c601c05609aad5b0df4b4573fbf69aa13f"
dependencies = [
"bytes",
"prost-derive",
@ -2068,9 +2068,9 @@ dependencies = [
[[package]]
name = "prost-build"
version = "0.13.2"
version = "0.13.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f8650aabb6c35b860610e9cff5dc1af886c9e25073b7b1712a68972af4281302"
checksum = "0c1318b19085f08681016926435853bbf7858f9c082d0999b80550ff5d9abe15"
dependencies = [
"bytes",
"heck 0.5.0",
@ -2091,9 +2091,9 @@ dependencies = [
[[package]]
name = "prost-derive"
version = "0.13.2"
version = "0.13.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "acf0c195eebb4af52c752bec4f52f645da98b6e92077a04110c7f349477ae5ac"
checksum = "e9552f850d5f0964a4e4d0bf306459ac29323ddfbae05e35a7c0d35cb0803cc5"
dependencies = [
"anyhow",
"itertools 0.13.0",
@ -2104,9 +2104,9 @@ dependencies = [
[[package]]
name = "prost-types"
version = "0.13.2"
version = "0.13.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "60caa6738c7369b940c3d49246a8d1749323674c65cb13010134f5c9bad5b519"
checksum = "4759aa0d3a6232fb8dbdb97b61de2c20047c68aca932c7ed76da9d788508d670"
dependencies = [
"prost",
]
@ -2159,9 +2159,9 @@ dependencies = [
[[package]]
name = "pulldown-cmark"
version = "0.9.6"
version = "0.12.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "57206b407293d2bcd3af849ce869d52068623f19e1b5ff8e8778e3309439682b"
checksum = "666f0f59e259aea2d72e6012290c09877a780935cc3c18b1ceded41f3890d59c"
dependencies = [
"bitflags 2.6.0",
"memchr",
@ -2170,18 +2170,18 @@ dependencies = [
[[package]]
name = "pulldown-cmark-to-cmark"
version = "10.0.4"
version = "17.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0194e6e1966c23cc5fd988714f85b18d548d773e81965413555d96569931833d"
checksum = "41b27c0d365d60ff3e085007911d73419e5664de48155d558ebfa84d117a5109"
dependencies = [
"pulldown-cmark",
]
[[package]]
name = "quick-xml"
version = "0.36.1"
version = "0.36.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "96a05e2e8efddfa51a84ca47cec303fac86c8541b686d37cac5efc0e094417bc"
checksum = "f7649a7b4df05aed9ea7ec6f628c67c9953a43869b8bc50929569b2999d443fe"
dependencies = [
"memchr",
"serde",
@ -2610,9 +2610,9 @@ dependencies = [
[[package]]
name = "security-framework-sys"
version = "2.11.1"
version = "2.12.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "75da29fe9b9b08fe9d6b22b5b4bcbc75d8db3aa31e639aa56bb62e9d46bfceaf"
checksum = "ea4a292869320c0272d7bc55a5a6aafaff59b4f63404a003887b679a2e05b4b6"
dependencies = [
"core-foundation-sys",
"libc",
@ -2925,18 +2925,18 @@ dependencies = [
[[package]]
name = "thiserror"
version = "1.0.63"
version = "1.0.64"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c0342370b38b6a11b6cc11d6a805569958d54cfa061a29969c3b5ce2ea405724"
checksum = "d50af8abc119fb8bb6dbabcfa89656f46f84aa0ac7688088608076ad2b459a84"
dependencies = [
"thiserror-impl",
]
[[package]]
name = "thiserror-impl"
version = "1.0.63"
version = "1.0.64"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a4558b58466b9ad7ca0f102865eccc95938dca1a74a856f2b57b6629050da261"
checksum = "08904e7672f5eb876eaaf87e0ce17857500934f4981c4a0ab2b4aa98baac7fc3"
dependencies = [
"proc-macro2",
"quote",
@ -3047,7 +3047,7 @@ dependencies = [
"tokio",
"tokio-util",
"tonic",
"tower",
"tower 0.4.13",
"tower-service",
"tracing",
]
@ -3175,7 +3175,7 @@ dependencies = [
"tokio",
"tokio-rustls",
"tokio-stream",
"tower",
"tower 0.4.13",
"tower-layer",
"tower-service",
"tracing",
@ -3240,6 +3240,22 @@ dependencies = [
"tracing",
]
[[package]]
name = "tower"
version = "0.5.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2873938d487c3cfb9aed7546dc9f2711d867c9f90c46b889989a2cb84eba6b4f"
dependencies = [
"futures-core",
"futures-util",
"pin-project-lite",
"sync_wrapper 0.1.2",
"tokio",
"tower-layer",
"tower-service",
"tracing",
]
[[package]]
name = "tower-http"
version = "0.5.2"
@ -3257,6 +3273,22 @@ dependencies = [
"tracing",
]
[[package]]
name = "tower-http"
version = "0.6.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "41515cc9e193536d93fd0dbbea0c73819c08eca76e0b30909a325c3ec90985bb"
dependencies = [
"bitflags 2.6.0",
"bytes",
"http",
"http-body",
"pin-project-lite",
"tower-layer",
"tower-service",
"tracing",
]
[[package]]
name = "tower-layer"
version = "0.3.3"
@ -3398,7 +3430,7 @@ checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b"
[[package]]
name = "tvix-castore"
version = "0.1.0"
source = "git+https://git.dgnum.eu/mdebray/tvl-depot?rev=240b6a8ba42ec0295fecb228c161bfc45a6cd6bc#240b6a8ba42ec0295fecb228c161bfc45a6cd6bc"
source = "git+https://git.dgnum.eu/mdebray/tvl-depot?rev=1333cca6e467fb9d870e1b40c84314f80dbd4577#1333cca6e467fb9d870e1b40c84314f80dbd4577"
dependencies = [
"async-compression",
"async-stream",
@ -3437,7 +3469,7 @@ dependencies = [
"tonic",
"tonic-build",
"tonic-reflection",
"tower",
"tower 0.4.13",
"tracing",
"tracing-indicatif",
"tvix-tracing",
@ -3449,7 +3481,7 @@ dependencies = [
[[package]]
name = "tvix-store"
version = "0.1.0"
source = "git+https://git.dgnum.eu/mdebray/tvl-depot?rev=240b6a8ba42ec0295fecb228c161bfc45a6cd6bc#240b6a8ba42ec0295fecb228c161bfc45a6cd6bc"
source = "git+https://git.dgnum.eu/mdebray/tvl-depot?rev=1333cca6e467fb9d870e1b40c84314f80dbd4577#1333cca6e467fb9d870e1b40c84314f80dbd4577"
dependencies = [
"anyhow",
"async-compression",
@ -3492,8 +3524,8 @@ dependencies = [
"tonic-build",
"tonic-health",
"tonic-reflection",
"tower",
"tower-http",
"tower 0.4.13",
"tower-http 0.5.2",
"tracing",
"tracing-indicatif",
"tvix-castore",
@ -3505,7 +3537,7 @@ dependencies = [
[[package]]
name = "tvix-tracing"
version = "0.1.0"
source = "git+https://git.dgnum.eu/mdebray/tvl-depot?rev=240b6a8ba42ec0295fecb228c161bfc45a6cd6bc#240b6a8ba42ec0295fecb228c161bfc45a6cd6bc"
source = "git+https://git.dgnum.eu/mdebray/tvl-depot?rev=1333cca6e467fb9d870e1b40c84314f80dbd4577#1333cca6e467fb9d870e1b40c84314f80dbd4577"
dependencies = [
"axum",
"http",
@ -3593,9 +3625,9 @@ dependencies = [
[[package]]
name = "unicode-width"
version = "0.1.13"
version = "0.1.14"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0336d538f7abc86d282a4189614dfaa90810dfc2c6f6427eaf88e16311dd225d"
checksum = "7dd6e30e90baa6f72411720665d41d89b9a3d039dc45b8faea1ddd07f617f6af"
[[package]]
name = "untrusted"

30
Cargo.toml
View file

@ -1,24 +1,24 @@
[package]
name = "multitier-tvix-cache"
version = "0.1.0"
version = "0.2.0"
edition = "2021"
[dependencies]
serde = "1.0.204"
tokio = { version = "1.38.1", features = ["full"] }
tokio-stream = "0.1.15"
tonic = "0.12.1"
tower = "0.4.13"
tower-http = "0.5.2"
serde = "1.0.210"
tokio = { version = "1.40.0", features = ["full"] }
tokio-stream = "0.1.16"
tonic = "0.12.2"
tower = "0.5.1"
tower-http = { version= "0.6.0", features = ["trace"]}
tracing = "0.1.40"
tvix-castore = { git = "https://git.dgnum.eu/mdebray/tvl-depot", rev = "240b6a8ba42ec0295fecb228c161bfc45a6cd6bc" }
tvix-store = { git = "https://git.dgnum.eu/mdebray/tvl-depot", rev = "240b6a8ba42ec0295fecb228c161bfc45a6cd6bc", features = ["xp-store-composition" ] }
tvix-tracing = { git = "https://git.dgnum.eu/mdebray/tvl-depot", rev = "240b6a8ba42ec0295fecb228c161bfc45a6cd6bc" }
nar-bridge = { git = "https://git.dgnum.eu/mdebray/tvl-depot", rev = "240b6a8ba42ec0295fecb228c161bfc45a6cd6bc" }
tvix-castore = { git = "https://git.dgnum.eu/mdebray/tvl-depot", rev = "1333cca6e467fb9d870e1b40c84314f80dbd4577" }
tvix-store = { git = "https://git.dgnum.eu/mdebray/tvl-depot", rev = "1333cca6e467fb9d870e1b40c84314f80dbd4577", features = ["xp-store-composition" ] }
tvix-tracing = { git = "https://git.dgnum.eu/mdebray/tvl-depot", rev = "1333cca6e467fb9d870e1b40c84314f80dbd4577" }
nar-bridge = { git = "https://git.dgnum.eu/mdebray/tvl-depot", rev = "1333cca6e467fb9d870e1b40c84314f80dbd4577" }
url = "2.5.2"
clap = "4.5.9"
axum = "0.7.5"
clap = "4.5.18"
axum = "0.7.6"
tokio-listener = { version = "0.4.3", features = ["serde"] }
toml = "0.8.15"
toml = "0.8.19"
futures = "0.3.30"
tonic-health = "0.12.1"
tonic-health = "0.12.2"

1
default.nix
View file

@ -33,6 +33,7 @@ in
name = "multitenant-tvix-binary-cache";
buildInputs = check.enabledPackages ++ [
pkgs.cargo
pkgs.cargo-edit
pkgs.protobuf
pkgs.rustc
pkgs.rust-analyzer

14
npins/sources.json
View file

@ -8,9 +8,9 @@
"repo": "git-hooks.nix"
},
"branch": "master",
"revision": "0ff4381bbb8f7a52ca4a851660fc7a437a4c6e07",
"url": "https://github.com/cachix/git-hooks.nix/archive/0ff4381bbb8f7a52ca4a851660fc7a437a4c6e07.tar.gz",
"hash": "0bmgc731c5rvky6qxc4f6gvgyiic8dna5dv3j19kya86idf7wn0p"
"revision": "4e743a6920eab45e8ba0fbe49dc459f1423a4b74",
"url": "https://github.com/cachix/git-hooks.nix/archive/4e743a6920eab45e8ba0fbe49dc459f1423a4b74.tar.gz",
"hash": "0fc69dsn5rhv2zb16c2bfgx84ja8cmn7d7j2mrw3n4m8y611x40g"
},
"nixpkgs": {
"type": "Git",
@ -20,10 +20,10 @@
"repo": "nixpkgs"
},
"branch": "nixos-unstable",
"revision": "574d1eac1c200690e27b8eb4e24887f8df7ac27c",
"url": "https://github.com/NixOS/nixpkgs/archive/574d1eac1c200690e27b8eb4e24887f8df7ac27c.tar.gz",
"hash": "0s6h7r9jin9sd8l85hdjwl3jsvzkddn3blggy78w4f21qa3chymz"
"revision": "c04d5652cfa9742b1d519688f65d1bbccea9eb7e",
"url": "https://github.com/NixOS/nixpkgs/archive/c04d5652cfa9742b1d519688f65d1bbccea9eb7e.tar.gz",
"hash": "0sgr1aka3fpihq2z6clkfbix1kly4bxlxgwy419z26lhc7zjnr9y"
}
},
"version": 3
}
}