From 8704d6f7759af2f6f78b86b499f2c4fffc20987e Mon Sep 17 00:00:00 2001
From: Harsh Shandilya <me@msfjarvis.dev>
Date: Sun, 25 Jun 2023 17:35:21 +0530
Subject: [PATCH] feat(flakes): adopt nix-systems for flake systems

---
 flake.lock | 40 +++++++++++++++-----------------------
 flake.nix  | 56 ++++++++++++++++++++----------------------------------
 2 files changed, 36 insertions(+), 60 deletions(-)

diff --git a/flake.lock b/flake.lock
index 8c5fca8..15606b1 100644
--- a/flake.lock
+++ b/flake.lock
@@ -48,7 +48,9 @@
         "nixpkgs": [
           "nixpkgs"
         ],
-        "systems": "systems"
+        "systems": [
+          "systems"
+        ]
       },
       "locked": {
         "lastModified": 1687173957,
@@ -103,7 +105,9 @@
     },
     "flake-utils": {
       "inputs": {
-        "systems": "systems_2"
+        "systems": [
+          "systems"
+        ]
       },
       "locked": {
         "lastModified": 1687171271,
@@ -144,7 +148,8 @@
         "flake-compat": "flake-compat",
         "flake-utils": "flake-utils",
         "nixpkgs": "nixpkgs",
-        "rust-msrv": "rust-msrv"
+        "rust-msrv": "rust-msrv",
+        "systems": "systems"
       }
     },
     "rust-analyzer-src": {
@@ -203,31 +208,16 @@
     },
     "systems": {
       "locked": {
-        "lastModified": 1681028828,
-        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
-        "owner": "nix-systems",
-        "repo": "default",
-        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
+        "lastModified": 1687694171,
+        "narHash": "sha256-m4E0xN69qKj/oKOj8OtiZcSFpFlO8paI6E3Wo5oXDJc=",
+        "owner": "msfjarvis",
+        "repo": "flake-systems",
+        "rev": "7876462a5f60841e8b2712ad20dc18470f448e8d",
         "type": "github"
       },
       "original": {
-        "owner": "nix-systems",
-        "repo": "default",
-        "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",
+        "owner": "msfjarvis",
+        "repo": "flake-systems",
         "type": "github"
       }
     }
diff --git a/flake.nix b/flake.nix
index a1bbdc3..d4f11be 100644
--- a/flake.nix
+++ b/flake.nix
@@ -1,48 +1,34 @@
 {
   description = "healthchecks-rs monorepo";
 
-  inputs = {
-    nixpkgs = {url = "github:NixOS/nixpkgs/nixpkgs-unstable";};
+  inputs.nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable";
 
-    devshell = {
-      url = "github:numtide/devshell";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
+  inputs.systems.url = "github:msfjarvis/flake-systems";
 
-    fenix = {
-      url = "github:nix-community/fenix";
-      inputs = {
-        nixpkgs.follows = "nixpkgs";
-      };
-    };
+  inputs.advisory-db.url = "github:rustsec/advisory-db";
+  inputs.advisory-db.flake = false;
 
-    flake-utils = {url = "github:numtide/flake-utils";};
+  inputs.crane.url = "github:ipetkov/crane";
+  inputs.crane.inputs.flake-compat.follows = "flake-compat";
+  inputs.crane.inputs.flake-utils.follows = "flake-utils";
+  inputs.crane.inputs.nixpkgs.follows = "nixpkgs";
 
-    flake-compat = {
-      url = "github:nix-community/flake-compat";
-      flake = false;
-    };
+  inputs.devshell.url = "github:numtide/devshell";
+  inputs.devshell.inputs.nixpkgs.follows = "nixpkgs";
+  inputs.devshell.inputs.systems.follows = "systems";
 
-    crane = {
-      url = "github:ipetkov/crane";
-      inputs = {
-        flake-compat.follows = "flake-compat";
-        flake-utils.follows = "flake-utils";
-        nixpkgs.follows = "nixpkgs";
-      };
-    };
+  inputs.fenix.url = "github:nix-community/fenix";
+  inputs.fenix.inputs.nixpkgs.follows = "nixpkgs";
 
-    advisory-db = {
-      url = "github:rustsec/advisory-db";
-      flake = false;
-    };
+  inputs.flake-utils.url = "github:numtide/flake-utils";
+  inputs.flake-utils.inputs.systems.follows = "systems";
 
-    # Keep in sync with healthchecks/Cargo.toml
-    rust-msrv = {
-      url = "https://static.rust-lang.org/dist/channel-rust-1.64.0.toml";
-      flake = false;
-    };
-  };
+  inputs.flake-compat.url = "github:nix-community/flake-compat";
+  inputs.flake-compat.flake = false;
+
+  # Keep in sync with healthchecks/Cargo.toml
+  inputs.rust-msrv.url = "https://static.rust-lang.org/dist/channel-rust-1.64.0.toml";
+  inputs.rust-msrv.flake = false;
 
   outputs = {
     self,