From 99202303be8e012db84f2beb0e371a4cccb84f11 Mon Sep 17 00:00:00 2001 From: Zhaofeng Li Date: Mon, 16 Jan 2023 14:14:14 -0700 Subject: [PATCH] Fix build with nixpkgs 22.11 We temporarily patch sea-orm to build with a lower MSRV. --- Cargo.lock | 14 +++++--------- server/Cargo.toml | 12 +++++++++++- 2 files changed, 16 insertions(+), 10 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index a206ea4..f870490 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3008,8 +3008,7 @@ dependencies = [ [[package]] name = "sea-orm" version = "0.10.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc2db217f2061ab2bbb1bd22323a533ace0617f97690919f3ed3894e1b3ba170" +source = "git+https://github.com/zhaofengli/sea-orm?branch=attic#bc765b2ceede7fb225a9a7a38109c6e23726d70b" dependencies = [ "async-stream", "async-trait", @@ -3036,8 +3035,7 @@ dependencies = [ [[package]] name = "sea-orm-cli" version = "0.10.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ebcce92f0f804acd10b4378a3c8b0e5fb28f3a9ae9337006bd651baa3a95632c" +source = "git+https://github.com/zhaofengli/sea-orm?branch=attic#bc765b2ceede7fb225a9a7a38109c6e23726d70b" dependencies = [ "chrono", "clap 3.2.23", @@ -3052,8 +3050,7 @@ dependencies = [ [[package]] name = "sea-orm-macros" version = "0.10.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38066057ef1fa17ddc6ce1458cf269862b8f1df919497d110ea127b549a90fbd" +source = "git+https://github.com/zhaofengli/sea-orm?branch=attic#bc765b2ceede7fb225a9a7a38109c6e23726d70b" dependencies = [ "bae", "heck 0.3.3", @@ -3064,9 +3061,8 @@ dependencies = [ [[package]] name = "sea-orm-migration" -version = "0.10.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ada716f9825e4190a0a8ebaecbf7171ce0ed6f218ea2e70086bdc72ccfc1d03c" +version = "0.10.5" +source = "git+https://github.com/zhaofengli/sea-orm?branch=attic#bc765b2ceede7fb225a9a7a38109c6e23726d70b" dependencies = [ "async-trait", "clap 3.2.23", diff --git a/server/Cargo.toml b/server/Cargo.toml index 8623091..0b986bb 100644 --- a/server/Cargo.toml +++ b/server/Cargo.toml @@ -71,6 +71,11 @@ features = [ ] [dependencies.sea-orm] +# Temporary workaround for nixpkgs 22.11 w/ Rust 1.64.0. +# TODO: Remove once 23.05 becomes stable +git = "https://github.com/zhaofengli/sea-orm" +branch = "attic" + version = "0.10.6" features = [ "runtime-tokio-rustls", @@ -81,7 +86,12 @@ features = [ ] [dependencies.sea-orm-migration] -version = "0.10.6" +# Temporary workaround for nixpkgs 22.11 w/ Rust 1.64.0. +# TODO: Remove once 23.05 becomes stable +git = "https://github.com/zhaofengli/sea-orm" +branch = "attic" + +version = "0.10.5" [dependencies.tokio] version = "1.23.0"