nix: upgrade dependencies and flake output conventions

2 files changed, 44 insertions, 46 deletions

diff --git a/flake.lock b/flake.lock
index bd1c02f..72c2dd0 100644
--- a/flake.lock
+++ b/flake.lock
@@ -2,15 +2,16 @@
   "nodes": {
     "flake-utils": {
       "locked": {
-        "lastModified": 1610051610,
-        "narHash": "sha256-U9rPz/usA1/Aohhk7Cmc2gBrEEKRzcW4nwPWMPwja4Y=",
+        "lastModified": 1667395993,
+        "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=",
         "owner": "numtide",
         "repo": "flake-utils",
-        "rev": "3982c9903e93927c2164caa727cd3f6a0e6d14cc",
+        "rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f",
         "type": "github"
       },
       "original": {
         "owner": "numtide",
+        "ref": "master",
         "repo": "flake-utils",
         "type": "github"
       }
@@ -22,47 +23,48 @@
         ]
       },
       "locked": {
-        "lastModified": 1610977739,
-        "narHash": "sha256-W+uzJ49g/koyX30g/24OVehw5iG54klR0pFwFLuuzHw=",
+        "lastModified": 1662220400,
+        "narHash": "sha256-9o2OGQqu4xyLZP9K6kNe1pTHnyPz0Wr3raGYnr9AIgY=",
         "owner": "nmattia",
         "repo": "naersk",
-        "rev": "79a613f3b5b6ca73eb25d02051192b8aeddfdb53",
+        "rev": "6944160c19cb591eb85bbf9b2f2768a935623ed3",
         "type": "github"
       },
       "original": {
         "owner": "nmattia",
+        "ref": "master",
         "repo": "naersk",
         "type": "github"
       }
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1635879315,
-        "narHash": "sha256-yfCKg/0Cc2wKUQvb0ND5ijac8adPuDBvubJhpGemNlM=",
+        "lastModified": 1669625751,
+        "narHash": "sha256-KIT7X/L0h0e5gbvvU3rPsrWsftei6i8obXPlvBYAy1A=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "3dc6784ba46181e08df9a9b1117a512208711b09",
+        "rev": "cc7ae74d400f29260eab2f48f1f44a10914d0f9c",
         "type": "github"
       },
       "original": {
         "owner": "nixos",
-        "ref": "release-21.05",
+        "ref": "release-22.05",
         "repo": "nixpkgs",
         "type": "github"
       }
     },
     "nixpkgs-mozilla": {
-      "flake": false,
       "locked": {
-        "lastModified": 1603906276,
-        "narHash": "sha256-RsNPnEKd7BcogwkqhaV5kI/HuNC4flH/OQCC/4W5y/8=",
+        "lastModified": 1664789696,
+        "narHash": "sha256-UGWJHQShiwLCr4/DysMVFrYdYYHcOqAOVsWNUu+l6YU=",
         "owner": "mozilla",
         "repo": "nixpkgs-mozilla",
-        "rev": "8c007b60731c07dd7a052cce508de3bb1ae849b4",
+        "rev": "80627b282705101e7b38e19ca6e8df105031b072",
         "type": "github"
       },
       "original": {
         "owner": "mozilla",
+        "ref": "master",
         "repo": "nixpkgs-mozilla",
         "type": "github"
       }
diff --git a/flake.nix b/flake.nix
index 405a2e1..fbe0fab 100644
--- a/flake.nix
+++ b/flake.nix
@@ -1,15 +1,14 @@
 {
   inputs = {
-    nixpkgs.url = "github:nixos/nixpkgs/release-21.05";
-    flake-utils.url = "github:numtide/flake-utils";
+    nixpkgs.url = "github:nixos/nixpkgs/release-22.05";
+    flake-utils.url = "github:numtide/flake-utils/master";
 
     nixpkgs-mozilla = {
-      url = "github:mozilla/nixpkgs-mozilla";
-      flake = false;
+      url = "github:mozilla/nixpkgs-mozilla/master";
     };
 
     naersk = {
-      url = "github:nmattia/naersk";
+      url = "github:nmattia/naersk/master";
       inputs.nixpkgs.follows = "nixpkgs";
     };
   };
@@ -28,27 +27,28 @@
 
         overlays = [
           (import inputs.nixpkgs-mozilla)
-
-          (self: super: let
-            rust = (super.rustChannelOf {
-              channel = "nightly";
-              date = "2021-10-26";
-              sha256 = "1hLbypXA+nuH7o3AHCokzSBZAvQxvef4x9+XxO3aBao=";
-            }).rust.override {
-              extensions = ["rust-src"];
-            };
-          in {
-            cargo = rust;
-            rustc = rust;
-
-            naerskRust = rust;
-          })
         ];
       };
 
-      naersk = (inputs.naersk.lib."${system}".override {
-        inherit (pkgs) cargo rustc;
-      });
+      mkRust = extensions: (pkgs.rustChannelOf {
+        channel = "nightly";
+        date = "2021-10-26";
+        sha256 = "1hLbypXA+nuH7o3AHCokzSBZAvQxvef4x9+XxO3aBao=";
+      }).rust.override {
+        inherit extensions;
+      };
+
+      buildToolchain = mkRust [];
+      devToolchain = mkRust [
+        "rust-analyzer"
+        "rust-src"
+        "clippy"
+      ];
+
+      naersk = pkgs.callPackage inputs.naersk {
+        cargo = buildToolchain;
+        rustc = buildToolchain;
+      };
 
       deps = with pkgs; [
         openssl
@@ -70,20 +70,16 @@
       };
 
     in {
-      devShell = pkgs.mkShell {
+      devShells.default = pkgs.mkShell {
         buildInputs = (with pkgs; [
-          cargo
-          rustc
-
-          rustracer
+          devToolchain
         ]) ++ deps;
 
-        RUST_SRC_PATH = "${pkgs.naerskRust}/lib/rustlib/src/rust";
+        RUST_SRC_PATH = "${devToolchain}/lib/rustlib/src/rust";
       };
 
-      defaultPackage = pkg;
-
-      defaultApp = {
+      packages.default = pkg;
+      apps.default = {
         type = "app";
         program = "${pkg}/bin/thulani";
       };