diff --git a/tvix/Cargo.lock b/tvix/Cargo.lock index 0824dde9e..bd8a3d864 100644 --- a/tvix/Cargo.lock +++ b/tvix/Cargo.lock @@ -3602,8 +3602,9 @@ dependencies = [ [[package]] name = "reqwest-middleware" -version = "0.4.0" -source = "git+https://github.com/TrueLayer/reqwest-middleware?rev=9fdba406c124c567e2302f1aec63483ed7db63b1#9fdba406c124c567e2302f1aec63483ed7db63b1" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "64e8975513bd9a7a43aad01030e79b3498e05db14e9d945df6483e8cf9b8c4c4" dependencies = [ "anyhow", "async-trait", @@ -3616,8 +3617,9 @@ dependencies = [ [[package]] name = "reqwest-tracing" -version = "0.5.5" -source = "git+https://github.com/TrueLayer/reqwest-middleware?rev=9fdba406c124c567e2302f1aec63483ed7db63b1#9fdba406c124c567e2302f1aec63483ed7db63b1" +version = "0.5.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d9c88a8d9cfe3319b5adc10f3ffc3db75c7346837a1f857f8269f6361f3b2744" dependencies = [ "anyhow", "async-trait", diff --git a/tvix/Cargo.nix b/tvix/Cargo.nix index 2266ebc28..1f4ec9891 100644 --- a/tvix/Cargo.nix +++ b/tvix/Cargo.nix @@ -11693,14 +11693,9 @@ rec { }; "reqwest-middleware" = rec { crateName = "reqwest-middleware"; - version = "0.4.0"; + version = "0.4.1"; edition = "2018"; - workspace_member = null; - src = pkgs.fetchgit { - url = "https://github.com/TrueLayer/reqwest-middleware"; - rev = "9fdba406c124c567e2302f1aec63483ed7db63b1"; - sha256 = "0jn14w0pbixscp4vgcanpi36d7b9k5c2hvksa00l5xgsmkmxni7l"; - }; + sha256 = "1i64p3wqqgj8yrfr97afn5fy161lkgkk046hm91pm6mx2dargs34"; libName = "reqwest_middleware"; authors = [ "Rodrigo Gryzinski " @@ -11753,14 +11748,9 @@ rec { }; "reqwest-tracing" = rec { crateName = "reqwest-tracing"; - version = "0.5.5"; + version = "0.5.6"; edition = "2018"; - workspace_member = null; - src = pkgs.fetchgit { - url = "https://github.com/TrueLayer/reqwest-middleware"; - rev = "9fdba406c124c567e2302f1aec63483ed7db63b1"; - sha256 = "0jn14w0pbixscp4vgcanpi36d7b9k5c2hvksa00l5xgsmkmxni7l"; - }; + sha256 = "0i177cgkdxk9h9zqa7vshd376p5p7py3y3y1mnsijczykj6qmj6r"; libName = "reqwest_tracing"; authors = [ "Rodrigo Gryzinski " diff --git a/tvix/Cargo.toml b/tvix/Cargo.toml index 71b2b0451..d2340fa9e 100644 --- a/tvix/Cargo.toml +++ b/tvix/Cargo.toml @@ -108,9 +108,8 @@ quote = "1.0.37" redb = "2.1.2" regex = "1.10.6" reqwest = { version = "0.12.7", default-features = false } -# https://github.com/TrueLayer/reqwest-middleware/issues/220 -reqwest-middleware = { git = "https://github.com/TrueLayer/reqwest-middleware", rev = "9fdba406c124c567e2302f1aec63483ed7db63b1", default-features = false } -reqwest-tracing = { git = "https://github.com/TrueLayer/reqwest-middleware", rev = "9fdba406c124c567e2302f1aec63483ed7db63b1", default-features = false } +reqwest-middleware = { version = "0.4.1", default-features = false } +reqwest-tracing = { version = "0.5.6", default-features = false } rnix = "0.11.0" rowan = "0.15" # keep in sync with rnix rstest = "0.19.0" diff --git a/tvix/crate-hashes.json b/tvix/crate-hashes.json index fbf986134..11679cb2e 100644 --- a/tvix/crate-hashes.json +++ b/tvix/crate-hashes.json @@ -1,5 +1,3 @@ { - "git+https://github.com/TrueLayer/reqwest-middleware?rev=9fdba406c124c567e2302f1aec63483ed7db63b1#0.4.0": "0jn14w0pbixscp4vgcanpi36d7b9k5c2hvksa00l5xgsmkmxni7l", - "git+https://github.com/TrueLayer/reqwest-middleware?rev=9fdba406c124c567e2302f1aec63483ed7db63b1#reqwest-tracing@0.5.5": "0jn14w0pbixscp4vgcanpi36d7b9k5c2hvksa00l5xgsmkmxni7l", "git+https://github.com/tvlfyi/wu-manber.git#wu-manber@0.1.0": "1zhk83lbq99xzyjwphv2qrb8f8qgfqwa5bbbvyzm0z0bljsjv0pd" } \ No newline at end of file diff --git a/tvix/default.nix b/tvix/default.nix index edb03b073..1b103c89b 100644 --- a/tvix/default.nix +++ b/tvix/default.nix @@ -18,8 +18,6 @@ let (k: (lib.nameValuePair "${crates.internal.crates.${k}.crateName}-${crates.internal.crates.${k}.version}" crates.internal.crates.${k}.src.outputHash) ) [ - "reqwest-middleware" - "reqwest-tracing" "wu-manber" ]); };