feat(devshell): update rust

tao3k · Sep 23, 2023 · 355ee01 · 355ee01
1 parent 37c2ae2
commit 355ee01
Show file tree

Hide file tree

Showing 6 changed files with 35 additions and 26 deletions.
diff --git a/evalModules/devshell/modules/language/rust.nix b/evalModules/devshell/modules/language/rust.nix
@@ -0,0 +1,21 @@
+{
+  options = with lib; {
+    overlays = mkOption {
+      type = types.lazyAttrsOf (
+        types.uniq (
+          types.functionTo (types.functionTo (types.lazyAttrsOf types.unspecified))
+        )
+      );
+      apply = lib.mapAttrs (
+        _k: f: final: prev:
+        f final prev
+      );
+      default = { };
+      example = lib.literalExpression or lib.literalExample ''
+        {
+          default = final: prev: {};
+        }
+      '';
+    };
+  };
+}
diff --git a/evalModules/devshell/profiles/rust.nix b/evalModules/devshell/profiles/rust.nix
@@ -1,10 +1,14 @@
 let
-  pkgs' = nixpkgs.appendOverlays [ fenix.overlays.default ];
+  pkgs' = nixpkgs.appendOverlays [ config.language.rust.overlays.default ];
 in
 {
-  imports = [ (extraModulesPath + "/language/rust.nix") ];
+  imports = [
+    POS.devshellModules.language.rust
+    (extraModulesPath + "/language/rust.nix")
+  ];
 
   language.rust = {
+    overlays = fenix.overlays;
     packageSet = pkgs'.fenix.default;
     enableDefaultToolchain = true;
     tools = [ "toolchain" ];

diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -108,8 +108,6 @@
           };
         }).outputsForTarget.default;
 
-      test = self;
-
       evalModules = {
         devshell = rec {
           loadModules = flops.lib.haumea.pops.default.setInit {

diff --git a/tests/_snapshots/devshell b/tests/_snapshots/devshell
@@ -1,2 +1,2 @@
 #json
-{"rust":"/nix/store/1fnvpi7rxxk8vayyi7kincsc4cz7sn1x-devshell"}
+{"rust":"/nix/store/43i35s8ih0kk6hhnbidbpf9ip5bj1g1w-rust"}
diff --git a/tests/devshell/expr.nix b/tests/devshell/expr.nix
@@ -30,7 +30,7 @@ let
     }).exports.default;
 
   shell = inputs.devshell.mkShell {
-    name = "devshell";
+    name = "rust";
     imports = [ devshellProfiles.rust ];
   };
 in