From f5432dae532e0fdc60e109430d066e03d133509c Mon Sep 17 00:00:00 2001
From: Kaya Gokalp <kayagokalp123@gmail.com>
Date: Fri, 4 Aug 2023 00:04:44 +0300
Subject: [PATCH] fix: bump rust to 1.70 from 07-01

---
 flake.lock  | 42 ++++++++++++++++++++++++++++++------------
 patches.nix |  5 +++--
 2 files changed, 33 insertions(+), 14 deletions(-)

diff --git a/flake.lock b/flake.lock
index 939191b7..71ca1791 100644
--- a/flake.lock
+++ b/flake.lock
@@ -20,11 +20,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1674641431,
-        "narHash": "sha256-qfo19qVZBP4qn5M5gXc/h1MDgAtPA5VxJm9s8RUAkVk=",
+        "lastModified": 1691006197,
+        "narHash": "sha256-DbtxVWPt+ZP5W0Usg7jAyTomIM//c3Jtfa59Ht7AV8s=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "9b97ad7b4330aacda9b2343396eb3df8a853b4fc",
+        "rev": "66aedfd010204949cb225cf749be08cb13ce1813",
         "type": "github"
       },
       "original": {
@@ -50,11 +50,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1685673048,
-        "narHash": "sha256-iGmamm2ykfUpekXf02SN/r4dPeU33rekwXpkQyB5L1I=",
+        "lastModified": 1691029059,
+        "narHash": "sha256-QwVeE9YTgH3LmL7yw2V/hgswL6yorIvYSp4YGI8lZYM=",
         "owner": "oxalica",
         "repo": "rust-overlay",
-        "rev": "19fdc1c7ae8aa90ba50f044496fda6c4b6616f91",
+        "rev": "99df4908445be37ddb2d332580365fce512a7dcf",
         "type": "github"
       },
       "original": {
@@ -67,11 +67,11 @@
     "sway-vim-src": {
       "flake": false,
       "locked": {
-        "lastModified": 1636665970,
-        "narHash": "sha256-dk8YCP09aDcuFKxP1iAdWbmQHh+P8wmPLjYyDTdujz0=",
+        "lastModified": 1676340483,
+        "narHash": "sha256-WjnR5oOVs9drlMiYgR0HdGm+HkGcuF1z/LPQATVGxYs=",
         "owner": "fuellabs",
         "repo": "sway.vim",
-        "rev": "2f9e8714413dc668c94b358efbb3d282e4873edb",
+        "rev": "93aed5a89124806a01c91d8ab4b55aed13cbddb0",
         "type": "github"
       },
       "original": {
@@ -95,13 +95,31 @@
         "type": "github"
       }
     },
+    "systems_2": {
+      "locked": {
+        "lastModified": 1681028828,
+        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
+        "owner": "nix-systems",
+        "repo": "default",
+        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-systems",
+        "repo": "default",
+        "type": "github"
+      }
+    },
     "utils": {
+      "inputs": {
+        "systems": "systems_2"
+      },
       "locked": {
-        "lastModified": 1667395993,
-        "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=",
+        "lastModified": 1689068808,
+        "narHash": "sha256-6ixXo3wt24N/melDWjq70UuHQLxGV8jZvooRanIHXw0=",
         "owner": "numtide",
         "repo": "flake-utils",
-        "rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f",
+        "rev": "919d646de7be200f3bf08cb76ae1f09402b6f9b4",
         "type": "github"
       },
       "original": {
diff --git a/patches.nix b/patches.nix
index d69fad22..88021cca 100644
--- a/patches.nix
+++ b/patches.nix
@@ -311,9 +311,10 @@ in [
       rust = pkgs.rust-bin.stable."1.68.0".default;
     };
   }
-  # `forc-wallet` requires Rust 1.70 as of ~2023-07-20
+
+  # `forc` requires Rust 1.70 as of ~2023-07-01
   {
-    condition = m: m.date >= "2023-07-20";
+    condition = m: m.date >= "2023-07-01";
     patch = m: {
       rust = pkgs.rust-bin.stable."1.70.0".default;
     };