From 06f58fa2e1c16bf168c229fb66f5ce1885c8299b Mon Sep 17 00:00:00 2001 From: Aumetra Weisman Date: Fri, 29 Mar 2024 19:58:04 +0100 Subject: [PATCH] flake up --- Cargo.lock | 2 ++ Cargo.toml | 1 - flake.lock | 18 +++++++++--------- flake.nix | 4 ++-- 4 files changed, 13 insertions(+), 12 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 66ad10241..c7799fe28 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -6862,6 +6862,8 @@ dependencies = [ [[package]] name = "scoped-futures" version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b1473e24c637950c9bd38763220bea91ec3e095a89f672bbd7a10d03e77ba467" dependencies = [ "cfg-if", "pin-utils", diff --git a/Cargo.toml b/Cargo.toml index 94748813b..277b8ccf7 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -117,5 +117,4 @@ install-updater = true [patch.crates-io] diesel-async = { git = "https://github.com/weiznich/diesel_async.git", rev = "017ebe2fb7a2709ab5db92148dea5ce812a35e09" } -scoped-futures = { path = "../../scoped-futures" } tokio-postgres-rustls = { git = "https://github.com/jbg/tokio-postgres-rustls.git", rev = "b3b59ac2fa1b5823f2426fef78a0fb74c004ec38" } diff --git a/flake.lock b/flake.lock index b4d584edb..635450cac 100644 --- a/flake.lock +++ b/flake.lock @@ -71,11 +71,11 @@ "pre-commit-hooks": "pre-commit-hooks_2" }, "locked": { - "lastModified": 1711122363, - "narHash": "sha256-Yw/t9HCY9U/EpkXlzW+5o/WEpZKUNgrSbcuHOZFpAXU=", + "lastModified": 1711676035, + "narHash": "sha256-m8AHpQR0WVVEoWWOpXVNvqfB5cXiMRnHfcYYm2zg7tk=", "owner": "cachix", "repo": "devenv", - "rev": "63c7109f20b5ded0bc07f95ece9518bbb7fdea5b", + "rev": "19098329b4e79f60705d7fb241a3617266658f98", "type": "github" }, "original": { @@ -468,11 +468,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1711001935, - "narHash": "sha256-URtGpHue7HHZK0mrHnSf8wJ6OmMKYSsoLmJybrOLFSQ=", + "lastModified": 1711523803, + "narHash": "sha256-UKcYiHWHQynzj6CN/vTcix4yd1eCu1uFdsuarupdCQQ=", "owner": "nixos", "repo": "nixpkgs", - "rev": "20f77aa09916374aa3141cbc605c955626762c9a", + "rev": "2726f127c15a4cc9810843b96cad73c7eb39e443", "type": "github" }, "original": { @@ -581,11 +581,11 @@ ] }, "locked": { - "lastModified": 1711073443, - "narHash": "sha256-PpNb4xq7U5Q/DdX40qe7CijUsqhVVM3VZrhN0+c6Lcw=", + "lastModified": 1711678273, + "narHash": "sha256-7lIB0hMRnfzx/9oSIwTnwXmVnbvVGRoadOCW+1HI5zY=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "eec55ba9fcde6be4c63942827247e42afef7fafe", + "rev": "42a168449605950935f15ea546f6f770e5f7f629", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 29ed38fd3..e214b14ad 100644 --- a/flake.nix +++ b/flake.nix @@ -37,8 +37,8 @@ }; stdenv = pkgs.stdenvAdapters.useMoldLinker pkgs.stdenv; rustPlatform = pkgs.makeRustPlatform { - cargo = pkgs.rust-bin.stable.latest.minimal; - rustc = pkgs.rust-bin.stable.latest.minimal; + cargo = pkgs.rust-bin.beta.latest.minimal; + rustc = pkgs.rust-bin.beta.latest.minimal; inherit stdenv; };