Improve flake.nix

Author: mawkler

flake.lock

@@ -1,37 +1,45 @@
 {
   inputs = {
-    naersk.url = "github:nix-community/naersk/master";
     nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable";
-    utils.url = "github:numtide/flake-utils";
+    flake-utils.url = "github:numtide/flake-utils";
+    naersk = {
+      url = "github:nix-community/naersk";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
   };
 
-  outputs = { nixpkgs, utils, naersk, ... }:
-    utils.lib.eachDefaultSystem (system:
+  outputs =
+    {
+      flake-utils,
+      naersk,
+      nixpkgs,
+      ...
+    }:
+    flake-utils.lib.eachDefaultSystem (
+      system:
       let
-        pkgs = import nixpkgs { inherit system; };
-        naersk-lib = pkgs.callPackage naersk { };
-      in {
-        defaultPackage = naersk-lib.buildPackage {
-          src = ./.;
-          # The binary is called `maconomy`, not `maconomy-cli`
-          pname = "maconomy";
+        pkgs = (import nixpkgs) { inherit system; };
+        naersk' = pkgs.callPackage naersk { };
+      in
+      {
+        devShell = pkgs.mkShell {
+          # For `nix develop`
+          nativeBuildInputs = with pkgs; [
+            # Rust stuff - use unwrapped to avoid -Z flags
+            rustfmt
+            pre-commit
+            rustPackages.clippy
+            cargo-insta
+
+            # Other
+            openssl
+            pkg-config
+            chromium
+          ];
         };
-        devShell = with pkgs;
-          mkShell {
-            buildInputs = [
-              # Rust stuff
-              cargo
-              rustc
-              rustfmt
-              pre-commit
-              rustPackages.clippy
 
-              # Other
-              openssl
-              pkg-config
-              chromium
-            ];
-            RUST_SRC_PATH = rustPlatform.rustLibSrc;
-          };
-      });
+        # For `nix build`/`nix run`
+        packages.default = naersk'.buildPackage { src = ./.; };
+      }
+    );
 }