Clean up flake.nix

flake.lock

@@ -4,23 +4,6 @@
       "inputs": {
         "systems": "systems"
       },
-      "locked": {
-        "lastModified": 1689068808,
-        "narHash": "sha256-6ixXo3wt24N/melDWjq70UuHQLxGV8jZvooRanIHXw0=",
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "rev": "919d646de7be200f3bf08cb76ae1f09402b6f9b4",
-        "type": "github"
-      },
-      "original": {
-        "id": "flake-utils",
-        "type": "indirect"
-      }
-    },
-    "flake-utils_2": {
-      "inputs": {
-        "systems": "systems_2"
-      },
       "locked": {
         "lastModified": 1681202837,
         "narHash": "sha256-H+Rh19JDwRtpVPAWp64F+rlEtxUWBAQW28eAi3SRSzg=",
@@ -69,14 +52,13 @@
     },
     "root": {
       "inputs": {
-        "flake-utils": "flake-utils",
         "nixpkgs": "nixpkgs",
         "rust-overlay": "rust-overlay"
       }
     },
     "rust-overlay": {
       "inputs": {
-        "flake-utils": "flake-utils_2",
+        "flake-utils": "flake-utils",
         "nixpkgs": "nixpkgs_2"
       },
       "locked": {
@@ -107,21 +89,6 @@
         "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",
-        "type": "github"
-      }
     }
   },
   "root": "root",

flake.nix

@@ -6,12 +6,12 @@
     rust-overlay.url = "github:oxalica/rust-overlay";
   };
 
-  outputs = { self, nixpkgs, rust-overlay, flake-utils }:
+  outputs = { self, nixpkgs, rust-overlay }:
     let
       overlays = [ (import rust-overlay) ];
-      pkgs = import nixpkgs {
-        inherit overlays;
       system = "x86_64-linux";
+      pkgs = import nixpkgs {
+        inherit system overlays;
       };
       rustSettings = with pkgs; {
         src = ./.; 
@@ -19,26 +19,24 @@
         buildInputs = [ openssl ];
         cargoHash = nixpkgs.lib.fakeHash;
       };
-    in
+    in rec {
-    with pkgs; rec {
+      devShells.${system}.default = with pkgs; mkShell {
-      devShells.x86_64-linux.default = mkShell {
         packages = [ bacon ];
-        inputsFrom = [
+        inputsFrom = with packages.${system}; [ tatoeba images ];
-          packages.x86_64-linux.tatoeba
-          packages.x86_64-linux.images
-        ];
       };
-      packages.x86_64-linux.tatoeba = rustPlatform.buildRustPackage (rustSettings // {
+      packages.${system} = {
+        tatoeba = pkgs.rustPlatform.buildRustPackage (rustSettings // {
           pname = "tatoeba";
           version = "0.1.0";
           buildAndTestSubdir = "tatoeba";
           cargoHash = "sha256-74Jq3saaUyPvNm/0croVOBuMtpN8xT3S4z37nutJdw4=";
         });
-      packages.x86_64-linux.images = rustPlatform.buildRustPackage (rustSettings // {
+        images = pkgs.rustPlatform.buildRustPackage (rustSettings // {
           pname = "images";
           version = "0.1.0";
           buildAndTestSubdir = "images";
           cargoHash = "sha256-fKmTZTcJj/eYCQE9cjiXB/Pt6BdJNZ/e5cSRgbuPIJs=";
         });
       };
+    };
 }