zaphar/kitchen
1
0
Fork 0
mirror of https://github.com/zaphar/kitchen.git synced 2025-07-22 19:40:14 -04:00
Code Issues Packages Projects Releases Wiki Activity

Update nix builds to use rust 1.64

Browse Source
This commit is contained in:
Jeremy Wall 2022-10-11 16:49:12 -04:00
parent 9cf6bcc7fc
commit 58dc0eef3f
6 changed files with 26 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Cargo.lock generated
View File

@ -1906,6 +1906,7 @@ dependencies = [
[[package]] [[package]]
name = "sqlx" name = "sqlx"
version = "0.6.2" version = "0.6.2"
source = "git+https://github.com/zaphar/sqlx?branch=remove_unstable_async_std_feature#cc8a048bbe9af370c22211d9d95243bfc42a0c14"
dependencies = [ dependencies = [
"sqlx-core", "sqlx-core",
"sqlx-macros", "sqlx-macros",
@ -1914,6 +1915,7 @@ dependencies = [
[[package]] [[package]]
name = "sqlx-core" name = "sqlx-core"
version = "0.6.2" version = "0.6.2"
source = "git+https://github.com/zaphar/sqlx?branch=remove_unstable_async_std_feature#cc8a048bbe9af370c22211d9d95243bfc42a0c14"
dependencies = [ dependencies = [
"ahash", "ahash",
"atoi", "atoi",
@ -1958,6 +1960,7 @@ dependencies = [
[[package]] [[package]]
name = "sqlx-macros" name = "sqlx-macros"
version = "0.6.2" version = "0.6.2"
source = "git+https://github.com/zaphar/sqlx?branch=remove_unstable_async_std_feature#cc8a048bbe9af370c22211d9d95243bfc42a0c14"
dependencies = [ dependencies = [
"dotenvy", "dotenvy",
"either", "either",
@ -1978,6 +1981,7 @@ dependencies = [
[[package]] [[package]]
name = "sqlx-rt" name = "sqlx-rt"
version = "0.6.2" version = "0.6.2"
source = "git+https://github.com/zaphar/sqlx?branch=remove_unstable_async_std_feature#cc8a048bbe9af370c22211d9d95243bfc42a0c14"
dependencies = [ dependencies = [
"async-std", "async-std",
"futures-rustls", "futures-rustls",

5
Cargo.toml
View File

@ -3,4 +3,7 @@ members = [ "recipes", "kitchen", "web", "recipe-store"]
[patch.crates-io] [patch.crates-io]
# TODO(jwall): When the fix for RcSignal Binding is released we can drop this patch. # TODO(jwall): When the fix for RcSignal Binding is released we can drop this patch.
sycamore = {git = "https://github.com/sycamore-rs/sycamore/", rev = "20b6069c470a51d2ba6197bb322036e8324ff297" } sycamore = { git = "https://github.com/sycamore-rs/sycamore/", rev = "20b6069c470a51d2ba6197bb322036e8324ff297" }
# NOTE(jwall): We are maintaining a patch to remove the unstable async_std_feature. It breaks in our project on
# Rust v1.64
sqlx = { git = "https://github.com/zaphar/sqlx", branch = "remove_unstable_async_std_feature" }

12
flake.lock generated
View File

@ -33,11 +33,11 @@
}, },
"flake-utils_2": { "flake-utils_2": {
"locked": { "locked": {
"lastModified": 1637014545, "lastModified": 1659877975,
"narHash": "sha256-26IZAc5yzlD9FlDT54io1oqG/bBoyka+FJk5guaX4x4=", "narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=",
"owner": "numtide", "owner": "numtide",
"repo": "flake-utils", "repo": "flake-utils",
"rev": "bba5dcc8e0b20ab664967ad83d24d64cb64ec4f4", "rev": "c0e246b9b83f637f4681389ecabcb2681b4f3af0",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -127,11 +127,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1659599305, "lastModified": 1665398664,
"narHash": "sha256-htzFq5RffyoKSZxiLfpUq5CyhkQwycsXB5ptale5e78=", "narHash": "sha256-y/UcVB5k0Wdc0j+7whJE2+vko8m296wZYX37b2lFSpI=",
"owner": "oxalica", "owner": "oxalica",
"repo": "rust-overlay", "repo": "rust-overlay",
"rev": "28cedcb8dfea9f1b96b0635cf99fe6bdca163f4e", "rev": "af29a900f10dd6e467622202fb4f6d944d72a3a6",
"type": "github" "type": "github"
}, },
"original": { "original": {

6
flake.nix
View File

@ -23,7 +23,7 @@
let let
overlays = [ rust-overlay.overlays.default ]; overlays = [ rust-overlay.overlays.default ];
pkgs = import nixpkgs { inherit system overlays; }; pkgs = import nixpkgs { inherit system overlays; };
rust-wasm = pkgs.rust-bin.stable."1.60.0".default.override { rust-wasm = pkgs.rust-bin.stable."1.64.0".default.override {
extensions = [ "rust-src" ]; extensions = [ "rust-src" ];
# Add wasm32 as an extra target besides the native target. # Add wasm32 as an extra target besides the native target.
targets = [ "wasm32-unknown-unknown" ]; targets = [ "wasm32-unknown-unknown" ];
@ -40,7 +40,9 @@
kitchen = (kitchenGen { kitchen = (kitchenGen {
inherit pkgs version naersk-lib kitchenWasm rust-wasm; inherit pkgs version naersk-lib kitchenWasm rust-wasm;
# Because it's a workspace we need the other crates available as source # Because it's a workspace we need the other crates available as source
root = (pkgs.callPackage gitignore { }).gitignoreSource ./.; # TODO(jwall): gitignoreSource is broken right now due to being impure.
#root = (pkgs.callPackage gitignore { }).gitignoreSource ./.;
root = ./.;
}); });
module = moduleGen {inherit kitchen;}; module = moduleGen {inherit kitchen;};
in in

3
kitchen/Cargo.toml
View File

@ -53,6 +53,5 @@ version = "1.12.0"
features = ["tokio1"] features = ["tokio1"]
[dependencies.sqlx] [dependencies.sqlx]
path = "../../sqlx" version = "0.6.2"
#version = "0.6.2"
features = ["sqlite", "runtime-async-std-rustls", "offline"] features = ["sqlite", "runtime-async-std-rustls", "offline"]

8
nix/kitchenWasm/default.nix
View File

@ -9,7 +9,13 @@ let
lockFile = ./../../Cargo.lock; lockFile = ./../../Cargo.lock;
# NOTE(jwall): Because we use wasm-pack directly below we need # NOTE(jwall): Because we use wasm-pack directly below we need
# the cargo dependencies to already be installed. # the cargo dependencies to already be installed.
cargoDeps = (pkgs.rustPlatform.importCargoLock { inherit lockFile; }); cargoDeps = (pkgs.rustPlatform.importCargoLock { inherit lockFile; outputHashes = {
# I'm maintaining some patches for these so the lockfile hashes are a little
# incorrect. We override those here.
"sycamore-0.8.2" = "sha256-I+NTfT83l8kST//IxJOZmeuhi1xWX070LToWPRU9j2A=";
"sqlx-0.6.2" = "sha256-X/LFvtzRfiOIEZJiVzmFvvULPpjhqvI99pSwH7a//GM=";
};
});
in in
stdenv.mkDerivation { stdenv.mkDerivation {
inherit src pname; inherit src pname;